From 12aab50e5c83dcb11e0fdc3dab23797216e82bae Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 25 Feb 2026 19:39:45 +0900 Subject: [PATCH] Move v2 files to final location This contains only renames and namespace updates. --- .../NonVisual/Filtering/FilterMatchingTest.cs | 1 - .../Background/TestSceneUserDimBackgrounds.cs | 2 +- .../DailyChallenge/TestSceneDailyChallenge.cs | 2 +- .../Visual/Editing/TestSceneEditorSaving.cs | 2 +- .../Editing/TestSceneOpenEditorTimestamp.cs | 2 +- .../Visual/Multiplayer/QueueModeTestScene.cs | 4 +- .../Multiplayer/TestSceneHostOnlyQueueMode.cs | 4 +- .../TestSceneBeatmapEditorNavigation.cs | 2 +- .../TestSceneButtonSystemNavigation.cs | 2 +- .../TestSceneChangeAndUseGameplayBindings.cs | 2 +- .../TestSceneMouseWheelVolumeAdjust.cs | 2 +- .../Navigation/TestScenePerformFromScreen.cs | 2 +- .../Navigation/TestScenePresentBeatmap.cs | 2 +- .../Navigation/TestScenePresentScore.cs | 4 +- .../Navigation/TestSceneScreenNavigation.cs | 29 +- .../TestSceneSkinEditorNavigation.cs | 2 +- .../TestSceneSongSelectNavigation.cs | 8 +- .../BeatmapCarouselFilterGroupingTest.cs | 3 +- .../BeatmapCarouselFilterSortingTest.cs | 3 +- .../BeatmapCarouselTestScene.cs | 4 +- .../SongSelectComponentsTestScene.cs | 2 +- .../SongSelectTestScene.cs | 6 +- .../TestSceneBeatmapCarousel.cs | 4 +- .../TestSceneBeatmapCarouselArtistGrouping.cs | 4 +- ...tSceneBeatmapCarouselCollectionGrouping.cs | 2 +- ...tSceneBeatmapCarouselDifficultyGrouping.cs | 4 +- .../TestSceneBeatmapCarouselFiltering.cs | 4 +- .../TestSceneBeatmapCarouselNoGrouping.cs | 4 +- .../TestSceneBeatmapCarouselRandom.cs | 4 +- .../TestSceneBeatmapCarouselScrolling.cs | 4 +- .../TestSceneBeatmapCarouselSetsSplitApart.cs | 4 +- .../TestSceneBeatmapCarouselUpdateHandling.cs | 4 +- .../TestSceneBeatmapFilterControl.cs | 4 +- .../TestSceneBeatmapLeaderboardScore.cs | 4 +- .../TestSceneBeatmapLeaderboardSorting.cs | 6 +- .../TestSceneBeatmapLeaderboardWedge.cs | 4 +- .../TestSceneBeatmapMetadataWedge.cs | 24 +- .../TestSceneBeatmapRecommendations.cs | 2 +- .../TestSceneBeatmapTitleWedge.cs | 47 +++- .../TestSceneBeatmapTitleWedgeStatistic.cs | 4 +- .../TestSceneDifficultyRangeSlider.cs | 4 +- .../TestSceneDifficultyStatisticsDisplay.cs | 4 +- .../TestSceneFooterButtonMods.cs | 4 +- .../TestScenePanelBeatmap.cs | 4 +- .../TestScenePanelBeatmapStandalone.cs | 4 +- .../TestScenePanelGroup.cs | 6 +- .../TestScenePanelSet.cs | 4 +- .../TestScenePanelUpdateBeatmapButton.cs | 4 +- .../TestSceneSongSelect.cs | 13 +- ...neSongSelectCurrentSelectionInvalidated.cs | 6 +- .../TestSceneSongSelectFiltering.cs | 8 +- .../TestSceneSongSelectGrouping.cs | 4 +- .../UserInterface/TestSceneScreenFooter.cs | 2 +- osu.Game/Beatmaps/BeatmapMetadata.cs | 2 +- .../Online/Leaderboards/LeaderboardScore.cs | 2 +- osu.Game/OsuGame.cs | 2 +- .../Overlays/FirstRunSetup/ScreenUIScale.cs | 2 +- .../Overlays/SkinEditor/SkinEditorOverlay.cs | 2 +- .../SkinEditor/SkinEditorSceneLibrary.cs | 2 +- .../Submission/BeatmapSubmissionScreen.cs | 2 +- osu.Game/Screens/Menu/MainMenu.cs | 2 +- .../DailyChallengeLeaderboard.cs | 2 +- .../OnlinePlay/FooterButtonFreeMods.cs | 2 +- .../Multiplayer/MultiplayerMatchSongSelect.cs | 2 +- .../OnlinePlay/OnlinePlayFreestyleSelect.cs | 1 - .../Playlists/PlaylistsSongSelect.cs | 2 +- .../{SelectV2 => Select}/BeatmapCarousel.cs | 3 +- .../BeatmapCarouselFilterGrouping.cs | 3 +- .../BeatmapCarouselFilterMatching.cs | 3 +- .../BeatmapCarouselFilterSorting.cs | 3 +- .../BeatmapDetailsArea.Header.cs | 3 +- .../BeatmapDetailsArea.WedgeSelector.cs | 2 +- .../BeatmapDetailsArea.cs | 2 +- .../BeatmapLeaderboardScore.Tooltip.cs | 2 +- .../BeatmapLeaderboardScore.cs | 3 +- .../BeatmapLeaderboardWedge.cs | 2 +- .../BeatmapMetadataWedge.FailRetryDisplay.cs | 2 +- .../BeatmapMetadataWedge.MetadataDisplay.cs | 2 +- ...eatmapMetadataWedge.RatingSpreadDisplay.cs | 2 +- ...BeatmapMetadataWedge.SuccessRateDisplay.cs | 2 +- .../BeatmapMetadataWedge.TagsLine.cs | 2 +- .../BeatmapMetadataWedge.UserRatingDisplay.cs | 2 +- .../BeatmapMetadataWedge.cs | 2 +- .../BeatmapTitleWedge.DifficultyDisplay.cs | 2 +- ...pTitleWedge.DifficultyStatisticsDisplay.cs | 2 +- .../BeatmapTitleWedge.FavouriteButton.cs | 2 +- .../BeatmapTitleWedge.Statistic.cs | 2 +- .../BeatmapTitleWedge.StatisticDifficulty.cs | 2 +- .../BeatmapTitleWedge.StatisticPlayCount.cs | 2 +- .../{SelectV2 => Select}/BeatmapTitleWedge.cs | 2 +- .../FilterControl.DifficultyRangeSlider.cs | 2 +- .../FilterControl.ScopedBeatmapSetDisplay.cs | 2 +- .../{SelectV2 => Select}/FilterControl.cs | 3 +- .../{SelectV2 => Select}/FooterButtonMods.cs | 2 +- .../FooterButtonOptions.Popover.cs | 2 +- .../FooterButtonOptions.cs | 2 +- .../FooterButtonRandom.cs | 2 +- .../{SelectV2 => Select}/ISongSelect.cs | 2 +- .../LeftSideInteractionContainer.cs | 2 +- .../NoResultsPlaceholder.cs | 3 +- .../Screens/{SelectV2 => Select}/Panel.cs | 2 +- .../{SelectV2 => Select}/PanelBeatmap.cs | 2 +- .../PanelBeatmapSet.SpreadDisplay.cs | 2 +- .../{SelectV2 => Select}/PanelBeatmapSet.cs | 2 +- .../PanelBeatmapStandalone.SpreadDisplay.cs | 2 +- .../PanelBeatmapStandalone.cs | 2 +- .../{SelectV2 => Select}/PanelGroup.cs | 2 +- .../PanelGroupRankDisplay.cs | 2 +- .../PanelGroupRankedStatus.cs | 2 +- .../PanelGroupStarDifficulty.cs | 2 +- .../PanelLocalRankDisplay.cs | 2 +- .../PanelSetBackground.cs | 2 +- .../PanelUpdateBeatmapButton.cs | 3 +- .../Panel_EzKpcDisplay.cs | 0 .../Panel_EzKpsDisplay.cs | 0 .../Panel_EzTagDisplay.cs | 0 .../RealmPopulatingOnlineLookupSource.cs | 2 +- .../{SelectV2 => Select}/SoloSongSelect.cs | 3 +- .../{SelectV2 => Select}/SongSelect.cs | 3 +- .../UpdateLocalConfirmationDialog.cs | 2 +- .../{SelectV2 => Select}/WedgeBackground.cs | 2 +- .../Screens/SelectV2/CollectionDropdown.cs | 256 ------------------ .../Tests/Visual/EditorSavingTestScene.cs | 2 +- 123 files changed, 218 insertions(+), 470 deletions(-) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/BeatmapCarouselFilterGroupingTest.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/BeatmapCarouselFilterSortingTest.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/BeatmapCarouselTestScene.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/SongSelectComponentsTestScene.cs (97%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/SongSelectTestScene.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarousel.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselArtistGrouping.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselCollectionGrouping.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselDifficultyGrouping.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselFiltering.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselNoGrouping.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselRandom.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselScrolling.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselSetsSplitApart.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapCarouselUpdateHandling.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapFilterControl.cs (93%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapLeaderboardScore.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapLeaderboardSorting.cs (95%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapLeaderboardWedge.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapMetadataWedge.cs (90%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapTitleWedge.cs (88%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneBeatmapTitleWedgeStatistic.cs (97%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneDifficultyRangeSlider.cs (96%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneDifficultyStatisticsDisplay.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneFooterButtonMods.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestScenePanelBeatmap.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestScenePanelBeatmapStandalone.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestScenePanelGroup.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestScenePanelSet.cs (97%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestScenePanelUpdateBeatmapButton.cs (95%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneSongSelect.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneSongSelectCurrentSelectionInvalidated.cs (98%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneSongSelectFiltering.cs (99%) rename osu.Game.Tests/Visual/{SongSelectV2 => SongSelect}/TestSceneSongSelectGrouping.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapCarousel.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapCarouselFilterGrouping.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapCarouselFilterMatching.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapCarouselFilterSorting.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapDetailsArea.Header.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapDetailsArea.WedgeSelector.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapDetailsArea.cs (98%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapLeaderboardScore.Tooltip.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapLeaderboardScore.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapLeaderboardWedge.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapMetadataWedge.FailRetryDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapMetadataWedge.MetadataDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapMetadataWedge.RatingSpreadDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapMetadataWedge.SuccessRateDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapMetadataWedge.TagsLine.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapMetadataWedge.UserRatingDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapMetadataWedge.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapTitleWedge.DifficultyDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapTitleWedge.FavouriteButton.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapTitleWedge.Statistic.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapTitleWedge.StatisticDifficulty.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapTitleWedge.StatisticPlayCount.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/BeatmapTitleWedge.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/FilterControl.DifficultyRangeSlider.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/FilterControl.ScopedBeatmapSetDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/FilterControl.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/FooterButtonMods.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/FooterButtonOptions.Popover.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/FooterButtonOptions.cs (98%) rename osu.Game/Screens/{SelectV2 => Select}/FooterButtonRandom.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/ISongSelect.cs (98%) rename osu.Game/Screens/{SelectV2 => Select}/LeftSideInteractionContainer.cs (98%) rename osu.Game/Screens/{SelectV2 => Select}/NoResultsPlaceholder.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/Panel.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelBeatmap.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelBeatmapSet.SpreadDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelBeatmapSet.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelBeatmapStandalone.SpreadDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelBeatmapStandalone.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelGroup.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelGroupRankDisplay.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelGroupRankedStatus.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelGroupStarDifficulty.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelLocalRankDisplay.cs (98%) rename osu.Game/Screens/{SelectV2 => Select}/PanelSetBackground.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/PanelUpdateBeatmapButton.cs (98%) rename osu.Game/Screens/{SelectV2 => Select}/Panel_EzKpcDisplay.cs (100%) rename osu.Game/Screens/{SelectV2 => Select}/Panel_EzKpsDisplay.cs (100%) rename osu.Game/Screens/{SelectV2 => Select}/Panel_EzTagDisplay.cs (100%) rename osu.Game/Screens/{SelectV2 => Select}/RealmPopulatingOnlineLookupSource.cs (99%) rename osu.Game/Screens/{SelectV2 => Select}/SoloSongSelect.cs (98%) rename osu.Game/Screens/{SelectV2 => Select}/SongSelect.cs (99%) rename osu.Game/Screens/Select/{Carousel => }/UpdateLocalConfirmationDialog.cs (94%) rename osu.Game/Screens/{SelectV2 => Select}/WedgeBackground.cs (98%) delete mode 100644 osu.Game/Screens/SelectV2/CollectionDropdown.cs diff --git a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs index 7dcb8621bf..5455963ff8 100644 --- a/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs +++ b/osu.Game.Tests/NonVisual/Filtering/FilterMatchingTest.cs @@ -11,7 +11,6 @@ using osu.Game.Rulesets; using osu.Game.Rulesets.Filter; using osu.Game.Rulesets.Mods; using osu.Game.Screens.Select; -using osu.Game.Screens.Select.Carousel; using osu.Game.Screens.Select.Filter; namespace osu.Game.Tests.NonVisual.Filtering diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs index 1365d95a55..3b531e2036 100644 --- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs +++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs @@ -32,7 +32,7 @@ using osu.Game.Screens.Backgrounds; using osu.Game.Screens.Play; using osu.Game.Screens.Play.PlayerSettings; using osu.Game.Screens.Ranking; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Storyboards.Drawables; using osu.Game.Tests.Resources; using osuTK; diff --git a/osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs b/osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs index f1422b4654..bf88cee11b 100644 --- a/osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs +++ b/osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs @@ -15,7 +15,7 @@ using osu.Game.Online.Rooms; using osu.Game.Overlays; using osu.Game.Overlays.Notifications; using osu.Game.Rulesets.Osu.Mods; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Tests.Visual.Metadata; using osu.Game.Tests.Visual.OnlinePlay; diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs index 66a039f36e..4ab7571636 100644 --- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs +++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSaving.cs @@ -15,7 +15,7 @@ using osu.Game.Beatmaps.ControlPoints; using osu.Game.Overlays; using osu.Game.Screens.Edit; using osu.Game.Screens.Edit.Compose.Components.Timeline; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK.Input; namespace osu.Game.Tests.Visual.Editing diff --git a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs index e3b79d4053..46f47f6a92 100644 --- a/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs +++ b/osu.Game.Tests/Visual/Editing/TestSceneOpenEditorTimestamp.cs @@ -14,7 +14,7 @@ using osu.Game.Rulesets; using osu.Game.Rulesets.Osu; using osu.Game.Screens.Edit; using osu.Game.Screens.Menu; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; namespace osu.Game.Tests.Visual.Editing diff --git a/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs b/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs index f0b7d643b2..b10be77fb6 100644 --- a/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs +++ b/osu.Game.Tests/Visual/Multiplayer/QueueModeTestScene.cs @@ -125,7 +125,7 @@ namespace osu.Game.Tests.Visual.Multiplayer protected void AddBeatmapFromSongSelect(Func beatmap, RulesetInfo? ruleset = null, IReadOnlyList? mods = null) { - Screens.SelectV2.SongSelect? songSelect = null; + Screens.Select.SongSelect? songSelect = null; AddStep("click add button", () => { @@ -133,7 +133,7 @@ namespace osu.Game.Tests.Visual.Multiplayer InputManager.Click(MouseButton.Left); }); - AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.SelectV2.SongSelect) != null); + AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.Select.SongSelect) != null); AddUntilStep("wait for loaded", () => songSelect.IsCurrentScreen() && !songSelect.AsNonNull().IsFiltering); if (ruleset != null) diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneHostOnlyQueueMode.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneHostOnlyQueueMode.cs index 89980b4257..a1ced5698e 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneHostOnlyQueueMode.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneHostOnlyQueueMode.cs @@ -89,7 +89,7 @@ namespace osu.Game.Tests.Visual.Multiplayer private void selectNewItem(Func beatmap) { - Screens.SelectV2.SongSelect? songSelect = null; + Screens.Select.SongSelect? songSelect = null; AddUntilStep("wait for playlist panels to load", () => { @@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Multiplayer InputManager.Click(MouseButton.Left); }); - AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.SelectV2.SongSelect) != null); + AddUntilStep("wait for song select", () => (songSelect = CurrentSubScreen as Screens.Select.SongSelect) != null); AddUntilStep("wait for loaded", () => songSelect.IsCurrentScreen() && !songSelect.AsNonNull().IsFiltering); BeatmapInfo otherBeatmap = null!; diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs index c7499c98b5..09e8253080 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneBeatmapEditorNavigation.cs @@ -26,8 +26,8 @@ using osu.Game.Screens.Edit; using osu.Game.Screens.Edit.GameplayTest; using osu.Game.Screens.Edit.Setup; using osu.Game.Screens.Menu; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; using osuTK.Input; diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs index 0ccfb5a4e3..a908c9cf1b 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneButtonSystemNavigation.cs @@ -5,7 +5,7 @@ using System.Linq; using NUnit.Framework; using osu.Framework.Testing; using osu.Game.Screens.Menu; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK.Input; namespace osu.Game.Tests.Visual.Navigation diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs index 4f27d9b323..6ddd784329 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneChangeAndUseGameplayBindings.cs @@ -15,7 +15,7 @@ using osu.Game.Input.Bindings; using osu.Game.Overlays.Settings.Sections.Input; using osu.Game.Screens.Play; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Beatmaps.IO; using osuTK.Input; diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs b/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs index 0a4349d73f..d3321753c1 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneMouseWheelVolumeAdjust.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using osu.Framework.Extensions; using osu.Game.Configuration; using osu.Game.Screens.Play; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Beatmaps.IO; using osuTK.Input; diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs index 04d7b15295..f86727ab10 100644 --- a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs +++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs @@ -17,7 +17,7 @@ using osu.Game.Rulesets.Mods; using osu.Game.Screens; using osu.Game.Screens.Menu; using osu.Game.Screens.Play; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Beatmaps.IO; using osuTK.Input; diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs index 1dd39e5bf9..4acc174f72 100644 --- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs +++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs @@ -16,7 +16,7 @@ using osu.Game.Rulesets.Catch; using osu.Game.Rulesets.Mania; using osu.Game.Rulesets.Osu; using osu.Game.Screens.Menu; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; namespace osu.Game.Tests.Visual.Navigation { diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs index fa337a3ec2..06ea5c7da2 100644 --- a/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs +++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs @@ -18,8 +18,8 @@ using osu.Game.Screens; using osu.Game.Screens.Menu; using osu.Game.Screens.Play; using osu.Game.Screens.Ranking; -using osu.Game.Screens.SelectV2; -using FilterControl = osu.Game.Screens.SelectV2.FilterControl; +using osu.Game.Screens.Select; +using FilterControl = osu.Game.Screens.Select.FilterControl; namespace osu.Game.Tests.Visual.Navigation { diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs index b52075ac99..36f2b51f29 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs @@ -51,12 +51,13 @@ using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Play.PlayerSettings; using osu.Game.Screens.Ranking; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Beatmaps.IO; using osu.Game.Tests.Resources; using osu.Game.Utils; using osuTK; using osuTK.Input; +using CollectionDropdown = osu.Game.Screens.Select.CollectionDropdown; namespace osu.Game.Tests.Visual.Navigation { @@ -197,14 +198,14 @@ namespace osu.Game.Tests.Visual.Navigation AddStep("set filter again", () => filterControlTextBox().Current.Value = "test"); AddStep("open collections dropdown", () => { - InputManager.MoveMouseTo(songSelect.ChildrenOfType().Single()); + InputManager.MoveMouseTo(songSelect.ChildrenOfType().Single()); InputManager.Click(MouseButton.Left); }); AddStep("press back once", () => InputManager.Click(MouseButton.Button1)); AddAssert("still at song select", () => Game.ScreenStack.CurrentScreen == songSelect); AddAssert("collections dropdown closed", () => songSelect - .ChildrenOfType().Single() + .ChildrenOfType().Single() .ChildrenOfType.DropdownMenu>().Single().State == MenuState.Closed); AddStep("press back a second time", () => InputManager.Click(MouseButton.Button1)); @@ -317,7 +318,7 @@ namespace osu.Game.Tests.Visual.Navigation [Test] public void TestAttemptPlayBeatmapWrongHashFails() { - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely()); PushAndConfirm(() => songSelect = new SoloSongSelect()); @@ -352,7 +353,7 @@ namespace osu.Game.Tests.Visual.Navigation [Test] public void TestAttemptPlayBeatmapMissingFails() { - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; AddStep("import beatmap", () => BeatmapImportHelper.LoadQuickOszIntoOsu(Game).GetResultSafely()); PushAndConfirm(() => songSelect = new SoloSongSelect()); @@ -386,7 +387,7 @@ namespace osu.Game.Tests.Visual.Navigation { Player player = null; - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; PushAndConfirm(() => songSelect = new SoloSongSelect()); AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); @@ -429,7 +430,7 @@ namespace osu.Game.Tests.Visual.Navigation { Player player = null; - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; PushAndConfirm(() => songSelect = new SoloSongSelect()); AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); @@ -483,7 +484,7 @@ namespace osu.Game.Tests.Visual.Navigation { Player player = null; - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; PushAndConfirm(() => songSelect = new SoloSongSelect()); AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); @@ -526,7 +527,7 @@ namespace osu.Game.Tests.Visual.Navigation { Player player = null; - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; PushAndConfirm(() => songSelect = new SoloSongSelect()); AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); @@ -1194,9 +1195,9 @@ namespace osu.Game.Tests.Visual.Navigation AddStep("close settings sidebar", () => InputManager.Key(Key.Escape)); - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; AddRepeatStep("go to solo", () => InputManager.Key(Key.P), 3); - AddUntilStep("wait for song select", () => (songSelect = Game.ScreenStack.CurrentScreen as Screens.SelectV2.SongSelect) != null); + AddUntilStep("wait for song select", () => (songSelect = Game.ScreenStack.CurrentScreen as Screens.Select.SongSelect) != null); AddUntilStep("wait for beatmap sets loaded", () => songSelect.CarouselItemsPresented); AddStep("switch to osu! ruleset", () => @@ -1281,7 +1282,7 @@ namespace osu.Game.Tests.Visual.Navigation [Test] public void TestExitSongSelectAndImmediatelyClickLogo() { - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; PushAndConfirm(() => songSelect = new SoloSongSelect()); AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); @@ -1312,7 +1313,7 @@ namespace osu.Game.Tests.Visual.Navigation { BeatmapSetInfo beatmap = null; - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; PushAndConfirm(() => songSelect = new SoloSongSelect()); AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); @@ -1371,7 +1372,7 @@ namespace osu.Game.Tests.Visual.Navigation IWorkingBeatmap beatmap() => Game.Beatmap.Value; - Screens.SelectV2.SongSelect songSelect = null; + Screens.Select.SongSelect songSelect = null; PushAndConfirm(() => songSelect = new SoloSongSelect()); AddUntilStep("wait for song select", () => songSelect.CarouselItemsPresented); diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs index 9ddeb7870b..97dfcd75b5 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneSkinEditorNavigation.cs @@ -27,7 +27,7 @@ using osu.Game.Screens.Edit.Components; using osu.Game.Screens.Play; using osu.Game.Screens.Play.HUD; using osu.Game.Screens.Play.HUD.HitErrorMeters; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Skinning; using osu.Game.Tests.Beatmaps.IO; using osuTK; diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneSongSelectNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneSongSelectNavigation.cs index 4295e9e88e..2984613807 100644 --- a/osu.Game.Tests/Visual/Navigation/TestSceneSongSelectNavigation.cs +++ b/osu.Game.Tests/Visual/Navigation/TestSceneSongSelectNavigation.cs @@ -24,17 +24,13 @@ using osu.Game.Screens.Footer; using osu.Game.Screens.Menu; using osu.Game.Screens.Play; using osu.Game.Screens.Ranking; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Beatmaps.IO; using osu.Game.Tests.Resources; using osuTK.Input; namespace osu.Game.Tests.Visual.Navigation { - /// - /// Tests copied out of `TestSceneScreenNavigation` which are specific to song select. - /// These are for SongSelectV2. Eventually, the tests in the above class should be deleted along with old song select. - /// public partial class TestSceneSongSelectNavigation : OsuGameTestScene { [Test] @@ -277,7 +273,7 @@ namespace osu.Game.Tests.Visual.Navigation /// /// Note: This test was written to demonstrate the failure described at https://github.com/ppy/osu/issues/35023, /// but because the failure scenario there entailed a race condition, it was possible for the test to pass regardless - /// unless was increased. + /// unless was increased. /// [Test] public void TestPresentFromResults() diff --git a/osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselFilterGroupingTest.cs b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterGroupingTest.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselFilterGroupingTest.cs rename to osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterGroupingTest.cs index 1d6f3b0af4..15d1f911e0 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselFilterGroupingTest.cs +++ b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterGroupingTest.cs @@ -14,10 +14,9 @@ using osu.Game.Graphics.Carousel; using osu.Game.Scoring; using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class BeatmapCarouselFilterGroupingTest diff --git a/osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselFilterSortingTest.cs b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterSortingTest.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselFilterSortingTest.cs rename to osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterSortingTest.cs index e043ff2479..7e40a9349f 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselFilterSortingTest.cs +++ b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselFilterSortingTest.cs @@ -12,10 +12,9 @@ using osu.Game.Beatmaps; using osu.Game.Graphics.Carousel; using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class BeatmapCarouselFilterSortingTest diff --git a/osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselTestScene.cs b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselTestScene.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselTestScene.cs rename to osu.Game.Tests/Visual/SongSelect/BeatmapCarouselTestScene.cs index dc3a49c068..ae31606abb 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/BeatmapCarouselTestScene.cs +++ b/osu.Game.Tests/Visual/SongSelect/BeatmapCarouselTestScene.cs @@ -25,15 +25,13 @@ using osu.Game.Overlays; using osu.Game.Scoring; using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Beatmaps; using osu.Game.Tests.Resources; using osuTK; using osuTK.Graphics; using osuTK.Input; -using BeatmapCarousel = osu.Game.Screens.SelectV2.BeatmapCarousel; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public abstract partial class BeatmapCarouselTestScene : OsuManualInputManagerTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/SongSelectComponentsTestScene.cs b/osu.Game.Tests/Visual/SongSelect/SongSelectComponentsTestScene.cs similarity index 97% rename from osu.Game.Tests/Visual/SongSelectV2/SongSelectComponentsTestScene.cs rename to osu.Game.Tests/Visual/SongSelect/SongSelectComponentsTestScene.cs index 843d65b7f8..94ca56897e 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/SongSelectComponentsTestScene.cs +++ b/osu.Game.Tests/Visual/SongSelect/SongSelectComponentsTestScene.cs @@ -9,7 +9,7 @@ using osu.Framework.Testing; using osu.Game.Graphics.Cursor; using osu.Game.Overlays; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public abstract partial class SongSelectComponentsTestScene : OsuManualInputManagerTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/SongSelectTestScene.cs b/osu.Game.Tests/Visual/SongSelect/SongSelectTestScene.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/SongSelectTestScene.cs rename to osu.Game.Tests/Visual/SongSelect/SongSelectTestScene.cs index ac8591699a..e5fce29812 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/SongSelectTestScene.cs +++ b/osu.Game.Tests/Visual/SongSelect/SongSelectTestScene.cs @@ -23,11 +23,11 @@ using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osu.Game.Scoring; using osu.Game.Screens.Menu; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public abstract partial class SongSelectTestScene : ScreenTestScene { @@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 private RealmDetachedBeatmapStore beatmapStore = null!; - protected Screens.SelectV2.SongSelect SongSelect { get; private set; } = null!; + protected Screens.Select.SongSelect SongSelect { get; private set; } = null!; protected BeatmapCarousel Carousel => SongSelect.ChildrenOfType().Single(); [Cached] diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarousel.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs index ce671c7e7f..b7c113cffb 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarousel.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs @@ -10,11 +10,11 @@ using osu.Framework.Testing; using osu.Framework.Threading; using osu.Framework.Utils; using osu.Game.Beatmaps; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { /// /// Covers common steps which can be used for manual testing. diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselArtistGrouping.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselArtistGrouping.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselArtistGrouping.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselArtistGrouping.cs index 28cdca34e1..a591dff010 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselArtistGrouping.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselArtistGrouping.cs @@ -7,12 +7,12 @@ using osu.Framework.Testing; using osu.Game.Beatmaps; using osu.Game.Database; using osu.Game.Graphics.Carousel; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; using osuTK; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselArtistGrouping : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselCollectionGrouping.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselCollectionGrouping.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselCollectionGrouping.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselCollectionGrouping.cs index e410d66ce8..0d7b9c2991 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselCollectionGrouping.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselCollectionGrouping.cs @@ -8,7 +8,7 @@ using osu.Framework.Testing; using osu.Game.Collections; using osu.Game.Screens.Select.Filter; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselCollectionGrouping : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselDifficultyGrouping.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselDifficultyGrouping.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselDifficultyGrouping.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselDifficultyGrouping.cs index 2cffe60ec1..4a41612c30 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselDifficultyGrouping.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselDifficultyGrouping.cs @@ -5,11 +5,11 @@ using System.Linq; using NUnit.Framework; using osu.Framework.Testing; using osu.Game.Graphics.Carousel; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osuTK; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselDifficultyGrouping : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselFiltering.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselFiltering.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselFiltering.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselFiltering.cs index b1bd9fd3ed..73596a768d 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselFiltering.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselFiltering.cs @@ -9,11 +9,11 @@ using osu.Framework.Testing; using osu.Game.Beatmaps; using osu.Game.Rulesets; using osu.Game.Rulesets.Osu; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselFiltering : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselNoGrouping.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselNoGrouping.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselNoGrouping.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselNoGrouping.cs index c839a28055..1ff87712de 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselNoGrouping.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselNoGrouping.cs @@ -4,12 +4,12 @@ using System.Linq; using NUnit.Framework; using osu.Framework.Testing; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osuTK; using osuTK.Input; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselNoGrouping : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselRandom.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselRandom.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselRandom.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselRandom.cs index ce68d587c8..66328de8dd 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselRandom.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselRandom.cs @@ -5,10 +5,10 @@ using System.Linq; using NUnit.Framework; using osu.Framework.Testing; using osu.Game.Beatmaps; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselRandom : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselScrolling.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselScrolling.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselScrolling.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselScrolling.cs index c1cee4e398..319803ef5f 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselScrolling.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselScrolling.cs @@ -5,9 +5,9 @@ using System.Linq; using NUnit.Framework; using osu.Framework.Graphics.Primitives; using osu.Framework.Testing; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselScrolling : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselSetsSplitApart.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselSetsSplitApart.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselSetsSplitApart.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselSetsSplitApart.cs index 31488e399a..12d70702d5 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselSetsSplitApart.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselSetsSplitApart.cs @@ -6,10 +6,10 @@ using System.Linq; using NUnit.Framework; using osu.Framework.Testing; using osu.Game.Beatmaps; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselSetsSplitApart : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselUpdateHandling.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselUpdateHandling.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselUpdateHandling.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselUpdateHandling.cs index 17f328b549..1033a17e05 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselUpdateHandling.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselUpdateHandling.cs @@ -12,11 +12,11 @@ using osu.Game.Database; using osu.Game.Extensions; using osu.Game.Graphics.Containers; using osu.Game.Graphics.Sprites; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { [TestFixture] public partial class TestSceneBeatmapCarouselUpdateHandling : BeatmapCarouselTestScene diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapFilterControl.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapFilterControl.cs similarity index 93% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapFilterControl.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapFilterControl.cs index 284484d2df..81f6cbc70d 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapFilterControl.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapFilterControl.cs @@ -4,9 +4,9 @@ using NUnit.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneBeatmapFilterControl : SongSelectComponentsTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardScore.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardScore.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardScore.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardScore.cs index 0aca2d6a1c..856a4be67d 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardScore.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardScore.cs @@ -21,13 +21,13 @@ using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu.Mods; using osu.Game.Rulesets.Scoring; using osu.Game.Scoring; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Users; using osuTK; using osuTK.Input; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneBeatmapLeaderboardScore : SongSelectComponentsTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardSorting.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardSorting.cs similarity index 95% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardSorting.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardSorting.cs index a37700f6be..9c50bccd6e 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardSorting.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardSorting.cs @@ -24,11 +24,11 @@ using osu.Game.Rulesets; using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Scoring; using osu.Game.Scoring; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Users; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneBeatmapLeaderboardSorting : SongSelectComponentsTestScene { @@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 private LeaderboardManager leaderboardManager = null!; - private readonly IBindable onlineLookupResult = new Bindable(); + private readonly IBindable onlineLookupResult = new Bindable(); protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardWedge.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardWedge.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardWedge.cs index 4609bd8936..c6d6339c98 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapLeaderboardWedge.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboardWedge.cs @@ -26,12 +26,12 @@ using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu.Mods; using osu.Game.Scoring; using osu.Game.Screens.Play.Leaderboards; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Users; using osuTK.Input; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneBeatmapLeaderboardWedge : SongSelectComponentsTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapMetadataWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataWedge.cs similarity index 90% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapMetadataWedge.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataWedge.cs index 0266584389..769d6bb8f8 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapMetadataWedge.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapMetadataWedge.cs @@ -13,16 +13,16 @@ using osu.Game.Extensions; using osu.Game.Graphics.Sprites; using osu.Game.Models; using osu.Game.Online.API.Requests.Responses; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneBeatmapMetadataWedge : SongSelectComponentsTestScene { private BeatmapMetadataWedge wedge = null!; - [Cached(typeof(IBindable))] - private Bindable onlineLookupResult = new Bindable(); + [Cached(typeof(IBindable))] + private Bindable onlineLookupResult = new Bindable(); protected override void LoadComplete() { @@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 working.BeatmapInfo.OnlineID = 0; Beatmap.Value = working; - onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(null); + onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(null); }); } @@ -154,7 +154,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 var (working, _) = createTestBeatmap(); Beatmap.Value = working; - onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(null); + onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(null); }); AddAssert("rating wedge still hidden", () => !wedge.RatingsVisible); AddAssert("fail time wedge still hidden", () => !wedge.FailRetryVisible); @@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 var (working, online) = createTestBeatmap(); Beatmap.Value = working; - onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress(); + onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress(); Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500); }); AddWaitStep("wait", 5); @@ -203,7 +203,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 online.Result!.RelatedTags[2].Name = "some/tag"; Beatmap.Value = working; - onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress(); + onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress(); Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500); }); AddWaitStep("wait", 5); @@ -217,7 +217,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 working.BeatmapSetInfo.Beatmaps.Single().Metadata.UserTags.Clear(); Beatmap.Value = working; - onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress(); + onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress(); Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500); }); AddWaitStep("wait", 5); @@ -231,13 +231,13 @@ namespace osu.Game.Tests.Visual.SongSelectV2 working.BeatmapSetInfo.Beatmaps.Single().Metadata.UserTags.Clear(); Beatmap.Value = working; - onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.InProgress(); + onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.InProgress(); Scheduler.AddDelayed(() => onlineLookupResult.Value = online, 500); }); AddWaitStep("wait", 5); } - private (WorkingBeatmap, Screens.SelectV2.SongSelect.BeatmapSetLookupResult) createTestBeatmap() + private (WorkingBeatmap, Screens.Select.SongSelect.BeatmapSetLookupResult) createTestBeatmap() { var working = CreateWorkingBeatmap(Ruleset.Value); var onlineSet = new APIBeatmapSet @@ -292,7 +292,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 working.BeatmapSetInfo.DateSubmitted = DateTimeOffset.Now; working.BeatmapSetInfo.DateRanked = DateTimeOffset.Now; working.Metadata.UserTags.AddRange(onlineSet.RelatedTags.Select(t => t.Name)); - return (working, Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(onlineSet)); + return (working, Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(onlineSet)); } } } diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs index 832e8fc90f..f2b4e41470 100644 --- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapRecommendations.cs @@ -23,7 +23,7 @@ using osu.Game.Rulesets.Catch; using osu.Game.Rulesets.Mania; using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Taiko; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Users; using osu.Game.Utils; diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedge.cs similarity index 88% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedge.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedge.cs index d89d90ea84..0d14de8b9e 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedge.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedge.cs @@ -29,11 +29,10 @@ using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects.Legacy; using osu.Game.Rulesets.Osu; using osu.Game.Rulesets.Osu.Mods; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Skinning; -using osu.Game.Tests.Visual.SongSelect; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneBeatmapTitleWedge : SongSelectComponentsTestScene { @@ -42,8 +41,8 @@ namespace osu.Game.Tests.Visual.SongSelectV2 private BeatmapTitleWedge titleWedge = null!; private BeatmapTitleWedge.DifficultyDisplay difficultyDisplay => titleWedge.ChildrenOfType().Single(); - [Cached(typeof(IBindable))] - private Bindable onlineLookupResult = new Bindable(); + [Cached(typeof(IBindable))] + private Bindable onlineLookupResult = new Bindable(); [BackgroundDependencyLoader] private void load(RulesetStore rulesets) @@ -86,7 +85,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 foreach (var rulesetInfo in rulesets.AvailableRulesets) { - var testBeatmap = TestSceneBeatmapInfoWedge.CreateTestBeatmap(rulesetInfo); + var testBeatmap = createTestBeatmapFromRuleset(rulesetInfo); setRuleset(rulesetInfo); selectBeatmap(testBeatmap); @@ -108,7 +107,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 public void TestBPMUpdates() { const double bpm = 120; - IBeatmap beatmap = TestSceneBeatmapInfoWedge.CreateTestBeatmap(new OsuRuleset().RulesetInfo); + IBeatmap beatmap = createTestBeatmapFromRuleset(new OsuRuleset().RulesetInfo); beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 60 * 1000 / bpm }); OsuModDoubleTime doubleTime = null!; @@ -160,7 +159,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 var (working, _) = createTestBeatmap(); Beatmap.Value = working; - onlineLookupResult.Value = Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(null); + onlineLookupResult.Value = Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(null); }); AddUntilStep("play count is -", () => this.ChildrenOfType().ElementAt(0).Text.ToString(), () => Is.EqualTo("-")); AddUntilStep("favourites count is -", () => this.ChildrenOfType().Single().Text.ToString(), () => Is.EqualTo("-")); @@ -255,7 +254,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 [TestCase(120, 120.4, "DT", "180-181 (mostly 180)")] public void TestVaryingBPM(double commonBpm, double otherBpm, string? mod, string expectedDisplay) { - IBeatmap beatmap = TestSceneBeatmapInfoWedge.CreateTestBeatmap(new OsuRuleset().RulesetInfo); + IBeatmap beatmap = createTestBeatmapFromRuleset(new OsuRuleset().RulesetInfo); beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 60 * 1000 / commonBpm }); beatmap.ControlPointInfo.Add(100, new TimingControlPoint { BeatLength = 60 * 1000 / otherBpm }); beatmap.ControlPointInfo.Add(200, new TimingControlPoint { BeatLength = 60 * 1000 / commonBpm }); @@ -299,7 +298,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 }); } - private (WorkingBeatmap, Screens.SelectV2.SongSelect.BeatmapSetLookupResult) createTestBeatmap() + private (WorkingBeatmap, Screens.Select.SongSelect.BeatmapSetLookupResult) createTestBeatmap() { var working = CreateWorkingBeatmap(Ruleset.Value); var onlineSet = new APIBeatmapSet @@ -320,7 +319,33 @@ namespace osu.Game.Tests.Visual.SongSelectV2 working.BeatmapSetInfo.DateSubmitted = DateTimeOffset.Now; working.BeatmapSetInfo.DateRanked = DateTimeOffset.Now; - return (working, Screens.SelectV2.SongSelect.BeatmapSetLookupResult.Completed(onlineSet)); + return (working, Screens.Select.SongSelect.BeatmapSetLookupResult.Completed(onlineSet)); + } + + private static IBeatmap createTestBeatmapFromRuleset(RulesetInfo ruleset) + { + List objects = new List(); + for (double i = 0; i < 50000; i += 1000) + objects.Add(new TestHitObject { StartTime = i }); + + return new Beatmap + { + BeatmapInfo = new BeatmapInfo + { + Metadata = new BeatmapMetadata + { + Author = { Username = $"{ruleset.ShortName}Author" }, + Artist = $"{ruleset.ShortName}Artist", + Source = $"{ruleset.ShortName}Source", + Title = $"{ruleset.ShortName}Title" + }, + Ruleset = ruleset, + StarRating = 6, + DifficultyName = $"{ruleset.ShortName}Version", + Difficulty = new BeatmapDifficulty() + }, + HitObjects = objects + }; } private class TestHitObject : ConvertHitObject; diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedgeStatistic.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedgeStatistic.cs similarity index 97% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedgeStatistic.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedgeStatistic.cs index 6bf9469021..f0691f05a1 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedgeStatistic.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapTitleWedgeStatistic.cs @@ -8,10 +8,10 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Testing; using osu.Game.Graphics; using osu.Game.Overlays; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Visual.UserInterface; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneBeatmapTitleWedgeStatistic : ThemeComparisonTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyRangeSlider.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeSlider.cs similarity index 96% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyRangeSlider.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeSlider.cs index f97af65fd9..ed7ade4914 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyRangeSlider.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyRangeSlider.cs @@ -7,12 +7,12 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Game.Overlays; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Visual.UserInterface; using osuTK; using osuTK.Graphics; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneDifficultyRangeSlider : ThemeComparisonTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyStatisticsDisplay.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyStatisticsDisplay.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyStatisticsDisplay.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyStatisticsDisplay.cs index 0ee742a09d..5b15add2ad 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyStatisticsDisplay.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneDifficultyStatisticsDisplay.cs @@ -11,10 +11,10 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Framework.Testing; using osu.Game.Overlays; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK.Graphics; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneDifficultyStatisticsDisplay : OsuTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneFooterButtonMods.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneFooterButtonMods.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneFooterButtonMods.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneFooterButtonMods.cs index c339f16bb4..08d02015a2 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneFooterButtonMods.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneFooterButtonMods.cs @@ -13,10 +13,10 @@ using osu.Game.Overlays; using osu.Game.Overlays.Mods; using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Osu.Mods; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Utils; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneFooterButtonMods : OsuTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelBeatmap.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmap.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestScenePanelBeatmap.cs rename to osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmap.cs index 618b9e0d48..ca71f5a212 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelBeatmap.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmap.cs @@ -19,12 +19,12 @@ using osu.Game.Overlays; using osu.Game.Rulesets.Mania; using osu.Game.Rulesets.Osu; using osu.Game.Scoring; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Tests.Visual.UserInterface; using osuTK; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestScenePanelBeatmap : ThemeComparisonTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelBeatmapStandalone.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmapStandalone.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestScenePanelBeatmapStandalone.cs rename to osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmapStandalone.cs index 67a9f54f1a..48c0fef48a 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelBeatmapStandalone.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestScenePanelBeatmapStandalone.cs @@ -19,12 +19,12 @@ using osu.Game.Overlays; using osu.Game.Rulesets.Mania; using osu.Game.Rulesets.Osu; using osu.Game.Scoring; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Tests.Visual.UserInterface; using osuTK; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestScenePanelBeatmapStandalone : ThemeComparisonTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelGroup.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePanelGroup.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestScenePanelGroup.cs rename to osu.Game.Tests/Visual/SongSelect/TestScenePanelGroup.cs index 12557a80f4..62c8a9c8c5 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelGroup.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestScenePanelGroup.cs @@ -7,15 +7,15 @@ using NUnit.Framework; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; -using osu.Game.Overlays; using osu.Game.Graphics.Carousel; using osu.Game.Graphics.Cursor; +using osu.Game.Overlays; using osu.Game.Scoring; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Visual.UserInterface; using osuTK; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestScenePanelGroup : ThemeComparisonTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelSet.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePanelSet.cs similarity index 97% rename from osu.Game.Tests/Visual/SongSelectV2/TestScenePanelSet.cs rename to osu.Game.Tests/Visual/SongSelect/TestScenePanelSet.cs index b574262d55..a903f8c83f 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelSet.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestScenePanelSet.cs @@ -11,12 +11,12 @@ using osu.Game.Beatmaps; using osu.Game.Graphics.Carousel; using osu.Game.Graphics.Cursor; using osu.Game.Overlays; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Resources; using osu.Game.Tests.Visual.UserInterface; using osuTK; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestScenePanelSet : ThemeComparisonTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelUpdateBeatmapButton.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePanelUpdateBeatmapButton.cs similarity index 95% rename from osu.Game.Tests/Visual/SongSelectV2/TestScenePanelUpdateBeatmapButton.cs rename to osu.Game.Tests/Visual/SongSelect/TestScenePanelUpdateBeatmapButton.cs index 8156842eb9..02715ade3a 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestScenePanelUpdateBeatmapButton.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestScenePanelUpdateBeatmapButton.cs @@ -5,9 +5,9 @@ using System; using NUnit.Framework; using osu.Framework.Graphics; using osu.Game.Beatmaps; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestScenePanelUpdateBeatmapButton : OsuTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs index 2434924393..6eddc8e1d8 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelect.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelect.cs @@ -23,15 +23,14 @@ using osu.Game.Screens.Play; using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; using osu.Game.Screens.Select; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; using osuTK.Input; -using BeatmapCarousel = osu.Game.Screens.SelectV2.BeatmapCarousel; -using FooterButtonMods = osu.Game.Screens.SelectV2.FooterButtonMods; -using FooterButtonOptions = osu.Game.Screens.SelectV2.FooterButtonOptions; -using FooterButtonRandom = osu.Game.Screens.SelectV2.FooterButtonRandom; +using BeatmapCarousel = osu.Game.Screens.Select.BeatmapCarousel; +using FooterButtonMods = osu.Game.Screens.Select.FooterButtonMods; +using FooterButtonOptions = osu.Game.Screens.Select.FooterButtonOptions; +using FooterButtonRandom = osu.Game.Screens.Select.FooterButtonRandom; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneSongSelect : SongSelectTestScene { @@ -324,7 +323,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 AddStep("exit gameplay", () => Stack.CurrentScreen.Exit()); - AddUntilStep("wait for song select", () => Stack.CurrentScreen is Screens.SelectV2.SongSelect); + AddUntilStep("wait for song select", () => Stack.CurrentScreen is Screens.Select.SongSelect); AddUntilStep("wait for filtered", () => SongSelect.ChildrenOfType().Single().FilterCount, () => Is.EqualTo(2)); } diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectCurrentSelectionInvalidated.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectCurrentSelectionInvalidated.cs similarity index 98% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectCurrentSelectionInvalidated.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectCurrentSelectionInvalidated.cs index 0ec61f59da..59c9074ddb 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectCurrentSelectionInvalidated.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectCurrentSelectionInvalidated.cs @@ -8,11 +8,11 @@ using NUnit.Framework; using osu.Framework.Testing; using osu.Game.Beatmaps; using osu.Game.Configuration; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osuTK.Input; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { /// /// The fallback behaviour guaranteed by SongSelect is that a random selection will happen in worst case scenario. @@ -226,7 +226,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2 Beatmaps.Delete(Beatmaps.GetAllUsableBeatmapSets().Last()); // check selection during debounce - Scheduler.AddDelayed(() => selectedBeatmapDuringDebounce = Beatmap.Value.BeatmapInfo, Screens.SelectV2.SongSelect.SELECTION_DEBOUNCE / 2f); + Scheduler.AddDelayed(() => selectedBeatmapDuringDebounce = Beatmap.Value.BeatmapInfo, Screens.Select.SongSelect.SELECTION_DEBOUNCE / 2f); }); WaitForFiltering(); diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectFiltering.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFiltering.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectFiltering.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFiltering.cs index 2e7e08b331..a479a28657 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectFiltering.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectFiltering.cs @@ -16,13 +16,13 @@ using osu.Game.Rulesets.Catch; using osu.Game.Rulesets.Mania.Mods; using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Osu.Mods; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osuTK.Input; -using FilterControl = osu.Game.Screens.SelectV2.FilterControl; -using NoResultsPlaceholder = osu.Game.Screens.SelectV2.NoResultsPlaceholder; +using FilterControl = osu.Game.Screens.Select.FilterControl; +using NoResultsPlaceholder = osu.Game.Screens.Select.NoResultsPlaceholder; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { public partial class TestSceneSongSelectFiltering : SongSelectTestScene { diff --git a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectGrouping.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectGrouping.cs similarity index 99% rename from osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectGrouping.cs rename to osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectGrouping.cs index e65c9553c2..eb282d3d3c 100644 --- a/osu.Game.Tests/Visual/SongSelectV2/TestSceneSongSelectGrouping.cs +++ b/osu.Game.Tests/Visual/SongSelect/TestSceneSongSelectGrouping.cs @@ -16,11 +16,11 @@ using osu.Game.Models; using osu.Game.Online.API; using osu.Game.Online.API.Requests.Responses; using osu.Game.Scoring; +using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; -using osu.Game.Screens.SelectV2; using osu.Game.Tests.Resources; -namespace osu.Game.Tests.Visual.SongSelectV2 +namespace osu.Game.Tests.Visual.SongSelect { /// /// Test suite for grouping modes which require the presence of API / realm. diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs index 0da7c3eb95..a958c5f43e 100644 --- a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs +++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenFooter.cs @@ -17,7 +17,7 @@ using osu.Game.Overlays; using osu.Game.Overlays.Mods; using osu.Game.Screens; using osu.Game.Screens.Footer; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; namespace osu.Game.Tests.Visual.UserInterface { diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs index 1603a9848c..d8bf2c752b 100644 --- a/osu.Game/Beatmaps/BeatmapMetadata.cs +++ b/osu.Game/Beatmaps/BeatmapMetadata.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using Newtonsoft.Json; using osu.Game.Models; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Users; using osu.Game.Utils; using Realms; diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs index 1e4d3484b7..57682513d4 100644 --- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs +++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs @@ -34,7 +34,7 @@ using osu.Game.Resources.Localisation.Web; using osu.Game.Rulesets.Mods; using osu.Game.Utils; using CommonStrings = osu.Game.Localisation.CommonStrings; -using SongSelect = osu.Game.Screens.SelectV2.SongSelect; +using SongSelect = osu.Game.Screens.Select.SongSelect; using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; namespace osu.Game.Online.Leaderboards diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 6cdada3156..32214ee113 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -72,7 +72,7 @@ using osu.Game.Screens.OnlinePlay.Playlists; using osu.Game.Screens.Play; using osu.Game.Screens.Play.Leaderboards; using osu.Game.Screens.Ranking; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Seasonal; using osu.Game.Skinning; using osu.Game.Updater; diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs index edadc333c8..09bdb8b843 100644 --- a/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs +++ b/osu.Game/Overlays/FirstRunSetup/ScreenUIScale.cs @@ -25,7 +25,7 @@ using osu.Game.Rulesets.Mods; using osu.Game.Screens; using osu.Game.Screens.Footer; using osu.Game.Screens.Menu; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Tests.Visual; using osuTK; diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs index 063c311865..dd28c1a2d0 100644 --- a/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs +++ b/osu.Game/Overlays/SkinEditor/SkinEditorOverlay.cs @@ -29,7 +29,7 @@ using osu.Game.Screens.Edit; using osu.Game.Screens.Edit.Components; using osu.Game.Screens.Menu; using osu.Game.Screens.Play; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Users; using osu.Game.Utils; diff --git a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs index 2bcbca186e..1ebbb47a11 100644 --- a/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs +++ b/osu.Game/Overlays/SkinEditor/SkinEditorSceneLibrary.cs @@ -12,7 +12,7 @@ using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; using osu.Game.Localisation; using osu.Game.Screens; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK; namespace osu.Game.Overlays.SkinEditor diff --git a/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs b/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs index c840bce7d3..cc35318387 100644 --- a/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs +++ b/osu.Game/Screens/Edit/Submission/BeatmapSubmissionScreen.cs @@ -30,7 +30,7 @@ using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests.Responses; using osu.Game.Overlays; using osu.Game.Overlays.Notifications; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK; namespace osu.Game.Screens.Edit.Submission diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs index 85e86ef6c6..8b4ba316f4 100644 --- a/osu.Game/Screens/Menu/MainMenu.cs +++ b/osu.Game/Screens/Menu/MainMenu.cs @@ -40,7 +40,7 @@ using osu.Game.Screens.OnlinePlay.DailyChallenge; using osu.Game.Screens.OnlinePlay.Matchmaking.Intro; using osu.Game.Screens.OnlinePlay.Multiplayer; using osu.Game.Screens.OnlinePlay.Playlists; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Seasonal; using osuTK; using osuTK.Graphics; diff --git a/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeLeaderboard.cs b/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeLeaderboard.cs index 65805a970d..62c5c0c8df 100644 --- a/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeLeaderboard.cs +++ b/osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeLeaderboard.cs @@ -17,7 +17,7 @@ using osu.Game.Online.Rooms; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osu.Game.Scoring; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK; namespace osu.Game.Screens.OnlinePlay.DailyChallenge diff --git a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs index aff9b803c6..28154180e6 100644 --- a/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs +++ b/osu.Game/Screens/OnlinePlay/FooterButtonFreeMods.cs @@ -20,7 +20,7 @@ using osu.Game.Overlays.Mods; using osu.Game.Rulesets.Mods; using osu.Game.Screens.Footer; using osu.Game.Screens.Play.HUD; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK; namespace osu.Game.Screens.OnlinePlay diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs index f234bed697..ce5d68b004 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs @@ -24,9 +24,9 @@ using osu.Game.Overlays.Mods; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osu.Game.Screens.Footer; +using osu.Game.Screens.Select; using osu.Game.Users; using osu.Game.Utils; -using osu.Game.Screens.SelectV2; namespace osu.Game.Screens.OnlinePlay.Multiplayer { diff --git a/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs b/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs index 0ff3ade809..150cdb859d 100644 --- a/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs +++ b/osu.Game/Screens/OnlinePlay/OnlinePlayFreestyleSelect.cs @@ -13,7 +13,6 @@ using osu.Game.Online.Rooms; using osu.Game.Rulesets; using osu.Game.Screens.Footer; using osu.Game.Screens.Select; -using SongSelect = osu.Game.Screens.SelectV2.SongSelect; namespace osu.Game.Screens.OnlinePlay { diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs index fb921f219a..7c1b3cd620 100644 --- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs +++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs @@ -18,7 +18,7 @@ using osu.Game.Overlays.Mods; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osu.Game.Screens.Footer; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osu.Game.Utils; namespace osu.Game.Screens.OnlinePlay.Playlists diff --git a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapCarousel.cs rename to osu.Game/Screens/Select/BeatmapCarousel.cs index 853b1684dd..0e625baf57 100644 --- a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs +++ b/osu.Game/Screens/Select/BeatmapCarousel.cs @@ -35,10 +35,9 @@ using osu.Game.Online.API; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osu.Game.Scoring; -using osu.Game.Screens.Select; using Realms; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { [Cached] public partial class BeatmapCarousel : Carousel diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs b/osu.Game/Screens/Select/BeatmapCarouselFilterGrouping.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs rename to osu.Game/Screens/Select/BeatmapCarouselFilterGrouping.cs index 95fe6acad0..963727816c 100644 --- a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterGrouping.cs +++ b/osu.Game/Screens/Select/BeatmapCarouselFilterGrouping.cs @@ -12,11 +12,10 @@ using osu.Game.Beatmaps; using osu.Game.Collections; using osu.Game.Graphics.Carousel; using osu.Game.Scoring; -using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; using osu.Game.Utils; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public class BeatmapCarouselFilterGrouping : ICarouselFilter { diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterMatching.cs b/osu.Game/Screens/Select/BeatmapCarouselFilterMatching.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapCarouselFilterMatching.cs rename to osu.Game/Screens/Select/BeatmapCarouselFilterMatching.cs index 1d77330ea4..55a6c54041 100644 --- a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterMatching.cs +++ b/osu.Game/Screens/Select/BeatmapCarouselFilterMatching.cs @@ -9,10 +9,9 @@ using System.Threading.Tasks; using osu.Framework.Extensions; using osu.Game.Beatmaps; using osu.Game.Graphics.Carousel; -using osu.Game.Screens.Select; using osu.Game.Utils; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public class BeatmapCarouselFilterMatching : ICarouselFilter { diff --git a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs b/osu.Game/Screens/Select/BeatmapCarouselFilterSorting.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs rename to osu.Game/Screens/Select/BeatmapCarouselFilterSorting.cs index f626d6aa75..5bc3f5eabf 100644 --- a/osu.Game/Screens/SelectV2/BeatmapCarouselFilterSorting.cs +++ b/osu.Game/Screens/Select/BeatmapCarouselFilterSorting.cs @@ -9,11 +9,10 @@ using System.Threading.Tasks; using osu.Framework.Extensions; using osu.Game.Beatmaps; using osu.Game.Graphics.Carousel; -using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; using osu.Game.Utils; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public class BeatmapCarouselFilterSorting : ICarouselFilter { diff --git a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.Header.cs b/osu.Game/Screens/Select/BeatmapDetailsArea.Header.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapDetailsArea.Header.cs rename to osu.Game/Screens/Select/BeatmapDetailsArea.Header.cs index 5b3f27ce64..fd6437d1a9 100644 --- a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.Header.cs +++ b/osu.Game/Screens/Select/BeatmapDetailsArea.Header.cs @@ -14,10 +14,9 @@ using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Localisation; using osu.Game.Online.Leaderboards; using osu.Game.Screens.Play.Leaderboards; -using osu.Game.Screens.Select; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapDetailsArea { diff --git a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.WedgeSelector.cs b/osu.Game/Screens/Select/BeatmapDetailsArea.WedgeSelector.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapDetailsArea.WedgeSelector.cs rename to osu.Game/Screens/Select/BeatmapDetailsArea.WedgeSelector.cs index 95f60fb423..9a5db9b818 100644 --- a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.WedgeSelector.cs +++ b/osu.Game/Screens/Select/BeatmapDetailsArea.WedgeSelector.cs @@ -18,7 +18,7 @@ using osu.Game.Localisation; using osu.Game.Overlays; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapDetailsArea { diff --git a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.cs b/osu.Game/Screens/Select/BeatmapDetailsArea.cs similarity index 98% rename from osu.Game/Screens/SelectV2/BeatmapDetailsArea.cs rename to osu.Game/Screens/Select/BeatmapDetailsArea.cs index 7a2068b0cf..f83fd1539d 100644 --- a/osu.Game/Screens/SelectV2/BeatmapDetailsArea.cs +++ b/osu.Game/Screens/Select/BeatmapDetailsArea.cs @@ -6,7 +6,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Graphics.Containers; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { /// /// The left portion of the song select screen which houses the metadata or leaderboards wedge, along with controls diff --git a/osu.Game/Screens/SelectV2/BeatmapLeaderboardScore.Tooltip.cs b/osu.Game/Screens/Select/BeatmapLeaderboardScore.Tooltip.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapLeaderboardScore.Tooltip.cs rename to osu.Game/Screens/Select/BeatmapLeaderboardScore.Tooltip.cs index 1f92699887..bd3b6f16b3 100644 --- a/osu.Game/Screens/SelectV2/BeatmapLeaderboardScore.Tooltip.cs +++ b/osu.Game/Screens/Select/BeatmapLeaderboardScore.Tooltip.cs @@ -34,7 +34,7 @@ using osu.Game.Utils; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapLeaderboardScore { diff --git a/osu.Game/Screens/SelectV2/BeatmapLeaderboardScore.cs b/osu.Game/Screens/Select/BeatmapLeaderboardScore.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapLeaderboardScore.cs rename to osu.Game/Screens/Select/BeatmapLeaderboardScore.cs index 079f4192e0..c6d52a7ace 100644 --- a/osu.Game/Screens/SelectV2/BeatmapLeaderboardScore.cs +++ b/osu.Game/Screens/Select/BeatmapLeaderboardScore.cs @@ -32,7 +32,6 @@ using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.UI; using osu.Game.Scoring; -using osu.Game.Screens.Select; using osu.Game.Users; using osu.Game.Users.Drawables; using osu.Game.Utils; @@ -40,7 +39,7 @@ using osuTK; using osuTK.Graphics; using CommonStrings = osu.Game.Localisation.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public sealed partial class BeatmapLeaderboardScore : OsuClickableContainer, IHasContextMenu, IHasCustomTooltip { diff --git a/osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs b/osu.Game/Screens/Select/BeatmapLeaderboardWedge.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs rename to osu.Game/Screens/Select/BeatmapLeaderboardWedge.cs index 18b1bc2e27..25eac3e182 100644 --- a/osu.Game/Screens/SelectV2/BeatmapLeaderboardWedge.cs +++ b/osu.Game/Screens/Select/BeatmapLeaderboardWedge.cs @@ -37,7 +37,7 @@ using osu.Game.Screens.Play.Leaderboards; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapLeaderboardWedge : VisibilityContainer { diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.FailRetryDisplay.cs b/osu.Game/Screens/Select/BeatmapMetadataWedge.FailRetryDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapMetadataWedge.FailRetryDisplay.cs rename to osu.Game/Screens/Select/BeatmapMetadataWedge.FailRetryDisplay.cs index 9ee61b7c5c..1bbce94f4f 100644 --- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.FailRetryDisplay.cs +++ b/osu.Game/Screens/Select/BeatmapMetadataWedge.FailRetryDisplay.cs @@ -17,7 +17,7 @@ using osu.Game.Graphics.Sprites; using osu.Game.Resources.Localisation.Web; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapMetadataWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.MetadataDisplay.cs b/osu.Game/Screens/Select/BeatmapMetadataWedge.MetadataDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapMetadataWedge.MetadataDisplay.cs rename to osu.Game/Screens/Select/BeatmapMetadataWedge.MetadataDisplay.cs index 84948678d0..3b9d31380a 100644 --- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.MetadataDisplay.cs +++ b/osu.Game/Screens/Select/BeatmapMetadataWedge.MetadataDisplay.cs @@ -13,7 +13,7 @@ using osu.Game.Graphics.UserInterface; using osu.Game.Overlays; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapMetadataWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.RatingSpreadDisplay.cs b/osu.Game/Screens/Select/BeatmapMetadataWedge.RatingSpreadDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapMetadataWedge.RatingSpreadDisplay.cs rename to osu.Game/Screens/Select/BeatmapMetadataWedge.RatingSpreadDisplay.cs index ee938ecdd9..3a6017f4ec 100644 --- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.RatingSpreadDisplay.cs +++ b/osu.Game/Screens/Select/BeatmapMetadataWedge.RatingSpreadDisplay.cs @@ -13,7 +13,7 @@ using osu.Game.Graphics.Sprites; using osu.Game.Resources.Localisation.Web; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapMetadataWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.SuccessRateDisplay.cs b/osu.Game/Screens/Select/BeatmapMetadataWedge.SuccessRateDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapMetadataWedge.SuccessRateDisplay.cs rename to osu.Game/Screens/Select/BeatmapMetadataWedge.SuccessRateDisplay.cs index 6118547274..48680b5b29 100644 --- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.SuccessRateDisplay.cs +++ b/osu.Game/Screens/Select/BeatmapMetadataWedge.SuccessRateDisplay.cs @@ -15,7 +15,7 @@ using osu.Game.Overlays; using osu.Game.Resources.Localisation.Web; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapMetadataWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.TagsLine.cs b/osu.Game/Screens/Select/BeatmapMetadataWedge.TagsLine.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapMetadataWedge.TagsLine.cs rename to osu.Game/Screens/Select/BeatmapMetadataWedge.TagsLine.cs index e48b4f20da..975dfd6212 100644 --- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.TagsLine.cs +++ b/osu.Game/Screens/Select/BeatmapMetadataWedge.TagsLine.cs @@ -22,7 +22,7 @@ using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Overlays; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapMetadataWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.UserRatingDisplay.cs b/osu.Game/Screens/Select/BeatmapMetadataWedge.UserRatingDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapMetadataWedge.UserRatingDisplay.cs rename to osu.Game/Screens/Select/BeatmapMetadataWedge.UserRatingDisplay.cs index 2f38079577..2d8d039d99 100644 --- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.UserRatingDisplay.cs +++ b/osu.Game/Screens/Select/BeatmapMetadataWedge.UserRatingDisplay.cs @@ -13,7 +13,7 @@ using osu.Game.Overlays; using osu.Game.Resources.Localisation.Web; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapMetadataWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.cs b/osu.Game/Screens/Select/BeatmapMetadataWedge.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapMetadataWedge.cs rename to osu.Game/Screens/Select/BeatmapMetadataWedge.cs index 9c0ab105e2..128dde88c9 100644 --- a/osu.Game/Screens/SelectV2/BeatmapMetadataWedge.cs +++ b/osu.Game/Screens/Select/BeatmapMetadataWedge.cs @@ -22,7 +22,7 @@ using osu.Game.Online.Chat; using osu.Game.Resources.Localisation.Web; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapMetadataWedge : VisibilityContainer { diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.DifficultyDisplay.cs b/osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapTitleWedge.DifficultyDisplay.cs rename to osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyDisplay.cs index dd537adcc8..ef515e96cb 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.DifficultyDisplay.cs +++ b/osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyDisplay.cs @@ -27,7 +27,7 @@ using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapTitleWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs b/osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs rename to osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs index 595959cfce..e07eea1491 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs +++ b/osu.Game/Screens/Select/BeatmapTitleWedge.DifficultyStatisticsDisplay.cs @@ -17,7 +17,7 @@ using osu.Game.Overlays; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapTitleWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.FavouriteButton.cs b/osu.Game/Screens/Select/BeatmapTitleWedge.FavouriteButton.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapTitleWedge.FavouriteButton.cs rename to osu.Game/Screens/Select/BeatmapTitleWedge.FavouriteButton.cs index 62ac8a07b4..bd3aaaa239 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.FavouriteButton.cs +++ b/osu.Game/Screens/Select/BeatmapTitleWedge.FavouriteButton.cs @@ -26,7 +26,7 @@ using osu.Game.Resources.Localisation.Web; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapTitleWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.Statistic.cs b/osu.Game/Screens/Select/BeatmapTitleWedge.Statistic.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapTitleWedge.Statistic.cs rename to osu.Game/Screens/Select/BeatmapTitleWedge.Statistic.cs index 85a0382360..1ed08ce124 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.Statistic.cs +++ b/osu.Game/Screens/Select/BeatmapTitleWedge.Statistic.cs @@ -15,7 +15,7 @@ using osu.Game.Overlays; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapTitleWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.StatisticDifficulty.cs b/osu.Game/Screens/Select/BeatmapTitleWedge.StatisticDifficulty.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapTitleWedge.StatisticDifficulty.cs rename to osu.Game/Screens/Select/BeatmapTitleWedge.StatisticDifficulty.cs index bcce78246d..3133f8a67b 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.StatisticDifficulty.cs +++ b/osu.Game/Screens/Select/BeatmapTitleWedge.StatisticDifficulty.cs @@ -19,7 +19,7 @@ using osu.Game.Rulesets.Difficulty; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapTitleWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.StatisticPlayCount.cs b/osu.Game/Screens/Select/BeatmapTitleWedge.StatisticPlayCount.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapTitleWedge.StatisticPlayCount.cs rename to osu.Game/Screens/Select/BeatmapTitleWedge.StatisticPlayCount.cs index d193cbe286..f8f5fe3782 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.StatisticPlayCount.cs +++ b/osu.Game/Screens/Select/BeatmapTitleWedge.StatisticPlayCount.cs @@ -18,7 +18,7 @@ using osu.Game.Overlays; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapTitleWedge { diff --git a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.cs b/osu.Game/Screens/Select/BeatmapTitleWedge.cs similarity index 99% rename from osu.Game/Screens/SelectV2/BeatmapTitleWedge.cs rename to osu.Game/Screens/Select/BeatmapTitleWedge.cs index 93707f9af1..5387fbdd33 100644 --- a/osu.Game/Screens/SelectV2/BeatmapTitleWedge.cs +++ b/osu.Game/Screens/Select/BeatmapTitleWedge.cs @@ -30,7 +30,7 @@ using osu.Game.Rulesets.Mods; using osu.Game.Utils; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class BeatmapTitleWedge : VisibilityContainer { diff --git a/osu.Game/Screens/SelectV2/FilterControl.DifficultyRangeSlider.cs b/osu.Game/Screens/Select/FilterControl.DifficultyRangeSlider.cs similarity index 99% rename from osu.Game/Screens/SelectV2/FilterControl.DifficultyRangeSlider.cs rename to osu.Game/Screens/Select/FilterControl.DifficultyRangeSlider.cs index f15cfa4b4d..902b335c62 100644 --- a/osu.Game/Screens/SelectV2/FilterControl.DifficultyRangeSlider.cs +++ b/osu.Game/Screens/Select/FilterControl.DifficultyRangeSlider.cs @@ -21,7 +21,7 @@ using osu.Game.Resources.Localisation.Web; using osu.Game.Utils; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class FilterControl { diff --git a/osu.Game/Screens/SelectV2/FilterControl.ScopedBeatmapSetDisplay.cs b/osu.Game/Screens/Select/FilterControl.ScopedBeatmapSetDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/FilterControl.ScopedBeatmapSetDisplay.cs rename to osu.Game/Screens/Select/FilterControl.ScopedBeatmapSetDisplay.cs index 378db5cb2d..78dfb163ad 100644 --- a/osu.Game/Screens/SelectV2/FilterControl.ScopedBeatmapSetDisplay.cs +++ b/osu.Game/Screens/Select/FilterControl.ScopedBeatmapSetDisplay.cs @@ -16,7 +16,7 @@ using osu.Game.Input.Bindings; using osu.Game.Localisation; using osu.Game.Overlays; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class FilterControl { diff --git a/osu.Game/Screens/SelectV2/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs similarity index 99% rename from osu.Game/Screens/SelectV2/FilterControl.cs rename to osu.Game/Screens/Select/FilterControl.cs index 22083dfe5f..c90276e9cd 100644 --- a/osu.Game/Screens/SelectV2/FilterControl.cs +++ b/osu.Game/Screens/Select/FilterControl.cs @@ -32,13 +32,12 @@ using osu.Game.Online.API; using osu.Game.Online.API.Requests.Responses; using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; -using osu.Game.Screens.Select; using osu.Game.Screens.Select.Filter; using osuTK; using osuTK.Graphics; using osuTK.Input; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public sealed partial class FilterControl : OverlayContainer { diff --git a/osu.Game/Screens/SelectV2/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs similarity index 99% rename from osu.Game/Screens/SelectV2/FooterButtonMods.cs rename to osu.Game/Screens/Select/FooterButtonMods.cs index 27e0ac68f9..81668cc414 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonMods.cs +++ b/osu.Game/Screens/Select/FooterButtonMods.cs @@ -30,7 +30,7 @@ using osuTK; using osuTK.Graphics; using osuTK.Input; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class FooterButtonMods : ScreenFooterButton, IHasCurrentValue> { diff --git a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs b/osu.Game/Screens/Select/FooterButtonOptions.Popover.cs similarity index 99% rename from osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs rename to osu.Game/Screens/Select/FooterButtonOptions.Popover.cs index 2f0f36c99c..d4b7a13d9c 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonOptions.Popover.cs +++ b/osu.Game/Screens/Select/FooterButtonOptions.Popover.cs @@ -23,7 +23,7 @@ using osuTK; using osuTK.Graphics; using osuTK.Input; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class FooterButtonOptions { diff --git a/osu.Game/Screens/SelectV2/FooterButtonOptions.cs b/osu.Game/Screens/Select/FooterButtonOptions.cs similarity index 98% rename from osu.Game/Screens/SelectV2/FooterButtonOptions.cs rename to osu.Game/Screens/Select/FooterButtonOptions.cs index 4da40559e9..819b51aea5 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonOptions.cs +++ b/osu.Game/Screens/Select/FooterButtonOptions.cs @@ -14,7 +14,7 @@ using osu.Game.Localisation; using osu.Game.Overlays; using osu.Game.Screens.Footer; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class FooterButtonOptions : ScreenFooterButton, IHasPopover { diff --git a/osu.Game/Screens/SelectV2/FooterButtonRandom.cs b/osu.Game/Screens/Select/FooterButtonRandom.cs similarity index 99% rename from osu.Game/Screens/SelectV2/FooterButtonRandom.cs rename to osu.Game/Screens/Select/FooterButtonRandom.cs index 4bd42497eb..bf001b7b8f 100644 --- a/osu.Game/Screens/SelectV2/FooterButtonRandom.cs +++ b/osu.Game/Screens/Select/FooterButtonRandom.cs @@ -15,7 +15,7 @@ using osu.Game.Screens.Footer; using osuTK; using osuTK.Input; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class FooterButtonRandom : ScreenFooterButton { diff --git a/osu.Game/Screens/SelectV2/ISongSelect.cs b/osu.Game/Screens/Select/ISongSelect.cs similarity index 98% rename from osu.Game/Screens/SelectV2/ISongSelect.cs rename to osu.Game/Screens/Select/ISongSelect.cs index 5de1d4e75e..b1c32435bf 100644 --- a/osu.Game/Screens/SelectV2/ISongSelect.cs +++ b/osu.Game/Screens/Select/ISongSelect.cs @@ -8,7 +8,7 @@ using osu.Game.Beatmaps; using osu.Game.Graphics.UserInterface; using osu.Game.Scoring; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { /// /// Actions exposed by song select which are used by subcomponents to perform top-level operations. diff --git a/osu.Game/Screens/SelectV2/LeftSideInteractionContainer.cs b/osu.Game/Screens/Select/LeftSideInteractionContainer.cs similarity index 98% rename from osu.Game/Screens/SelectV2/LeftSideInteractionContainer.cs rename to osu.Game/Screens/Select/LeftSideInteractionContainer.cs index 212bb233f4..4b28213f4e 100644 --- a/osu.Game/Screens/SelectV2/LeftSideInteractionContainer.cs +++ b/osu.Game/Screens/Select/LeftSideInteractionContainer.cs @@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Input; using osu.Framework.Input.Events; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { /// /// Handles mouse interactions required when moving away from the carousel. diff --git a/osu.Game/Screens/SelectV2/NoResultsPlaceholder.cs b/osu.Game/Screens/Select/NoResultsPlaceholder.cs similarity index 99% rename from osu.Game/Screens/SelectV2/NoResultsPlaceholder.cs rename to osu.Game/Screens/Select/NoResultsPlaceholder.cs index 597b6de851..cd38ce2f6c 100644 --- a/osu.Game/Screens/SelectV2/NoResultsPlaceholder.cs +++ b/osu.Game/Screens/Select/NoResultsPlaceholder.cs @@ -14,10 +14,9 @@ using osu.Game.Graphics.Sprites; using osu.Game.Localisation; using osu.Game.Online.Chat; using osu.Game.Overlays; -using osu.Game.Screens.Select; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class NoResultsPlaceholder : VisibilityContainer { diff --git a/osu.Game/Screens/SelectV2/Panel.cs b/osu.Game/Screens/Select/Panel.cs similarity index 99% rename from osu.Game/Screens/SelectV2/Panel.cs rename to osu.Game/Screens/Select/Panel.cs index 241002fa76..60175d0a0d 100644 --- a/osu.Game/Screens/SelectV2/Panel.cs +++ b/osu.Game/Screens/Select/Panel.cs @@ -24,7 +24,7 @@ using osu.Game.Overlays; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public abstract partial class Panel : PoolableDrawable, ICarouselPanel, IHasContextMenu { diff --git a/osu.Game/Screens/SelectV2/PanelBeatmap.cs b/osu.Game/Screens/Select/PanelBeatmap.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelBeatmap.cs rename to osu.Game/Screens/Select/PanelBeatmap.cs index c6bf3d21ca..3c227a3e16 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmap.cs +++ b/osu.Game/Screens/Select/PanelBeatmap.cs @@ -30,7 +30,7 @@ using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelBeatmap : Panel { diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs b/osu.Game/Screens/Select/PanelBeatmapSet.SpreadDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs rename to osu.Game/Screens/Select/PanelBeatmapSet.SpreadDisplay.cs index 89916b13d8..338b4036bd 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs +++ b/osu.Game/Screens/Select/PanelBeatmapSet.SpreadDisplay.cs @@ -20,7 +20,7 @@ using osu.Game.Graphics.UserInterface; using osu.Game.Rulesets; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelBeatmapSet { diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs b/osu.Game/Screens/Select/PanelBeatmapSet.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelBeatmapSet.cs rename to osu.Game/Screens/Select/PanelBeatmapSet.cs index f6a33e5ce0..5a9508a823 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapSet.cs +++ b/osu.Game/Screens/Select/PanelBeatmapSet.cs @@ -32,7 +32,7 @@ using osuTK; using osuTK.Graphics; using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelBeatmapSet : Panel { diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs b/osu.Game/Screens/Select/PanelBeatmapStandalone.SpreadDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs rename to osu.Game/Screens/Select/PanelBeatmapStandalone.SpreadDisplay.cs index f8f5883c99..1e4efe495c 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs +++ b/osu.Game/Screens/Select/PanelBeatmapStandalone.SpreadDisplay.cs @@ -18,7 +18,7 @@ using osu.Game.Graphics.UserInterface; using osu.Game.Rulesets; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelBeatmapStandalone { diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs b/osu.Game/Screens/Select/PanelBeatmapStandalone.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs rename to osu.Game/Screens/Select/PanelBeatmapStandalone.cs index 6aa8f4ada2..87e49e8d3d 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs +++ b/osu.Game/Screens/Select/PanelBeatmapStandalone.cs @@ -27,7 +27,7 @@ using osu.Game.Rulesets; using osu.Game.Rulesets.Mods; using osuTK; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelBeatmapStandalone : Panel { diff --git a/osu.Game/Screens/SelectV2/PanelGroup.cs b/osu.Game/Screens/Select/PanelGroup.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelGroup.cs rename to osu.Game/Screens/Select/PanelGroup.cs index d2ae495610..0b3fed9278 100644 --- a/osu.Game/Screens/SelectV2/PanelGroup.cs +++ b/osu.Game/Screens/Select/PanelGroup.cs @@ -22,7 +22,7 @@ using osuTK; using osuTK.Graphics; using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelGroup : Panel { diff --git a/osu.Game/Screens/SelectV2/PanelGroupRankDisplay.cs b/osu.Game/Screens/Select/PanelGroupRankDisplay.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelGroupRankDisplay.cs rename to osu.Game/Screens/Select/PanelGroupRankDisplay.cs index 6895c30fee..0697e992f4 100644 --- a/osu.Game/Screens/SelectV2/PanelGroupRankDisplay.cs +++ b/osu.Game/Screens/Select/PanelGroupRankDisplay.cs @@ -23,7 +23,7 @@ using osuTK; using osuTK.Graphics; using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelGroupRankDisplay : Panel { diff --git a/osu.Game/Screens/SelectV2/PanelGroupRankedStatus.cs b/osu.Game/Screens/Select/PanelGroupRankedStatus.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelGroupRankedStatus.cs rename to osu.Game/Screens/Select/PanelGroupRankedStatus.cs index ce175efcf6..fdd48a0a10 100644 --- a/osu.Game/Screens/SelectV2/PanelGroupRankedStatus.cs +++ b/osu.Game/Screens/Select/PanelGroupRankedStatus.cs @@ -22,7 +22,7 @@ using osuTK; using osuTK.Graphics; using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelGroupRankedStatus : Panel { diff --git a/osu.Game/Screens/SelectV2/PanelGroupStarDifficulty.cs b/osu.Game/Screens/Select/PanelGroupStarDifficulty.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelGroupStarDifficulty.cs rename to osu.Game/Screens/Select/PanelGroupStarDifficulty.cs index e6b59334cd..1abbd44d9f 100644 --- a/osu.Game/Screens/SelectV2/PanelGroupStarDifficulty.cs +++ b/osu.Game/Screens/Select/PanelGroupStarDifficulty.cs @@ -21,7 +21,7 @@ using osuTK; using osuTK.Graphics; using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelGroupStarDifficulty : Panel { diff --git a/osu.Game/Screens/SelectV2/PanelLocalRankDisplay.cs b/osu.Game/Screens/Select/PanelLocalRankDisplay.cs similarity index 98% rename from osu.Game/Screens/SelectV2/PanelLocalRankDisplay.cs rename to osu.Game/Screens/Select/PanelLocalRankDisplay.cs index c72835144f..a0fdb82a43 100644 --- a/osu.Game/Screens/SelectV2/PanelLocalRankDisplay.cs +++ b/osu.Game/Screens/Select/PanelLocalRankDisplay.cs @@ -16,7 +16,7 @@ using osu.Game.Scoring; using osuTK; using Realms; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelLocalRankDisplay : CompositeDrawable { diff --git a/osu.Game/Screens/SelectV2/PanelSetBackground.cs b/osu.Game/Screens/Select/PanelSetBackground.cs similarity index 99% rename from osu.Game/Screens/SelectV2/PanelSetBackground.cs rename to osu.Game/Screens/Select/PanelSetBackground.cs index 7f15a23b9a..b6c4be7fd6 100644 --- a/osu.Game/Screens/SelectV2/PanelSetBackground.cs +++ b/osu.Game/Screens/Select/PanelSetBackground.cs @@ -17,7 +17,7 @@ using osu.Game.Overlays; using osuTK; using osuTK.Graphics; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelSetBackground : Container { diff --git a/osu.Game/Screens/SelectV2/PanelUpdateBeatmapButton.cs b/osu.Game/Screens/Select/PanelUpdateBeatmapButton.cs similarity index 98% rename from osu.Game/Screens/SelectV2/PanelUpdateBeatmapButton.cs rename to osu.Game/Screens/Select/PanelUpdateBeatmapButton.cs index e7204eefaf..fc83fa77ef 100644 --- a/osu.Game/Screens/SelectV2/PanelUpdateBeatmapButton.cs +++ b/osu.Game/Screens/Select/PanelUpdateBeatmapButton.cs @@ -18,12 +18,11 @@ using osu.Game.Graphics.UserInterface; using osu.Game.Localisation; using osu.Game.Online.API; using osu.Game.Overlays; -using osu.Game.Screens.Select.Carousel; using osuTK; using osuTK.Graphics; using CommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class PanelUpdateBeatmapButton : OsuAnimatedButton { diff --git a/osu.Game/Screens/SelectV2/Panel_EzKpcDisplay.cs b/osu.Game/Screens/Select/Panel_EzKpcDisplay.cs similarity index 100% rename from osu.Game/Screens/SelectV2/Panel_EzKpcDisplay.cs rename to osu.Game/Screens/Select/Panel_EzKpcDisplay.cs diff --git a/osu.Game/Screens/SelectV2/Panel_EzKpsDisplay.cs b/osu.Game/Screens/Select/Panel_EzKpsDisplay.cs similarity index 100% rename from osu.Game/Screens/SelectV2/Panel_EzKpsDisplay.cs rename to osu.Game/Screens/Select/Panel_EzKpsDisplay.cs diff --git a/osu.Game/Screens/SelectV2/Panel_EzTagDisplay.cs b/osu.Game/Screens/Select/Panel_EzTagDisplay.cs similarity index 100% rename from osu.Game/Screens/SelectV2/Panel_EzTagDisplay.cs rename to osu.Game/Screens/Select/Panel_EzTagDisplay.cs diff --git a/osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs b/osu.Game/Screens/Select/RealmPopulatingOnlineLookupSource.cs similarity index 99% rename from osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs rename to osu.Game/Screens/Select/RealmPopulatingOnlineLookupSource.cs index 2b75820587..132a160106 100644 --- a/osu.Game/Screens/SelectV2/RealmPopulatingOnlineLookupSource.cs +++ b/osu.Game/Screens/Select/RealmPopulatingOnlineLookupSource.cs @@ -15,7 +15,7 @@ using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests.Responses; using Realms; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { /// /// This component is designed to perform lookups of online data diff --git a/osu.Game/Screens/SelectV2/SoloSongSelect.cs b/osu.Game/Screens/Select/SoloSongSelect.cs similarity index 98% rename from osu.Game/Screens/SelectV2/SoloSongSelect.cs rename to osu.Game/Screens/Select/SoloSongSelect.cs index cf87a3466f..270d8f326a 100644 --- a/osu.Game/Screens/SelectV2/SoloSongSelect.cs +++ b/osu.Game/Screens/Select/SoloSongSelect.cs @@ -19,12 +19,11 @@ using osu.Game.Overlays.Notifications; using osu.Game.Rulesets.Mods; using osu.Game.Screens.Edit; using osu.Game.Screens.Play; -using osu.Game.Screens.Select; using osu.Game.Users; using osu.Game.Utils; using WebCommonStrings = osu.Game.Resources.Localisation.Web.CommonStrings; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { public partial class SoloSongSelect : SongSelect { diff --git a/osu.Game/Screens/SelectV2/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs similarity index 99% rename from osu.Game/Screens/SelectV2/SongSelect.cs rename to osu.Game/Screens/Select/SongSelect.cs index 4dca981c48..645e2b6ede 100644 --- a/osu.Game/Screens/SelectV2/SongSelect.cs +++ b/osu.Game/Screens/Select/SongSelect.cs @@ -52,14 +52,13 @@ using osu.Game.Screens.Footer; using osu.Game.Screens.Menu; using osu.Game.Screens.Play; using osu.Game.Screens.Ranking; -using osu.Game.Screens.Select; using osu.Game.Skinning; using osu.Game.Utils; using osuTK; using osuTK.Graphics; using osuTK.Input; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { /// /// This screen is intended to house all components introduced in the new song select design to add transitions and examine the overall look. diff --git a/osu.Game/Screens/Select/Carousel/UpdateLocalConfirmationDialog.cs b/osu.Game/Screens/Select/UpdateLocalConfirmationDialog.cs similarity index 94% rename from osu.Game/Screens/Select/Carousel/UpdateLocalConfirmationDialog.cs rename to osu.Game/Screens/Select/UpdateLocalConfirmationDialog.cs index ac9ceee815..3f847c6816 100644 --- a/osu.Game/Screens/Select/Carousel/UpdateLocalConfirmationDialog.cs +++ b/osu.Game/Screens/Select/UpdateLocalConfirmationDialog.cs @@ -6,7 +6,7 @@ using osu.Framework.Graphics.Sprites; using osu.Game.Localisation; using osu.Game.Overlays.Dialog; -namespace osu.Game.Screens.Select.Carousel +namespace osu.Game.Screens.Select { public partial class UpdateLocalConfirmationDialog : DangerousActionDialog { diff --git a/osu.Game/Screens/SelectV2/WedgeBackground.cs b/osu.Game/Screens/Select/WedgeBackground.cs similarity index 98% rename from osu.Game/Screens/SelectV2/WedgeBackground.cs rename to osu.Game/Screens/Select/WedgeBackground.cs index 3fa21beee2..aa1ce025bd 100644 --- a/osu.Game/Screens/SelectV2/WedgeBackground.cs +++ b/osu.Game/Screens/Select/WedgeBackground.cs @@ -9,7 +9,7 @@ using osu.Framework.Graphics.Shapes; using osu.Game.Graphics; using osu.Game.Overlays; -namespace osu.Game.Screens.SelectV2 +namespace osu.Game.Screens.Select { internal sealed partial class WedgeBackground : InputBlockingContainer { diff --git a/osu.Game/Screens/SelectV2/CollectionDropdown.cs b/osu.Game/Screens/SelectV2/CollectionDropdown.cs deleted file mode 100644 index 9f1950ac5f..0000000000 --- a/osu.Game/Screens/SelectV2/CollectionDropdown.cs +++ /dev/null @@ -1,256 +0,0 @@ -// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. -// See the LICENCE file in the repository root for full licence text. - -using System; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using osu.Framework.Allocation; -using osu.Framework.Bindables; -using osu.Framework.Extensions.ObjectExtensions; -using osu.Framework.Graphics; -using osu.Framework.Graphics.Sprites; -using osu.Framework.Graphics.UserInterface; -using osu.Framework.Input.Events; -using osu.Framework.Localisation; -using osu.Game.Beatmaps; -using osu.Game.Collections; -using osu.Game.Database; -using osu.Game.Graphics.Containers; -using osu.Game.Graphics.UserInterface; -using osu.Game.Graphics.UserInterfaceV2; -using osu.Game.Localisation; -using osuTK; -using Realms; - -namespace osu.Game.Screens.SelectV2 -{ - /// - /// A dropdown to select the collection to be used to filter results. - /// - public partial class CollectionDropdown : ShearedDropdown // TODO: partial class under FilterControl? - { - /// - /// Whether to show the "manage collections..." menu item in the dropdown. - /// - protected virtual bool ShowManageCollectionsItem => true; - - private readonly BindableList filters = new BindableList(); - - [Resolved] - private ManageCollectionsDialog? manageCollectionsDialog { get; set; } - - [Resolved] - private RealmAccess realm { get; set; } = null!; - - private IDisposable? realmSubscription; - - private readonly CollectionFilterMenuItem allBeatmapsItem = new AllBeatmapsCollectionFilterMenuItem(); - - public CollectionDropdown() - : base(CollectionsStrings.Collection) - { - ItemSource = filters; - - Current.Value = allBeatmapsItem; - AlwaysShowSearchBar = true; - } - - protected override void LoadComplete() - { - base.LoadComplete(); - - realmSubscription = realm.RegisterForNotifications(r => r.All().OrderBy(c => c.Name), collectionsChanged); - - Current.BindValueChanged(selectionChanged); - } - - private void collectionsChanged(IRealmCollection collections, ChangeSet? changes) - { - if (changes == null) - { - filters.Clear(); - filters.Add(allBeatmapsItem); - filters.AddRange(collections.Select(c => new CollectionFilterMenuItem(c.ToLive(realm)))); - if (ShowManageCollectionsItem) - filters.Add(new ManageCollectionsFilterMenuItem()); - } - else - { - foreach (int i in changes.DeletedIndices.OrderDescending()) - filters.RemoveAt(i + 1); - - foreach (int i in changes.InsertedIndices) - filters.Insert(i + 1, new CollectionFilterMenuItem(collections[i].ToLive(realm))); - - var selectedItem = SelectedItem?.Value; - - foreach (int i in changes.NewModifiedIndices) - { - var updatedItem = collections[i]; - - // This is responsible for updating the state of the +/- button and the collection's name. - // TODO: we can probably make the menu items update with changes to avoid this. - filters.RemoveAt(i + 1); - filters.Insert(i + 1, new CollectionFilterMenuItem(updatedItem.ToLive(realm))); - - if (updatedItem.ID == selectedItem?.Collection?.ID) - { - // This current update and schedule is required to work around dropdown headers not updating text even when the selected item - // changes. It's not great but honestly the whole dropdown menu structure isn't great. This needs to be fixed, but I'll issue - // a warning that it's going to be a frustrating journey. - Current.Value = allBeatmapsItem; - Schedule(() => - { - // current may have changed before the scheduled call is run. - if (Current.Value != allBeatmapsItem) - return; - - Current.Value = filters.SingleOrDefault(f => f.Collection?.ID == selectedItem.Collection?.ID) ?? filters[0]; - }); - - break; - } - } - } - } - - private void selectionChanged(ValueChangedEvent filter) - { - // May be null during .Clear(). - if (filter.NewValue.IsNull()) - return; - - // Never select the manage collection filter - rollback to the previous filter. - // This is done after the above since it is important that bindable is unbound from OldValue, which is lost after forcing it back to the old value. - if (filter.NewValue is ManageCollectionsFilterMenuItem) - { - Current.Value = filter.OldValue; - manageCollectionsDialog?.Show(); - } - } - - protected override void Dispose(bool isDisposing) - { - base.Dispose(isDisposing); - realmSubscription?.Dispose(); - } - - protected override LocalisableString GenerateItemText(CollectionFilterMenuItem item) => item.CollectionName; - - protected sealed override DropdownMenu CreateMenu() => CreateCollectionMenu(); - - protected virtual ShearedCollectionDropdownMenu CreateCollectionMenu() => new ShearedCollectionDropdownMenu(); - - protected partial class ShearedCollectionDropdownMenu : ShearedDropdownMenu - { - public ShearedCollectionDropdownMenu() - { - MaxHeight = 200; - } - - protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableCollectionMenuItem(item) - { - BackgroundColourHover = HoverColour, - BackgroundColourSelected = SelectionColour - }; - } - - protected partial class DrawableCollectionMenuItem : ShearedDropdownMenu.ShearedMenuItem - { - private IconButton addOrRemoveButton = null!; - - private bool beatmapInCollection; - - private readonly Live? collection; - - [Resolved] - private IBindable beatmap { get; set; } = null!; - - public DrawableCollectionMenuItem(MenuItem item) - : base(item) - { - collection = ((DropdownMenuItem)item).Value.Collection; - } - - [BackgroundDependencyLoader] - private void load() - { - AddInternal(addOrRemoveButton = new NoFocusChangeIconButton - { - Anchor = Anchor.CentreRight, - Origin = Anchor.CentreRight, - Shear = -OsuGame.SHEAR, - X = -OsuScrollContainer.SCROLL_BAR_WIDTH, - Scale = new Vector2(0.65f), - Action = addOrRemove, - }); - } - - protected override void LoadComplete() - { - base.LoadComplete(); - - if (collection != null) - { - beatmap.BindValueChanged(_ => - { - beatmapInCollection = collection.PerformRead(c => c.BeatmapMD5Hashes.Contains(beatmap.Value.BeatmapInfo.MD5Hash)); - - addOrRemoveButton.Enabled.Value = !beatmap.IsDefault; - addOrRemoveButton.Icon = beatmapInCollection ? FontAwesome.Solid.MinusSquare : FontAwesome.Solid.PlusSquare; - addOrRemoveButton.TooltipText = beatmapInCollection ? CollectionsStrings.RemoveSelectedBeatmap : CollectionsStrings.AddSelectedBeatmap; - - updateButtonVisibility(); - }, true); - } - - updateButtonVisibility(); - } - - protected override bool OnHover(HoverEvent e) - { - updateButtonVisibility(); - return base.OnHover(e); - } - - protected override void OnHoverLost(HoverLostEvent e) - { - updateButtonVisibility(); - base.OnHoverLost(e); - } - - protected override void OnSelectChange() - { - base.OnSelectChange(); - updateButtonVisibility(); - } - - private void updateButtonVisibility() - { - if (collection == null) - addOrRemoveButton.Alpha = 0; - else - addOrRemoveButton.Alpha = IsHovered || IsPreSelected || beatmapInCollection ? 1 : 0; - } - - private void addOrRemove() - { - Debug.Assert(collection != null); - - Task.Run(() => collection.PerformWrite(c => - { - if (!c.BeatmapMD5Hashes.Remove(beatmap.Value.BeatmapInfo.MD5Hash)) - c.BeatmapMD5Hashes.Add(beatmap.Value.BeatmapInfo.MD5Hash); - })); - } - - protected override Drawable CreateContent() => (Content)base.CreateContent(); - - private partial class NoFocusChangeIconButton : IconButton - { - public override bool ChangeFocusOnClick => false; - } - } - } -} diff --git a/osu.Game/Tests/Visual/EditorSavingTestScene.cs b/osu.Game/Tests/Visual/EditorSavingTestScene.cs index 8d27618c00..5a3f5c432e 100644 --- a/osu.Game/Tests/Visual/EditorSavingTestScene.cs +++ b/osu.Game/Tests/Visual/EditorSavingTestScene.cs @@ -13,7 +13,7 @@ using osu.Game.Rulesets.Edit; using osu.Game.Screens.Edit; using osu.Game.Screens.Edit.Setup; using osu.Game.Screens.Menu; -using osu.Game.Screens.SelectV2; +using osu.Game.Screens.Select; using osuTK.Input; namespace osu.Game.Tests.Visual