Integrate spotlight beatmap badge in listing cards

Lawtrohux · May 14, 2022 · 9bac33e · 9bac33e
1 parent 2878a6d
commit 9bac33e
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 13 deletions.
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
@@ -54,7 +54,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
             Height = height;
 
             FillFlowContainer leftIconArea = null!;
-            GridContainer titleContainer = null!;
+            FillFlowContainer titleBadgeArea = null!;
             GridContainer artistContainer = null!;
 
             Child = content.With(c =>
@@ -93,7 +93,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
                                     Direction = FillDirection.Vertical,
                                     Children = new Drawable[]
                                     {
-                                        titleContainer = new GridContainer
+                                        new GridContainer
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
@@ -108,7 +108,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
                                             },
                                             Content = new[]
                                             {
-                                                new[]
+                                                new Drawable[]
                                                 {
                                                     new OsuSpriteText
                                                     {
@@ -117,7 +117,13 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
                                                         RelativeSizeAxes = Axes.X,
                                                         Truncate = true
                                                     },
-                                                    Empty()
+                                                    titleBadgeArea = new FillFlowContainer
+                                                    {
+                                                        Anchor = Anchor.BottomRight,
+                                                        Origin = Anchor.BottomRight,
+                                                        AutoSizeAxes = Axes.Both,
+                                                        Direction = FillDirection.Horizontal,
+                                                    }
                                                 }
                                             }
                                         },
@@ -244,14 +250,24 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
             if (BeatmapSet.HasStoryboard)
                 leftIconArea.Add(new IconPill(FontAwesome.Solid.Image) { IconSize = new Vector2(20) });
 
+            if (BeatmapSet.FeaturedInSpotlight)
+            {
+                titleBadgeArea.Add(new SpotlightBeatmapPill
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Margin = new MarginPadding { Left = 5 }
+                });
+            }
+
             if (BeatmapSet.HasExplicitContent)
             {
-                titleContainer.Content[0][1] = new ExplicitContentBeatmapPill
+                titleBadgeArea.Add(new ExplicitContentBeatmapPill
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                     Margin = new MarginPadding { Left = 5 }
-                };
+                });
             }
 
             if (BeatmapSet.TrackId != null)

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
@@ -55,7 +55,7 @@ private void load()
             Height = height;
 
             FillFlowContainer leftIconArea = null!;
-            GridContainer titleContainer = null!;
+            FillFlowContainer titleBadgeArea = null!;
             GridContainer artistContainer = null!;
 
             Child = content.With(c =>
@@ -94,22 +94,22 @@ private void load()
                                     Direction = FillDirection.Vertical,
                                     Children = new Drawable[]
                                     {
-                                        titleContainer = new GridContainer
+                                        new GridContainer
                                         {
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
                                             ColumnDimensions = new[]
                                             {
                                                 new Dimension(),
-                                                new Dimension(GridSizeMode.AutoSize)
+                                                new Dimension(GridSizeMode.AutoSize),
                                             },
                                             RowDimensions = new[]
                                             {
                                                 new Dimension(GridSizeMode.AutoSize)
                                             },
                                             Content = new[]
                                             {
-                                                new[]
+                                                new Drawable[]
                                                 {
                                                     new OsuSpriteText
                                                     {
@@ -118,7 +118,13 @@ private void load()
                                                         RelativeSizeAxes = Axes.X,
                                                         Truncate = true
                                                     },
-                                                    Empty()
+                                                    titleBadgeArea = new FillFlowContainer
+                                                    {
+                                                        Anchor = Anchor.BottomRight,
+                                                        Origin = Anchor.BottomRight,
+                                                        AutoSizeAxes = Axes.Both,
+                                                        Direction = FillDirection.Horizontal,
+                                                    }
                                                 }
                                             }
                                         },
@@ -225,14 +231,24 @@ private void load()
             if (BeatmapSet.HasStoryboard)
                 leftIconArea.Add(new IconPill(FontAwesome.Solid.Image) { IconSize = new Vector2(20) });
 
+            if (BeatmapSet.FeaturedInSpotlight)
+            {
+                titleBadgeArea.Add(new SpotlightBeatmapPill
+                {
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+                    Margin = new MarginPadding { Left = 5 }
+                });
+            }
+
             if (BeatmapSet.HasExplicitContent)
             {
-                titleContainer.Content[0][1] = new ExplicitContentBeatmapPill
+                titleBadgeArea.Add(new ExplicitContentBeatmapPill
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
                     Margin = new MarginPadding { Left = 5 }
-                };
+                });
             }
 
             if (BeatmapSet.TrackId != null)