From 58d8f0733cfed3f432879263e827fc4cc1128162 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 17:45:58 +0900
Subject: [PATCH 1/3] Allow using OnlineViewContainer without deriving it

---
 osu.Game/Online/OnlineViewContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index c9fb70f0cc..8868f90524 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Online
     /// A <see cref="Container"/> for displaying online content which require a local user to be logged in.
     /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
     /// </summary>
-    public abstract class OnlineViewContainer : Container
+    public class OnlineViewContainer : Container
     {
         protected LoadingSpinner LoadingSpinner { get; private set; }
 
@@ -30,7 +30,7 @@ namespace osu.Game.Online
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        protected OnlineViewContainer(string placeholderMessage)
+        public OnlineViewContainer(string placeholderMessage)
         {
             this.placeholderMessage = placeholderMessage;
         }

From 0bd1964d8e7db31f84374aa079c16e43b2c33a24 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 18:04:41 +0900
Subject: [PATCH 2/3] Add login placeholder logic to OnlineOverlay

A perfect implementation of this would probably leave the filter/header
content visible, but that requires some re-thinking and restructuring to
how the content is displayed in these overlays (ie. the header
component shouldn't be inside the `ScrollContainer` as it is fixed).

Supersedes and closes #10774.
Closes #933.
Addresses most pieces of #7417.
---
 osu.Game/Overlays/ChangelogOverlay.cs      |  2 +-
 osu.Game/Overlays/NewsOverlay.cs           |  2 +-
 osu.Game/Overlays/OnlineOverlay.cs         | 15 ++++++++++++---
 osu.Game/Overlays/TabbableOnlineOverlay.cs |  3 +--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 593f59555a..537dd00727 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays
         protected List<APIUpdateStream> Streams;
 
         public ChangelogOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, false)
         {
         }
 
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 08e8331dd3..5beb285216 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays
         private readonly Bindable<string> article = new Bindable<string>(null);
 
         public NewsOverlay()
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, false)
         {
         }
 
diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 7c9f751d3b..0a5ceb1993 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 
 namespace osu.Game.Overlays
 {
@@ -16,10 +17,16 @@ namespace osu.Game.Overlays
         protected readonly LoadingLayer Loading;
         private readonly Container content;
 
-        protected OnlineOverlay(OverlayColourScheme colourScheme)
+        protected OnlineOverlay(OverlayColourScheme colourScheme, bool requiresSignIn = true)
             : base(colourScheme)
         {
-            base.Content.AddRange(new Drawable[]
+            var mainContent = requiresSignIn
+                ? new OnlineViewContainer($"Sign in to view the {Header.Title.Title}")
+                : new Container();
+
+            mainContent.RelativeSizeAxes = Axes.Both;
+
+            mainContent.AddRange(new Drawable[]
             {
                 ScrollFlow = new OverlayScrollContainer
                 {
@@ -41,8 +48,10 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                Loading = new LoadingLayer(true)
+                Loading = new LoadingLayer()
             });
+
+            base.Content.Add(mainContent);
         }
     }
 }
diff --git a/osu.Game/Overlays/TabbableOnlineOverlay.cs b/osu.Game/Overlays/TabbableOnlineOverlay.cs
index 8172e99c1b..9ceab12d3d 100644
--- a/osu.Game/Overlays/TabbableOnlineOverlay.cs
+++ b/osu.Game/Overlays/TabbableOnlineOverlay.cs
@@ -61,8 +61,7 @@ namespace osu.Game.Overlays
 
             LoadComponentAsync(display, loaded =>
             {
-                if (API.IsLoggedIn)
-                    Loading.Hide();
+                Loading.Hide();
 
                 Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);

From 10ec4cd8e07950b8a48e8da8931e3e39b16559b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 18 Feb 2021 22:38:17 +0900
Subject: [PATCH 3/3] Revert change to loading layer's default state

---
 osu.Game/Overlays/OnlineOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/OnlineOverlay.cs b/osu.Game/Overlays/OnlineOverlay.cs
index 0a5ceb1993..de33e4a1bc 100644
--- a/osu.Game/Overlays/OnlineOverlay.cs
+++ b/osu.Game/Overlays/OnlineOverlay.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Overlays
                         }
                     }
                 },
-                Loading = new LoadingLayer()
+                Loading = new LoadingLayer(true)
             });
 
             base.Content.Add(mainContent);