Replace Pill with Badge everywhere

ppy · May 14, 2022 · 88ba84a · 88ba84a
1 parent 9bac33e
commit 88ba84a
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
@@ -252,7 +252,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
 
             if (BeatmapSet.FeaturedInSpotlight)
             {
-                titleBadgeArea.Add(new SpotlightBeatmapPill
+                titleBadgeArea.Add(new SpotlightBeatmapBadge
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -262,7 +262,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
 
             if (BeatmapSet.HasExplicitContent)
             {
-                titleBadgeArea.Add(new ExplicitContentBeatmapPill
+                titleBadgeArea.Add(new ExplicitContentBeatmapBadge
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -272,7 +272,7 @@ private void load(BeatmapSetOverlay? beatmapSetOverlay)
 
             if (BeatmapSet.TrackId != null)
             {
-                artistContainer.Content[0][1] = new FeaturedArtistBeatmapPill
+                artistContainer.Content[0][1] = new FeaturedArtistBeatmapBadge
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,

diff --git a/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs b/osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
@@ -233,7 +233,7 @@ private void load()
 
             if (BeatmapSet.FeaturedInSpotlight)
             {
-                titleBadgeArea.Add(new SpotlightBeatmapPill
+                titleBadgeArea.Add(new SpotlightBeatmapBadge
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -243,7 +243,7 @@ private void load()
 
             if (BeatmapSet.HasExplicitContent)
             {
-                titleBadgeArea.Add(new ExplicitContentBeatmapPill
+                titleBadgeArea.Add(new ExplicitContentBeatmapBadge
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
@@ -253,7 +253,7 @@ private void load()
 
             if (BeatmapSet.TrackId != null)
             {
-                artistContainer.Content[0][1] = new FeaturedArtistBeatmapPill
+                artistContainer.Content[0][1] = new FeaturedArtistBeatmapBadge
                 {
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,

diff --git a/...e/Overlays/BeatmapSet/BeatmapBadgePill.cs → osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs b/...e/Overlays/BeatmapSet/BeatmapBadgePill.cs → osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs
@@ -14,7 +14,7 @@
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public abstract class BeatmapBadgePill : CompositeDrawable
+    public abstract class BeatmapBadge : CompositeDrawable
     {
         [Resolved]
         protected OsuColour Colours { get; private set; } = null!;
@@ -34,7 +34,7 @@ public abstract class BeatmapBadgePill : CompositeDrawable
 
         // todo: add linking support, to allow redirecting featured artist badge to corresponding track and spotlight badge to wiki page.
 
-        protected BeatmapBadgePill()
+        protected BeatmapBadge()
         {
             AutoSizeAxes = Axes.Both;
         }

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
@@ -40,9 +40,9 @@ public class BeatmapSetHeaderContent : CompositeDrawable
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
 
-        private readonly ExplicitContentBeatmapPill explicitContentPill;
-        private readonly SpotlightBeatmapPill spotlightPill;
-        private readonly FeaturedArtistBeatmapPill featuredArtistPill;
+        private readonly ExplicitContentBeatmapBadge explicitContent;
+        private readonly SpotlightBeatmapBadge spotlight;
+        private readonly FeaturedArtistBeatmapBadge featuredArtist;
 
         private readonly FillFlowContainer downloadButtonsContainer;
         private readonly BeatmapAvailability beatmapAvailability;
@@ -129,14 +129,14 @@ public BeatmapSetHeaderContent()
                                                 Origin = Anchor.BottomLeft,
                                                 Margin = new MarginPadding { Left = 5, Bottom = 4 }, // To better lineup with the font
                                             },
-                                            explicitContentPill = new ExplicitContentBeatmapPill
+                                            explicitContent = new ExplicitContentBeatmapBadge
                                             {
                                                 Alpha = 0f,
                                                 Anchor = Anchor.BottomLeft,
                                                 Origin = Anchor.BottomLeft,
                                                 Margin = new MarginPadding { Left = 10, Bottom = 4 },
                                             },
-                                            spotlightPill = new SpotlightBeatmapPill
+                                            spotlight = new SpotlightBeatmapBadge
                                             {
                                                 Alpha = 0f,
                                                 Anchor = Anchor.BottomLeft,
@@ -156,7 +156,7 @@ public BeatmapSetHeaderContent()
                                             {
                                                 Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
                                             },
-                                            featuredArtistPill = new FeaturedArtistBeatmapPill
+                                            featuredArtist = new FeaturedArtistBeatmapBadge
                                             {
                                                 Alpha = 0f,
                                                 Anchor = Anchor.BottomLeft,
@@ -267,9 +267,9 @@ private void load(OverlayColourProvider colourProvider)
                     title.Text = new RomanisableString(setInfo.NewValue.TitleUnicode, setInfo.NewValue.Title);
                     artist.Text = new RomanisableString(setInfo.NewValue.ArtistUnicode, setInfo.NewValue.Artist);
 
-                    explicitContentPill.Alpha = setInfo.NewValue.HasExplicitContent ? 1 : 0;
-                    spotlightPill.Alpha = setInfo.NewValue.FeaturedInSpotlight ? 1 : 0;
-                    featuredArtistPill.Alpha = setInfo.NewValue.TrackId != null ? 1 : 0;
+                    explicitContent.Alpha = setInfo.NewValue.HasExplicitContent ? 1 : 0;
+                    spotlight.Alpha = setInfo.NewValue.FeaturedInSpotlight ? 1 : 0;
+                    featuredArtist.Alpha = setInfo.NewValue.TrackId != null ? 1 : 0;
 
                     onlineStatusPill.FadeIn(500, Easing.OutQuint);
                     onlineStatusPill.Status = setInfo.NewValue.Status;

diff --git a/.../BeatmapSet/ExplicitContentBeatmapPill.cs → ...BeatmapSet/ExplicitContentBeatmapBadge.cs b/.../BeatmapSet/ExplicitContentBeatmapPill.cs → ...BeatmapSet/ExplicitContentBeatmapBadge.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class ExplicitContentBeatmapPill : BeatmapBadgePill
+    public class ExplicitContentBeatmapBadge : BeatmapBadge
     {
         public override LocalisableString BadgeText => BeatmapsetsStrings.NsfwBadgeLabel;
         public override Colour4 BadgeColour => Colours.Orange2;

diff --git a/...s/BeatmapSet/FeaturedArtistBeatmapPill.cs → .../BeatmapSet/FeaturedArtistBeatmapBadge.cs b/...s/BeatmapSet/FeaturedArtistBeatmapPill.cs → .../BeatmapSet/FeaturedArtistBeatmapBadge.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class FeaturedArtistBeatmapPill : BeatmapBadgePill
+    public class FeaturedArtistBeatmapBadge : BeatmapBadge
     {
         public override LocalisableString BadgeText => BeatmapsetsStrings.FeaturedArtistBadgeLabel;
         public override Colour4 BadgeColour => Colours.Blue1;

diff --git a/...erlays/BeatmapSet/SpotlightBeatmapPill.cs → ...rlays/BeatmapSet/SpotlightBeatmapBadge.cs b/...erlays/BeatmapSet/SpotlightBeatmapPill.cs → ...rlays/BeatmapSet/SpotlightBeatmapBadge.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class SpotlightBeatmapPill : BeatmapBadgePill
+    public class SpotlightBeatmapBadge : BeatmapBadge
     {
         public override LocalisableString BadgeText => BeatmapsetsStrings.SpotlightBadgeLabel;
         public override Colour4 BadgeColour => Colours.Pink1;

diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -78,7 +78,7 @@ public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
-        private ExplicitContentBeatmapPill explicitContentPill;
+        private ExplicitContentBeatmapBadge explicitContent;
         private ModDisplay modDisplay;
         private FillFlowContainer buttonsFlow;
         private UpdateableAvatar ownerAvatar;
@@ -293,7 +293,7 @@ private void refresh()
             }
 
             bool hasExplicitContent = (beatmap?.BeatmapSet as IBeatmapSetOnlineInfo)?.HasExplicitContent == true;
-            explicitContentPill.Alpha = hasExplicitContent ? 1 : 0;
+            explicitContent.Alpha = hasExplicitContent ? 1 : 0;
 
             modDisplay.Current.Value = requiredMods.ToArray();
 
@@ -380,7 +380,7 @@ protected override Drawable CreateContent()
                                                     Children = new Drawable[]
                                                     {
                                                         authorText = new LinkFlowContainer(fontParameters) { AutoSizeAxes = Axes.Both },
-                                                        explicitContentPill = new ExplicitContentBeatmapPill
+                                                        explicitContent = new ExplicitContentBeatmapBadge
                                                         {
                                                             Alpha = 0f,
                                                             Anchor = Anchor.CentreLeft,