From e0d58d51b61296e3a1b5b0783d8d3bce9838b234 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Jan 2023 16:47:29 +0900
Subject: [PATCH] Split out classes into own files and rename
 `GroupInfoContainer` to a flow

---
 .../{GroupInfoContainer.cs => GroupBadge.cs}  | 26 ++-------------
 .../Header/Components/GroupBadgeFlow.cs       | 33 +++++++++++++++++++
 .../Profile/Header/TopHeaderContainer.cs      |  6 ++--
 3 files changed, 38 insertions(+), 27 deletions(-)
 rename osu.Game/Overlays/Profile/Header/Components/{GroupInfoContainer.cs => GroupBadge.cs} (74%)
 create mode 100644 osu.Game/Overlays/Profile/Header/Components/GroupBadgeFlow.cs

diff --git a/osu.Game/Overlays/Profile/Header/Components/GroupInfoContainer.cs b/osu.Game/Overlays/Profile/Header/Components/GroupBadge.cs
similarity index 74%
rename from osu.Game/Overlays/Profile/Header/Components/GroupInfoContainer.cs
rename to osu.Game/Overlays/Profile/Header/Components/GroupBadge.cs
index 363a74b5c1..b469fbbcd1 100644
--- a/osu.Game/Overlays/Profile/Header/Components/GroupInfoContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/GroupBadge.cs
@@ -1,9 +1,8 @@
-// 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 System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -74,7 +73,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
             if (group.Playmodes?.Length > 0)
             {
                 innerContainer.AddRange(group.Playmodes.Select(p =>
-                        (rulesets.GetRuleset(p)?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }).With(icon =>
+                        (rulesets.GetRuleset((string)p)?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.Regular.QuestionCircle }).With(icon =>
                         {
                             icon.Size = new Vector2(TextSize - 1);
                         })).ToList()
@@ -82,25 +81,4 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
         }
     }
-
-    public partial class GroupInfoContainer : FillFlowContainer
-    {
-        public readonly Bindable<APIUser?> User = new Bindable<APIUser?>();
-
-        public GroupInfoContainer()
-        {
-            AutoSizeAxes = Axes.Both;
-            Direction = FillDirection.Horizontal;
-            Spacing = new Vector2(2);
-
-            User.BindValueChanged(val =>
-            {
-                if (val.NewValue?.Groups?.Length > 0)
-                {
-                    Clear(true);
-                    Children = val.NewValue?.Groups.Select(g => new GroupBadge(g)).ToList();
-                }
-            });
-        }
-    }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/GroupBadgeFlow.cs b/osu.Game/Overlays/Profile/Header/Components/GroupBadgeFlow.cs
new file mode 100644
index 0000000000..062cba2581
--- /dev/null
+++ b/osu.Game/Overlays/Profile/Header/Components/GroupBadgeFlow.cs
@@ -0,0 +1,33 @@
+// 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 System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osuTK;
+
+namespace osu.Game.Overlays.Profile.Header.Components
+{
+    public partial class GroupBadgeFlow : FillFlowContainer
+    {
+        public readonly Bindable<APIUser?> User = new Bindable<APIUser?>();
+
+        public GroupBadgeFlow()
+        {
+            AutoSizeAxes = Axes.Both;
+            Direction = FillDirection.Horizontal;
+            Spacing = new Vector2(2);
+
+            User.BindValueChanged(val =>
+            {
+                if (val.NewValue?.Groups?.Length > 0)
+                {
+                    Clear(true);
+                    Children = val.NewValue?.Groups.Select(g => new GroupBadge(g)).ToList();
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index c26efaf271..d6f2faf5e5 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Profile.Header
         private UpdateableFlag userFlag = null!;
         private OsuSpriteText userCountryText = null!;
         private FillFlowContainer userStats = null!;
-        private GroupInfoContainer groupInfoContainer = null!;
+        private GroupBadgeFlow groupBadgeFlow = null!;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                         Anchor = Anchor.CentreLeft,
                                                         Origin = Anchor.CentreLeft,
                                                     },
-                                                    groupInfoContainer = new GroupInfoContainer
+                                                    groupBadgeFlow = new GroupBadgeFlow
                                                     {
                                                         Anchor = Anchor.CentreLeft,
                                                         Origin = Anchor.CentreLeft,
@@ -190,7 +190,7 @@ namespace osu.Game.Overlays.Profile.Header
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
             titleText.Text = user?.Title ?? string.Empty;
             titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
-            groupInfoContainer.User.Value = user;
+            groupBadgeFlow.User.Value = user;
 
             userStats.Clear();