From 32cac76c827681b436bd8bdc8de03e608181260c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 12 Jan 2025 18:44:52 +0800
Subject: [PATCH] Improve Settings management

---
 .../UserSettings/Settings.cs                     | 16 ++++++++++++++--
 Flow.Launcher/App.xaml.cs                        |  8 ++++++--
 .../ViewModel/SettingWindowViewModel.cs          | 13 +++----------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index 0bcc9368d..3e43e3d32 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Text.Json.Serialization;
 using System.Windows;
 using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 using Flow.Launcher.ViewModel;
@@ -13,6 +13,18 @@ namespace Flow.Launcher.Infrastructure.UserSettings
 {
     public class Settings : BaseModel, IHotkeySettings
     {
+        private FlowLauncherJsonStorage<Settings> _storage;
+
+        public void Initialize(FlowLauncherJsonStorage<Settings> storage)
+        {
+            _storage = storage;
+        }
+
+        public void Save()
+        {
+            _storage.Save();
+        }
+
         private string language = "en";
         private string _theme = Constant.DefaultTheme;
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 58da35e85..9d7a0671e 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -14,6 +14,7 @@ using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Http;
 using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
@@ -52,6 +53,10 @@ namespace Flow.Launcher
         {
             await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
             {
+                var storage = new FlowLauncherJsonStorage<Settings>();
+                _settings = storage.Load();
+                _settings.Initialize(storage);
+
                 _portable.PreStartCleanUpAfterPortabilityUpdate();
 
                 Log.Info(
@@ -62,8 +67,7 @@ namespace Flow.Launcher
 
                 var imageLoadertask = ImageLoader.InitializeAsync();
 
-                _settingsVM = new SettingWindowViewModel(_updater, _portable);
-                _settings = _settingsVM.Settings;
+                _settingsVM = new SettingWindowViewModel(_settings, _updater, _portable);
                 _settings.WMPInstalled =  WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
 
                 AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 04dd6312b..95a1eb675 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -1,6 +1,5 @@
 using Flow.Launcher.Core;
 using Flow.Launcher.Core.Configuration;
-using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 
@@ -8,21 +7,17 @@ namespace Flow.Launcher.ViewModel;
 
 public class SettingWindowViewModel : BaseModel
 {
-    private readonly FlowLauncherJsonStorage<Settings> _storage;
-
     public Updater Updater { get; }
 
     public IPortable Portable { get; }
 
     public Settings Settings { get; }
 
-    public SettingWindowViewModel(Updater updater, IPortable portable)
+    public SettingWindowViewModel(Settings settings, Updater updater, IPortable portable)
     {
-        _storage = new FlowLauncherJsonStorage<Settings>();
-
+        Settings = settings;
         Updater = updater;
         Portable = portable;
-        Settings = _storage.Load();
     }
 
     public async void UpdateApp()
@@ -30,14 +25,12 @@ public class SettingWindowViewModel : BaseModel
         await Updater.UpdateAppAsync(App.API, false);
     }
 
-
-
     /// <summary>
     /// Save Flow settings. Plugins settings are not included.
     /// </summary>
     public void Save()
     {
-        _storage.Save();
+        Settings.Save();
     }
 
     public double SettingWindowWidth