From 94420f8c5129dfffabaf2362a0d25f82ba09d02b Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Thu, 19 Oct 2023 21:27:33 +0200
Subject: [PATCH] remove useless switch statements (all themes result in the
 same case)

---
 .../res/xml-sw600dp/key_styles_common.xml     | 63 +++++--------------
 app/src/main/res/xml/key_styles_common.xml    | 63 +++++--------------
 2 files changed, 28 insertions(+), 98 deletions(-)

diff --git a/app/src/main/res/xml-sw600dp/key_styles_common.xml b/app/src/main/res/xml-sw600dp/key_styles_common.xml
index ab60299e..15cc4104 100644
--- a/app/src/main/res/xml-sw600dp/key_styles_common.xml
+++ b/app/src/main/res/xml-sw600dp/key_styles_common.xml
@@ -72,57 +72,22 @@
         </default>
     </switch>
     <!-- numpadKeyStyle -->
-    <switch>
-        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
-            <key-style
-                latin:styleName="numpadKeyStyle"
-                latin:keySpec="!icon/numpad_key|!code/key_numpad"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="numpadKeyStyle"
-                latin:keySpec="!icon/numpad_key|!code/key_numpad"
-                latin:keyLabelFlags="keepBackgroundAspectRatio"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </default>
-    </switch>
+    <key-style
+        latin:styleName="numpadKeyStyle"
+        latin:keySpec="!icon/numpad_key|!code/key_numpad"
+        latin:keyActionFlags="noKeyPreview"
+        latin:backgroundType="functional" />
     <!-- alphaNumpadKeyStyle -->
-    <switch>
-        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
-            <key-style
-                latin:styleName="alphaNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="alphaNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
-                latin:keyLabelFlags="keepBackgroundAspectRatio"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </default>
-    </switch>
+    <key-style
+        latin:styleName="alphaNumpadKeyStyle"
+        latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
+        latin:keyActionFlags="noKeyPreview"
+        latin:backgroundType="functional" />
     <!-- symbolNumpadKeyStyle -->
-    <switch>
-        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
-            <key-style
-                latin:styleName="symbolNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
-                latin:keyActionFlags="noKeyPreview" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="symbolNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
-                latin:keyLabelFlags="keepBackgroundAspectRatio"
-                latin:keyActionFlags="noKeyPreview" />
-        </default>
-    </switch>
+    <key-style
+        latin:styleName="symbolNumpadKeyStyle"
+        latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
+        latin:keyActionFlags="noKeyPreview" />
     <key-style
         latin:styleName="deleteKeyStyle"
         latin:keySpec="!icon/delete_key|!code/key_delete"
diff --git a/app/src/main/res/xml/key_styles_common.xml b/app/src/main/res/xml/key_styles_common.xml
index c9c80218..d9f808cd 100644
--- a/app/src/main/res/xml/key_styles_common.xml
+++ b/app/src/main/res/xml/key_styles_common.xml
@@ -96,57 +96,22 @@
         </default>
     </switch>
     <!-- numpadKeyStyle -->
-    <switch>
-        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
-            <key-style
-                latin:styleName="numpadKeyStyle"
-                latin:keySpec="!icon/numpad_key|!code/key_numpad"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="numpadKeyStyle"
-                latin:keySpec="!icon/numpad_key|!code/key_numpad"
-                latin:keyLabelFlags="keepBackgroundAspectRatio"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </default>
-    </switch>
+    <key-style
+        latin:styleName="numpadKeyStyle"
+        latin:keySpec="!icon/numpad_key|!code/key_numpad"
+        latin:keyActionFlags="noKeyPreview"
+        latin:backgroundType="functional" />
     <!-- alphaNumpadKeyStyle -->
-    <switch>
-        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
-            <key-style
-                latin:styleName="alphaNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="alphaNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
-                latin:keyLabelFlags="keepBackgroundAspectRatio"
-                latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional" />
-        </default>
-    </switch>
+    <key-style
+        latin:styleName="alphaNumpadKeyStyle"
+        latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
+        latin:keyActionFlags="noKeyPreview"
+        latin:backgroundType="functional" />
     <!-- symbolNumpadKeyStyle -->
-    <switch>
-        <case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
-            <key-style
-                latin:styleName="symbolNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
-                latin:keyActionFlags="noKeyPreview" />
-        </case>
-        <default>
-            <key-style
-                latin:styleName="symbolNumpadKeyStyle"
-                latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
-                latin:keyLabelFlags="keepBackgroundAspectRatio"
-                latin:keyActionFlags="noKeyPreview" />
-        </default>
-    </switch>
+    <key-style
+        latin:styleName="symbolNumpadKeyStyle"
+        latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
+        latin:keyActionFlags="noKeyPreview" />
     <include
         latin:keyboardLayout="@xml/key_styles_enter" />
     <!-- TODO: Currently there is no way to specify icon alignment per theme. -->