From 446fbce81c34fd849bc8de08fdddf22cfe92a4c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jun 2019 01:36:17 +0900
Subject: [PATCH] Add base class for startup screens

Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
---
 osu.Game/Screens/Loader.cs          | 11 +----------
 osu.Game/Screens/Menu/Disclaimer.cs | 10 +---------
 osu.Game/Screens/Menu/Intro.cs      | 10 +---------
 osu.Game/Screens/StartupScreen.cs   | 21 +++++++++++++++++++++
 4 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 osu.Game/Screens/StartupScreen.cs

diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index e4956bc8ab..8add730c4e 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -9,22 +9,13 @@
 using osu.Game.Screens.Menu;
 using osuTK;
 using osu.Framework.Screens;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens
 {
-    public class Loader : OsuScreen
+    public class Loader : StartupScreen
     {
         private bool showDisclaimer;
 
-        public override bool HideOverlaysOnEnter => true;
-
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
-
-        public override bool CursorVisible => false;
-
-        public override bool AllowBackButton => false;
-
         public Loader()
         {
             ValidForResume = false;
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 8cf232af81..97231a1331 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -15,12 +15,11 @@
 using osu.Game.Online.API;
 using osuTK;
 using osuTK.Graphics;
-using osu.Game.Overlays;
 using osu.Game.Users;
 
 namespace osu.Game.Screens.Menu
 {
-    public class Disclaimer : OsuScreen
+    public class Disclaimer : StartupScreen
     {
         private Intro intro;
         private SpriteIcon icon;
@@ -28,13 +27,6 @@ public class Disclaimer : OsuScreen
         private LinkFlowContainer textFlow;
         private LinkFlowContainer supportFlow;
 
-        public override bool HideOverlaysOnEnter => true;
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
-
-        public override bool AllowBackButton => false;
-
-        public override bool CursorVisible => false;
-
         private Drawable heart;
 
         private const float icon_y = -85;
diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs
index eec92e3080..c52e8541c5 100644
--- a/osu.Game/Screens/Menu/Intro.cs
+++ b/osu.Game/Screens/Menu/Intro.cs
@@ -15,11 +15,10 @@
 using osu.Game.Screens.Backgrounds;
 using osuTK;
 using osuTK.Graphics;
-using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Menu
 {
-    public class Intro : OsuScreen
+    public class Intro : StartupScreen
     {
         private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
 
@@ -32,13 +31,6 @@ public class Intro : OsuScreen
         private SampleChannel welcome;
         private SampleChannel seeya;
 
-        public override bool AllowBackButton => false;
-
-        public override bool HideOverlaysOnEnter => true;
-        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
-
-        public override bool CursorVisible => false;
-
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
 
         private Bindable<bool> menuVoice;
diff --git a/osu.Game/Screens/StartupScreen.cs b/osu.Game/Screens/StartupScreen.cs
new file mode 100644
index 0000000000..797f185a37
--- /dev/null
+++ b/osu.Game/Screens/StartupScreen.cs
@@ -0,0 +1,21 @@
+// 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.Game.Overlays;
+
+namespace osu.Game.Screens
+{
+    /// <summary>
+    /// A screen which is shown once as part of the startup procedure.
+    /// </summary>
+    public abstract class StartupScreen : OsuScreen
+    {
+        public override bool AllowBackButton => false;
+
+        public override bool HideOverlaysOnEnter => true;
+
+        public override bool CursorVisible => false;
+
+        public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.Disabled;
+    }
+}