From 49d998c8db2f7a6be17d3fd25898015e5a3920b8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 8 Jul 2020 18:24:13 +0300
Subject: [PATCH] Refactor NewsOverlay to use displays logic

---
 .../Visual/Online/TestSceneNewsOverlay.cs     |  4 +-
 osu.Game/Overlays/DashboardOverlay.cs         |  8 +--
 osu.Game/Overlays/NewsOverlay.cs              | 70 +++++++++++++------
 3 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
index d47c972564..0b3ede5d13 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.cs
@@ -22,12 +22,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep(@"Show front page", () => news.ShowFrontPage());
             AddStep(@"Custom article", () => news.Current.Value = "Test Article 101");
 
-            AddStep(@"Article covers", () => news.LoadAndShowContent(new NewsCoverTest()));
+            AddStep(@"Article covers", () => news.LoadDisplay(new NewsCoverTest()));
         }
 
         private class TestNewsOverlay : NewsOverlay
         {
-            public new void LoadAndShowContent(NewsContent content) => base.LoadAndShowContent(content);
+            public void LoadDisplay(NewsContent content) => base.LoadDisplay(content);
         }
 
         private class NewsCoverTest : NewsContent
diff --git a/osu.Game/Overlays/DashboardOverlay.cs b/osu.Game/Overlays/DashboardOverlay.cs
index a72c3f4fa5..e3a4b0e152 100644
--- a/osu.Game/Overlays/DashboardOverlay.cs
+++ b/osu.Game/Overlays/DashboardOverlay.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Overlays
     {
         private CancellationTokenSource cancellationToken;
 
-        private Box background;
         private Container content;
         private DashboardOverlayHeader header;
         private LoadingLayer loading;
@@ -35,9 +34,10 @@ namespace osu.Game.Overlays
         {
             Children = new Drawable[]
             {
-                background = new Box
+                new Box
                 {
-                    RelativeSizeAxes = Axes.Both
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = ColourProvider.Background5
                 },
                 scrollFlow = new OverlayScrollContainer
                 {
@@ -66,8 +66,6 @@ namespace osu.Game.Overlays
                 },
                 loading = new LoadingLayer(content),
             };
-
-            background.Colour = ColourProvider.Background5;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 46d692d44d..ec25827b5a 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -7,37 +7,40 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.News;
 
 namespace osu.Game.Overlays
 {
     public class NewsOverlay : FullscreenOverlay
     {
-        private NewsHeader header;
-
-        private Container<NewsContent> content;
-
         public readonly Bindable<string> Current = new Bindable<string>(null);
 
+        private Container content;
+        private LoadingLayer loading;
+        private OverlayScrollContainer scrollFlow;
+
         public NewsOverlay()
             : base(OverlayColourScheme.Purple)
         {
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
+            NewsHeader header;
+
             Children = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.PurpleDarkAlternative
+                    Colour = ColourProvider.Background5,
                 },
-                new OverlayScrollContainer
+                scrollFlow = new OverlayScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
                     Child = new FillFlowContainer
                     {
                         RelativeSizeAxes = Axes.X,
@@ -49,7 +52,7 @@ namespace osu.Game.Overlays
                             {
                                 ShowFrontPage = ShowFrontPage
                             },
-                            content = new Container<NewsContent>
+                            content = new Container
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
@@ -57,25 +60,16 @@ namespace osu.Game.Overlays
                         },
                     },
                 },
+                loading = new LoadingLayer(content),
             };
 
             header.Post.BindTo(Current);
-            Current.TriggerChange();
         }
 
-        private CancellationTokenSource loadContentCancellation;
-
-        protected void LoadAndShowContent(NewsContent newContent)
+        protected override void LoadComplete()
         {
-            content.FadeTo(0.2f, 300, Easing.OutQuint);
-
-            loadContentCancellation?.Cancel();
-
-            LoadComponentAsync(newContent, c =>
-            {
-                content.Child = c;
-                content.FadeIn(300, Easing.OutQuint);
-            }, (loadContentCancellation = new CancellationTokenSource()).Token);
+            base.LoadComplete();
+            Current.BindValueChanged(onCurrentChanged, true);
         }
 
         public void ShowFrontPage()
@@ -83,5 +77,37 @@ namespace osu.Game.Overlays
             Current.Value = null;
             Show();
         }
+
+        private CancellationTokenSource cancellationToken;
+
+        private void onCurrentChanged(ValueChangedEvent<string> current)
+        {
+            cancellationToken?.Cancel();
+            loading.Show();
+
+            if (current.NewValue == null)
+            {
+                LoadDisplay(Empty());
+                return;
+            }
+
+            LoadDisplay(Empty());
+        }
+
+        protected void LoadDisplay(Drawable display)
+        {
+            scrollFlow.ScrollToStart();
+            LoadComponentAsync(display, loaded =>
+            {
+                content.Child = loaded;
+                loading.Hide();
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            cancellationToken?.Cancel();
+            base.Dispose(isDisposing);
+        }
     }
 }