Improve code quality

Jack251970 · Jack251970 · commit d01c67f433de · 2025-04-24T19:48:42.000+08:00
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -10,14 +10,14 @@ namespace Flow.Launcher
 {
     public partial class CustomQueryHotkeySetting : Window
     {
-        public Settings Settings { get; }
+        private readonly Settings _settings;
 
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
 
         public CustomQueryHotkeySetting(Settings settings)
         {
-            Settings = settings;
+            _settings = settings;
             InitializeComponent();
         }
 
@@ -30,13 +30,13 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
         {
             if (!update)
             {
-                Settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
+                _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
 
                 var pluginHotkey = new CustomPluginHotkey
                 {
                     Hotkey = HotkeyControl.CurrentHotkey.ToString(), ActionKeyword = tbAction.Text
                 };
-                Settings.CustomPluginHotkeys.Add(pluginHotkey);
+                _settings.CustomPluginHotkeys.Add(pluginHotkey);
 
                 HotKeyMapper.SetCustomQueryHotkey(pluginHotkey);
             }
@@ -55,7 +55,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
 
         public void UpdateItem(CustomPluginHotkey item)
         {
-            updateCustomHotkey = Settings.CustomPluginHotkeys.FirstOrDefault(o =>
+            updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>
                 o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
             if (updateCustomHotkey == null)
             {
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -1,15 +1,11 @@
 ﻿using System.Windows;
 using System.Windows.Input;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
-        public Settings Settings { get; } = Ioc.Default.GetRequiredService<Settings>();
-
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
         public string Key { get; set; } = string.Empty;
         public string Value { get; set; } = string.Empty;
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
@@ -42,14 +42,11 @@ public DisplayType Type
 
         private static void keyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var control = d as UserControl;
-            if (null == control) return; // This should not be possible
+            if (d is not UserControl) return; // This should not be possible
 
-            var newValue = e.NewValue as string;
-            if (null == newValue) return;
+            if (e.NewValue is not string newValue) return;
 
-            if (d is not HotkeyDisplay hotkeyDisplay)
-                return;
+            if (d is not HotkeyDisplay hotkeyDisplay) return;
 
             hotkeyDisplay.Values.Clear();
             foreach (var key in newValue.Split('+'))
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -1,29 +1,35 @@
 ﻿using System.Collections.Generic;
 using System.Windows.Navigation;
-using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.Core.Resource;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage1
     {
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 1;
-            InitializeComponent();
+            _viewModel.PageNum = 1;
+            base.OnNavigatedTo(e);
         }
 
         private readonly Internationalization _translater = Ioc.Default.GetRequiredService<Internationalization>();
 
         public List<Language> Languages => _translater.LoadAvailableLanguages();
 
-        public Settings Settings { get; set; }
-
         public string CustomLanguage
         {
             get
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -1,25 +1,31 @@
-﻿using Flow.Launcher.Helper;
-using Flow.Launcher.Infrastructure.Hotkey;
-using Flow.Launcher.Infrastructure.UserSettings;
+﻿using System.Windows.Media;
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.Input;
-using Flow.Launcher.ViewModel;
-using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Helper;
+using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage2
     {
-        public Settings Settings { get; set; }
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 2;
-            InitializeComponent();
+            _viewModel.PageNum = 2;
+            base.OnNavigatedTo(e);
         }
 
         [RelayCommand]
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
@@ -7,15 +7,21 @@ namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage3
     {
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 3;
-            InitializeComponent();
+            _viewModel.PageNum = 3;
+            base.OnNavigatedTo(e);
         }
-
-        public Settings Settings { get; set; }
     }
 }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
@@ -1,21 +1,27 @@
-﻿using CommunityToolkit.Mvvm.DependencyInjection;
+﻿using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
-using System.Windows.Navigation;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage4
     {
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 4;
-            InitializeComponent();
+            _viewModel.PageNum = 4;
+            base.OnNavigatedTo(e);
         }
-
-        public Settings Settings { get; set; }
     }
 }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -1,54 +1,74 @@
-﻿using System.Windows;
+﻿using System;
+using System.Windows;
 using System.Windows.Navigation;
-using Flow.Launcher.Infrastructure.UserSettings;
-using Microsoft.Win32;
-using Flow.Launcher.Infrastructure;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Helper;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage5
     {
-        private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";
-        public Settings Settings { get; set; }
-        public bool HideOnStartup { get; set; }
+        public Settings Settings { get; private set; }
+        private WelcomeViewModel _viewModel;
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            Settings = Ioc.Default.GetRequiredService<Settings>();
+            if (!IsInitialized)
+            {
+                Settings = Ioc.Default.GetRequiredService<Settings>();
+                _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+                InitializeComponent();
+            }
             // Sometimes the navigation is not triggered by button click,
             // so we need to reset the page number
-            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 5;
-            InitializeComponent();
+            _viewModel.PageNum = 5;
+            base.OnNavigatedTo(e);
         }
 
         private void OnAutoStartupChecked(object sender, RoutedEventArgs e)
         {
-            SetStartup();
+            ChangeAutoStartup(true);
         }
+
         private void OnAutoStartupUncheck(object sender, RoutedEventArgs e)
         {
-            RemoveStartup();
+            ChangeAutoStartup(false);
         }
 
-        private void RemoveStartup()
+        private void ChangeAutoStartup(bool value)
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-            key?.DeleteValue(Constant.FlowLauncher, false);
-            Settings.StartFlowLauncherOnSystemStartup = false;
-        }
-        private void SetStartup()
-        {
-            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-            key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath);
-            Settings.StartFlowLauncherOnSystemStartup = true;
+            Settings.StartFlowLauncherOnSystemStartup = value;
+            try
+            {
+                if (value)
+                {
+                    if (Settings.UseLogonTaskForStartup)
+                    {
+                        AutoStartup.ChangeToViaLogonTask();
+                    }
+                    else
+                    {
+                        AutoStartup.ChangeToViaRegistry();
+                    }
+                }
+                else
+                {
+                    AutoStartup.DisableViaLogonTaskAndRegistry();
+                }
+            }
+            catch (Exception e)
+            {
+                App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
+            }
         }
 
         private void OnHideOnStartupChecked(object sender, RoutedEventArgs e)
         {
             Settings.HideOnStartup = true;
         }
+
         private void OnHideOnStartupUnchecked(object sender, RoutedEventArgs e)
         {
             Settings.HideOnStartup = false;
@@ -59,6 +79,5 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
             var window = Window.GetWindow(this);
             window.Close();
         }
-
     }
 }
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml.cs b/Flow.Launcher/SelectBrowserWindow.xaml.cs
@@ -10,13 +10,14 @@ namespace Flow.Launcher
     [INotifyPropertyChanged]
     public partial class SelectBrowserWindow : Window
     {
-        public Settings Settings { get; }
+        private readonly Settings _settings;
 
         private int selectedCustomBrowserIndex;
 
         public int SelectedCustomBrowserIndex
         {
-            get => selectedCustomBrowserIndex; set
+            get => selectedCustomBrowserIndex;
+            set
             {
                 selectedCustomBrowserIndex = value;
                 OnPropertyChanged(nameof(CustomBrowser));
@@ -27,9 +28,9 @@ public int SelectedCustomBrowserIndex
         public CustomBrowserViewModel CustomBrowser => CustomBrowsers[SelectedCustomBrowserIndex];
         public SelectBrowserWindow(Settings settings)
         {
-            Settings = settings;
-            CustomBrowsers = new ObservableCollection<CustomBrowserViewModel>(Settings.CustomBrowserList.Select(x => x.Copy()));
-            SelectedCustomBrowserIndex = Settings.CustomBrowserIndex;
+            _settings = settings;
+            CustomBrowsers = new ObservableCollection<CustomBrowserViewModel>(_settings.CustomBrowserList.Select(x => x.Copy()));
+            SelectedCustomBrowserIndex = _settings.CustomBrowserIndex;
             InitializeComponent();
         }
 
@@ -40,8 +41,8 @@ private void btnCancel_Click(object sender, RoutedEventArgs e)
 
         private void btnDone_Click(object sender, RoutedEventArgs e)
         {
-            Settings.CustomBrowserList = CustomBrowsers.ToList();
-            Settings.CustomBrowserIndex = SelectedCustomBrowserIndex;
+            _settings.CustomBrowserList = CustomBrowsers.ToList();
+            _settings.CustomBrowserIndex = SelectedCustomBrowserIndex;
             Close();
         }
 
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml.cs b/Flow.Launcher/SelectFileManagerWindow.xaml.cs
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPanePluginStoreViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@ namespace Flow.Launcher`
`10`	`10`	`{`
`11`	`11`	`public partial class CustomQueryHotkeySetting : Window`
`12`	`12`	`{`
`13`		`- public Settings Settings { get; }`
	`13`	`+ private readonly Settings _settings;`
`14`	`14`
`15`	`15`	`private bool update;`
`16`	`16`	`private CustomPluginHotkey updateCustomHotkey;`
`17`	`17`
`18`	`18`	`public CustomQueryHotkeySetting(Settings settings)`
`19`	`19`	`{`
`20`		`- Settings = settings;`
	`20`	`+ _settings = settings;`
`21`	`21`	`InitializeComponent();`
`22`	`22`	`}`
`23`	`23`
`@@ -30,13 +30,13 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)`
`30`	`30`	`{`
`31`	`31`	`if (!update)`
`32`	`32`	`{`
`33`		`- Settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();`
	`33`	`+ _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();`
`34`	`34`
`35`	`35`	`var pluginHotkey = new CustomPluginHotkey`
`36`	`36`	`{`
`37`	`37`	`Hotkey = HotkeyControl.CurrentHotkey.ToString(), ActionKeyword = tbAction.Text`
`38`	`38`	`};`
`39`		`- Settings.CustomPluginHotkeys.Add(pluginHotkey);`
	`39`	`+ _settings.CustomPluginHotkeys.Add(pluginHotkey);`
`40`	`40`
`41`	`41`	`HotKeyMapper.SetCustomQueryHotkey(pluginHotkey);`
`42`	`42`	`}`
`@@ -55,7 +55,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)`
`55`	`55`
`56`	`56`	`public void UpdateItem(CustomPluginHotkey item)`
`57`	`57`	`{`
`58`		`- updateCustomHotkey = Settings.CustomPluginHotkeys.FirstOrDefault(o =>`
	`58`	`+ updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>`
`59`	`59`	`o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);`
`60`	`60`	`if (updateCustomHotkey == null)`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,21 @@ namespace Flow.Launcher.Resources.Pages`
`7`	`7`	`{`
`8`	`8`	`public partial class WelcomePage3`
`9`	`9`	`{`
	`10`	`+ public Settings Settings { get; private set; }`
	`11`	`+ private WelcomeViewModel _viewModel;`
	`12`	`+`
`10`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`11`	`14`	`{`
`12`		`- Settings = Ioc.Default.GetRequiredService<Settings>();`
	`15`	`+ if (!IsInitialized)`
	`16`	`+ {`
	`17`	`+ Settings = Ioc.Default.GetRequiredService<Settings>();`
	`18`	`+ _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
	`19`	`+ InitializeComponent();`
	`20`	`+ }`
`13`	`21`	`// Sometimes the navigation is not triggered by button click,`
`14`	`22`	`// so we need to reset the page number`
`15`		`- Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 3;`
`16`		`- InitializeComponent();`
	`23`	`+ _viewModel.PageNum = 3;`
	`24`	`+ base.OnNavigatedTo(e);`
`17`	`25`	`}`
`18`		`-`
`19`		`- public Settings Settings { get; set; }`
`20`	`26`	`}`
`21`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,27 @@`
`1`		`-using CommunityToolkit.Mvvm.DependencyInjection;`
	`1`	`+using System.Windows.Navigation;`
	`2`	`+using CommunityToolkit.Mvvm.DependencyInjection;`
`2`	`3`	`using Flow.Launcher.Infrastructure.UserSettings;`
`3`	`4`	`using Flow.Launcher.ViewModel;`
`4`		`-using System.Windows.Navigation;`
`5`	`5`
`6`	`6`	`namespace Flow.Launcher.Resources.Pages`
`7`	`7`	`{`
`8`	`8`	`public partial class WelcomePage4`
`9`	`9`	`{`
	`10`	`+ public Settings Settings { get; private set; }`
	`11`	`+ private WelcomeViewModel _viewModel;`
	`12`	`+`
`10`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`11`	`14`	`{`
`12`		`- Settings = Ioc.Default.GetRequiredService<Settings>();`
	`15`	`+ if (!IsInitialized)`
	`16`	`+ {`
	`17`	`+ Settings = Ioc.Default.GetRequiredService<Settings>();`
	`18`	`+ _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
	`19`	`+ InitializeComponent();`
	`20`	`+ }`
`13`	`21`	`// Sometimes the navigation is not triggered by button click,`
`14`	`22`	`// so we need to reset the page number`
`15`		`- Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 4;`
`16`		`- InitializeComponent();`
	`23`	`+ _viewModel.PageNum = 4;`
	`24`	`+ base.OnNavigatedTo(e);`
`17`	`25`	`}`
`18`		`-`
`19`		`- public Settings Settings { get; set; }`
`20`	`26`	`}`
`21`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,14 @@ namespace Flow.Launcher`
`10`	`10`	`[INotifyPropertyChanged]`
`11`	`11`	`public partial class SelectBrowserWindow : Window`
`12`	`12`	`{`
`13`		`- public Settings Settings { get; }`
	`13`	`+ private readonly Settings _settings;`
`14`	`14`
`15`	`15`	`private int selectedCustomBrowserIndex;`
`16`	`16`
`17`	`17`	`public int SelectedCustomBrowserIndex`
`18`	`18`	`{`
`19`		`- get => selectedCustomBrowserIndex; set`
	`19`	`+ get => selectedCustomBrowserIndex;`
	`20`	`+ set`
`20`	`21`	`{`
`21`	`22`	`selectedCustomBrowserIndex = value;`
`22`	`23`	`OnPropertyChanged(nameof(CustomBrowser));`
`@@ -27,9 +28,9 @@ public int SelectedCustomBrowserIndex`
`27`	`28`	`public CustomBrowserViewModel CustomBrowser => CustomBrowsers[SelectedCustomBrowserIndex];`
`28`	`29`	`public SelectBrowserWindow(Settings settings)`
`29`	`30`	`{`
`30`		`- Settings = settings;`
`31`		`- CustomBrowsers = new ObservableCollection<CustomBrowserViewModel>(Settings.CustomBrowserList.Select(x => x.Copy()));`
`32`		`- SelectedCustomBrowserIndex = Settings.CustomBrowserIndex;`
	`31`	`+ _settings = settings;`
	`32`	`+ CustomBrowsers = new ObservableCollection<CustomBrowserViewModel>(_settings.CustomBrowserList.Select(x => x.Copy()));`
	`33`	`+ SelectedCustomBrowserIndex = _settings.CustomBrowserIndex;`
`33`	`34`	`InitializeComponent();`
`34`	`35`	`}`
`35`	`36`
`@@ -40,8 +41,8 @@ private void btnCancel_Click(object sender, RoutedEventArgs e)`
`40`	`41`
`41`	`42`	`private void btnDone_Click(object sender, RoutedEventArgs e)`
`42`	`43`	`{`
`43`		`- Settings.CustomBrowserList = CustomBrowsers.ToList();`
`44`		`- Settings.CustomBrowserIndex = SelectedCustomBrowserIndex;`
	`44`	`+ _settings.CustomBrowserList = CustomBrowsers.ToList();`
	`45`	`+ _settings.CustomBrowserIndex = SelectedCustomBrowserIndex;`
`45`	`46`	`Close();`
`46`	`47`	`}`
`47`	`48`