From 1502b07ea86d7673dbbffa2fc2ec83612ca8d81c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 13 Jan 2021 11:33:00 +0300
Subject: [PATCH] Add explicit pill to playlist items

---
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index e3bce4029f..7987d715e3 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -23,6 +23,7 @@ using osu.Game.Online;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays.BeatmapListing.Panels;
+using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
@@ -41,6 +42,7 @@ namespace osu.Game.Screens.OnlinePlay
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
+        private ExplicitBeatmapPill explicitPill;
         private ModDisplay modDisplay;
 
         private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
@@ -116,6 +118,9 @@ namespace osu.Game.Screens.OnlinePlay
                 authorText.AddUserLink(Item.Beatmap.Value?.Metadata.Author);
             }
 
+            bool hasExplicitContent = Item.Beatmap.Value.BeatmapSet.OnlineInfo?.HasExplicitContent == true;
+            explicitPill.Alpha = hasExplicitContent ? 1 : 0;
+
             modDisplay.Current.Value = requiredMods.ToArray();
         }
 
@@ -165,18 +170,37 @@ namespace osu.Game.Screens.OnlinePlay
                                 {
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(15, 0),
+                                    Spacing = new Vector2(10f, 0),
                                     Children = new Drawable[]
                                     {
-                                        authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                        modDisplay = new ModDisplay
+                                        new FillFlowContainer
+                                        {
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Horizontal,
+                                            Spacing = new Vector2(10f, 0),
+                                            Children = new Drawable[]
+                                            {
+                                                authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+                                                explicitPill = new ExplicitBeatmapPill
+                                                {
+                                                    Alpha = 0f,
+                                                    Anchor = Anchor.CentreLeft,
+                                                    Origin = Anchor.CentreLeft,
+                                                    Margin = new MarginPadding { Top = 3f },
+                                                }
+                                            },
+                                        },
+                                        new Container
                                         {
                                             Anchor = Anchor.CentreLeft,
                                             Origin = Anchor.CentreLeft,
                                             AutoSizeAxes = Axes.Both,
-                                            Scale = new Vector2(0.4f),
-                                            DisplayUnrankedText = false,
-                                            ExpansionMode = ExpansionMode.AlwaysExpanded
+                                            Child = modDisplay = new ModDisplay
+                                            {
+                                                Scale = new Vector2(0.4f),
+                                                DisplayUnrankedText = false,
+                                                ExpansionMode = ExpansionMode.AlwaysExpanded
+                                            }
                                         }
                                     }
                                 }