-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove nullable disable annotation in the settings namespace.
- Loading branch information
1 parent
516d007
commit 14dab6c
Showing
10 changed files
with
7 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
2 changes: 0 additions & 2 deletions
2
osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsColourProvider.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(); | ||
|
2 changes: 0 additions & 2 deletions
2
osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeSettingsSection.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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(); | ||
|
||
|
2 changes: 0 additions & 2 deletions
2
osu.Game.Rulesets.Karaoke/Screens/Settings/KaraokeVersionManager.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
2 changes: 0 additions & 2 deletions
2
osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsLanguage.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|
2 changes: 0 additions & 2 deletions
2
osu.Game.Rulesets.Karaoke/Screens/Settings/SettingsMicrophoneDeviceDropdown.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
|