Tidy-up LauncherConfig and Logger properties

Author: neon-nyan

CollapseLauncher/Classes/AnimatedVisuals/Lottie/NewLogoTitleIntro.cs

@@ -156,7 +156,7 @@ void EnsureImageLoadingStarted()
             if (!_isImageLoadingStarted)
             {
                 var eventHandler = new TypedEventHandler<LoadedImageSurface, LoadedImageSourceLoadCompletedEventArgs>(HandleLoadCompleted);
-                _image_image_0 = LoadedImageSurface.StartLoadFromStream(File.OpenRead(Path.Combine(LauncherConfig.AppFolder, @"Assets\CollapseLauncherLogo.png")).AsRandomAccessStream());
+                _image_image_0 = LoadedImageSurface.StartLoadFromStream(File.OpenRead(Path.Combine(LauncherConfig.AppExecutableDir, @"Assets\CollapseLauncherLogo.png")).AsRandomAccessStream());
                 _image_image_0.LoadCompleted += eventHandler;
                 _isImageLoadingStarted = true;
             }

CollapseLauncher/Classes/FileDialog/FileDialogHelper.cs

@@ -150,7 +150,7 @@ private static bool IsProgramFilesPath(ReadOnlySpan<char> path)
 
         private static bool IsCollapseProgramPath(ReadOnlySpan<char> path)
         {
-            string collapseProgramPath = LauncherConfig.AppFolder;
+            string collapseProgramPath = LauncherConfig.AppExecutableDir;
             if (path.StartsWith(collapseProgramPath))
                 return true;
 

CollapseLauncher/Classes/GameManagement/GameSettings/Honkai/RegistryClass/Preset.cs

@@ -68,7 +68,7 @@ public Preset(string presetJSONPath, JsonTypeInfo<Dictionary<string, T1>?> jsonT
         /// <returns>The instance of preset</returns>
         public static Preset<T1, TObjectType> LoadPreset(GameNameType gameType, JsonTypeInfo<Dictionary<string, T1>?> jsonType)
         {
-            string presetPath = Path.Combine(AppFolder, $"Assets\\Presets\\{gameType}\\", $"{typeof(T1).Name}.json");
+            string presetPath = Path.Combine(AppExecutableDir, $"Assets\\Presets\\{gameType}\\", $"{typeof(T1).Name}.json");
             return new Preset<T1, TObjectType>(presetPath, jsonType);
         }
 

CollapseLauncher/Classes/Helper/HttpClientBuilder.cs

@@ -45,12 +45,11 @@ public HttpClientBuilder<THandler> UseProxy(bool isUseSystemProxy = true)
         private static string GetDefaultUserAgent()
         {
             Version operatingSystemVer = Environment.OSVersion.Version;
-            FileVersionInfo winAppSDKVer = FileVersionInfo.GetVersionInfo("Microsoft.ui.xaml.dll");
 
             return $"Mozilla/5.0 (Windows NT {operatingSystemVer}; Win64; x64) "
                 + $"{RuntimeInformation.FrameworkDescription.Replace(' ', '/')} (KHTML, like Gecko) "
                 + $"Collapse/{LauncherUpdateHelper.LauncherCurrentVersionString}-{(LauncherConfig.IsPreview ? "Preview" : "Stable")} "
-                + $"WinAppSDK/{winAppSDKVer.ProductVersion}";
+                + $"WinAppSDK/{LauncherConfig.WindowsAppSdkVersion}";
         }
 
         public HttpClientBuilder<THandler> UseExternalProxy(string host, string? username = null, string? password = null)

CollapseLauncher/Classes/Helper/Image/ImageLoaderHelper.cs

@@ -89,8 +89,8 @@ private static Waifu2X CreateWaifu2X()
             {
                 waifu2X.SetParam(Param.Noise, -1);
                 waifu2X.SetParam(Param.Scale, 2);
-                waifu2X.Load(Path.Combine(AppFolder!, @"Assets\Waifu2X_Models\scale2.0x_model.param.bin"),
-                    Path.Combine(AppFolder!, @"Assets\Waifu2X_Models\scale2.0x_model.bin"));
+                waifu2X.Load(Path.Combine(AppExecutableDir, @"Assets\Waifu2X_Models\scale2.0x_model.param.bin"),
+                    Path.Combine(AppExecutableDir, @"Assets\Waifu2X_Models\scale2.0x_model.bin"));
                 _cachedStatus = waifu2X.Status;
             }
             return waifu2X;
@@ -179,7 +179,7 @@ private static async Task<FileStream> SpawnImageCropperDialog(string filePath, s
             imageCropper.Opacity = 0;
 
             // Path of image
-            Uri overlayImageUri = new Uri(Path.Combine(AppFolder!, @"Assets\Images\ImageCropperOverlay",
+            Uri overlayImageUri = new Uri(Path.Combine(AppExecutableDir, @"Assets\Images\ImageCropperOverlay",
                                                        GetAppConfigValue("WindowSizeProfile").ToString() == "Small" ? "small.png" : "normal.png"));
 
             // Why not use ImageBrush?

CollapseLauncher/Classes/Helper/Image/Waifu2X.cs

@@ -28,7 +28,7 @@ static Waifu2XPInvoke()
 
         private static IntPtr DllImportResolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
         {
-            appDirPath ??= LauncherConfig.AppFolder;
+            appDirPath ??= LauncherConfig.AppExecutableDir;
 
             if (DllImportSearchPath.AssemblyDirectory != searchPath
              && DllImportSearchPath.ApplicationDirectory != searchPath)

CollapseLauncher/Classes/Helper/TaskSchedulerHelper.cs

@@ -233,7 +233,7 @@ private static async Task<int> GetInvokeCommandReturnCode(string argument)
             const string retValMark = "RETURNVAL_";
 
             // Get the applet path and check if the file exist
-            string appletPath = Path.Combine(LauncherConfig.AppFolder, "Lib", "win-x64", "Hi3Helper.TaskScheduler.exe");
+            string appletPath = Path.Combine(LauncherConfig.AppExecutableDir, "Lib", "win-x64", "Hi3Helper.TaskScheduler.exe");
             if (!File.Exists(appletPath))
             {
                 Logger.LogWriteLine($"Task Scheduler Applet does not exist in this path: {appletPath}", LogType.Error, true);

CollapseLauncher/Classes/Helper/Update/LauncherUpdateHelper.cs

@@ -5,6 +5,8 @@
 using Hi3Helper.Shared.Region;
 using System;
 using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
+
 #if !USEVELOPACK
 using Squirrel;
 using Squirrel.Sources;
@@ -20,26 +22,13 @@ namespace CollapseLauncher.Helper.Update
 {
     internal static class LauncherUpdateHelper
     {
-        static LauncherUpdateHelper()
-        {
-            string? versionString = LauncherConfig.AppCurrentVersionString;
-            if (string.IsNullOrEmpty(versionString))
-                throw new NullReferenceException("App cannot retrieve the current version of the executable!");
-
-            _launcherCurrentVersion = new GameVersion(versionString);
-            _launcherCurrentVersionString = _launcherCurrentVersion.VersionString;
-        }
-
         internal static AppUpdateVersionProp? AppUpdateVersionProp;
         internal static bool IsLauncherUpdateAvailable;
 
-        private static readonly GameVersion _launcherCurrentVersion;
-        internal static GameVersion? LauncherCurrentVersion
-            => _launcherCurrentVersion;
+        internal static GameVersion? LauncherCurrentVersion => field ??= new(LauncherConfig.AppCurrentVersionString);
 
-        private static readonly string _launcherCurrentVersionString;
-        internal static string LauncherCurrentVersionString
-            => _launcherCurrentVersionString;
+        [field: AllowNull, MaybeNull]
+        internal static string LauncherCurrentVersionString => field = LauncherConfig.AppCurrentVersionString;
 
         internal static async Task RunUpdateCheckDetached()
         {

CollapseLauncher/Classes/Properties/InnerLauncherConfig.cs

@@ -46,8 +46,6 @@ public enum AppMode
         public static AppMode                   m_appMode;
         public static Arguments                 m_arguments = new();
         public static bool                      m_isWindows11;
-        public static IntPtr                    m_oldWndProc;
-        public static Delegate?                 m_newWndProcDelegate;
         public static ConsoleControlHandler?    m_consoleCtrlHandler;
         public static MainPage?                 m_mainPage;
         public static HomePage?                 m_homePage;

CollapseLauncher/Classes/RegionManagement/RegionManagement.cs

@@ -202,10 +202,10 @@ private async Task DownloadBackgroundImage(CancellationToken Token)
             var currentGameType = GamePropertyVault.GetCurrentGameProperty()._GameVersion.GameType;
             tempImage ??= currentGameType switch
             {
-                GameNameType.Honkai => Path.Combine(AppFolder,   @"Assets\Images\GameBackground\honkai.webp"),
-                GameNameType.Genshin => Path.Combine(AppFolder,  @"Assets\Images\GameBackground\genshin.webp"),
-                GameNameType.StarRail => Path.Combine(AppFolder, @"Assets\Images\GameBackground\starrail.webp"),
-                GameNameType.Zenless => Path.Combine(AppFolder,  @"Assets\Images\GameBackground\zzz.webp"),
+                GameNameType.Honkai => Path.Combine(AppExecutableDir,   @"Assets\Images\GameBackground\honkai.webp"),
+                GameNameType.Genshin => Path.Combine(AppExecutableDir,  @"Assets\Images\GameBackground\genshin.webp"),
+                GameNameType.StarRail => Path.Combine(AppExecutableDir, @"Assets\Images\GameBackground\starrail.webp"),
+                GameNameType.Zenless => Path.Combine(AppExecutableDir,  @"Assets\Images\GameBackground\zzz.webp"),
                 _ => AppDefaultBG
             };
             BackgroundImgChanger.ChangeBackground(tempImage, () =>