From 3bc789fca892d8120e9916c6b285d56f64490086 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Jul 2019 15:09:06 +0900
Subject: [PATCH] Remove osd prefix and prefer upper-case OSD

---
 .../Visual/UserInterface/TestSceneOnScreenDisplay.cs        | 3 ++-
 osu.Game/Overlays/OSD/{OsdToast.cs => Toast.cs}             | 6 +++---
 .../{OsdTrackedSettingToast.cs => TrackedSettingToast.cs}   | 6 +++---
 osu.Game/Overlays/OnScreenDisplay.cs                        | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename osu.Game/Overlays/OSD/{OsdToast.cs => Toast.cs} (94%)
 rename osu.Game/Overlays/OSD/{OsdTrackedSettingToast.cs => TrackedSettingToast.cs} (98%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
index b28f794a58..59a35591bd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
+using osu.Game.Overlays.OSD;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -22,7 +23,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             osd.BeginTracking(this, config);
             Add(osd);
 
-            AddStep("Display empty osd toast", () => osd.Display(new Overlays.OSD.OsdToast()));
+            AddStep("Display empty osd toast", () => osd.Display(new Toast()));
             AddRepeatStep("Change toggle (no bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingNoKeybind), 2);
             AddRepeatStep("Change toggle (with bind)", () => config.ToggleSetting(TestConfigSetting.ToggleSettingWithKeybind), 2);
             AddRepeatStep("Change enum (no bind)", () => config.IncrementEnumSetting(TestConfigSetting.EnumSettingNoKeybind), 3);
diff --git a/osu.Game/Overlays/OSD/OsdToast.cs b/osu.Game/Overlays/OSD/Toast.cs
similarity index 94%
rename from osu.Game/Overlays/OSD/OsdToast.cs
rename to osu.Game/Overlays/OSD/Toast.cs
index f700577ba1..6634959bca 100644
--- a/osu.Game/Overlays/OSD/OsdToast.cs
+++ b/osu.Game/Overlays/OSD/Toast.cs
@@ -1,19 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.OSD
 {
-    public class OsdToast : Container
+    public class Toast : Container
     {
         private readonly Container content;
         protected override Container<Drawable> Content => content;
 
-        public OsdToast()
+        public Toast()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
diff --git a/osu.Game/Overlays/OSD/OsdTrackedSettingToast.cs b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
similarity index 98%
rename from osu.Game/Overlays/OSD/OsdTrackedSettingToast.cs
rename to osu.Game/Overlays/OSD/TrackedSettingToast.cs
index 411a33b000..8def8476f0 100644
--- a/osu.Game/Overlays/OSD/OsdTrackedSettingToast.cs
+++ b/osu.Game/Overlays/OSD/TrackedSettingToast.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions.Color4Extensions;
@@ -13,13 +14,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
-using System;
 
 namespace osu.Game.Overlays.OSD
 {
-    public class OsdTrackedSettingToast : OsdToast
+    public class TrackedSettingToast : Toast
     {
-        public OsdTrackedSettingToast(SettingDescription description)
+        public TrackedSettingToast(SettingDescription description)
         {
             SpriteText textLine2;
             FillFlowContainer<OptionLight> optionLights;
diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs
index 0577257080..a30ce5c56f 100644
--- a/osu.Game/Overlays/OnScreenDisplay.cs
+++ b/osu.Game/Overlays/OnScreenDisplay.cs
@@ -97,16 +97,16 @@ namespace osu.Game.Overlays
         }
 
         /// <summary>
-        /// Displays the given <see cref="OsdToast"/> as parameter on the OSD
+        /// Displays the given <see cref="Toast"/> as parameter on the OSD
         /// </summary>
         /// <param name="toast"></param>
-        public void Display(OsdToast toast)
+        public void Display(Toast toast)
         {
             box.Child = toast;
             DisplayTemporarily(box);
         }
 
-        private void displayTrackedSettingChange(SettingDescription description) => Schedule(() => Display(new OsdTrackedSettingToast(description)));
+        private void displayTrackedSettingChange(SettingDescription description) => Schedule(() => Display(new TrackedSettingToast(description)));
 
         private TransformSequence<Drawable> fadeIn;
         private ScheduledDelegate fadeOut;