From f7c942ac10b22d365f9f9b98228959d8c5d8350e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 31 Dec 2022 19:00:40 +0100
Subject: [PATCH] Move user stats into detail header container

---
 .../Header/Components/ExtendedDetails.cs      |  6 ++-
 .../Profile/Header/Components/MainDetails.cs  |  1 -
 .../Profile/Header/DetailHeaderContainer.cs   | 44 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/ExtendedDetails.cs b/osu.Game/Overlays/Profile/Header/Components/ExtendedDetails.cs
index b50b0041d0..50fc52600c 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ExtendedDetails.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ExtendedDetails.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public partial class ExtendedDetails : CompositeDrawable
     {
-        public Bindable<UserProfile?> UserProfile { get; } = new Bindable<UserProfile?>();
+        public Bindable<UserProfileData?> User { get; } = new Bindable<UserProfileData?>();
 
         private SpriteText rankedScore = null!;
         private SpriteText hitAccuracy = null!;
@@ -46,6 +46,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     new FillFlowContainer
                     {
                         Name = @"Labels",
+                        AutoSizeAxes = Axes.Both,
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(0, vertical_spacing),
                         Children = new Drawable[]
@@ -62,6 +63,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     new FillFlowContainer
                     {
                         Name = @"Values",
+                        AutoSizeAxes = Axes.Both,
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(0, vertical_spacing),
                         Children = new Drawable[]
@@ -83,7 +85,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         {
             base.LoadComplete();
 
-            UserProfile.BindValueChanged(userProfile => updateStatistics(userProfile.NewValue?.User.Statistics), true);
+            User.BindValueChanged(user => updateStatistics(user.NewValue?.User.Statistics), true);
         }
 
         private void updateStatistics(UserStatistics? statistics)
diff --git a/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs b/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs
index 930ba29c7f..b89973c5e5 100644
--- a/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/MainDetails.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 AutoSizeDuration = 200,
                 AutoSizeEasing = Easing.OutQuint,
                 Masking = true,
-                Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(0, 15),
                 Children = new Drawable[]
diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index 17de8b8ba0..1cc3aae735 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -26,10 +26,50 @@ namespace osu.Game.Overlays.Profile.Header
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background5,
                 },
-                new MainDetails
+                new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    User = { BindTarget = User }
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
+                    Child = new GridContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        RowDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        ColumnDimensions = new[]
+                        {
+                            new Dimension(),
+                            new Dimension(GridSizeMode.AutoSize),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
+                            {
+                                new MainDetails
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    User = { BindTarget = User }
+                                },
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Y,
+                                    Width = 2,
+                                    Colour = colourProvider.Background6,
+                                    Margin = new MarginPadding { Horizontal = 15 }
+                                },
+                                new ExtendedDetails
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    User = { BindTarget = User }
+                                }
+                            }
+                        }
+                    }
                 }
             };
         }