Refactor KeyPressMessage

Author: CodingOctocat

IPConfig/Models/Messages/KeyPressMessage.cs

@@ -1,24 +1,18 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Windows.Input;
 
 namespace IPConfig.Models.Messages;
 
 public class KeyPressMessage : ISender
 {
-    public KeyEventArgs? Args { get; }
+    public KeyEventArgs Args { get; }
 
     public string Gesture { get; private set; }
 
     public object Sender { get; }
 
-    public KeyPressMessage(object sender, string gesture)
-    {
-        Sender = sender;
-        Gesture = gesture;
-    }
-
     public KeyPressMessage(object sender, KeyEventArgs args)
     {
         Sender = sender;
@@ -27,40 +21,31 @@ public KeyPressMessage(object sender, KeyEventArgs args)
         GetGesture();
     }
 
-    [MemberNotNull(nameof(Gesture))]
-    private void GetGesture()
+    public bool GestureEquals(string gestureString)
     {
-        var keys = new List<string>();
+        var gestureConverter = new KeyGestureConverter();
+        var keyGesture = gestureConverter.ConvertFromInvariantString(gestureString) as KeyGesture;
+        string? normalizedGestureString = keyGesture?.GetDisplayStringForCulture(CultureInfo.InvariantCulture);
 
-        if (Args!.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Windows))
+        if (normalizedGestureString is not null)
         {
-            keys.Add("Win");
+            return normalizedGestureString.Equals(Gesture, StringComparison.OrdinalIgnoreCase);
         }
 
-        if (Args.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Control))
-        {
-            keys.Add("Ctrl");
-        }
-
-        if (Args.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Alt))
-        {
-            keys.Add("Alt");
-        }
-
-        if (Args.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Shift))
-        {
-            keys.Add("Shift");
-        }
+        return false;
+    }
 
-        if (Args.Key == Key.Escape)
+    [MemberNotNull(nameof(Gesture))]
+    private void GetGesture()
+    {
+        try
         {
-            keys.Add("Esc");
+            var gesture = new KeyGesture(Args.Key, Args.KeyboardDevice.Modifiers);
+            Gesture = gesture.GetDisplayStringForCulture(CultureInfo.InvariantCulture);
         }
-        else
+        catch (NotSupportedException)
         {
-            keys.Add(Args.Key.ToString());
+            Gesture = Args.Key.ToString();
         }
-
-        Gesture = String.Join('+', keys);
     }
 }

IPConfig/Views/IPConfigDetailView.xaml.cs

@@ -29,7 +29,7 @@ public IPConfigDetailView()
 
         WeakReferenceMessenger.Default.Register<IPConfigDetailView, KeyPressMessage>(this,
             (r, m) => {
-                if (m.Gesture == "F2")
+                if (m.GestureEquals("F2"))
                 {
                     tbIPConfigName.Focus();
                     tbIPConfigName.SelectAll();

IPConfig/Views/IPConfigListView.xaml.cs

@@ -37,11 +37,11 @@ public IPConfigListView()
 
         WeakReferenceMessenger.Default.Register<IPConfigListView, KeyPressMessage>(this,
             (r, m) => {
-                if (m.Gesture == "Ctrl+F")
+                if (m.GestureEquals("Ctrl+F"))
                 {
                     tbSearchBar.Focus();
                 }
-                else if (m.Gesture == "Esc" && Keyboard.FocusedElement == tbSearchBar)
+                else if (m.GestureEquals("Esc") && Keyboard.FocusedElement == tbSearchBar)
                 {
                     string text = tbSearchBar.Text;
 
@@ -52,7 +52,7 @@ public IPConfigListView()
                         lbIPConfigs.Focus();
                     }
                 }
-                else if (m.Gesture == "F9")
+                else if (m.GestureEquals("F9"))
                 {
                     lbIPConfigs.UpdateLayout();