style: nullable

[skip changelog]

Author: status102

src/MaaWpfGui/Configuration/ConfigFactory.cs

@@ -10,7 +10,7 @@
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY
 // </copyright>
-
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -44,10 +44,10 @@ public static class ConfigFactory
 
         private static readonly SemaphoreSlim _semaphore = new(1, 1);
 
-        public delegate void ConfigurationUpdateEventHandler(string key, object oldValue, object newValue);
+        public delegate void ConfigurationUpdateEventHandler(string key, object? oldValue, object? newValue);
 
         // ReSharper disable once EventNeverSubscribedTo.Global
-        public static event ConfigurationUpdateEventHandler ConfigurationUpdateEvent;
+        public static event ConfigurationUpdateEventHandler? ConfigurationUpdateEvent;
 
         private static readonly JsonSerializerOptions _options = new() { WriteIndented = true, Converters = { new JsonStringEnumConverter() }, Encoder = JavaScriptEncoder.Create(UnicodeRanges.BasicLatin, UnicodeRanges.CjkUnifiedIdeographs, UnicodeRanges.CjkSymbolsandPunctuation, UnicodeRanges.HalfwidthandFullwidthForms), DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull };
 
@@ -61,7 +61,7 @@ public static class ConfigFactory
                     Directory.CreateDirectory("config");
                 }
 
-                Root parsed = null;
+                Root? parsed = null;
                 if (File.Exists(_configurationFile))
                 {
                     try
@@ -195,7 +195,7 @@ void SpecificConfigBind(string name, SpecificConfig config)
             }
         });
 
-        private static PropertyChangedEventHandler OnPropertyChangedFactory(string key, object oldValue, object newValue)
+        private static PropertyChangedEventHandler OnPropertyChangedFactory(string key, object? oldValue, object? newValue)
         {
             return (o, args) =>
             {
@@ -213,7 +213,7 @@ private static PropertyChangedEventHandler OnPropertyChangedFactory(string key =
         {
             return (o, args) =>
             {
-                object after = null;
+                object? after = null;
                 if (args is PropertyChangedEventDetailArgs detailArgs)
                 {
                     after = detailArgs.NewValue;
@@ -236,7 +236,7 @@ private static NotifyCollectionChangedEventHandler<KeyValuePair<T1, T2>> OnColle
 
         public static readonly SpecificConfig CurrentConfig = Root.CurrentConfig;
 
-        private static async void OnPropertyChanged(string key, object oldValue, object newValue)
+        private static async void OnPropertyChanged(string key, object? oldValue, object? newValue)
         {
             var result = await SaveAsync();
             if (result)
@@ -250,7 +250,7 @@ private static async void OnPropertyChanged(string key, object oldValue, object
             }
         }
 
-        private static bool Save(string file = null)
+        private static bool Save(string? file = null)
         {
             lock (_lock)
             {
@@ -268,7 +268,7 @@ private static bool Save(string file = null)
             }
         }
 
-        private static async Task<bool> SaveAsync(string file = null)
+        private static async Task<bool> SaveAsync(string? file = null)
         {
             await _semaphore.WaitAsync();
             try
@@ -325,7 +325,7 @@ public static bool SwitchConfig(string configName)
             return true;
         }
 
-        public static bool AddConfiguration(string configName, string copyFrom = null)
+        public static bool AddConfiguration(string configName, string? copyFrom = null)
         {
             if (string.IsNullOrEmpty(configName))
             {

src/MaaWpfGui/Configuration/PropertyChangedEventDetailArgs.cs

@@ -10,7 +10,7 @@
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY
 // </copyright>
-
+#nullable enable
 using System.ComponentModel;
 
 namespace MaaWpfGui.Configuration

src/MaaWpfGui/Configuration/Root.cs

@@ -10,8 +10,7 @@
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY
 // </copyright>
-
-using System.Collections.Generic;
+#nullable enable
 using System.ComponentModel;
 using System.Text.Json.Serialization;
 using ObservableCollections;
@@ -20,13 +19,13 @@ namespace MaaWpfGui.Configuration
 {
     public class Root : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         [JsonInclude]
-        public ObservableDictionary<string, SpecificConfig> Configurations { get; private set; } = new ObservableDictionary<string, SpecificConfig>();
+        public ObservableDictionary<string, SpecificConfig> Configurations { get; private set; } = [];
 
         [JsonInclude]
-        public ObservableDictionary<int, Timer> Timers { get; private set; } = new ObservableDictionary<int, Timer>();
+        public ObservableDictionary<int, Timer> Timers { get; private set; } = [];
 
         public string Current { get; set; } = "Default";
 

src/MaaWpfGui/Configuration/VersionUpdate.cs

@@ -1,4 +1,4 @@
-// <copyright file="VersionUpdate.cs" company="MaaAssistantArknights">
+// <copyright file="VersionUpdate.cs" company="MaaAssistantArknights">
 // MaaWpfGui - A part of the MaaCoreArknights project
 // Copyright (C) 2021 MistEO and Contributors
 //
@@ -10,15 +10,14 @@
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY
 // </copyright>
-
-using System;
+#nullable enable
 using System.ComponentModel;
 
 namespace MaaWpfGui.Configuration
 {
     public class VersionUpdate : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
         // The following should not be modified manually
         public string Name { get; set; } = string.Empty;
@@ -61,7 +60,7 @@ public enum UpdateVersionType
             /// <summary>
             /// 开发版
             /// </summary>
-            Beta
+            Beta,
         }
     }
 }