From b9ad079bf8b077ae7a9aa53bdb2da1e6dcc0993e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 8 Oct 2019 20:57:55 +0300
Subject: [PATCH] Move CommentsHeader to it's own file

---
 .../Online/TestSceneCommentsContainer.cs      |  2 +
 .../Overlays/Comments/CommentsContainer.cs    | 56 ---------------
 osu.Game/Overlays/Comments/CommentsHeader.cs  | 69 +++++++++++++++++++
 3 files changed, 71 insertions(+), 56 deletions(-)
 create mode 100644 osu.Game/Overlays/Comments/CommentsHeader.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index e6f9582910..c8d16bdf21 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -17,6 +17,8 @@ public class TestSceneCommentsContainer : OsuTestScene
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(CommentsContainer),
+            typeof(CommentsHeader),
+            typeof(DrawableComment),
         };
 
         protected override bool UseOnlineAPI => true;
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index abbd2cdbde..f8783952d1 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -9,8 +9,6 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osuTK;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Comments
@@ -115,59 +113,5 @@ private void load()
         {
             background.Colour = colours.Gray3;
         }
-
-        private class CommentsHeader : CompositeDrawable
-        {
-            private const int height = 40;
-            private const int spacing = 10;
-            private const int padding = 50;
-
-            public readonly Bindable<SortCommentsBy> Sort = new Bindable<SortCommentsBy>();
-
-            private readonly Box background;
-
-            public CommentsHeader()
-            {
-                RelativeSizeAxes = Axes.X;
-                Height = height;
-                AddRangeInternal(new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Horizontal = padding },
-                        Children = new Drawable[]
-                        {
-                            new FillFlowContainer
-                            {
-                                AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                                Spacing = new Vector2(spacing, 0),
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.CentreLeft,
-                                Children = new Drawable[]
-                                {
-                                    new SpriteText
-                                    {
-                                        Font = OsuFont.GetFont(size: 14),
-                                        Text = @"Sort by"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                });
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                background.Colour = colours.Gray4;
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
new file mode 100644
index 0000000000..9ebd257a5d
--- /dev/null
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -0,0 +1,69 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API.Requests;
+using osu.Framework.Graphics;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Overlays.Comments
+{
+    public class CommentsHeader : CompositeDrawable
+    {
+        private const int height = 40;
+        private const int spacing = 10;
+        private const int padding = 50;
+
+        public readonly Bindable<SortCommentsBy> Sort = new Bindable<SortCommentsBy>();
+
+        private readonly Box background;
+
+        public CommentsHeader()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = height;
+            AddRangeInternal(new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = padding },
+                    Children = new Drawable[]
+                    {
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(spacing, 0),
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Children = new Drawable[]
+                            {
+                                new SpriteText
+                                {
+                                    Font = OsuFont.GetFont(size: 14),
+                                    Text = @"Sort by"
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.Gray4;
+        }
+    }
+}