Fix nullability (pt. 2)

Author: neon-nyan

CollapseLauncher/Classes/Helper/Metadata/PresetConfig.cs

@@ -2,6 +2,7 @@
 using CollapseLauncher.Helper.JsonConverter;
 using CollapseLauncher.Helper.LauncherApiLoader;
 using CollapseLauncher.Helper.LauncherApiLoader.HoYoPlay;
+using CollapseLauncher.Interfaces.Class;
 using Hi3Helper;
 using Hi3Helper.Data;
 using Hi3Helper.EncTool;
@@ -241,46 +242,45 @@ internal static class PresetConfigExt
             string launcherIdOrPasswordHead, string gameIdOrGamePackageIdHead,
             string? launcherIdOrPassword, string? gameIdOrGamePackageId)
         {
-            if (string.IsNullOrEmpty(url))
+            if (string.IsNullOrEmpty(url)
+                || string.IsNullOrEmpty(launcherIdOrPassword)
+                || string.IsNullOrEmpty(gameIdOrGamePackageId))
                 return url;
 
-            if (string.IsNullOrEmpty(launcherIdOrPassword) || string.IsNullOrEmpty(gameIdOrGamePackageId))
-                return url;
-
-            int urlLen = url.Length + (1 << 10);
-            char[] urlBuffer = ArrayPool<char>.Shared.Rent(urlLen);
-            Span<char> urlSpanBuffer = urlBuffer;
-            ReadOnlySpan<char> urlSpan = url;
+            int                urlLen        = url.Length + (1 << 10);
+            char[]             urlBuffer     = ArrayPool<char>.Shared.Rent(urlLen);
+            Span<char>         urlSpanBuffer = urlBuffer;
+            ReadOnlySpan<char> urlSpan       = url;
 
             try
             {
-                int urlSpanBufferLen = 0;
-                Span<Range> splitRanges = stackalloc Range[32];
-                int urlSplitRangesLen = urlSpan.Split(splitRanges, '?', StringSplitOptions.RemoveEmptyEntries);
+                int         urlSpanBufferLen  = 0;
+                Span<Range> splitRanges       = stackalloc Range[32];
+                int         urlSplitRangesLen = urlSpan.Split(splitRanges, '?', StringSplitOptions.RemoveEmptyEntries);
                 if (urlSplitRangesLen < 2)
                     return url;
 
                 ReadOnlySpan<char> urlPathSpan = urlSpan[splitRanges[0]];
-                ReadOnlySpan<char> querySpan = urlSpan[splitRanges[1]];
+                ReadOnlySpan<char> querySpan   = urlSpan[splitRanges[1]];
 
                 if (!urlPathSpan.TryCopyTo(urlSpanBuffer))
                     throw new InvalidOperationException("Failed to copy url path string to buffer");
-                urlSpanBufferLen += splitRanges[0].End.Value - splitRanges[0].Start.Value;
-                urlSpanBuffer[urlSpanBufferLen++] = '?';
+                urlSpanBufferLen                  += splitRanges[0].End.Value - splitRanges[0].Start.Value;
+                urlSpanBuffer[urlSpanBufferLen++] =  '?';
 
                 #region Parse and split queries - Sanitize the GameId and GameId query
                 int querySplitRangesLen = querySpan.Split(splitRanges, '&', StringSplitOptions.RemoveEmptyEntries);
                 int queryWritten = 0;
                 Span<char> querySpanBuffer = urlSpanBuffer[urlSpanBufferLen..];
                 for (int i = querySplitRangesLen - 1; i > -1; i--)
                 {
-                    Range segmentRange = splitRanges[i];
-                    int segmentLen = segmentRange.End.Value - segmentRange.Start.Value;
+                    Range              segmentRange = splitRanges[i];
+                    int                segmentLen   = segmentRange.End.Value - segmentRange.Start.Value;
                     ReadOnlySpan<char> querySegment = querySpan[segmentRange];
 
                     // Skip GameId or GameId query head
-                    if (querySegment.StartsWith(launcherIdOrPasswordHead, StringComparison.OrdinalIgnoreCase)
-                     || querySegment.StartsWith(gameIdOrGamePackageIdHead, StringComparison.OrdinalIgnoreCase))
+                    if (querySegment.StartsWith(launcherIdOrPasswordHead,     StringComparison.OrdinalIgnoreCase)
+                        || querySegment.StartsWith(gameIdOrGamePackageIdHead, StringComparison.OrdinalIgnoreCase))
                         continue;
 
                     // Otherwise, add others
@@ -294,7 +294,7 @@ internal static class PresetConfigExt
 
                 // Append '&'
                 if (queryWritten > 0 && querySpanBuffer[queryWritten - 1] != '&'
-                    && querySpanBuffer[queryWritten - 1] != '?')
+                                     && querySpanBuffer[queryWritten - 1] != '?')
                     querySpanBuffer[queryWritten++] = '&';
 
                 urlSpanBufferLen += queryWritten;
@@ -303,8 +303,8 @@ internal static class PresetConfigExt
                 #region Append GameId and GameId query
                 if (!launcherIdOrPasswordHead.TryCopyTo(urlSpanBuffer[urlSpanBufferLen..]))
                     throw new InvalidOperationException("Failed to copy launcher id or password head string to buffer");
-                urlSpanBufferLen += launcherIdOrPasswordHead.Length;
-                urlSpanBuffer[urlSpanBufferLen++] = '=';
+                urlSpanBufferLen                  += launcherIdOrPasswordHead.Length;
+                urlSpanBuffer[urlSpanBufferLen++] =  '=';
                 if (!launcherIdOrPassword.TryCopyTo(urlSpanBuffer[urlSpanBufferLen..]))
                     throw new InvalidOperationException("Failed to copy launcher id or password value string to buffer");
                 urlSpanBufferLen += launcherIdOrPassword.Length;
@@ -313,13 +313,13 @@ internal static class PresetConfigExt
 
                 if (!gameIdOrGamePackageIdHead.TryCopyTo(urlSpanBuffer[urlSpanBufferLen..]))
                     throw new InvalidOperationException("Failed to copy game id or package id head string to buffer");
-                urlSpanBufferLen += gameIdOrGamePackageIdHead.Length;
-                urlSpanBuffer[urlSpanBufferLen++] = '=';
+                urlSpanBufferLen                  += gameIdOrGamePackageIdHead.Length;
+                urlSpanBuffer[urlSpanBufferLen++] =  '=';
                 if (!gameIdOrGamePackageId.TryCopyTo(urlSpanBuffer[urlSpanBufferLen..]))
                     throw new InvalidOperationException("Failed to copy game id or package id value string to buffer");
                 urlSpanBufferLen += gameIdOrGamePackageId.Length;
 
-                string returnString = new string(urlBuffer, 0, urlSpanBufferLen);
+                string returnString = new(urlBuffer, 0, urlSpanBufferLen);
 #if DEBUG
                 LogWriteLine($"URL string's GameId or Password and GameId or PackageId association has been successfully replaced!\r\nSource: {url}\r\nResult: {returnString}", LogType.Debug, true);
 #endif
@@ -337,7 +337,8 @@ internal static class PresetConfigExt
     [JsonSerializable(typeof(PresetConfig))]
     internal sealed partial class PresetConfigJsonContext : JsonSerializerContext;
 
-    public class PresetConfig
+    [GeneratedBindableCustomProperty]
+    public partial class PresetConfig : NotifyPropertyChanged
     {
         #region Constants
         // ReSharper disable once UnusedMember.Local
@@ -795,12 +796,8 @@ private void SetVoiceLanguageID_StarRail(int langID)
             if (!value.DataVersion.TryGetValue(verInt, out GameDataVersion? verData))
             {
                 // Fallback to find the default value anyway
-                KeyValuePair<int, GameDataVersion>? kvpTemp = value.DataVersion.FirstOrDefault();
-                if (kvpTemp == null)
-                    return null;
-
-                // ReSharper disable once ConstantConditionalAccessQualifier
-                verData = kvpTemp?.Value;
+                KeyValuePair<int, GameDataVersion> kvpTemp = value.DataVersion.FirstOrDefault();
+                verData = kvpTemp.Value;
             }
 
             if (verData == null)

CollapseLauncher/Classes/Plugins/PluginManager.cs

@@ -18,10 +18,10 @@ namespace CollapseLauncher.Plugins;
 #nullable enable
 internal static partial class PluginManager
 {
-    private const string PluginDirPrefix = "Hi3Helper.Plugin.*";
+    private const  string PluginDirPrefix = "Hi3Helper.Plugin.*";
     internal const string ManifestPrefix  = "manifest.json";
 
-    public static readonly Dictionary<string, PluginInfo> PluginInstances = new(StringComparer.OrdinalIgnoreCase);
+    public static Dictionary<string, PluginInfo> PluginInstances { get; } = new(StringComparer.OrdinalIgnoreCase);
 
     internal static async Task LoadPlugins(
         Dictionary<string, Dictionary<string, PresetConfig>> launcherMetadataConfig,

CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/HonkaiGameSettingsPage.xaml

@@ -987,15 +987,6 @@
                                    Text="{x:Bind helper:Locale.Current.Lang._GameSettingsPage.ApplyBtn, Mode=OneWay}" />
                     </StackPanel>
                 </Button>
-                <TextBlock x:Name="ApplyText"
-                           Grid.Column="1"
-                           Margin="16,-4,0,0"
-                           HorizontalAlignment="Stretch"
-                           VerticalAlignment="Center"
-                           Style="{ThemeResource BodyStrongTextBlockStyle}"
-                           Text="{x:Bind helper:Locale.Current.Lang._GameSettingsPage.SettingsApplied, Mode=OneWay}"
-                           TextWrapping="Wrap"
-                           Visibility="Collapsed" />
                 <StackPanel Grid.Column="2"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">

CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml

@@ -877,15 +877,6 @@
                                    Text="{x:Bind helper:Locale.Current.Lang._GameSettingsPage.ApplyBtn, Mode=OneWay}" />
                     </StackPanel>
                 </Button>
-                <TextBlock x:Name="ApplyText"
-                           Grid.Column="1"
-                           Margin="16,-4,0,0"
-                           HorizontalAlignment="Stretch"
-                           VerticalAlignment="Center"
-                           Style="{ThemeResource BodyStrongTextBlockStyle}"
-                           Text="{x:Bind helper:Locale.Current.Lang._GameSettingsPage.SettingsApplied, Mode=OneWay}"
-                           TextWrapping="Wrap"
-                           Visibility="Collapsed" />
                 <StackPanel Grid.Column="2"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">

CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.xaml

@@ -1092,15 +1092,6 @@
                                    Text="{x:Bind helper:Locale.Current.Lang._GameSettingsPage.ApplyBtn, Mode=OneWay}" />
                     </StackPanel>
                 </Button>
-                <TextBlock x:Name="ApplyText"
-                           Grid.Column="1"
-                           Margin="16,-4,0,0"
-                           HorizontalAlignment="Stretch"
-                           VerticalAlignment="Center"
-                           Style="{ThemeResource BodyStrongTextBlockStyle}"
-                           Text="{x:Bind helper:Locale.Current.Lang._GameSettingsPage.SettingsApplied, Mode=OneWay}"
-                           TextWrapping="Wrap"
-                           Visibility="Collapsed" />
                 <StackPanel Grid.Column="2"
                             HorizontalAlignment="Right"
                             Orientation="Horizontal">

CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml

@@ -2257,15 +2257,15 @@
                                 <Grid Padding="8,2"
                                       Background="DarkBlue"
                                       CornerRadius="8"
-                                      Visibility="{x:Bind innerConfig:LauncherConfig.IsPreview, Mode=OneWay, Converter={StaticResource BooleanVisibilityConverter}}">
+                                      Visibility="{x:Bind IsPreviewBuild, Mode=OneWay, Converter={StaticResource BooleanVisibilityConverter}}">
                                     <TextBlock FontSize="10"
                                                FontWeight="Bold"
                                                Text="Preview" />
                                 </Grid>
                                 <Grid Padding="8,2"
                                       Background="DarkOliveGreen"
                                       CornerRadius="8"
-                                      Visibility="{x:Bind innerConfig:LauncherConfig.IsPreview, Mode=OneWay, Converter={StaticResource InverseBooleanVisibilityConverter}}">
+                                      Visibility="{x:Bind IsPreviewBuild, Mode=OneWay, Converter={StaticResource InverseBooleanVisibilityConverter}}">
                                     <TextBlock FontSize="10"
                                                FontWeight="Bold"
                                                Text="Stable" />
@@ -3148,7 +3148,7 @@
                             </Grid>
                         </Grid>
                     </Button>
-                    <ItemsRepeater ItemsSource="{x:Bind plugins:PluginManager.PluginInstances.Values, Mode=OneWay}">
+                    <ItemsRepeater ItemsSource="{x:Bind PluginInstances.Values, Mode=OneWay}">
                         <ItemsRepeater.ItemTemplate>
                             <DataTemplate x:DataType="plugins:PluginInfo">
                                 <Button Margin="0,0,0,4"

CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs

@@ -42,6 +42,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -60,7 +61,7 @@
 using static Hi3Helper.Logger;
 using static Hi3Helper.Shared.Region.LauncherConfig;
 using CollapseUIExt = CollapseLauncher.Extension.UIElementExtensions;
-
+using System.Runtime.CompilerServices;
 // ReSharper disable AsyncVoidMethod
 // ReSharper disable SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 // ReSharper disable SwitchStatementMissingSomeEnumCasesNoDefault
@@ -73,7 +74,7 @@
 // ReSharper disable RedundantExtendsListEntry
 // ReSharper disable HeuristicUnreachableCode
 
-
+#nullable enable
 namespace CollapseLauncher.Pages
 {
     [GeneratedBindableCustomProperty]
@@ -100,8 +101,21 @@ public int SelectedCDN
     }
 
     [GeneratedBindableCustomProperty]
-    public sealed partial class SettingsPage : Page
+    public sealed partial class SettingsPage : Page, INotifyPropertyChanged
     {
+        #region INotifyPropertyChanged
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        // ReSharper disable once UnusedMember.Local
+        private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+        {
+            // Raise the PropertyChanged event, passing the name of the property whose value has changed.
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        #endregion
+
         #region Properties
 
         private const string RepoUrl = "https://github.com/CollapseLauncher/Collapse/commit/";
@@ -117,13 +131,29 @@ public sealed partial class SettingsPage : Page
         private          Brush                                              _highlightBrush;
         private          Brush                                              _highlightSelectedBrush;
         private readonly List<MethodInfo>                                   _dialogMethods;
-        private          List<string>                                       DialogMethodNames        { get; }
-        public           string                                             SelectedDialogMethodName { get; set; }
-        private          CDNSelectionContext                                CdnSelectionContext      { get; } = new();
+
+        private List<string> DialogMethodNames { get; }
+
+        public string SelectedDialogMethodName
+        {
+            get;
+            set
+            {
+                field = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private CDNSelectionContext CdnSelectionContext { get; } = new();
 
         private List<TextBlock> FFmpegDecodingModeSelectionItems { get; } = BuildFFmpegDecodingModeSelectionItems();
+
         private List<StackPanel> FFmpegDecodingModeHelpItems { get; } = BuildFFmpegDecodingModeHelpItems();
 
+        private Dictionary<string, PluginInfo> PluginInstances => PluginManager.PluginInstances;
+
+        private bool IsPreviewBuild => LauncherConfig.IsPreview;
+
 #nullable enable
         private string? _previousSearchQuery;
 #nullable restore
@@ -143,7 +173,11 @@ .. typeof(SimpleDialogs)
                   .GetMethods(BindingFlags.Public | BindingFlags.Static)
                   .Where(m => m.ReturnType == typeof(Task<ContentDialogResult>))
             ];
-            
+
+            // Create brushes for highlighting
+            _highlightBrush         = new SolidColorBrush(Microsoft.UI.Colors.Yellow) { Opacity = 0.3 };
+            _highlightSelectedBrush = new SolidColorBrush(Microsoft.UI.Colors.Blue) { Opacity   = 0.5 };
+
             DialogMethodNames = [.. _dialogMethods.Select(m => m.Name)];
 
             if (DialogMethodNames.Count > 0)
@@ -1725,10 +1759,6 @@ private bool AreShortcutsEnabled
         #region Settings Search
         private void InitializeSettingsSearch()
         {
-            // Create brushes for highlighting
-            _highlightBrush = new SolidColorBrush(Microsoft.UI.Colors.Yellow) { Opacity = 0.3 };
-            _highlightSelectedBrush = new SolidColorBrush(Microsoft.UI.Colors.Blue) { Opacity = 0.5 };
-
             // Map all settings controls with their display text
             if (!(_settingsControls.Count < 1)) _settingsControls.Clear();
             ClearHighlighting();
@@ -1894,7 +1924,7 @@ private void AddControlRecursiveSelectible(FrameworkElement element)
 
         private void ClearHighlighting()
         {
-            foreach (HighlightableControlProperty? control in _highlightedControls)
+            foreach (HighlightableControlProperty control in _highlightedControls)
             {
                 control.ClearHighlight();
             }