RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-28 16:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.

Browse Source
This commit is contained in:
Lucas A 2019-06-11 19:41:48 +02:00
parent 6c74998487
commit 15893bbb75
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
View File

@ -61,11 +61,11 @@ namespace osu.Game.Tests.Visual.Online
public void UserActivitiesTests()
{
AddStep("idle", () => { flyte.Activity.Value = null; });
AddStep("spectating", () => { flyte.Activity.Value = new UserActivity.UserActivitySpectating(); });
AddStep("solo", () => { flyte.Activity.Value = new UserActivity.UserActivitySoloGame(null, null); });
AddStep("choosing", () => { flyte.Activity.Value = new UserActivity.UserActivityChoosingBeatmap(); });
AddStep("editing", () => { flyte.Activity.Value = new UserActivity.UserActivityEditing(null); });
AddStep("modding", () => { flyte.Activity.Value = new UserActivity.UserActivityModding(); });
AddStep("spectating", () => { flyte.Activity.Value = new UserActivity.Spectating(); });
AddStep("solo", () => { flyte.Activity.Value = new UserActivity.SoloGame(null, null); });
AddStep("choosing", () => { flyte.Activity.Value = new UserActivity.ChoosingBeatmap(); });
AddStep("editing", () => { flyte.Activity.Value = new UserActivity.Editing(null); });
AddStep("modding", () => { flyte.Activity.Value = new UserActivity.Modding(); });
}
}
}

2
osu.Game/Screens/Edit/Editor.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Screens.Edit
private DependencyContainer dependencies;
private GameHost host;
protected override UserActivity InitialScreenActivity => new UserActivity.UserActivityEditing(Beatmap.Value.BeatmapInfo);
protected override UserActivity InitialScreenActivity => new UserActivity.Editing(Beatmap.Value.BeatmapInfo);
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
=> dependencies = new DependencyContainer(base.CreateChildDependencies(parent));

2
osu.Game/Screens/Play/Player.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play
{
protected override bool AllowBackButton => false; // handled by HoldForMenuButton
protected override UserActivity InitialScreenActivity => new UserActivity.UserActivitySoloGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
protected override UserActivity InitialScreenActivity => new UserActivity.SoloGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
public override float BackgroundParallaxAmount => 0.1f;

2
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Screens.Select
public override bool AllowExternalScreenChange => true;
protected override UserActivity InitialScreenActivity => new UserActivity.UserActivityChoosingBeatmap();
protected override UserActivity InitialScreenActivity => new UserActivity.ChoosingBeatmap();
[BackgroundDependencyLoader]
private void load(OsuColour colours)

24
osu.Game/Users/UserActivity.cs
View File

@ -12,25 +12,25 @@ namespace osu.Game.Users
public abstract string Status { get; }
public virtual Color4 GetAppropriateColour(OsuColour colours) => colours.GreenDarker;
public class UserActivityModding : UserActivity
public class Modding : UserActivity
{
public override string Status => "Modding a map";
public override Color4 GetAppropriateColour(OsuColour colours) => colours.PurpleDark;
}
public class UserActivityChoosingBeatmap : UserActivity
public class ChoosingBeatmap : UserActivity
{
public override string Status => "Choosing a beatmap";
}
public class UserActivityMultiplayerGame : UserActivity
public class MultiplayerGame : UserActivity
{
public override string Status => "Multiplaying";
public override string Status => "Playing with others";
}
public class UserActivityEditing : UserActivity
public class Editing : UserActivity
{
public UserActivityEditing(BeatmapInfo info)
public Editing(BeatmapInfo info)
{
Beatmap = info;
}
@ -40,29 +40,29 @@ namespace osu.Game.Users
public BeatmapInfo Beatmap { get; }
}
public class UserActivitySoloGame : UserActivity
public class SoloGame : UserActivity
{
public UserActivitySoloGame(BeatmapInfo info, Rulesets.RulesetInfo ruleset)
public SoloGame(BeatmapInfo info, Rulesets.RulesetInfo ruleset)
{
Beatmap = info;
Ruleset = ruleset;
}
public override string Status => @"Solo Game";
public override string Status => @"Playing alone";
public BeatmapInfo Beatmap { get; }
public Rulesets.RulesetInfo Ruleset { get; }
}
public class UserActivitySpectating : UserActivity
public class Spectating : UserActivity
{
public override string Status => @"Spectating a game";
}
public class UserActivityInLobby : UserActivity
public class InLobby : UserActivity
{
public override string Status => @"in Multiplayer Lobby";
public override string Status => @"In a Multiplayer Lobby";
}
}
}