From a124c967dfd96a671640b24734f9e9c10d574f56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 30 Dec 2022 20:13:23 +0100
Subject: [PATCH] Add proper offline & loading state handling to user profile
 overlay

---
 .../Online/TestSceneUserProfileOverlay.cs     | 25 +++++++++++++++++++
 osu.Game/Overlays/UserProfileOverlay.cs       | 18 +++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
index 393fcd6d70..d3d9dcb990 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
@@ -51,6 +51,31 @@ namespace osu.Game.Tests.Visual.Online
             });
             AddStep("show user", () => profile.ShowUser(new APIUser { Id = 1 }));
             AddToggleStep("toggle visibility", visible => profile.State.Value = visible ? Visibility.Visible : Visibility.Hidden);
+            AddStep("log out", () => dummyAPI.Logout());
+            AddStep("log back in", () => dummyAPI.Login("username", "password"));
+        }
+
+        [Test]
+        public void TestLoading()
+        {
+            GetUserRequest pendingRequest = null!;
+
+            AddStep("set up request handling", () =>
+            {
+                dummyAPI.HandleRequest = req =>
+                {
+                    if (req is GetUserRequest getUserRequest)
+                    {
+                        pendingRequest = getUserRequest;
+                        return true;
+                    }
+
+                    return false;
+                };
+            });
+            AddStep("show user", () => profile.ShowUser(new APIUser { Id = 1 }));
+            AddWaitStep("wait some", 3);
+            AddStep("complete request", () => pendingRequest.TriggerSuccess(TEST_USER));
         }
 
         public static readonly APIUser TEST_USER = new APIUser
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 185119c631..155833e0c6 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -13,6 +13,8 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Profile;
@@ -26,6 +28,11 @@ namespace osu.Game.Overlays
 {
     public partial class UserProfileOverlay : FullscreenOverlay<ProfileHeader>
     {
+        protected override Container<Drawable> Content => onlineViewContainer;
+
+        private readonly OnlineViewContainer onlineViewContainer;
+        private readonly LoadingLayer loadingLayer;
+
         private ProfileSection? lastSection;
         private ProfileSection[]? sections;
         private GetUserRequest? userReq;
@@ -40,6 +47,14 @@ namespace osu.Game.Overlays
         public UserProfileOverlay()
             : base(OverlayColourScheme.Pink)
         {
+            base.Content.AddRange(new Drawable[]
+            {
+                onlineViewContainer = new OnlineViewContainer($"Sign in to view the {Header.Title.Title}")
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                loadingLayer = new LoadingLayer(true)
+            });
         }
 
         protected override ProfileHeader CreateHeader() => new ProfileHeader();
@@ -125,6 +140,7 @@ namespace osu.Game.Overlays
             userReq = user.OnlineID > 1 ? new GetUserRequest(user.OnlineID, ruleset) : new GetUserRequest(user.Username, ruleset);
             userReq.Success += u => userLoadComplete(u, ruleset);
             API.Queue(userReq);
+            loadingLayer.Show();
         }
 
         private void userLoadComplete(APIUser user, IRulesetInfo? ruleset)
@@ -151,6 +167,8 @@ namespace osu.Game.Overlays
                     }
                 }
             }
+
+            loadingLayer.Hide();
         }
 
         private partial class ProfileSectionTabControl : OverlayTabControl<ProfileSection>