Code quality

Author: Jack251970

Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs

@@ -25,13 +25,10 @@ public static class QuickSwitch
 
         private static UnhookWinEventSafeHandle _hookWinEventSafeHandle = null;
 
-        public static void Initialize(Action<HotkeyModel, EventHandler<HotkeyEventArgs>> setHotkeyAction)
+        public static bool Initialize()
         {
             try
             {
-                // Inspired from: https://github.com/citelao/dotnet_win32/blob/c830132d84eeed3a77e3a6e7f9ed6109258c7947/window_events/Program.cs
-                // Here we use an UnhookWinEventSafeHandle as return value so the result is IDisposable and
-                // can be cleaned up automatically for us.
                 _hookWinEventSafeHandle = PInvoke.SetWinEventHook(
                     PInvoke.EVENT_SYSTEM_FOREGROUND,
                     PInvoke.EVENT_SYSTEM_FOREGROUND,
@@ -44,18 +41,22 @@ public static void Initialize(Action<HotkeyModel, EventHandler<HotkeyEventArgs>>
                 if (_hookWinEventSafeHandle.IsInvalid)
                 {
                     Log.Error("Failed to set window event hook");
-                    return;
+                    return false;
                 }
 
-                setHotkeyAction(new HotkeyModel("Alt+G"), (_, _) =>
-                {
-                    NavigateDialogPath(_automation.ElementFromHandle(Win32Helper.GetForegroundWindow()));
-                });
+                return true;
             }
             catch (System.Exception e)
             {
                 Log.Exception(nameof(QuickSwitch), "Failed to initialize QuickSwitch", e);
             }
+
+            return false;
+        }
+
+        public static void OnToggleHotkey(object sender, HotkeyEventArgs args)
+        {
+            NavigateDialogPath(_automation.ElementFromHandle(Win32Helper.GetForegroundWindow()));
         }
 
         private static void NavigateDialogPath(IUIAutomationElement window)

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -53,6 +53,7 @@ public void Save()
         public string SettingWindowHotkey { get; set; } = $"Ctrl+I";
         public string CycleHistoryUpHotkey { get; set; } = $"{KeyConstant.Alt} + Up";
         public string CycleHistoryDownHotkey { get; set; } = $"{KeyConstant.Alt} + Down";
+        public string QuickSwitchHotkey { get; set; } = $"{KeyConstant.Alt} + G";
 
         public string Language
         {

Flow.Launcher/App.xaml.cs

@@ -334,7 +334,7 @@ protected virtual void Dispose(bool disposing)
                     // since some resources owned by the thread need to be disposed.
                     _mainWindow?.Dispatcher.Invoke(_mainWindow.Dispose);
                     _mainVM?.Dispose();
-                    Infrastructure.QuickSwitch.QuickSwitch.Dispose();
+                    HotKeyMapper.Dispose();
                 }
 
                 Log.Info("|App.Dispose|End Flow Launcher dispose ----------------------------------------------------");

Flow.Launcher/Helper/HotKeyMapper.cs

@@ -1,12 +1,13 @@
-using Flow.Launcher.Infrastructure.Hotkey;
+using System;
+using ChefKeys;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Infrastructure.QuickSwitch;
 using Flow.Launcher.Infrastructure.UserSettings;
-using System;
+using Flow.Launcher.ViewModel;
 using NHotkey;
 using NHotkey.Wpf;
-using Flow.Launcher.ViewModel;
-using ChefKeys;
-using Flow.Launcher.Infrastructure.Logger;
-using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Helper;
 
@@ -23,7 +24,15 @@ internal static void Initialize()
         SetHotkey(_settings.Hotkey, OnToggleHotkey);
         LoadCustomPluginHotkey();
 
-        Infrastructure.QuickSwitch.QuickSwitch.Initialize(SetHotkey);
+        if (QuickSwitch.Initialize())
+        {
+            SetHotkey(_settings.QuickSwitchHotkey, QuickSwitch.OnToggleHotkey);
+        }
+    }
+
+    internal static void Dispose()
+    {
+        QuickSwitch.Dispose();
     }
 
     internal static void OnToggleHotkey(object sender, HotkeyEventArgs args)