From 12472593cc4f2c7b36a8682c7d63d17315e7a9cf Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Mon, 14 Mar 2022 20:14:04 +0000
Subject: [PATCH] Mark required dependencies as non-nullable

---
 .../Overlays/Chat/ChannelControl/ControlItem.cs    | 14 +++++++-------
 .../Chat/ChannelControl/ControlItemAvatar.cs       |  3 ++-
 .../Chat/ChannelControl/ControlItemMention.cs      |  4 ++--
 .../Chat/ChannelControl/ControlItemText.cs         |  8 ++++----
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs b/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs
index e475ac7821..073173f2ff 100644
--- a/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Overlays.Chat.ChannelControl
             }
         }
 
+        private readonly Channel channel;
+
         private Box? hoverBox;
         private Box? selectBox;
         private ControlItemText? text;
@@ -47,12 +49,10 @@ namespace osu.Game.Overlays.Chat.ChannelControl
         private ControlItemClose? close;
 
         [Resolved]
-        private Bindable<Channel>? selectedChannel { get; set; }
+        private Bindable<Channel> selectedChannel { get; set; } = null!;
 
         [Resolved]
-        private OverlayColourProvider? colourProvider { get; set; }
-
-        private readonly Channel channel;
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         public ControlItem(Channel channel)
         {
@@ -70,13 +70,13 @@ namespace osu.Game.Overlays.Chat.ChannelControl
                 hoverBox = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider!.Background3,
+                    Colour = colourProvider.Background3,
                     Alpha = 0f,
                 },
                 selectBox = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider!.Background4,
+                    Colour = colourProvider.Background4,
                     Alpha = 0f,
                 },
                 new Container
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.Chat.ChannelControl
         {
             base.LoadComplete();
 
-            selectedChannel?.BindValueChanged(change =>
+            selectedChannel.BindValueChanged(change =>
             {
                 if (change.NewValue == channel)
                     selectBox?.Show();
diff --git a/osu.Game/Overlays/Chat/ChannelControl/ControlItemAvatar.cs b/osu.Game/Overlays/Chat/ChannelControl/ControlItemAvatar.cs
index 9192f20cb1..62b893f3bc 100644
--- a/osu.Game/Overlays/Chat/ChannelControl/ControlItemAvatar.cs
+++ b/osu.Game/Overlays/Chat/ChannelControl/ControlItemAvatar.cs
@@ -16,9 +16,10 @@ namespace osu.Game.Overlays.Chat.ChannelControl
 {
     public class ControlItemAvatar : CircularContainer
     {
-        private DrawableAvatar? avatar;
         private readonly Channel channel;
 
+        private DrawableAvatar? avatar;
+
         public ControlItemAvatar(Channel channel)
         {
             this.channel = channel;
diff --git a/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs b/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs
index 6af2e26af8..693fb68217 100644
--- a/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs
+++ b/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Chat.ChannelControl
         private OsuSpriteText? countText;
 
         [Resolved]
-        private OverlayColourProvider? colourProvider { get; set; }
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Chat.ChannelControl
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider!.Colour1,
+                    Colour = colourProvider.Colour1,
                 },
                 countText = new OsuSpriteText
                 {
diff --git a/osu.Game/Overlays/Chat/ChannelControl/ControlItemText.cs b/osu.Game/Overlays/Chat/ChannelControl/ControlItemText.cs
index bb88d733d4..9b0f5011fc 100644
--- a/osu.Game/Overlays/Chat/ChannelControl/ControlItemText.cs
+++ b/osu.Game/Overlays/Chat/ChannelControl/ControlItemText.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Overlays.Chat.ChannelControl
             }
         }
 
+        private readonly Channel channel;
+
         private OsuSpriteText? text;
 
         [Resolved]
-        private OverlayColourProvider? colourProvider { get; set; }
-
-        private readonly Channel channel;
+        private OverlayColourProvider colourProvider { get; set; } = null!;
 
         public ControlItemText(Channel channel)
         {
@@ -51,7 +51,7 @@ namespace osu.Game.Overlays.Chat.ChannelControl
                 Origin = Anchor.CentreLeft,
                 Text = channel.Type == ChannelType.Public ? $"# {channel.Name.Substring(1)}" : channel.Name,
                 Font = OsuFont.Torus.With(size: 17, weight: FontWeight.SemiBold),
-                Colour = colourProvider!.Light3,
+                Colour = colourProvider.Light3,
                 Margin = new MarginPadding { Bottom = 2 },
                 RelativeSizeAxes = Axes.X,
                 Truncate = true,