Merge pull request #1994 from andy840119/remove-nullable-disable-anno…

…tation-in-the-setting-page

osu.Game.Rulesets.Karaoke/Extensions/OsuGameExtensions.cs

@@ -15,10 +15,10 @@ namespace osu.Game.Rulesets.Karaoke.Extensions;
 /// </summary>
 public static class OsuGameExtensions
 {
-    public static KaraokeRuleset? GetRuleset(this DependencyContainer dependencies)
+    public static KaraokeRuleset GetRuleset(this DependencyContainer dependencies)
     {
         var rulesets = dependencies.Get<RulesetStore>().AvailableRulesets.Select(info => info.CreateInstance());
-        return rulesets.FirstOrDefault(r => r is KaraokeRuleset) as KaraokeRuleset;
+        return rulesets.OfType<KaraokeRuleset>().First();
     }
 
     private static Container? getBasePlacementContainer(this OsuGame game)

osu.Game.Rulesets.Karaoke/Screens/Settings/Header.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -25,7 +23,7 @@ public partial class Header : Container
     public const float HEIGHT = 75;
 
     [Resolved]
-    private KaraokeSettingsColourProvider colourProvider { get; set; }
+    private KaraokeSettingsColourProvider colourProvider { get; set; } = null!;
 
     private readonly Box background;
     private readonly KaraokeConfigHeaderTitle title;

osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -31,7 +29,7 @@ public partial class KaraokeSettings : OsuScreen
     private Bindable<SettingsSection> selectedSection = new();
 
     [Cached]
-    private Bindable<SettingsSubsection> selectedSubsection = new();
+    private Bindable<SettingsSubsection?> selectedSubsection = new();
 
     private readonly KaraokeConfigWaveContainer waves;
     private readonly Box background;

osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsColourProvider.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Karaoke.Screens.Settings.Sections;

osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsPanel.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -25,7 +23,7 @@ public partial class KaraokeSettingsPanel : SettingsPanel
 {
     public new const float WIDTH = 300;
 
-    private Box hoverBackground;
+    private Box hoverBackground = null!;
 
     protected override IEnumerable<SettingsSection> CreateSections() => new SettingsSection[]
     {
@@ -75,7 +73,7 @@ public void ScrollToSection(SettingsSection settingsSection)
     public IReadOnlyList<SettingsSection> Sections => SectionsContainer.Children;
 
     [BackgroundDependencyLoader]
-    private void load(KaraokeSettingsColourProvider colourProvider, Bindable<SettingsSection> selectedSection, Bindable<SettingsSubsection> selectedSubsection)
+    private void load(KaraokeSettingsColourProvider colourProvider, Bindable<SettingsSection> selectedSection, Bindable<SettingsSubsection?> selectedSubsection)
     {
         initialSelectionContainer();
         initialContentContainer();

osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsSection.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;

osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsSubsection.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Input.Events;
@@ -15,10 +13,10 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Settings;
 public abstract partial class KaraokeSettingsSubsection : SettingsSubsection
 {
     [Resolved]
-    protected KaraokeRulesetConfigManager Config { get; private set; }
+    protected KaraokeRulesetConfigManager Config { get; private set; } = null!;
 
     [Resolved]
-    private Bindable<SettingsSubsection> selectedSubsection { get; set; }
+    private Bindable<SettingsSubsection?> selectedSubsection { get; set; } = null!;
 
     public virtual SettingsSubsectionPreview CreatePreview() => new UnderConstructionPreview();
 

osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeVersionManager.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Development;
 using osu.Framework.Graphics;

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/DefaultPreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/LyricPreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Globalization;
 using osu.Framework.Allocation;
@@ -31,9 +29,9 @@ public partial class LyricPreview : SettingsSubsectionPreview
     private readonly Bindable<CultureInfo> preferLanguage = new();
 
     [Resolved]
-    private FontStore fontStore { get; set; }
+    private FontStore fontStore { get; set; } = null!;
 
-    private KaraokeLocalFontStore localFontStore;
+    private KaraokeLocalFontStore localFontStore = null!;
 
     private readonly DrawableLyric drawableLyric;
 

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/NotePlayfieldPreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Gameplay/ShowCursorPreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Graphics/ManageFontPreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -36,11 +34,11 @@ public ManageFontPreview()
         ShowBackground = false;
     }
 
-    private EggContainer eggContainer;
-    private FillFlowContainer<GenerateRowContainer> textContainer;
+    private EggContainer eggContainer = null!;
+    private FillFlowContainer<GenerateRowContainer> textContainer = null!;
 
     [BackgroundDependencyLoader]
-    private void load(TextureStore textures, OsuColour colours)
+    private void load(OsuColour colours)
     {
         Children = new Drawable[]
         {
@@ -126,7 +124,7 @@ private void load(TextureStore textures, OsuColour colours)
                             return ("Eggs/camp-tent", 0.5f, 50);
 
                         default:
-                            return (null, 0, 0);
+                            return (string.Empty, 0, 0);
                     }
                 }
             };
@@ -168,7 +166,7 @@ public partial class GenerateRowContainer : BeatSyncedContainer
 
         private readonly GenerateDirection direction;
 
-        public Action<string> ClickedText;
+        public Action<string>? ClickedText;
 
         public GenerateRowContainer(GenerateDirection direction)
         {
@@ -268,7 +266,7 @@ static Colour4 getRandomColour()
     public partial class EggContainer : BeatSyncedContainer
     {
         [Resolved]
-        private TextureStore textures { get; set; }
+        private TextureStore textures { get; set; } = null!;
 
         public void GenerateEgg(string textureName, float scale, float yOffset)
         {

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/Input/MicrophoneDevicePreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using ManagedBass;
 using osu.Framework.Allocation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/SettingsSubsectionPreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;

osu.Game.Rulesets.Karaoke/Screens/Settings/Previews/UnderConstructionPreview.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ConfigSection.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/GeneralSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/LyricSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Settings;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/NoteSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL 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.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/ScoringSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL 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.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Gameplay/TranslateSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Globalization;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/LyricFontSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL 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.Framework.Graphics.Sprites;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/ManageFontSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL 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.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/NoteFontSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL 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.Framework.Graphics.Sprites;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Graphics/TransparentSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL 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.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/Input/MicrophoneSettings.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL 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.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/ScoringSection.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/Sections/StyleSection.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;

osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsFont.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
@@ -32,7 +30,7 @@ private partial class FontSelectionButton : CompositeDrawable, IHasCurrentValue<
         private const float height = 30;
 
         private readonly BindableWithCurrent<FontUsage> current = new();
-        private BindableFontUsage bindableFontUsage;
+        private BindableFontUsage? bindableFontUsage;
 
         private readonly GridContainer grid;
         private readonly SettingsButton fontButton;

osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsLanguage.cs

@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Globalization;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;