Merge pull request #20 from jeremy-visionaid/reduce-allocations

Reduce allocations

Author: davidortinau

src/Plugin.Maui.KeyListener/KeyboardKeysExtensions.Windows.cs

@@ -4,13 +4,15 @@
 
 namespace Plugin.Maui.KeyListener;
 
-internal static class KeyboardKeysExtensions
+internal static partial class KeyboardKeysExtensions
 {
+	static readonly VirtualKey[] VirtualKeyValues = Enum.GetValues<VirtualKey>();
+
 	internal static VirtualKey ToPlatformKeys(this KeyboardKeys keyboardKeys)
 	{
 		List<VirtualKey> platformKeyValues = new();
 
-		foreach (KeyboardKeys keyboardKey in Enum.GetValues(typeof(KeyboardKeys)))
+		foreach (KeyboardKeys keyboardKey in KeyboardKeysValues)
 		{
 			if (keyboardKeys.HasFlag(keyboardKey))
 			{
@@ -30,7 +32,7 @@ internal static List<VirtualKey> ToPlatformKeyValues(this KeyboardKeys keyboardK
 	{
 		List<VirtualKey> platformKeyValues = new();
 
-		foreach (KeyboardKeys keyboardKey in Enum.GetValues(typeof(KeyboardKeys)))
+		foreach (KeyboardKeys keyboardKey in KeyboardKeysValues)
 		{
 			if (keyboardKeys.HasFlag(keyboardKey))
 			{
@@ -47,7 +49,7 @@ internal static KeyboardKeys ToKeyboardKeys(this VirtualKey platformKeys)
 	{
 		List<KeyboardKeys> keyboardKeyValues = new();
 
-		foreach (VirtualKey platformKey in Enum.GetValues(typeof(VirtualKey)))
+		foreach (VirtualKey platformKey in VirtualKeyValues)
 		{
 			if (platformKeys.HasFlag(platformKey))
 			{

src/Plugin.Maui.KeyListener/KeyboardKeysExtensions.cs

@@ -0,0 +1,6 @@
+namespace Plugin.Maui.KeyListener;
+
+internal static partial class KeyboardKeysExtensions
+{
+	static readonly KeyboardKeys[] KeyboardKeysValues = Enum.GetValues<KeyboardKeys>();
+}

src/Plugin.Maui.KeyListener/KeyboardKeysExtensions.iOS.cs

@@ -3,13 +3,15 @@
 
 namespace Plugin.Maui.KeyListener;
 
-internal static class KeyboardKeysExtensions
+internal static partial class KeyboardKeysExtensions
 {
+    static readonly UIKeyboardHidUsage[] UIKeyboardHidUsages = Enum.GetValues<UIKeyboardHidUsage>();
+
     internal static UIKeyboardHidUsage ToPlatformKeys(this KeyboardKeys keyboardKeys)
     {
         List<UIKeyboardHidUsage> platformKeyValues = new();
 
-        foreach (KeyboardKeys keyboardKey in Enum.GetValues(typeof(KeyboardKeys)))
+        foreach (KeyboardKeys keyboardKey in KeyboardKeysValues)
         {
             if (keyboardKeys.HasFlag(keyboardKey))
             {
@@ -29,7 +31,7 @@ internal static List<UIKeyboardHidUsage> ToPlatformKeyValues(this KeyboardKeys k
     {
         List<UIKeyboardHidUsage> platformKeyValues = new();
 
-        foreach (KeyboardKeys keyboardKey in Enum.GetValues(typeof(KeyboardKeys)))
+        foreach (KeyboardKeys keyboardKey in KeyboardKeysValues)
         {
             if (keyboardKeys.HasFlag(keyboardKey))
             {
@@ -47,7 +49,7 @@ internal static KeyboardKeys ToKeyboardKeys(this UIKeyboardHidUsage platformKeys
     {
         List<KeyboardKeys> keyboardKeyValues = new();
 
-        foreach (UIKeyboardHidUsage platformKey in Enum.GetValues(typeof(UIKeyboardHidUsage)))
+        foreach (UIKeyboardHidUsage platformKey in UIKeyboardHidUsages)
         {
             if (platformKeys.HasFlag(platformKey))
             {

src/Plugin.Maui.KeyListener/KeyboardModifiersExtensions.iOS.cs

@@ -5,63 +5,39 @@ namespace Plugin.Maui.KeyListener;
 
 internal static class KeyboardModifiersExtensions
 {
+    static readonly KeyboardModifiers[] VirtualModifiersValues = Enum.GetValues<KeyboardModifiers>();
+
+    static readonly UIKeyModifierFlags[] UIKeyModifierFlagsValues = Enum.GetValues<UIKeyModifierFlags>();
+
     internal static UIKeyModifierFlags ToPlatformModifiers(this KeyboardModifiers virtualModifiers)
     {
-        List<UIKeyModifierFlags> platformModifierValues = new();
+        UIKeyModifierFlags platformModifiers = 0;
 
-        foreach (KeyboardModifiers virtualModifier in Enum.GetValues(typeof(KeyboardModifiers)))
+        foreach (KeyboardModifiers virtualModifier in VirtualModifiersValues)
         {
             if (virtualModifiers.HasFlag(virtualModifier))
             {
                 UIKeyModifierFlags platformModifier = ToPlatformModifier(virtualModifier);
-
-                if (platformModifier != 0)
-                    platformModifierValues.Add(platformModifier);
+                platformModifiers |= platformModifier;
             }
         }
 
-        var platformModifiers = ToPlatformModifiers(platformModifierValues);
-
         return platformModifiers;
     }
 
     internal static KeyboardModifiers ToVirtualModifiers(this UIKeyModifierFlags platformModifiers)
     {
-        List<KeyboardModifiers> virtualModifierValues = new();
+        KeyboardModifiers virtualModifiers = 0;
 
-        foreach (UIKeyModifierFlags platformModifier in Enum.GetValues(typeof(UIKeyModifierFlags)))
+        foreach (UIKeyModifierFlags platformModifier in UIKeyModifierFlagsValues)
         {
             if (platformModifiers.HasFlag(platformModifier))
             {
                 KeyboardModifiers virtualModifier = ToVirtualModifier(platformModifier);
-
-                if (virtualModifier != 0)
-                    virtualModifierValues.Add(virtualModifier);
+                virtualModifiers |= virtualModifier;
             }
         }
 
-        var virtualModifiers = ToVirtualModifiers(virtualModifierValues);
-
-        return virtualModifiers;
-    }
-
-    static UIKeyModifierFlags ToPlatformModifiers(List<UIKeyModifierFlags> platformModifierValues)
-    {
-        UIKeyModifierFlags platformModifiers = 0;
-
-        foreach (UIKeyModifierFlags platformModifier in platformModifierValues)
-            platformModifiers |= platformModifier;
-
-        return platformModifiers;
-    }
-
-    static KeyboardModifiers ToVirtualModifiers(List<KeyboardModifiers> virtualModifierValues)
-    {
-        KeyboardModifiers virtualModifiers = 0;
-
-        foreach (KeyboardModifiers virtualModifer in virtualModifierValues)
-            virtualModifiers |= virtualModifer;
-
         return virtualModifiers;
     }