h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 11:02:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #18495 from peppy/rename-chat-overlay

Browse Source 
Remove "V2" suffix from `ChatOverlay` components
This commit is contained in:
Dan Balasescu 2022-05-30 18:45:02 +09:00 committed by GitHub
commit 98fe0cf3d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Navigation/TestSceneOsuGame.cs
View File

@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual.Navigation
typeof(DashboardOverlay), typeof(DashboardOverlay),
typeof(NewsOverlay), typeof(NewsOverlay),
typeof(ChannelManager), typeof(ChannelManager),
typeof(ChatOverlayV2), typeof(ChatOverlay),
typeof(SettingsOverlay), typeof(SettingsOverlay),
typeof(UserProfileOverlay), typeof(UserProfileOverlay),
typeof(BeatmapSetOverlay), typeof(BeatmapSetOverlay),

4
osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
View File

@ -86,9 +86,9 @@ namespace osu.Game.Tests.Visual.Navigation
[Test] [Test]
public void TestOverlaysAlwaysClosed() public void TestOverlaysAlwaysClosed()
{ {
ChatOverlayV2 chat = null; ChatOverlay chat = null;
AddUntilStep("is at menu", () => Game.ScreenStack.CurrentScreen is MainMenu); AddUntilStep("is at menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
AddUntilStep("wait for chat load", () => (chat = Game.ChildrenOfType<ChatOverlayV2>().SingleOrDefault()) != null); AddUntilStep("wait for chat load", () => (chat = Game.ChildrenOfType<ChatOverlay>().SingleOrDefault()) != null);
AddStep("show chat", () => InputManager.Key(Key.F8)); AddStep("show chat", () => InputManager.Key(Key.F8));

8
osu.Game.Tests/Visual/Online/TestSceneChatOverlayV2.cs → osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
View File

@ -32,9 +32,9 @@ using osuTK.Input;
namespace osu.Game.Tests.Visual.Online namespace osu.Game.Tests.Visual.Online
{ {
[TestFixture] [TestFixture]
public class TestSceneChatOverlayV2 : OsuManualInputManagerTestScene public class TestSceneChatOverlay : OsuManualInputManagerTestScene
{ {
private TestChatOverlayV2 chatOverlay; private TestChatOverlay chatOverlay;
private ChannelManager channelManager; private ChannelManager channelManager;
private APIUser testUser; private APIUser testUser;
@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
Children = new Drawable[] Children = new Drawable[]
{ {
channelManager, channelManager,
chatOverlay = new TestChatOverlayV2(), chatOverlay = new TestChatOverlay(),
}, },
}; };
}); });
@ -564,7 +564,7 @@ namespace osu.Game.Tests.Visual.Online
}; };
} }
private class TestChatOverlayV2 : ChatOverlayV2 private class TestChatOverlay : ChatOverlay
{ {
public bool SlowLoading { get; set; } public bool SlowLoading { get; set; }

2
osu.Game.Tests/Visual/Online/TestSceneMessageNotifier.cs
View File

@ -208,7 +208,7 @@ namespace osu.Game.Tests.Visual.Online
}; };
[Cached] [Cached]
public ChatOverlayV2 ChatOverlay { get; } = new ChatOverlayV2(); public ChatOverlay ChatOverlay { get; } = new ChatOverlay();
private readonly MessageNotifier messageNotifier = new MessageNotifier(); private readonly MessageNotifier messageNotifier = new MessageNotifier();

2
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -46,7 +46,7 @@ namespace osu.Game.Configuration
SetDefault(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation); SetDefault(OsuSetting.RandomSelectAlgorithm, RandomSelectAlgorithm.RandomPermutation);
SetDefault(OsuSetting.ChatDisplayHeight, ChatOverlayV2.DEFAULT_HEIGHT, 0.2f, 1f); SetDefault(OsuSetting.ChatDisplayHeight, ChatOverlay.DEFAULT_HEIGHT, 0.2f, 1f);
SetDefault(OsuSetting.BeatmapListingCardSize, BeatmapCardSize.Normal); SetDefault(OsuSetting.BeatmapListingCardSize, BeatmapCardSize.Normal);

4
osu.Game/Online/Chat/MessageNotifier.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Online.Chat
private INotificationOverlay notifications { get; set; } private INotificationOverlay notifications { get; set; }
[Resolved] [Resolved]
private ChatOverlayV2 chatOverlay { get; set; } private ChatOverlay chatOverlay { get; set; }
[Resolved] [Resolved]
private ChannelManager channelManager { get; set; } private ChannelManager channelManager { get; set; }
@ -170,7 +170,7 @@ namespace osu.Game.Online.Chat
public override bool IsImportant => false; public override bool IsImportant => false;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, ChatOverlayV2 chatOverlay, INotificationOverlay notificationOverlay) private void load(OsuColour colours, ChatOverlay chatOverlay, INotificationOverlay notificationOverlay)
{ {
IconBackground.Colour = colours.PurpleDark; IconBackground.Colour = colours.PurpleDark;

4
osu.Game/OsuGame.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game
public Toolbar Toolbar; public Toolbar Toolbar;
private ChatOverlayV2 chatOverlay; private ChatOverlay chatOverlay;
private ChannelManager channelManager; private ChannelManager channelManager;
@ -848,7 +848,7 @@ namespace osu.Game
loadComponentSingleFile(news = new NewsOverlay(), overlayContent.Add, true); loadComponentSingleFile(news = new NewsOverlay(), overlayContent.Add, true);
var rankingsOverlay = loadComponentSingleFile(new RankingsOverlay(), overlayContent.Add, true); var rankingsOverlay = loadComponentSingleFile(new RankingsOverlay(), overlayContent.Add, true);
loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true); loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true);
loadComponentSingleFile(chatOverlay = new ChatOverlayV2(), overlayContent.Add, true); loadComponentSingleFile(chatOverlay = new ChatOverlay(), overlayContent.Add, true);
loadComponentSingleFile(new MessageNotifier(), AddInternal, true); loadComponentSingleFile(new MessageNotifier(), AddInternal, true);
loadComponentSingleFile(Settings = new SettingsOverlay(), leftFloatingOverlayContent.Add, true); loadComponentSingleFile(Settings = new SettingsOverlay(), leftFloatingOverlayContent.Add, true);
loadComponentSingleFile(changelogOverlay = new ChangelogOverlay(), overlayContent.Add, true); loadComponentSingleFile(changelogOverlay = new ChangelogOverlay(), overlayContent.Add, true);

4
osu.Game/Overlays/ChatOverlayV2.cs → osu.Game/Overlays/ChatOverlay.cs
View File

@ -27,7 +27,7 @@ using osu.Game.Overlays.Chat.Listing;
namespace osu.Game.Overlays namespace osu.Game.Overlays
{ {
public class ChatOverlayV2 : OsuFocusedOverlayContainer, INamedOverlayComponent, IKeyBindingHandler<PlatformAction> public class ChatOverlay : OsuFocusedOverlayContainer, INamedOverlayComponent, IKeyBindingHandler<PlatformAction>
{ {
public string IconTexture => "Icons/Hexacons/messaging"; public string IconTexture => "Icons/Hexacons/messaging";
public LocalisableString Title => ChatStrings.HeaderTitle; public LocalisableString Title => ChatStrings.HeaderTitle;
@ -70,7 +70,7 @@ namespace osu.Game.Overlays
private readonly IBindableList<Channel> availableChannels = new BindableList<Channel>(); private readonly IBindableList<Channel> availableChannels = new BindableList<Channel>();
private readonly IBindableList<Channel> joinedChannels = new BindableList<Channel>(); private readonly IBindableList<Channel> joinedChannels = new BindableList<Channel>();
public ChatOverlayV2() public ChatOverlay()
{ {
Height = DEFAULT_HEIGHT; Height = DEFAULT_HEIGHT;

2
osu.Game/Overlays/Profile/Header/Components/MessageUserButton.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
private UserProfileOverlay userOverlay { get; set; } private UserProfileOverlay userOverlay { get; set; }
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private ChatOverlayV2 chatOverlay { get; set; } private ChatOverlay chatOverlay { get; set; }
[Resolved] [Resolved]
private IAPIProvider apiProvider { get; set; } private IAPIProvider apiProvider { get; set; }

2
osu.Game/Overlays/Toolbar/ToolbarChatButton.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Toolbar
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(ChatOverlayV2 chat) private void load(ChatOverlay chat)
{ {
StateContainer = chat; StateContainer = chat;
} }