From ffa22d8a682983cd8aa7e2ade12d824cb6f18f46 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 17 Oct 2022 13:42:17 +0300
Subject: [PATCH] Update popover not to use labelled drawables

---
 osu.Game/Overlays/Comments/DrawableComment.cs |  5 +--
 .../Overlays/Comments/ReportCommentPopover.cs | 43 ++++++++++++++-----
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 998f3b8e62..04e088dc35 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -570,10 +570,7 @@ namespace osu.Game.Overlays.Comments
             }
         }
 
-        public Popover GetPopover()
-        {
-            return new ReportCommentPopover(ReportComment);
-        }
+        public Popover GetPopover() => new ReportCommentPopover(ReportComment);
 
         private class ReportToast : Toast
         {
diff --git a/osu.Game/Overlays/Comments/ReportCommentPopover.cs b/osu.Game/Overlays/Comments/ReportCommentPopover.cs
index 5f9e7ff45c..ad135f7eec 100644
--- a/osu.Game/Overlays/Comments/ReportCommentPopover.cs
+++ b/osu.Game/Overlays/Comments/ReportCommentPopover.cs
@@ -8,7 +8,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Resources.Localisation.Web;
 using osuTK;
 
 namespace osu.Game.Overlays.Comments
@@ -16,8 +19,8 @@ namespace osu.Game.Overlays.Comments
     public class ReportCommentPopover : OsuPopover
     {
         private readonly Action<CommentReportReason, string> action;
-        private LabelledEnumDropdown<CommentReportReason> reason = null!;
-        private LabelledTextBox info = null!;
+        private OsuEnumDropdown<CommentReportReason> reason = null!;
+        private OsuTextBox info = null!;
         private ShakeContainer shaker = null!;
 
         public ReportCommentPopover(Action<CommentReportReason, string> action)
@@ -36,13 +39,28 @@ namespace osu.Game.Overlays.Comments
                 Spacing = new Vector2(7),
                 Children = new Drawable[]
                 {
-                    reason = new LabelledEnumDropdown<CommentReportReason>
+                    new OsuSpriteText
                     {
-                        Label = "Reason"
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = UsersStrings.ReportReason,
+                        Font = OsuFont.Torus.With(size: 20),
                     },
-                    info = new LabelledTextBox
+                    reason = new OsuEnumDropdown<CommentReportReason>
                     {
-                        Label = "Additional info",
+                        RelativeSizeAxes = Axes.X
+                    },
+                    new OsuSpriteText
+                    {
+                        Origin = Anchor.TopCentre,
+                        Anchor = Anchor.TopCentre,
+                        Text = UsersStrings.ReportComments,
+                        Font = OsuFont.Torus.With(size: 20),
+                    },
+                    info = new OsuTextBox
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        PlaceholderText = UsersStrings.ReportPlaceholder
                     },
                     new Container
                     {
@@ -54,10 +72,13 @@ namespace osu.Game.Overlays.Comments
                             AutoSizeAxes = Axes.Y,
                             Child = new RoundedButton
                             {
-                                BackgroundColour = colours.Pink3,
-                                Text = "Send report",
-                                RelativeSizeAxes = Axes.X,
-                                Action = send
+                                Origin = Anchor.TopCentre,
+                                Anchor = Anchor.TopCentre,
+                                Width = 200,
+                                BackgroundColour = colours.Red3,
+                                Text = UsersStrings.ReportActionsSend,
+                                Action = send,
+                                Margin = new MarginPadding { Bottom = 5, Top = 10 },
                             }
                         }
                     }
@@ -70,7 +91,7 @@ namespace osu.Game.Overlays.Comments
             string infoValue = info.Current.Value;
             var reasonValue = reason.Current.Value;
 
-            if (reasonValue == CommentReportReason.Other && string.IsNullOrWhiteSpace(infoValue))
+            if (string.IsNullOrWhiteSpace(infoValue))
             {
                 shaker.Shake();
                 return;