From 5be11f539bbe56c53a6b451ffbb0f32931b35383 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 25 Sep 2017 17:26:27 +0800 Subject: [PATCH] Rename to BeatmapSetOverlay --- .../AuthorInfo.cs | 6 ++--- .../BasicStats.cs | 4 +-- .../BeatmapPicker.cs | 6 ++--- .../Details.cs | 8 +++--- .../DownloadButton.cs | 4 +-- .../FavouriteButton.cs | 4 +-- .../Header.cs | 10 +++---- .../HeaderButton.cs | 2 +- .../{OnlineBeatmapSet => BeatmapSet}/Info.cs | 14 +++++----- .../PreviewButton.cs | 6 ++--- .../SuccessRate.cs | 6 ++--- ...tmapSetOverlay.cs => BeatmapSetOverlay.cs} | 6 ++--- ...verlay.cs => TestCaseBeatmapSetOverlay.cs} | 8 +++--- osu.Game/osu.Game.csproj | 26 +++++++++---------- 14 files changed, 55 insertions(+), 55 deletions(-) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/AuthorInfo.cs (95%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/BasicStats.cs (96%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/BeatmapPicker.cs (96%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/Details.cs (94%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/DownloadButton.cs (95%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/FavouriteButton.cs (95%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/Header.cs (96%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/HeaderButton.cs (93%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/Info.cs (93%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/PreviewButton.cs (95%) rename osu.Game/Overlays/{OnlineBeatmapSet => BeatmapSet}/SuccessRate.cs (96%) rename osu.Game/Overlays/{OnlineBeatmapSetOverlay.cs => BeatmapSetOverlay.cs} (91%) rename osu.Game/Tests/Visual/{TestCaseOnlineBeatmapSetOverlay.cs => TestCaseBeatmapSetOverlay.cs} (96%) diff --git a/osu.Game/Overlays/OnlineBeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs similarity index 95% rename from osu.Game/Overlays/OnlineBeatmapSet/AuthorInfo.cs rename to osu.Game/Overlays/BeatmapSet/AuthorInfo.cs index ce46e96380..b0e4e49e31 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/AuthorInfo.cs +++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs @@ -1,16 +1,16 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; -using OpenTK.Graphics; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; using osu.Game.Graphics.Sprites; using osu.Game.Users; +using OpenTK; +using OpenTK.Graphics; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class AuthorInfo : Container { diff --git a/osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs similarity index 96% rename from osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs rename to osu.Game/Overlays/BeatmapSet/BasicStats.cs index 947bc111e0..885f9cc219 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/BasicStats.cs +++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs @@ -2,7 +2,6 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE using System; -using OpenTK; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; @@ -10,8 +9,9 @@ using osu.Framework.Graphics.Cursor; using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; +using OpenTK; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class BasicStats : Container { diff --git a/osu.Game/Overlays/OnlineBeatmapSet/BeatmapPicker.cs b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs similarity index 96% rename from osu.Game/Overlays/OnlineBeatmapSet/BeatmapPicker.cs rename to osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs index d7b9fa49bd..2317e8562a 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/BeatmapPicker.cs +++ b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs @@ -3,8 +3,6 @@ using System; using System.Linq; -using OpenTK; -using OpenTK.Graphics; using osu.Framework; using osu.Framework.Allocation; using osu.Framework.Configuration; @@ -18,8 +16,10 @@ using osu.Game.Beatmaps.Drawables; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Graphics.Sprites; +using OpenTK; +using OpenTK.Graphics; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class BeatmapPicker : Container { diff --git a/osu.Game/Overlays/OnlineBeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs similarity index 94% rename from osu.Game/Overlays/OnlineBeatmapSet/Details.cs rename to osu.Game/Overlays/BeatmapSet/Details.cs index 958cc2cd18..2fd0a55d9e 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/Details.cs +++ b/osu.Game/Overlays/BeatmapSet/Details.cs @@ -1,16 +1,16 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; -using OpenTK.Graphics; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Game.Beatmaps; using osu.Game.Screens.Select.Details; +using OpenTK; +using OpenTK.Graphics; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class Details : FillFlowContainer { @@ -48,7 +48,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet public Details() { - Width = OnlineBeatmapSetOverlay.RIGHT_WIDTH; + Width = BeatmapSetOverlay.RIGHT_WIDTH; AutoSizeAxes = Axes.Y; Spacing = new Vector2(1f); diff --git a/osu.Game/Overlays/OnlineBeatmapSet/DownloadButton.cs b/osu.Game/Overlays/BeatmapSet/DownloadButton.cs similarity index 95% rename from osu.Game/Overlays/OnlineBeatmapSet/DownloadButton.cs rename to osu.Game/Overlays/BeatmapSet/DownloadButton.cs index 855aa3de93..18a0cfd968 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/DownloadButton.cs +++ b/osu.Game/Overlays/BeatmapSet/DownloadButton.cs @@ -1,13 +1,13 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; +using OpenTK; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class DownloadButton : HeaderButton { diff --git a/osu.Game/Overlays/OnlineBeatmapSet/FavouriteButton.cs b/osu.Game/Overlays/BeatmapSet/FavouriteButton.cs similarity index 95% rename from osu.Game/Overlays/OnlineBeatmapSet/FavouriteButton.cs rename to osu.Game/Overlays/BeatmapSet/FavouriteButton.cs index 4998ea1c19..9fd4ac177c 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/FavouriteButton.cs +++ b/osu.Game/Overlays/BeatmapSet/FavouriteButton.cs @@ -1,15 +1,15 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; using osu.Framework.Configuration; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Shapes; using osu.Game.Graphics; using osu.Game.Graphics.Backgrounds; +using OpenTK; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class FavouriteButton : HeaderButton { diff --git a/osu.Game/Overlays/OnlineBeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs similarity index 96% rename from osu.Game/Overlays/OnlineBeatmapSet/Header.cs rename to osu.Game/Overlays/BeatmapSet/Header.cs index 2cd07b2212..a93ccbf704 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/Header.cs +++ b/osu.Game/Overlays/BeatmapSet/Header.cs @@ -1,8 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; -using OpenTK.Graphics; using osu.Framework.Allocation; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; @@ -13,8 +11,10 @@ using osu.Game.Beatmaps; using osu.Game.Beatmaps.Drawables; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; +using OpenTK; +using OpenTK.Graphics; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class Header : Container { @@ -124,7 +124,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet new Container { RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = OnlineBeatmapSetOverlay.X_PADDING }, + Padding = new MarginPadding { Top = 20, Bottom = 30, Horizontal = BeatmapSetOverlay.X_PADDING }, Child = new FillFlowContainer { RelativeSizeAxes = Axes.Both, @@ -196,7 +196,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet { Anchor = Anchor.BottomRight, Origin = Anchor.BottomRight, - Margin = new MarginPadding { Right = OnlineBeatmapSetOverlay.X_PADDING }, + Margin = new MarginPadding { Right = BeatmapSetOverlay.X_PADDING }, }, }, }, diff --git a/osu.Game/Overlays/OnlineBeatmapSet/HeaderButton.cs b/osu.Game/Overlays/BeatmapSet/HeaderButton.cs similarity index 93% rename from osu.Game/Overlays/OnlineBeatmapSet/HeaderButton.cs rename to osu.Game/Overlays/BeatmapSet/HeaderButton.cs index fe852ec83a..3075020fe6 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/HeaderButton.cs +++ b/osu.Game/Overlays/BeatmapSet/HeaderButton.cs @@ -8,7 +8,7 @@ using osu.Game.Graphics; using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Containers; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class HeaderButton : OsuClickableContainer { diff --git a/osu.Game/Overlays/OnlineBeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs similarity index 93% rename from osu.Game/Overlays/OnlineBeatmapSet/Info.cs rename to osu.Game/Overlays/BeatmapSet/Info.cs index 7782e8b7ab..4a59591a72 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/Info.cs +++ b/osu.Game/Overlays/BeatmapSet/Info.cs @@ -1,8 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; -using OpenTK.Graphics; using osu.Framework.Allocation; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; @@ -11,8 +9,10 @@ using osu.Framework.Graphics.Shapes; using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; +using OpenTK; +using OpenTK.Graphics; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class Info : Container { @@ -67,13 +67,13 @@ namespace osu.Game.Overlays.OnlineBeatmapSet new Container { RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Top = 15, Horizontal = OnlineBeatmapSetOverlay.X_PADDING }, + Padding = new MarginPadding { Top = 15, Horizontal = BeatmapSetOverlay.X_PADDING }, Children = new Drawable[] { new Container { RelativeSizeAxes = Axes.Both, - Padding = new MarginPadding { Right = metadata_width + OnlineBeatmapSetOverlay.RIGHT_WIDTH + spacing * 2 }, + Padding = new MarginPadding { Right = metadata_width + BeatmapSetOverlay.RIGHT_WIDTH + spacing * 2 }, Child = new ScrollContainer { RelativeSizeAxes = Axes.Both, @@ -89,7 +89,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet Width = metadata_width, ScrollbarVisible = false, Padding = new MarginPadding { Horizontal = 10 }, - Margin = new MarginPadding { Right = OnlineBeatmapSetOverlay.RIGHT_WIDTH + spacing }, + Margin = new MarginPadding { Right = BeatmapSetOverlay.RIGHT_WIDTH + spacing }, Child = new FillFlowContainer { RelativeSizeAxes = Axes.X, @@ -108,7 +108,7 @@ namespace osu.Game.Overlays.OnlineBeatmapSet Anchor = Anchor.TopRight, Origin = Anchor.TopRight, RelativeSizeAxes = Axes.Y, - Width = OnlineBeatmapSetOverlay.RIGHT_WIDTH, + Width = BeatmapSetOverlay.RIGHT_WIDTH, Children = new Drawable[] { successRateBackground = new Box diff --git a/osu.Game/Overlays/OnlineBeatmapSet/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/PreviewButton.cs similarity index 95% rename from osu.Game/Overlays/OnlineBeatmapSet/PreviewButton.cs rename to osu.Game/Overlays/BeatmapSet/PreviewButton.cs index b8673e2a77..bdb06106f0 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/PreviewButton.cs +++ b/osu.Game/Overlays/BeatmapSet/PreviewButton.cs @@ -1,8 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; -using OpenTK.Graphics; using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Track; @@ -15,8 +13,10 @@ using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using osu.Game.Graphics.UserInterface; +using OpenTK; +using OpenTK.Graphics; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class PreviewButton : OsuClickableContainer { diff --git a/osu.Game/Overlays/OnlineBeatmapSet/SuccessRate.cs b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs similarity index 96% rename from osu.Game/Overlays/OnlineBeatmapSet/SuccessRate.cs rename to osu.Game/Overlays/BeatmapSet/SuccessRate.cs index 3389542e64..26335aac9b 100644 --- a/osu.Game/Overlays/OnlineBeatmapSet/SuccessRate.cs +++ b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs @@ -1,17 +1,17 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; +using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; -using osu.Game.Beatmaps; using osu.Game.Screens.Select.Details; -using System; -namespace osu.Game.Overlays.OnlineBeatmapSet +namespace osu.Game.Overlays.BeatmapSet { public class SuccessRate : Container { diff --git a/osu.Game/Overlays/OnlineBeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs similarity index 91% rename from osu.Game/Overlays/OnlineBeatmapSetOverlay.cs rename to osu.Game/Overlays/BeatmapSetOverlay.cs index 8db211e352..d809bc6727 100644 --- a/osu.Game/Overlays/OnlineBeatmapSetOverlay.cs +++ b/osu.Game/Overlays/BeatmapSetOverlay.cs @@ -10,11 +10,11 @@ using osu.Framework.Graphics.Shapes; using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Graphics.Containers; -using osu.Game.Overlays.OnlineBeatmapSet; +using osu.Game.Overlays.BeatmapSet; namespace osu.Game.Overlays { - public class OnlineBeatmapSetOverlay : WaveOverlayContainer + public class BeatmapSetOverlay : WaveOverlayContainer { public const float X_PADDING = 40; public const float RIGHT_WIDTH = 275; @@ -22,7 +22,7 @@ namespace osu.Game.Overlays private readonly Header header; private readonly Info info; - public OnlineBeatmapSetOverlay() + public BeatmapSetOverlay() { FirstWaveColour = OsuColour.Gray(0.4f); SecondWaveColour = OsuColour.Gray(0.3f); diff --git a/osu.Game/Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs b/osu.Game/Tests/Visual/TestCaseBeatmapSetOverlay.cs similarity index 96% rename from osu.Game/Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs rename to osu.Game/Tests/Visual/TestCaseBeatmapSetOverlay.cs index 71113b5478..76ed9979ca 100644 --- a/osu.Game/Tests/Visual/TestCaseOnlineBeatmapSetOverlay.cs +++ b/osu.Game/Tests/Visual/TestCaseBeatmapSetOverlay.cs @@ -12,15 +12,15 @@ using osu.Game.Users; namespace osu.Game.Tests.Visual { - internal class TestCaseOnlineBeatmapSetOverlay : OsuTestCase + internal class TestCaseBeatmapSetOverlay : OsuTestCase { public override string Description => @"view online beatmap sets"; - private readonly OnlineBeatmapSetOverlay overlay; + private readonly BeatmapSetOverlay overlay; - public TestCaseOnlineBeatmapSetOverlay() + public TestCaseBeatmapSetOverlay() { - Add(overlay = new OnlineBeatmapSetOverlay()); + Add(overlay = new BeatmapSetOverlay()); } [BackgroundDependencyLoader] diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 659af88b3f..ddb29c63c3 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -774,19 +774,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +