rename

Author: JiuLing-zhang

src/ComputerLock/App.xaml.cs

@@ -40,12 +40,12 @@ private void Init()
         services.AddSingleton<AppSettings>((sp) =>
         {
             var appSettings = sp.GetRequiredService<AppSettingsProvider>().LoadSettings();
-            var hotKeyTools = sp.GetRequiredService<HotKeyTools>();
-            appSettings.Initialize(hotKeyTools);
+            var hotkeyTools = sp.GetRequiredService<HotkeyTools>();
+            appSettings.Initialize(hotkeyTools);
             return appSettings;
         });
         services.AddSingleton(LogManager.GetLogger());
-        services.AddSingleton<HotKeyHook>();
+        services.AddSingleton<HotkeyHook>();
         services.AddSingleton<MouseHook>();
         services.AddSingleton<UpdateHelper>();
         services.AddSingleton<AutostartHook>();
@@ -55,7 +55,7 @@ private void Init()
         services.AddTransient<WindowLockScreen>();
         services.AddTransient<WindowBlankScreen>();
         services.AddSingleton<SystemKeyHook>();
-        services.AddSingleton<HotKeyTools>();
+        services.AddSingleton<HotkeyTools>();
         services.AddSingleton<IWindowMoving, WindowMoving>();
         services.AddSingleton<IWindowTitleBar, WindowTitleBar>();
         services.AddSingleton<IGlobalLockService, GlobalLockService>();

src/ComputerLock/Components/ShortcutKeySetting.razor.cs

@@ -15,7 +15,7 @@ public partial class ShortcutKeySetting
     private IStringLocalizer<Lang> Lang { get; set; } = default!;
 
     [Inject]
-    private HotKeyTools HotKeyTools { get; set; } = default!;
+    private HotkeyTools HotkeyTools { get; set; } = default!;
 
     protected override async Task OnInitializedAsync()
     {
@@ -58,7 +58,7 @@ private Task OnKeyDown(KeyboardEventArgs value)
         if ((ascii >= 48 && ascii <= 57) || (ascii >= 65 && ascii <= 90))
         {
             _key += $"{ascii}";
-            _text = HotKeyTools.StringKeyToDisplay(_key);
+            _text = HotkeyTools.StringKeyToDisplay(_key);
         }
         else
         {

src/ComputerLock/Configuration/AppSettings.cs

@@ -4,11 +4,11 @@ namespace ComputerLock.Configuration;
 public class AppSettings
 {
     [JsonIgnore]
-    private HotKeyTools? _hotKeyTools;
+    private HotkeyTools? _hotkeyTools;
 
-    public void Initialize(HotKeyTools hotKeyTools)
+    public void Initialize(HotkeyTools hotkeyTools)
     {
-        _hotKeyTools = hotKeyTools;
+        _hotkeyTools = hotkeyTools;
     }
 
     /// <summary>
@@ -79,13 +79,13 @@ public void Initialize(HotKeyTools hotKeyTools)
     /// 锁屏快捷键(映射到按键名称，用于主界面显示)
     /// </summary>
     [JsonIgnore]
-    public string LockHotKeyDisplay => _hotKeyTools?.StringKeyToDisplay(ShortcutKeyForLock) ?? "";
+    public string LockHotkeyDisplay => _hotkeyTools?.StringKeyToDisplay(ShortcutKeyForLock) ?? "";
 
     /// <summary>
     /// 锁屏快捷键
     /// </summary>
     [JsonIgnore]
-    public HotKey? LockHotKey => _hotKeyTools?.StringKeyToHotKey(ShortcutKeyForLock);
+    public Hotkey? LockHotkey => _hotkeyTools?.StringKeyToHotkey(ShortcutKeyForLock);
 
 
     /// <summary>

…c/ComputerLock/Enums/HotkeyModifiers2.cs src/ComputerLock/Enums/HotkeyModifiers.cssrc/ComputerLock/Enums/HotkeyModifiers2.cs renamed to src/ComputerLock/Enums/HotkeyModifiers.cs src/ComputerLock/Enums/HotkeyModifiers2.cs renamed to src/ComputerLock/Enums/HotkeyModifiers.cs

@@ -4,7 +4,7 @@
 /// 热键修饰键
 /// </summary>
 [Flags]
-public enum HotKeyModifiers : uint
+public enum HotkeyModifiers : uint
 {
     Alt = 1,
     Control = 2,

src/ComputerLock/Models/Hotkey.cs

@@ -0,0 +1,7 @@
+namespace ComputerLock.Models;
+
+public class Hotkey(HotkeyModifiers modifiers, Keys key)
+{
+    public HotkeyModifiers Modifiers { get; set; } = modifiers;
+    public Keys Key { get; set; } = key;
+}

src/ComputerLock/Models/Hotkey2.cs

@@ -1,32 +1,32 @@
 namespace ComputerLock.Models;
 
-public class HotKeyTools(IStringLocalizer<Lang> lang)
+public class HotkeyTools(IStringLocalizer<Lang> lang)
 {
-    public HotKey? StringKeyToHotKey(string shortcutKey)
+    public Hotkey? StringKeyToHotkey(string shortcutKey)
     {
         if (shortcutKey.IsEmpty())
         {
             return null;
         }
 
-        HotKeyModifiers modifiers = 0;
+        HotkeyModifiers modifiers = 0;
         if (shortcutKey.IndexOf("Ctrl") >= 0)
         {
-            modifiers |= HotKeyModifiers.Control;
+            modifiers |= HotkeyModifiers.Control;
         }
         if (shortcutKey.IndexOf("Shift") >= 0)
         {
-            modifiers |= HotKeyModifiers.Shift;
+            modifiers |= HotkeyModifiers.Shift;
         }
         if (shortcutKey.IndexOf("Alt") >= 0)
         {
-            modifiers |= HotKeyModifiers.Alt;
+            modifiers |= HotkeyModifiers.Alt;
         }
 
         string[] keyParts = shortcutKey.Split([" + "], StringSplitOptions.None);
         int keyCode = int.Parse(keyParts[^1]);
         Keys key = (Keys)keyCode;
-        return new HotKey(modifiers, key);
+        return new Hotkey(modifiers, key);
     }
 
     public string StringKeyToDisplay(string shortcutKey)

src/ComputerLock/Models/HotkeyTools2.cs src/ComputerLock/Models/HotkeyTools.cssrc/ComputerLock/Models/HotkeyTools2.cs renamed to src/ComputerLock/Models/HotkeyTools.cs

@@ -51,7 +51,7 @@ else
                    Size="Size.Small"
                    Color="Color.Primary"
                    OnClick="SetShortcutKey">
-            @(AppSettings.LockHotKeyDisplay)
+            @(AppSettings.LockHotkeyDisplay)
         </MudButton>
         @if (AppSettings.ShortcutKeyForLock.IsNotEmpty())
         {

src/ComputerLock/Pages/Index.razor

@@ -26,7 +26,7 @@ public partial class Index
     private IGlobalLockService GlobalLockService { get; set; } = default!;
 
     [Inject]
-    private HotKeyHook HotKeyHook { get; set; } = default!;
+    private HotkeyHook HotkeyHook { get; set; } = default!;
 
     [Inject]
     private IWindowTitleBar WindowTitleBar { get; set; } = default!;
@@ -45,10 +45,10 @@ protected override async Task OnInitializedAsync()
 
         if (AppSettings.ShortcutKeyForLock.IsNotTrimEmpty())
         {
-            RegisterHotKey();
+            RegisterHotkey();
         }
 
-        HotKeyHook.HotKeyPressed += () =>
+        HotkeyHook.HotkeyPressed += () =>
         {
             if (GlobalLockService.IsLocked)
             {
@@ -167,24 +167,24 @@ private async Task SetShortcutKey()
 
         AppSettings.ShortcutKeyForLock = result.Data!.ToString()!;
         SaveSettings();
-        RegisterHotKey();
+        RegisterHotkey();
     }
     private Task ClearShortcutKey()
     {
         AppSettings.ShortcutKeyForLock = "";
         SaveSettings();
-        UnregisterHotKey();
+        UnregisterHotkey();
         return Task.CompletedTask;
     }
 
-    public void RegisterHotKey()
+    public void RegisterHotkey()
     {
         try
         {
-            if (AppSettings.LockHotKey != null)
+            if (AppSettings.LockHotkey != null)
             {
                 Logger.Write("注册锁屏热键");
-                HotKeyHook.Register(AppSettings.LockHotKey);
+                HotkeyHook.Register(AppSettings.LockHotkey);
             }
         }
         catch (Exception ex)
@@ -194,12 +194,12 @@ public void RegisterHotKey()
         }
     }
 
-    public void UnregisterHotKey()
+    public void UnregisterHotkey()
     {
         try
         {
             Logger.Write("释放锁屏热键");
-            HotKeyHook.Unregister();
+            HotkeyHook.Unregister();
         }
         catch (Exception ex)
         {

src/ComputerLock/Pages/Index.razor.cs

@@ -5,7 +5,7 @@ namespace ComputerLock.Platforms;
 /// <summary>
 /// 快捷键钩子
 /// </summary>
-public class HotKeyHook : IDisposable
+public class HotkeyHook : IDisposable
 {
     [DllImport("user32.dll")]
     private static extern bool RegisterHotKey(IntPtr hWnd, int id, uint fsModifiers, uint vk);
@@ -16,13 +16,13 @@ public class HotKeyHook : IDisposable
     private const int HotkeyId = 90;
     private bool _isRegistered;
 
-    public event Action? HotKeyPressed;
+    public event Action? HotkeyPressed;
 
-    private sealed class HotKeyNativeWindow : NativeWindow
+    private sealed class HotkeyNativeWindow : NativeWindow
     {
-        public event Action? OnHotKeyPressed;
+        public event Action? OnHotkeyPressed;
 
-        public HotKeyNativeWindow()
+        public HotkeyNativeWindow()
         {
             this.CreateHandle(new CreateParams());
         }
@@ -33,7 +33,7 @@ protected override void WndProc(ref Message m)
             {
                 if (m.WParam.ToInt32() == HotkeyId)
                 {
-                    OnHotKeyPressed?.Invoke();
+                    OnHotkeyPressed?.Invoke();
                 }
             }
             else
@@ -43,18 +43,18 @@ protected override void WndProc(ref Message m)
         }
     }
 
-    private readonly HotKeyNativeWindow _nativeWindow;
+    private readonly HotkeyNativeWindow _nativeWindow;
 
-    public HotKeyHook()
+    public HotkeyHook()
     {
-        _nativeWindow = new HotKeyNativeWindow();
-        _nativeWindow.OnHotKeyPressed += () => HotKeyPressed?.Invoke();
+        _nativeWindow = new HotkeyNativeWindow();
+        _nativeWindow.OnHotkeyPressed += () => HotkeyPressed?.Invoke();
     }
 
     /// <summary>
     /// 注册快捷键
     /// </summary>
-    public void Register(HotKey hotKey)
+    public void Register(Hotkey hotKey)
     {
         if (_isRegistered)
         {
@@ -99,7 +99,7 @@ protected virtual void Dispose(bool disposing)
         _nativeWindow.DestroyHandle();
     }
 
-    ~HotKeyHook()
+    ~HotkeyHook()
     {
         Dispose(false);
     }