Add featured artist marker to beatmap set listing and overlay

osu.Game/Overlays/BeatmapListing/Panels/GridBeatmapPanel.cs

@@ -25,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, titleContainer;
+        private FillFlowContainer bottomPanel, statusContainer, titleContainer, artistContainer;
         private PlayButton playButton;
         private Box progressBar;
 
@@ -89,11 +89,19 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                         },
                                     }
                                 },
-                                new OsuSpriteText
+                                artistContainer = new FillFlowContainer
                                 {
-                                    Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
+                                    AutoSizeAxes = Axes.Both,
-                                    Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
+                                    Direction = FillDirection.Horizontal,
-                                },
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
+                                            Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
+                                        }
+                                    }
+                                }
                             },
                         },
                         new Container
@@ -213,6 +221,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 });
             }
 
+            if (SetInfo.OnlineInfo?.TrackId != null)
+            {
+                artistContainer.Add(new FeaturedArtistBeatmapPill
+                {
+                    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));

osu.Game/Overlays/BeatmapListing/Panels/ListBeatmapPanel.cs

@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
         private const float vertical_padding = 5;
         private const float height = 70;
 
-        private FillFlowContainer statusContainer, titleContainer;
+        private FillFlowContainer statusContainer, titleContainer, artistContainer;
         protected BeatmapPanelDownloadButton DownloadButton;
         private PlayButton playButton;
         private Box progressBar;
@@ -112,10 +112,18 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                                                                 },
                                                             }
                                                         },
-                                                        new OsuSpriteText
+                                                        artistContainer = new FillFlowContainer
                                                         {
-                                                            Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
+                                                            AutoSizeAxes = Axes.Both,
-                                                            Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
+                                                            Direction = FillDirection.Horizontal,
+                                                            Children = new[]
+                                                            {
+                                                                new OsuSpriteText
+                                                                {
+                                                                    Text = new RomanisableString(SetInfo.Metadata.ArtistUnicode, SetInfo.Metadata.Artist),
+                                                                    Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true)
+                                                                },
+                                                            },
                                                         },
                                                     }
                                                 },
@@ -227,6 +235,16 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 });
             }
 
+            if (SetInfo.OnlineInfo?.TrackId != null)
+            {
+                artistContainer.Add(new FeaturedArtistBeatmapPill
+                {
+                    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) });

osu.Game/Overlays/BeatmapSet/BeatmapSetBadgePill.cs

@@ -0,0 +1,32 @@
+// 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class BeatmapSetBadgePill : CircularContainer
+    {
+        public BeatmapSetBadgePill()
+        {
+            AutoSizeAxes = Axes.Both;
+            Masking = true;
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load([CanBeNull] OsuColour colours, [CanBeNull] OverlayColourProvider colourProvider)
+        {
+            Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = colourProvider?.Background5 ?? colours?.Gray2 ?? Color4.DarkGray,
+            });
+        }
+    }
+}

osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs

@@ -37,6 +37,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
         private readonly ExplicitContentBeatmapPill explicitContentPill;
+        private readonly FeaturedArtistBeatmapPill featuredArtistPill;
         private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapAvailability beatmapAvailability;
         private readonly BeatmapSetOnlineStatusPill onlineStatusPill;
@@ -129,10 +130,25 @@ namespace osu.Game.Overlays.BeatmapSet
                                             }
                                         }
                                     },
-                                    artist = new OsuSpriteText
+                                    new FillFlowContainer
                                     {
-                                        Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
+                                        Direction = FillDirection.Horizontal,
-                                        Margin = new MarginPadding { Bottom = 20 }
+                                        AutoSizeAxes = Axes.Both,
+                                        Margin = new MarginPadding { Bottom = 20 },
+                                        Children = new Drawable[]
+                                        {
+                                            artist = new OsuSpriteText
+                                            {
+                                                Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
+                                            },
+                                            featuredArtistPill = new FeaturedArtistBeatmapPill
+                                            {
+                                                Alpha = 0f,
+                                                Anchor = Anchor.BottomLeft,
+                                                Origin = Anchor.BottomLeft,
+                                                Margin = new MarginPadding { Left = 10 }
+                                            }
+                                        }
                                     },
                                     new Container
                                     {
@@ -233,6 +249,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     artist.Text = new RomanisableString(setInfo.NewValue.Metadata.ArtistUnicode, setInfo.NewValue.Metadata.Artist);
 
                     explicitContentPill.Alpha = setInfo.NewValue.OnlineInfo.HasExplicitContent ? 1 : 0;
+                    featuredArtistPill.Alpha = setInfo.NewValue.OnlineInfo.TrackId != null ? 1 : 0;
 
                     onlineStatusPill.FadeIn(500, Easing.OutQuint);
                     onlineStatusPill.Status = setInfo.NewValue.OnlineInfo.Status;

osu.Game/Overlays/BeatmapSet/ExplicitContentBeatmapPill.cs

@@ -4,44 +4,24 @@
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class ExplicitContentBeatmapPill : CompositeDrawable
+    public class ExplicitContentBeatmapPill : BeatmapSetBadgePill
     {
-        public ExplicitContentBeatmapPill()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            AutoSizeAxes = Axes.Both;
+            Add(new OsuSpriteText
-        }
-
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, OverlayColourProvider colourProvider)
-        {
-            InternalChild = new CircularContainer
             {
-                Masking = true,
+                Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
-                AutoSizeAxes = Axes.Both,
+                Text = BeatmapsetsStrings.NsfwBadgeLabel.ToUpper(),
-                Children = new Drawable[]
+                Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
-                {
+                Colour = OverlayColourProvider.Orange.Colour2,
-                    new Box
+            });
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider?.Background5 ?? colours.Gray2,
-                    },
-                    new OsuSpriteText
-                    {
-                        Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
-                        Text = BeatmapsetsStrings.NsfwBadgeLabel.ToUpper(),
-                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
-                        Colour = OverlayColourProvider.Orange.Colour2,
-                    }
-                }
-            };
         }
     }
 }

osu.Game/Overlays/BeatmapSet/FeaturedArtistBeatmapPill.cs

@@ -0,0 +1,27 @@
+// 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.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Resources.Localisation.Web;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class FeaturedArtistBeatmapPill : BeatmapSetBadgePill
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Add(new OsuSpriteText
+            {
+                Margin = new MarginPadding { Horizontal = 10f, Vertical = 2f },
+                Text = BeatmapsetsStrings.FeaturedArtistBadgeLabel.ToUpper(),
+                Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
+                Colour = OverlayColourProvider.Blue.Colour1
+            });
+        }
+    }
+}