From f6637eec36a460c5551e81d5b8776c12fad0caa9 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:29:30 +0300
Subject: [PATCH] Add explicit pill to beatmap panels

---
 .../BeatmapListing/Panels/GridBeatmapPanel.cs | 29 +++++++++++++++----
 .../BeatmapListing/Panels/ListBeatmapPanel.cs | 27 ++++++++++++++---
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
index 28c36e6c56..b7002a96e5 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.BeatmapSet;
 using osuTK;
 using osuTK.Graphics;
 
@@ -24,7 +25,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private const float horizontal_padding = 10;
         private const float vertical_padding = 5;
 
-        private FillFlowContainer bottomPanel, statusContainer;
+        private FillFlowContainer bottomPanel, statusContainer, titleContainer;
         private PlayButton playButton;
         private Box progressBar;
 
@@ -73,12 +74,20 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                             AutoSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Left = horizontal_padding, Right = horizontal_padding },
                             Direction = FillDirection.Vertical,
-                            Children = new[]
+                            Children = new Drawable[]
                             {
-                                new OsuSpriteText
+                                titleContainer = new FillFlowContainer
                                 {
-                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
-                                    Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                        },
+                                    }
                                 },
                                 new OsuSpriteText
                                 {
@@ -194,6 +203,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
+            if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
+            {
+                titleContainer.Add(new ExplicitBeatmapPill
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding { Left = 10f, Top = 2f },
+                });
+            }
+
             if (SetInfo.OnlineInfo?.HasVideo ?? false)
             {
                 statusContainer.Add(new IconPill(FontAwesome.Solid.Film));
diff --git a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
index 433ea37f06..69671ab75b 100644
--- a/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
+++ b/osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs
@@ -14,6 +14,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.BeatmapSet;
 using osuTK;
 using osuTK.Graphics;
 
@@ -26,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private const float vertical_padding = 5;
         private const float height = 70;
 
-        private FillFlowContainer statusContainer;
+        private FillFlowContainer statusContainer, titleContainer;
         protected BeatmapPanelDownloadButton DownloadButton;
         private PlayButton playButton;
         private Box progressBar;
@@ -98,10 +99,18 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                     Direction = FillDirection.Vertical,
                                                     Children = new Drawable[]
                                                     {
-                                                        new OsuSpriteText
+                                                        titleContainer = new FillFlowContainer
                                                         {
-                                                            Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
-                                                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                                            AutoSizeAxes = Axes.Both,
+                                                            Direction = FillDirection.Horizontal,
+                                                            Children = new[]
+                                                            {
+                                                                new OsuSpriteText
+                                                                {
+                                                                    Text = new LocalisedString((SetInfo.Metadata.TitleUnicode, SetInfo.Metadata.Title)),
+                                                                    Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                                                },
+                                                            }
                                                         },
                                                         new OsuSpriteText
                                                         {
@@ -208,6 +217,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 },
             });
 
+            if (SetInfo.OnlineInfo?.HasExplicitContent ?? false)
+            {
+                titleContainer.Add(new ExplicitBeatmapPill
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Margin = new MarginPadding { Left = 10f, Top = 2f },
+                });
+            }
+
             if (SetInfo.OnlineInfo?.HasVideo ?? false)
             {
                 statusContainer.Add(new IconPill(FontAwesome.Solid.Film) { IconSize = new Vector2(20) });