Merge pull request #26183 from peppy/menu-supporter-display

Show supporter love message at main menu and remove the disclaimer screen
ppy · Dec 28, 2023 · f5a3124 · f5a3124
2 parents 17325ff + a717ad5
commit f5a3124
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 244 deletions.
diff --git a/...Tests/Visual/Menus/TestSceneDisclaimer.cs → ...Visual/Menus/TestSceneSupporterDisplay.cs b/...Tests/Visual/Menus/TestSceneDisclaimer.cs → ...Visual/Menus/TestSceneSupporterDisplay.cs
@@ -1,19 +1,27 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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.Allocation;
+using NUnit.Framework;
+using osu.Framework.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Screens.Menu;
 
 namespace osu.Game.Tests.Visual.Menus
 {
-    public partial class TestSceneDisclaimer : ScreenTestScene
+    public partial class TestSceneSupporterDisplay : OsuTestScene
     {
-        [BackgroundDependencyLoader]
-        private void load()
+        [Test]
+        public void TestBasic()
         {
-            AddStep("load disclaimer", () => LoadScreen(new Disclaimer()));
+            AddStep("create display", () =>
+            {
+                Child = new SupporterDisplay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                };
+            });
 
             AddStep("toggle support", () =>
             {

diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
@@ -21,8 +21,6 @@ namespace osu.Game.Screens
 {
     public partial class Loader : StartupScreen
     {
-        private bool showDisclaimer;
-
         public Loader()
         {
             ValidForResume = false;
@@ -35,13 +33,7 @@ public Loader()
         private LoadingSpinner spinner;
         private ScheduledDelegate spinnerShow;
 
-        protected virtual OsuScreen CreateLoadableScreen()
-        {
-            if (showDisclaimer)
-                return new Disclaimer(getIntroSequence());
-
-            return getIntroSequence();
-        }
+        protected virtual OsuScreen CreateLoadableScreen() => getIntroSequence();
 
         private IntroScreen getIntroSequence()
         {
@@ -107,9 +99,8 @@ private void checkIfLoaded()
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, OsuConfigManager config)
+        private void load(OsuConfigManager config)
         {
-            showDisclaimer = game.IsDeployedBuild;
             introSequence = config.Get<IntroSequence>(OsuSetting.IntroSequence);
         }
 

diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
@@ -96,6 +96,7 @@ public partial class MainMenu : OsuScreen, IHandlePresentBeatmap, IKeyBindingHan
         private Container logoTarget;
         private MenuTip menuTip;
         private FillFlowContainer bottomElementsFlow;
+        private SupporterDisplay supporterDisplay;
 
         private Sample reappearSampleSwoosh;
 
@@ -179,6 +180,12 @@ private void load(BeatmapListingOverlay beatmapListing, SettingsOverlay settings
                         }
                     }
                 },
+                supporterDisplay = new SupporterDisplay
+                {
+                    Margin = new MarginPadding(5),
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                },
                 holdToExitGameOverlay?.CreateProxy() ?? Empty()
             });
 
@@ -339,6 +346,9 @@ public override void OnSuspending(ScreenTransitionEvent e)
             bottomElementsFlow
                 .ScaleTo(0.9f, 1000, Easing.OutQuint)
                 .FadeOut(500, Easing.OutQuint);
+
+            supporterDisplay
+                .FadeOut(500, Easing.OutQuint);
         }
 
         public override void OnResuming(ScreenTransitionEvent e)
@@ -403,6 +413,9 @@ public override bool OnExiting(ScreenExitEvent e)
             bottomElementsFlow
                 .FadeOut(500, Easing.OutQuint);
 
+            supporterDisplay
+                .FadeOut(500, Easing.OutQuint);
+
             return base.OnExiting(e);
         }