From 730bc3a9616e03d129224704373273fe93fc293f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 May 2023 16:13:54 +0900
Subject: [PATCH] Apply NRT and simplify some remaining code

---
 .../OnlinePlay/Lounge/Components/MatchTypePill.cs        | 3 +--
 .../OnlinePlay/Lounge/Components/OnlinePlayPill.cs       | 6 ++----
 .../OnlinePlay/Lounge/Components/QueueModePill.cs        | 3 +--
 .../Lounge/Components/RoomSpecialCategoryPill.cs         | 9 ++-------
 .../OnlinePlay/Lounge/Components/RoomStatusPill.cs       | 6 ++----
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
index e019de0f6f..35e0482f2b 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/MatchTypePill.cs
@@ -20,8 +20,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onMatchTypeChanged(ValueChangedEvent<MatchType> type)
         {
-            TextFlow.Clear();
-            TextFlow.AddText(type.NewValue.GetLocalisableDescription());
+            TextFlow.Text = type.NewValue.GetLocalisableDescription();
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
index 1235e5234c..983fab8525 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/OnlinePlayPill.cs
@@ -1,8 +1,6 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
@@ -12,8 +10,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public abstract partial class OnlinePlayPill : OnlinePlayComposite
     {
-        protected PillContainer Pill;
-        protected OsuTextFlowContainer TextFlow;
+        protected PillContainer Pill { get; private set; } = null!;
+        protected OsuTextFlowContainer TextFlow { get; private set; } = null!;
 
         protected OnlinePlayPill()
         {
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
index e402653c2f..208c11c155 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/QueueModePill.cs
@@ -20,8 +20,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         private void onQueueModeChanged(ValueChangedEvent<QueueMode> mode)
         {
-            TextFlow.Clear();
-            TextFlow.AddText(mode.NewValue.GetLocalisableDescription());
+            TextFlow.Text = mode.NewValue.GetLocalisableDescription();
         }
     }
 }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
index b869ede9bd..e88624f877 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomSpecialCategoryPill.cs
@@ -19,18 +19,13 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         {
             base.LoadComplete();
 
-            Pill.Background.Colour = colours.Pink;
             Pill.Background.Alpha = 1;
             TextFlow.Colour = Color4.Black;
 
             Category.BindValueChanged(c =>
             {
-                TextFlow.Clear();
-                TextFlow.AddText(c.NewValue.GetLocalisableDescription());
-
-                var backgroundColour = colours.ForRoomCategory(Category.Value);
-                if (backgroundColour != null)
-                    Pill.Background.Colour = backgroundColour.Value;
+                TextFlow.Text = c.NewValue.GetLocalisableDescription();
+                Pill.Background.Colour = colours.ForRoomCategory(c.NewValue) ?? colours.Pink;
             }, true);
         }
     }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
index f260d168a7..ab3d293db8 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusPill.cs
@@ -30,17 +30,15 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             FinishTransforms(true);
 
             TextFlow.Colour = Colour4.Black;
+            Pill.Background.Alpha = 1;
         }
 
         private void updateDisplay()
         {
             RoomStatus status = getDisplayStatus();
 
-            Pill.Background.Alpha = 1;
             Pill.Background.FadeColour(status.GetAppropriateColour(colours), 100);
-
-            TextFlow.Clear();
-            TextFlow.AddText(status.Message);
+            TextFlow.Text = status.Message;
         }
 
         private RoomStatus getDisplayStatus()