From 05f7ea6b6d27ea5378b10c1e4f0965e162a5ce96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Sat, 27 Nov 2021 15:08:03 +0100 Subject: [PATCH] Remove mentions of "panel" and "direct" from names of old download buttons --- .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs | 4 ++-- ...ectDownloadButton.cs => TestSceneBeatmapDownloadButton.cs} | 4 ++-- ...BeatmapPanelDownloadButton.cs => BeatmapDownloadButton.cs} | 4 ++-- osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs | 2 +- osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename osu.Game.Tests/Visual/Online/{TestSceneDirectDownloadButton.cs => TestSceneBeatmapDownloadButton.cs} (97%) rename osu.Game/Beatmaps/Drawables/{BeatmapPanelDownloadButton.cs => BeatmapDownloadButton.cs} (96%) diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs index 0b3ecb41cd..55aa665ff1 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs @@ -235,7 +235,7 @@ namespace osu.Game.Tests.Visual.Multiplayer assertDownloadButtonVisible(false); void assertDownloadButtonVisible(bool visible) => AddUntilStep($"download button {(visible ? "shown" : "hidden")}", - () => playlist.ChildrenOfType().Single().Alpha == (visible ? 1 : 0)); + () => playlist.ChildrenOfType().Single().Alpha == (visible ? 1 : 0)); } [Test] @@ -249,7 +249,7 @@ namespace osu.Game.Tests.Visual.Multiplayer createPlaylist(byOnlineId, byChecksum); - AddAssert("download buttons shown", () => playlist.ChildrenOfType().All(d => d.IsPresent)); + AddAssert("download buttons shown", () => playlist.ChildrenOfType().All(d => d.IsPresent)); } [Test] diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapDownloadButton.cs similarity index 97% rename from osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs rename to osu.Game.Tests/Visual/Online/TestSceneBeatmapDownloadButton.cs index d1af8dd685..21bf8d1c5a 100644 --- a/osu.Game.Tests/Visual/Online/TestSceneDirectDownloadButton.cs +++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapDownloadButton.cs @@ -14,7 +14,7 @@ using osuTK; namespace osu.Game.Tests.Visual.Online { - public class TestSceneDirectDownloadButton : OsuTestScene + public class TestSceneBeatmapDownloadButton : OsuTestScene { private TestDownloadButton downloadButton; @@ -137,7 +137,7 @@ namespace osu.Game.Tests.Visual.Online return apiBeatmapSet; } - private class TestDownloadButton : BeatmapPanelDownloadButton + private class TestDownloadButton : BeatmapDownloadButton { public new bool DownloadEnabled => base.DownloadEnabled; diff --git a/osu.Game/Beatmaps/Drawables/BeatmapPanelDownloadButton.cs b/osu.Game/Beatmaps/Drawables/BeatmapDownloadButton.cs similarity index 96% rename from osu.Game/Beatmaps/Drawables/BeatmapPanelDownloadButton.cs rename to osu.Game/Beatmaps/Drawables/BeatmapDownloadButton.cs index 1a47182d22..e2485e7a77 100644 --- a/osu.Game/Beatmaps/Drawables/BeatmapPanelDownloadButton.cs +++ b/osu.Game/Beatmaps/Drawables/BeatmapDownloadButton.cs @@ -15,7 +15,7 @@ using osu.Game.Online.API.Requests.Responses; namespace osu.Game.Beatmaps.Drawables { - public class BeatmapPanelDownloadButton : CompositeDrawable + public class BeatmapDownloadButton : CompositeDrawable { protected bool DownloadEnabled => button.Enabled.Value; @@ -34,7 +34,7 @@ namespace osu.Game.Beatmaps.Drawables private readonly IBeatmapSetInfo beatmapSet; - public BeatmapPanelDownloadButton(IBeatmapSetInfo beatmapSet) + public BeatmapDownloadButton(IBeatmapSetInfo beatmapSet) { this.beatmapSet = beatmapSet; diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs index b46919ef18..8f4089c707 100644 --- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs +++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs @@ -285,7 +285,7 @@ namespace osu.Game.Overlays.BeatmapSet { case DownloadState.LocallyAvailable: // temporary for UX until new design is implemented. - downloadButtonsContainer.Child = new BeatmapPanelDownloadButton(BeatmapSet.Value) + downloadButtonsContainer.Child = new BeatmapDownloadButton(BeatmapSet.Value) { Width = 50, RelativeSizeAxes = Axes.Y, diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs index 58c63010fd..2dbe2df82c 100644 --- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs +++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs @@ -338,7 +338,7 @@ namespace osu.Game.Screens.OnlinePlay return true; } - private sealed class PlaylistDownloadButton : BeatmapPanelDownloadButton + private sealed class PlaylistDownloadButton : BeatmapDownloadButton { private readonly PlaylistItem playlistItem;