From 92e6e53ab4a01d7eb201b6499dd814fdd92f573a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 5 Mar 2025 13:39:25 +0800
Subject: [PATCH 1/4] Use dependency injection instead of navigation parameter

---
 Flow.Launcher/MainWindow.xaml.cs                     |  2 +-
 Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs   | 11 ++++-------
 Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs   |  8 ++------
 Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs   |  9 +++------
 Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs   |  9 +++------
 Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs   |  9 +++------
 .../ViewModels/SettingsPaneAboutViewModel.cs         |  2 +-
 Flow.Launcher/WelcomeWindow.xaml.cs                  | 12 ++++--------
 8 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 3f1bae090a3..3616e4c59ca 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -445,7 +445,7 @@ private void CheckFirstLaunch()
 
         private void OpenWelcomeWindow()
         {
-            var WelcomeWindow = new WelcomeWindow(_settings);
+            var WelcomeWindow = new WelcomeWindow();
             WelcomeWindow.Show();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
index 98fb47288ea..8d4312ba57a 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows.Navigation;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Core.Resource;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -10,10 +10,7 @@ public partial class WelcomePage1
     {
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
         private Internationalization _translater => InternationalizationManager.Instance;
@@ -37,4 +34,4 @@ public string CustomLanguage
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
index 1ed5747cdc6..4a4679a4aa3 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -1,11 +1,11 @@
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
-using System;
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.ViewModel;
 using System.Windows.Media;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -15,11 +15,7 @@ public partial class WelcomePage2
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Parameter setting.");
-
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
index 9051e7c2798..38cb8642a2d 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
@@ -1,5 +1,5 @@
-using System;
-using System.Windows.Navigation;
+using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.Resources.Pages
@@ -8,10 +8,7 @@ public partial class WelcomePage3
     {
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else if(Settings is null)
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
index 11bbcd6ed22..fc656893533 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
@@ -1,5 +1,5 @@
-using Flow.Launcher.Infrastructure.UserSettings;
-using System;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Infrastructure.UserSettings;
 using System.Windows.Navigation;
 
 namespace Flow.Launcher.Resources.Pages
@@ -8,10 +8,7 @@ public partial class WelcomePage4
     {
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
index abb8053035c..5327eb5c858 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Windows;
+using System.Windows;
 using System.Windows.Navigation;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Microsoft.Win32;
 using Flow.Launcher.Infrastructure;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -15,10 +15,7 @@ public partial class WelcomePage5
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index ade65028472..6606b00f01c 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -54,7 +54,7 @@ public SettingsPaneAboutViewModel(Settings settings, Updater updater)
     [RelayCommand]
     private void OpenWelcomeWindow()
     {
-        var window = new WelcomeWindow(_settings);
+        var window = new WelcomeWindow();
         window.ShowDialog();
     }
 
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
index c3723a8c529..1d55b5741a2 100644
--- a/Flow.Launcher/WelcomeWindow.xaml.cs
+++ b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -2,7 +2,6 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Controls;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Resources.Pages;
 using ModernWpf.Media.Animation;
 
@@ -10,13 +9,10 @@ namespace Flow.Launcher
 {
     public partial class WelcomeWindow : Window
     {
-        private readonly Settings settings;
-
-        public WelcomeWindow(Settings settings)
+        public WelcomeWindow()
         {
             InitializeComponent();
             BackButton.IsEnabled = false;
-            this.settings = settings;
         }
 
         private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()
@@ -57,7 +53,7 @@ private void ForwardButton_Click(object sender, RoutedEventArgs e)
             pageNum++;
             UpdateView();
 
-            ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _transitionInfo);
+            ContentFrame.Navigate(PageTypeSelector(pageNum), null, _transitionInfo);
         }
 
         private void BackwardButton_Click(object sender, RoutedEventArgs e)
@@ -66,7 +62,7 @@ private void BackwardButton_Click(object sender, RoutedEventArgs e)
             {
                 pageNum--;
                 UpdateView();
-                ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _backTransitionInfo);
+                ContentFrame.Navigate(PageTypeSelector(pageNum), null, _backTransitionInfo);
             }
             else
             {
@@ -109,7 +105,7 @@ private void OnActivated(object sender, EventArgs e)
 
         private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
         {
-            ContentFrame.Navigate(PageTypeSelector(1), settings); /* Set First Page */
+            ContentFrame.Navigate(PageTypeSelector(1)); /* Set First Page */
         }
     }
 }

From f2248e93b18d92dfc1c4d9d0920f2d9167044702 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 5 Mar 2025 14:42:08 +0800
Subject: [PATCH 2/4] Use dependency injection instead of dependency property

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml   |   1 -
 Flow.Launcher/HotkeyControl.xaml.cs           | 139 +++++++++++++++---
 Flow.Launcher/HotkeyControlDialog.xaml.cs     |   7 +-
 .../Resources/Pages/WelcomePage2.xaml         |   3 +-
 .../Views/SettingsPaneHotkey.xaml             |  42 ++----
 5 files changed, 137 insertions(+), 55 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 70ebb404b91..ccf4de8706b 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -103,7 +103,6 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         HorizontalContentAlignment="Left"
-                        HotkeySettings="{Binding Settings}"
                         DefaultHotkey="" />
                     <TextBlock
                         Grid.Row="1"
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index e1dfc1108ef..869774882cd 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -4,25 +4,16 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher
 {
     public partial class HotkeyControl
     {
-        public IHotkeySettings HotkeySettings {
-            get { return (IHotkeySettings)GetValue(HotkeySettingsProperty); }
-            set { SetValue(HotkeySettingsProperty, value); }
-        }
-
-        public static readonly DependencyProperty HotkeySettingsProperty = DependencyProperty.Register(
-            nameof(HotkeySettings),
-            typeof(IHotkeySettings),
-            typeof(HotkeyControl),
-            new PropertyMetadata()
-        );
         public string WindowTitle {
             get { return (string)GetValue(WindowTitleProperty); }
             set { SetValue(WindowTitleProperty, value); }
@@ -71,8 +62,7 @@ private static void OnHotkeyChanged(DependencyObject d, DependencyPropertyChange
                 return;
             }
 
-            hotkeyControl.SetKeysToDisplay(new HotkeyModel(hotkeyControl.Hotkey));
-            hotkeyControl.CurrentHotkey = new HotkeyModel(hotkeyControl.Hotkey);
+            hotkeyControl.RefreshHotkeyInterface(hotkeyControl.Hotkey);
         }
 
 
@@ -90,17 +80,117 @@ public ICommand? ChangeHotkey
         }
 
 
-        public static readonly DependencyProperty HotkeyProperty = DependencyProperty.Register(
-            nameof(Hotkey),
-            typeof(string),
+        public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
+            nameof(Type),
+            typeof(HotkeyType),
             typeof(HotkeyControl),
-            new FrameworkPropertyMetadata("", FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnHotkeyChanged)
+            new FrameworkPropertyMetadata(HotkeyType.Hotkey, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnHotkeyChanged)
         );
 
+        public HotkeyType Type
+        {
+            get { return (HotkeyType)GetValue(TypeProperty); }
+            set { SetValue(TypeProperty, value); }
+        }
+
+        public enum HotkeyType
+        {
+            Hotkey,
+            PreviewHotkey,
+            OpenContextMenuHotkey,
+            SettingWindowHotkey,
+            CycleHistoryUpHotkey,
+            CycleHistoryDownHotkey,
+            SelectPrevPageHotkey,
+            SelectNextPageHotkey,
+            AutoCompleteHotkey,
+            AutoCompleteHotkey2,
+            SelectPrevItemHotkey,
+            SelectPrevItemHotkey2,
+            SelectNextItemHotkey,
+            SelectNextItemHotkey2
+        }
+
+        // We can initialize settings in static field because it has been construct in App constuctor
+        // and it will not construct settings instances twice
+        private static readonly Settings _settings = Ioc.Default.GetRequiredService<Settings>();
+
         public string Hotkey
         {
-            get { return (string)GetValue(HotkeyProperty); }
-            set { SetValue(HotkeyProperty, value); }
+            get
+            {
+                return Type switch
+                {
+                    HotkeyType.Hotkey => _settings.Hotkey,
+                    HotkeyType.PreviewHotkey => _settings.PreviewHotkey,
+                    HotkeyType.OpenContextMenuHotkey => _settings.OpenContextMenuHotkey,
+                    HotkeyType.SettingWindowHotkey => _settings.SettingWindowHotkey,
+                    HotkeyType.CycleHistoryUpHotkey => _settings.CycleHistoryUpHotkey,
+                    HotkeyType.CycleHistoryDownHotkey => _settings.CycleHistoryDownHotkey,
+                    HotkeyType.SelectPrevPageHotkey => _settings.SelectPrevPageHotkey,
+                    HotkeyType.SelectNextPageHotkey => _settings.SelectNextPageHotkey,
+                    HotkeyType.AutoCompleteHotkey => _settings.AutoCompleteHotkey,
+                    HotkeyType.AutoCompleteHotkey2 => _settings.AutoCompleteHotkey2,
+                    HotkeyType.SelectPrevItemHotkey => _settings.SelectPrevItemHotkey,
+                    HotkeyType.SelectPrevItemHotkey2 => _settings.SelectPrevItemHotkey2,
+                    HotkeyType.SelectNextItemHotkey => _settings.SelectNextItemHotkey,
+                    HotkeyType.SelectNextItemHotkey2 => _settings.SelectNextItemHotkey2,
+                    _ => string.Empty
+                };
+            }
+            set
+            {
+                switch (Type)
+                {
+                    case HotkeyType.Hotkey:
+                        _settings.Hotkey = value;
+                        break;
+                    case HotkeyType.PreviewHotkey:
+                        _settings.PreviewHotkey = value;
+                        break;
+                    case HotkeyType.OpenContextMenuHotkey:
+                        _settings.OpenContextMenuHotkey = value;
+                        break;
+                    case HotkeyType.SettingWindowHotkey:
+                        _settings.SettingWindowHotkey = value;
+                        break;
+                    case HotkeyType.CycleHistoryUpHotkey:
+                        _settings.CycleHistoryUpHotkey = value;
+                        break;
+                    case HotkeyType.CycleHistoryDownHotkey:
+                        _settings.CycleHistoryDownHotkey = value;
+                        break;
+                    case HotkeyType.SelectPrevPageHotkey:
+                        _settings.SelectPrevPageHotkey = value;
+                        break;
+                    case HotkeyType.SelectNextPageHotkey:
+                        _settings.SelectNextPageHotkey = value;
+                        break;
+                    case HotkeyType.AutoCompleteHotkey:
+                        _settings.AutoCompleteHotkey = value;
+                        break;
+                    case HotkeyType.AutoCompleteHotkey2:
+                        _settings.AutoCompleteHotkey2 = value;
+                        break;
+                    case HotkeyType.SelectPrevItemHotkey:
+                        _settings.SelectPrevItemHotkey = value;
+                        break;
+                    case HotkeyType.SelectNextItemHotkey:
+                        _settings.SelectNextItemHotkey = value;
+                        break;
+                    case HotkeyType.SelectPrevItemHotkey2:
+                        _settings.SelectPrevItemHotkey2 = value;
+                        break;
+                    case HotkeyType.SelectNextItemHotkey2:
+                        _settings.SelectNextItemHotkey2 = value;
+                        break;
+                    default:
+                        return;
+                }
+
+                // After setting the hotkey, we need to refresh the interface
+                RefreshHotkeyInterface(Hotkey);
+            }
         }
 
         public HotkeyControl()
@@ -108,7 +198,14 @@ public HotkeyControl()
             InitializeComponent();
 
             HotkeyList.ItemsSource = KeysToDisplay;
-            SetKeysToDisplay(CurrentHotkey);
+
+            RefreshHotkeyInterface(Hotkey);
+        }
+
+        public void RefreshHotkeyInterface(string hotkey)
+        {
+            SetKeysToDisplay(new HotkeyModel(Hotkey));
+            CurrentHotkey = new HotkeyModel(Hotkey);
         }
 
         private static bool CheckHotkeyAvailability(HotkeyModel hotkey, bool validateKeyGesture) =>
@@ -133,7 +230,7 @@ private async Task OpenHotkeyDialog()
                 HotKeyMapper.RemoveHotkey(Hotkey);
             }
 
-            var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, HotkeySettings, WindowTitle);
+            var dialog = new HotkeyControlDialog(Hotkey, DefaultHotkey, WindowTitle);
             await dialog.ShowAsync();
             switch (dialog.ResultType)
             {
diff --git a/Flow.Launcher/HotkeyControlDialog.xaml.cs b/Flow.Launcher/HotkeyControlDialog.xaml.cs
index a4d21a7827b..2f8c5eb2616 100644
--- a/Flow.Launcher/HotkeyControlDialog.xaml.cs
+++ b/Flow.Launcher/HotkeyControlDialog.xaml.cs
@@ -4,9 +4,11 @@
 using System.Windows;
 using System.Windows.Input;
 using ChefKeys;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using ModernWpf.Controls;
 
@@ -16,7 +18,7 @@ namespace Flow.Launcher;
 
 public partial class HotkeyControlDialog : ContentDialog
 {
-    private IHotkeySettings _hotkeySettings;
+    private static readonly IHotkeySettings _hotkeySettings = Ioc.Default.GetRequiredService<Settings>();
     private Action? _overwriteOtherHotkey;
     private string DefaultHotkey { get; }
     public string WindowTitle { get; }
@@ -36,7 +38,7 @@ public enum EResultType
 
     private static bool isOpenFlowHotkey;
 
-    public HotkeyControlDialog(string hotkey, string defaultHotkey, IHotkeySettings hotkeySettings, string windowTitle = "")
+    public HotkeyControlDialog(string hotkey, string defaultHotkey, string windowTitle = "")
     {
         WindowTitle = windowTitle switch
         {
@@ -45,7 +47,6 @@ public HotkeyControlDialog(string hotkey, string defaultHotkey, IHotkeySettings
         };
         DefaultHotkey = defaultHotkey;
         CurrentHotkey = new HotkeyModel(hotkey);
-        _hotkeySettings = hotkeySettings;
         SetKeysToDisplay(CurrentHotkey);
 
         InitializeComponent();
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
index 6c6fcbb625f..04c76d0277f 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
@@ -114,8 +114,7 @@
                         Margin="0,8,0,0"
                         ChangeHotkey="{Binding SetTogglingHotkeyCommand}"
                         DefaultHotkey="Alt+Space"
-                        Hotkey="{Binding Settings.Hotkey}"
-                        HotkeySettings="{Binding Settings}"
+                        Type="Hotkey"
                         ValidateKeyGesture="True"
                         WindowTitle="{DynamicResource flowlauncherHotkey}" />
                 </StackPanel>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
index 22e3960ef19..b1d72ede5bf 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
@@ -34,8 +34,7 @@
                 <flowlauncher:HotkeyControl
                     ChangeHotkey="{Binding SetTogglingHotkeyCommand}"
                     DefaultHotkey="Alt+Space"
-                    Hotkey="{Binding Settings.Hotkey}"
-                    HotkeySettings="{Binding Settings}"
+                    Type="Hotkey"
                     ValidateKeyGesture="True"
                     WindowTitle="{DynamicResource flowlauncherHotkey}" />
             </cc:Card>
@@ -46,8 +45,7 @@
                 Sub="{DynamicResource previewHotkeyToolTip}">
                 <flowlauncher:HotkeyControl
                     DefaultHotkey="F1"
-                    Hotkey="{Binding Settings.PreviewHotkey}"
-                    HotkeySettings="{Binding Settings}"
+                    Type="PreviewHotkey"
                     ValidateKeyGesture="False"
                     WindowTitle="{DynamicResource previewHotkey}" />
             </cc:Card>
@@ -105,8 +103,7 @@
                         Type="Inside">
                         <flowlauncher:HotkeyControl
                             DefaultHotkey="Ctrl+I"
-                            Hotkey="{Binding Settings.OpenContextMenuHotkey}"
-                            HotkeySettings="{Binding Settings}"
+                            Type="OpenContextMenuHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -127,8 +124,7 @@
                         Type="Inside">
                         <flowlauncher:HotkeyControl
                             DefaultHotkey="Ctrl+I"
-                            Hotkey="{Binding Settings.SettingWindowHotkey}"
-                            HotkeySettings="{Binding Settings}"
+                            Type="SettingWindowHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -149,8 +145,7 @@
                         Type="Inside">
                         <flowlauncher:HotkeyControl
                             DefaultHotkey="Alt+Up"
-                            Hotkey="{Binding Settings.CycleHistoryUpHotkey}"
-                            HotkeySettings="{Binding Settings}"
+                            Type="CycleHistoryUpHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -159,8 +154,7 @@
                         Type="Inside">
                         <flowlauncher:HotkeyControl
                             DefaultHotkey="Alt+Down"
-                            Hotkey="{Binding Settings.CycleHistoryDownHotkey}"
-                            HotkeySettings="{Binding Settings}"
+                            Type="CycleHistoryDownHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -176,8 +170,7 @@
                         Type="Inside">
                         <flowlauncher:HotkeyControl
                             DefaultHotkey=""
-                            Hotkey="{Binding Settings.SelectPrevPageHotkey}"
-                            HotkeySettings="{Binding Settings}"
+                            Type="SelectPrevPageHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
                     <cc:Card
@@ -186,8 +179,7 @@
                         Type="Inside">
                         <flowlauncher:HotkeyControl
                             DefaultHotkey=""
-                            Hotkey="{Binding Settings.SelectNextPageHotkey}"
-                            HotkeySettings="{Binding Settings}"
+                            Type="SelectNextPageHotkey"
                             ValidateKeyGesture="False" />
                     </cc:Card>
 
@@ -221,8 +213,7 @@
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
                         DefaultHotkey="Ctrl+Tab"
-                        Hotkey="{Binding Settings.AutoCompleteHotkey}"
-                        HotkeySettings="{Binding Settings}"
+                        Type="AutoCompleteHotkey"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -231,8 +222,7 @@
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
                         DefaultHotkey=""
-                        Hotkey="{Binding Settings.AutoCompleteHotkey2}"
-                        HotkeySettings="{Binding Settings}"
+                        Type="AutoCompleteHotkey2"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -244,8 +234,7 @@
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
                         DefaultHotkey="Shift+Tab"
-                        Hotkey="{Binding Settings.SelectPrevItemHotkey}"
-                        HotkeySettings="{Binding Settings}"
+                        Type="SelectPrevItemHotkey"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -254,8 +243,7 @@
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
                         DefaultHotkey=""
-                        Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
-                        HotkeySettings="{Binding Settings}"
+                        Type="SelectPrevItemHotkey2"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>
@@ -267,8 +255,7 @@
                 <cc:ExCard.SideContent>
                     <flowlauncher:HotkeyControl
                         DefaultHotkey="Tab"
-                        Hotkey="{Binding Settings.SelectNextItemHotkey}"
-                        HotkeySettings="{Binding Settings}"
+                        Type="SelectNextItemHotkey"
                         ValidateKeyGesture="False" />
                 </cc:ExCard.SideContent>
                 <cc:Card
@@ -277,8 +264,7 @@
                     Type="InsideFit">
                     <flowlauncher:HotkeyControl
                         DefaultHotkey=""
-                        Hotkey="{Binding Settings.SelectNextItemHotkey2}"
-                        HotkeySettings="{Binding Settings}"
+                        Type="SelectNextItemHotkey2"
                         ValidateKeyGesture="False" />
                 </cc:Card>
             </cc:ExCard>

From c68a764dcfcf1842224bee88ed136de67d08f510 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 5 Mar 2025 14:52:14 +0800
Subject: [PATCH 3/4] Improve code quality

---
 Flow.Launcher/HotkeyControl.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index 869774882cd..273d18e3f5d 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -111,7 +111,7 @@ public enum HotkeyType
             SelectNextItemHotkey2
         }
 
-        // We can initialize settings in static field because it has been construct in App constuctor
+        // We can initialize settings in static field because it has been constructed in App constuctor
         // and it will not construct settings instances twice
         private static readonly Settings _settings = Ioc.Default.GetRequiredService<Settings>();
 
@@ -202,7 +202,7 @@ public HotkeyControl()
             RefreshHotkeyInterface(Hotkey);
         }
 
-        public void RefreshHotkeyInterface(string hotkey)
+        private void RefreshHotkeyInterface(string hotkey)
         {
             SetKeysToDisplay(new HotkeyModel(Hotkey));
             CurrentHotkey = new HotkeyModel(Hotkey);

From 8ce4bd92e2d39331b40b5a6cc1344b4dd262a3a6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 6 Mar 2025 10:44:15 +0800
Subject: [PATCH 4/4] Fix page number issue when navigating with keyboard

---
 Flow.Launcher/App.xaml.cs                     |  1 +
 .../Resources/Pages/WelcomePage1.xaml.cs      |  4 ++
 .../Resources/Pages/WelcomePage2.xaml.cs      |  3 +
 .../Resources/Pages/WelcomePage3.xaml.cs      |  4 ++
 .../Resources/Pages/WelcomePage4.xaml.cs      |  4 ++
 .../Resources/Pages/WelcomePage5.xaml.cs      |  4 ++
 Flow.Launcher/ViewModel/WelcomeViewModel.cs   | 68 +++++++++++++++++++
 Flow.Launcher/WelcomeWindow.xaml              | 25 ++++---
 Flow.Launcher/WelcomeWindow.xaml.cs           | 62 ++++++++---------
 9 files changed, 130 insertions(+), 45 deletions(-)
 create mode 100644 Flow.Launcher/ViewModel/WelcomeViewModel.cs

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 447eca79267..07b721b9991 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -64,6 +64,7 @@ public App()
                         .AddSingleton<IPublicAPI, PublicAPIInstance>()
                         .AddSingleton<MainViewModel>()
                         .AddSingleton<Theme>()
+                        .AddSingleton<WelcomeViewModel>()
                     ).Build();
                 Ioc.Default.ConfigureServices(host.Services);
             }
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
index 8d4312ba57a..880bfd9bcc2 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -3,6 +3,7 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Core.Resource;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -11,6 +12,9 @@ public partial class WelcomePage1
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             Settings = Ioc.Default.GetRequiredService<Settings>();
+            // Sometimes the navigation is not triggered by button click,
+            // so we need to reset the page number
+            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 1;
             InitializeComponent();
         }
         private Internationalization _translater => InternationalizationManager.Instance;
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
index 4a4679a4aa3..786b4d5063d 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -16,6 +16,9 @@ public partial class WelcomePage2
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             Settings = Ioc.Default.GetRequiredService<Settings>();
+            // Sometimes the navigation is not triggered by button click,
+            // so we need to reset the page number
+            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 2;
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
index 38cb8642a2d..f59b65c1c4c 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
@@ -1,6 +1,7 @@
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -9,6 +10,9 @@ public partial class WelcomePage3
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             Settings = Ioc.Default.GetRequiredService<Settings>();
+            // Sometimes the navigation is not triggered by button click,
+            // so we need to reset the page number
+            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 3;
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
index fc656893533..4c83f3a83e0 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.ViewModel;
 using System.Windows.Navigation;
 
 namespace Flow.Launcher.Resources.Pages
@@ -9,6 +10,9 @@ public partial class WelcomePage4
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             Settings = Ioc.Default.GetRequiredService<Settings>();
+            // Sometimes the navigation is not triggered by button click,
+            // so we need to reset the page number
+            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 4;
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
index 5327eb5c858..95d7ff1a0d2 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -4,6 +4,7 @@
 using Microsoft.Win32;
 using Flow.Launcher.Infrastructure;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -16,6 +17,9 @@ public partial class WelcomePage5
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             Settings = Ioc.Default.GetRequiredService<Settings>();
+            // Sometimes the navigation is not triggered by button click,
+            // so we need to reset the page number
+            Ioc.Default.GetRequiredService<WelcomeViewModel>().PageNum = 5;
             InitializeComponent();
         }
 
diff --git a/Flow.Launcher/ViewModel/WelcomeViewModel.cs b/Flow.Launcher/ViewModel/WelcomeViewModel.cs
new file mode 100644
index 00000000000..5eecabfde85
--- /dev/null
+++ b/Flow.Launcher/ViewModel/WelcomeViewModel.cs
@@ -0,0 +1,68 @@
+using Flow.Launcher.Plugin;
+
+namespace Flow.Launcher.ViewModel
+{
+    public partial class WelcomeViewModel : BaseModel
+    {
+        public const int MaxPageNum = 5;
+
+        public string PageDisplay => $"{PageNum}/5";
+
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                if (_pageNum != value)
+                {
+                    _pageNum = value;
+                    OnPropertyChanged();
+                    UpdateView();
+                }
+            }
+        }
+
+        private bool _backEnabled = false;
+        public bool BackEnabled
+        {
+            get => _backEnabled;
+            set
+            {
+                _backEnabled = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _nextEnabled = true;
+        public bool NextEnabled
+        {
+            get => _nextEnabled;
+            set
+            {
+                _nextEnabled = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private void UpdateView()
+        {
+            OnPropertyChanged(nameof(PageDisplay));
+            if (PageNum == 1)
+            {
+                BackEnabled = false;
+                NextEnabled = true;
+            }
+            else if (PageNum == MaxPageNum)
+            {
+                BackEnabled = true;
+                NextEnabled = false;
+            }
+            else
+            {
+                BackEnabled = true;
+                NextEnabled = true;
+            }
+        }
+    }
+}
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index 73f423d0ba6..e7c483f89b5 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -6,6 +6,7 @@
     xmlns:local="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
+    xmlns:vm="clr-namespace:Flow.Launcher.ViewModel"
     Name="FlowWelcomeWindow"
     Title="{DynamicResource Welcome_Page1_Title}"
     Width="550"
@@ -14,8 +15,10 @@
     MinHeight="650"
     MaxWidth="550"
     MaxHeight="650"
+    d:DataContext="{d:DesignInstance Type=vm:WelcomeViewModel}"
     Activated="OnActivated"
     Background="{DynamicResource Color00B}"
+    Closed="Window_Closed"
     Foreground="{DynamicResource PopupTextColor}"
     MouseDown="window_MouseDown"
     WindowStartupLocation="CenterScreen"
@@ -41,12 +44,12 @@
                         Grid.Column="0"
                         Width="16"
                         Height="16"
-                        Margin="10,4,4,4"
+                        Margin="10 4 4 4"
                         RenderOptions.BitmapScalingMode="HighQuality"
                         Source="/Images/app.png" />
                     <TextBlock
                         Grid.Column="1"
-                        Margin="4,0,0,0"
+                        Margin="4 0 0 0"
                         VerticalAlignment="Center"
                         FontSize="12"
                         Foreground="{DynamicResource Color05B}"
@@ -95,7 +98,7 @@
             Grid.Row="1"
             Background="{DynamicResource Color00B}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="130" />
@@ -109,11 +112,11 @@
                     VerticalAlignment="Center">
                     <TextBlock
                         Name="PageNavigation"
-                        Margin="0,2,0,0"
+                        Margin="0 2 0 0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         FontSize="14"
-                        Text="{Binding PageDisplay, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                        Text="{Binding PageDisplay, Mode=OneWay}"
                         TextAlignment="Center" />
                 </StackPanel>
 
@@ -122,25 +125,26 @@
                     Grid.Column="0"
                     Width="100"
                     Height="40"
-                    Margin="20,5,0,5"
+                    Margin="20 5 0 5"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource Skip}"
                     DockPanel.Dock="Right"
                     FontSize="14" />
                 <DockPanel
                     Grid.Column="2"
-                    Margin="0,0,20,0"
+                    Margin="0 0 20 0"
                     VerticalAlignment="Stretch">
                     <Button
                         x:Name="NextButton"
                         Width="40"
                         Height="40"
-                        Margin="8,5,0,5"
+                        Margin="8 5 0 5"
                         Click="ForwardButton_Click"
                         Content="&#xe76c;"
                         DockPanel.Dock="Right"
                         FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="18" />
+                        FontSize="18"
+                        IsEnabled="{Binding NextEnabled, Mode=OneWay}" />
                     <Button
                         x:Name="BackButton"
                         Width="40"
@@ -149,7 +153,8 @@
                         Content="&#xe76b;"
                         DockPanel.Dock="Right"
                         FontFamily="/Resources/#Segoe Fluent Icons"
-                        FontSize="18" />
+                        FontSize="18"
+                        IsEnabled="{Binding BackEnabled, Mode=OneWay}" />
                     <StackPanel />
                 </DockPanel>
 
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
index 1d55b5741a2..637f9448d9a 100644
--- a/Flow.Launcher/WelcomeWindow.xaml.cs
+++ b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -4,69 +4,55 @@
 using System.Windows.Controls;
 using Flow.Launcher.Resources.Pages;
 using ModernWpf.Media.Animation;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.ViewModel;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher
 {
     public partial class WelcomeWindow : Window
     {
-        public WelcomeWindow()
-        {
-            InitializeComponent();
-            BackButton.IsEnabled = false;
-        }
+        private readonly WelcomeViewModel _viewModel;
 
-        private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()
+        private readonly NavigationTransitionInfo _forwardTransitionInfo = new SlideNavigationTransitionInfo()
         {
             Effect = SlideNavigationTransitionEffect.FromRight
         };
-        private NavigationTransitionInfo _backTransitionInfo = new SlideNavigationTransitionInfo()
+        private readonly NavigationTransitionInfo _backTransitionInfo = new SlideNavigationTransitionInfo()
         {
             Effect = SlideNavigationTransitionEffect.FromLeft
         };
 
-        private int pageNum = 1;
-        private int MaxPage = 5;
-        public string PageDisplay => $"{pageNum}/5";
+        public WelcomeWindow()
+        {
+            _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
+            DataContext = _viewModel;
+            InitializeComponent();
+        }
 
-        private void UpdateView()
+        private void ForwardButton_Click(object sender, RoutedEventArgs e)
         {
-            PageNavigation.Text = PageDisplay;
-            if (pageNum == 1)
+            if (_viewModel.PageNum < WelcomeViewModel.MaxPageNum)
             {
-                BackButton.IsEnabled = false;
-                NextButton.IsEnabled = true;
-            }
-            else if (pageNum == MaxPage)
-            {
-                BackButton.IsEnabled = true;
-                NextButton.IsEnabled = false;
+                _viewModel.PageNum++;
+                ContentFrame.Navigate(PageTypeSelector(_viewModel.PageNum), null, _forwardTransitionInfo);
             }
             else
             {
-                BackButton.IsEnabled = true;
-                NextButton.IsEnabled = true;
+                _viewModel.NextEnabled = false;
             }
         }
 
-        private void ForwardButton_Click(object sender, RoutedEventArgs e)
-        {
-            pageNum++;
-            UpdateView();
-
-            ContentFrame.Navigate(PageTypeSelector(pageNum), null, _transitionInfo);
-        }
-
         private void BackwardButton_Click(object sender, RoutedEventArgs e)
         {
-            if (pageNum > 1)
+            if (_viewModel.PageNum > 1)
             {
-                pageNum--;
-                UpdateView();
-                ContentFrame.Navigate(PageTypeSelector(pageNum), null, _backTransitionInfo);
+                _viewModel.PageNum--;
+                ContentFrame.Navigate(PageTypeSelector(_viewModel.PageNum), null, _backTransitionInfo);
             }
             else
             {
-                BackButton.IsEnabled = false;
+                _viewModel.BackEnabled = false;
             }
         }
 
@@ -107,5 +93,11 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
         {
             ContentFrame.Navigate(PageTypeSelector(1)); /* Set First Page */
         }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            // Save settings when window is closed
+            Ioc.Default.GetRequiredService<Settings>().Save();
+        }
     }
 }