From 6ce3873656b7c12aeea091d9a7e7467d467bd26f Mon Sep 17 00:00:00 2001
From: "pdroidandroid@gmail.com" <MajeurAndroid@users.noreply.github.com>
Date: Mon, 16 May 2022 15:38:57 +0200
Subject: [PATCH] Replaced number more keys with symbols when number row is
 enabled (qwerty, qwertz, azerty, bepo)

---
 .../res/xml/rowkeys_armenian_phonetic1.xml    | 137 ++++++++++------
 app/src/main/res/xml/rowkeys_bepo1.xml        | 152 ++++++++++++------
 .../main/res/xml/rowkeys_qwertz1_left5.xml    |  81 +++++++---
 .../main/res/xml/rowkeys_qwertz1_right5.xml   |  83 +++++++---
 4 files changed, 305 insertions(+), 148 deletions(-)

diff --git a/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml b/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml
index 6289d3c1b..78be7c684 100644
--- a/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml
+++ b/app/src/main/res/xml/rowkeys_armenian_phonetic1.xml
@@ -19,54 +19,91 @@
 -->
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
-    <Key
-        latin:keySpec="&#x0567;"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <!-- U+0569: "թ" ARMENIAN SMALL LETTER TO -->
-    <Key
-        latin:keySpec="&#x0569;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2" />
-    <!-- U+0583: "փ" ARMENIAN SMALL LETTER PIWR -->
-    <Key
-        latin:keySpec="&#x0583;"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <!-- U+0571: "ձ" ARMENIAN SMALL LETTER JA -->
-    <Key
-        latin:keySpec="&#x0571;"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4" />
-    <!-- U+057B: "ջ" ARMENIAN SMALL LETTER JHEH -->
-    <Key
-        latin:keySpec="&#x057B;"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5" />
-    <!-- U+0580: "ր" ARMENIAN SMALL LETTER REH -->
-    <Key
-        latin:keySpec="&#x0580;"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6" />
-    <!-- U+0579: "չ" ARMENIAN SMALL LETTER CHA -->
-    <Key
-        latin:keySpec="&#x0579;"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7" />
-    <!-- U+0573: "ճ" ARMENIAN SMALL LETTER CHEH -->
-    <Key
-        latin:keySpec="&#x0573;"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8" />
-    <!-- U+056A: "ժ" ARMENIAN SMALL LETTER ZHE -->
-    <Key
-        latin:keySpec="&#x056A;"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9" />
-    <!-- U+056E: "ծ" ARMENIAN SMALL LETTER CA -->
-    <Key
-        latin:keySpec="&#x056E;"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true">
+            <!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
+            <Key
+                latin:keySpec="&#x0567;"/>
+            <!-- U+0569: "թ" ARMENIAN SMALL LETTER TO -->
+            <Key
+                latin:keySpec="&#x0569;"/>
+            <!-- U+0583: "փ" ARMENIAN SMALL LETTER PIWR -->
+            <Key
+                latin:keySpec="&#x0583;"/>
+            <!-- U+0571: "ձ" ARMENIAN SMALL LETTER JA -->
+            <Key
+                latin:keySpec="&#x0571;"/>
+            <!-- U+057B: "ջ" ARMENIAN SMALL LETTER JHEH -->
+            <Key
+                latin:keySpec="&#x057B;"/>
+            <!-- U+0580: "ր" ARMENIAN SMALL LETTER REH -->
+            <Key
+                latin:keySpec="&#x0580;"/>
+            <!-- U+0579: "չ" ARMENIAN SMALL LETTER CHA -->
+            <Key
+                latin:keySpec="&#x0579;"/>
+            <!-- U+0573: "ճ" ARMENIAN SMALL LETTER CHEH -->
+            <Key
+                latin:keySpec="&#x0573;"/>
+            <!-- U+056A: "ժ" ARMENIAN SMALL LETTER ZHE -->
+            <Key
+                latin:keySpec="&#x056A;"/>
+            <!-- U+056E: "ծ" ARMENIAN SMALL LETTER CA -->
+            <Key
+                latin:keySpec="&#x056E;"/>
+        </case>
+        <default>
+            <!-- U+0567: "է" ARMENIAN SMALL LETTER EH -->
+            <Key
+                latin:keySpec="&#x0567;"
+                latin:keyHintLabel="1"
+                latin:additionalMoreKeys="1"/>
+            <!-- U+0569: "թ" ARMENIAN SMALL LETTER TO -->
+            <Key
+                latin:keySpec="&#x0569;"
+                latin:keyHintLabel="2"
+                latin:additionalMoreKeys="2"/>
+            <!-- U+0583: "փ" ARMENIAN SMALL LETTER PIWR -->
+            <Key
+                latin:keySpec="&#x0583;"
+                latin:keyHintLabel="3"
+                latin:additionalMoreKeys="3"/>
+            <!-- U+0571: "ձ" ARMENIAN SMALL LETTER JA -->
+            <Key
+                latin:keySpec="&#x0571;"
+                latin:keyHintLabel="4"
+                latin:additionalMoreKeys="4"/>
+            <!-- U+057B: "ջ" ARMENIAN SMALL LETTER JHEH -->
+            <Key
+                latin:keySpec="&#x057B;"
+                latin:keyHintLabel="5"
+                latin:additionalMoreKeys="5"/>
+            <!-- U+0580: "ր" ARMENIAN SMALL LETTER REH -->
+            <Key
+                latin:keySpec="&#x0580;"
+                latin:keyHintLabel="6"
+                latin:additionalMoreKeys="6"/>
+            <!-- U+0579: "չ" ARMENIAN SMALL LETTER CHA -->
+            <Key
+                latin:keySpec="&#x0579;"
+                latin:keyHintLabel="7"
+                latin:additionalMoreKeys="7"/>
+            <!-- U+0573: "ճ" ARMENIAN SMALL LETTER CHEH -->
+            <Key
+                latin:keySpec="&#x0573;"
+                latin:keyHintLabel="8"
+                latin:additionalMoreKeys="8"/>
+            <!-- U+056A: "ժ" ARMENIAN SMALL LETTER ZHE -->
+            <Key
+                latin:keySpec="&#x056A;"
+                latin:keyHintLabel="9"
+                latin:additionalMoreKeys="9"/>
+            <!-- U+056E: "ծ" ARMENIAN SMALL LETTER CA -->
+            <Key
+                latin:keySpec="&#x056E;"
+                latin:keyHintLabel="0"
+                latin:additionalMoreKeys="0"/>
+        </default>
+    </switch>
 </merge>
diff --git a/app/src/main/res/xml/rowkeys_bepo1.xml b/app/src/main/res/xml/rowkeys_bepo1.xml
index 9d4decbfa..d73cdb9f5 100644
--- a/app/src/main/res/xml/rowkeys_bepo1.xml
+++ b/app/src/main/res/xml/rowkeys_bepo1.xml
@@ -15,52 +15,108 @@
  -->
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="b"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1"/>
-    <Key
-        latin:keySpec="&#xE9;"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2,&#xE8;" />
-    <Key
-        latin:keySpec="p"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3" />
-    <Key
-        latin:keySpec="o"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/morekeys_o" />
-    <Key
-        latin:keySpec="v"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/morekeys_v" />
-    <Key
-        latin:keySpec="d"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/morekeys_d" />
-    <Key
-        latin:keySpec="l"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/morekeys_l" />
-    <Key
-        latin:keySpec="j"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/morekeys_j" />
-    <Key
-        latin:keySpec="z"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/morekeys_z" />
-    <Key
-        latin:keySpec="w"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0"
-        latin:moreKeys="!text/morekeys_w" />
+    >
+    <switch>
+        <case
+            latin:numberRowEnabled="true">
+            <Key
+                latin:keySpec="b"
+                latin:keyHintLabel="%"
+                latin:additionalMoreKeys="%"/>
+            <Key
+                latin:keySpec="&#xE9;"
+                latin:keyHintLabel="\\"
+                latin:additionalMoreKeys="\\,&#xE8;"/>
+            <Key
+                latin:keySpec="p"
+                latin:keyHintLabel="|"
+                latin:additionalMoreKeys="|"/>
+            <Key
+                latin:keySpec="o"
+                latin:keyHintLabel="="
+                latin:additionalMoreKeys="="
+                latin:moreKeys="!text/morekeys_o"/>
+            <Key
+                latin:keySpec="v"
+                latin:keyHintLabel="["
+                latin:additionalMoreKeys="["
+                latin:moreKeys="!text/morekeys_v"/>
+            <Key
+                latin:keySpec="d"
+                latin:keyHintLabel="]"
+                latin:additionalMoreKeys="]"
+                latin:moreKeys="!text/morekeys_d"/>
+            <!-- U+003C: "<" LESS-THAN SIGN -->
+            <Key
+                latin:keySpec="l"
+                latin:keyHintLabel="&#x003C;"
+                latin:additionalMoreKeys="&#x003C;"
+                latin:moreKeys="!text/morekeys_l"/>
+            <!-- U+003E: ">" GREATER-THAN SIGN -->
+            <Key
+                latin:keySpec="j"
+                latin:keyHintLabel="&#x003E;"
+                latin:additionalMoreKeys="&#x003E;"
+                latin:moreKeys="!text/morekeys_j"/>
+            <Key
+                latin:keySpec="z"
+                latin:keyHintLabel="{"
+                latin:additionalMoreKeys="{"
+                latin:moreKeys="!text/morekeys_z"/>
+            <Key
+                latin:keySpec="w"
+                latin:keyHintLabel="}"
+                latin:additionalMoreKeys="}"
+                latin:moreKeys="!text/morekeys_w"/>
+        </case>
+        <default>
+            <Key
+                latin:keySpec="b"
+                latin:keyHintLabel="1"
+                latin:additionalMoreKeys="1"/>
+            <Key
+                latin:keySpec="&#xE9;"
+                latin:keyHintLabel="2"
+                latin:additionalMoreKeys="2,&#xE8;"/>
+            <Key
+                latin:keySpec="p"
+                latin:keyHintLabel="3"
+                latin:additionalMoreKeys="3"/>
+            <Key
+                latin:keySpec="o"
+                latin:keyHintLabel="4"
+                latin:additionalMoreKeys="4"
+                latin:moreKeys="!text/morekeys_o"/>
+            <Key
+                latin:keySpec="v"
+                latin:keyHintLabel="5"
+                latin:additionalMoreKeys="5"
+                latin:moreKeys="!text/morekeys_v"/>
+            <Key
+                latin:keySpec="d"
+                latin:keyHintLabel="6"
+                latin:additionalMoreKeys="6"
+                latin:moreKeys="!text/morekeys_d"/>
+            <Key
+                latin:keySpec="l"
+                latin:keyHintLabel="7"
+                latin:additionalMoreKeys="7"
+                latin:moreKeys="!text/morekeys_l"/>
+            <Key
+                latin:keySpec="j"
+                latin:keyHintLabel="8"
+                latin:additionalMoreKeys="8"
+                latin:moreKeys="!text/morekeys_j"/>
+            <Key
+                latin:keySpec="z"
+                latin:keyHintLabel="9"
+                latin:additionalMoreKeys="9"
+                latin:moreKeys="!text/morekeys_z"/>
+            <Key
+                latin:keySpec="w"
+                latin:keyHintLabel="0"
+                latin:additionalMoreKeys="0"
+                latin:moreKeys="!text/morekeys_w"/>
+        </default>
+    </switch>
 </merge>
diff --git a/app/src/main/res/xml/rowkeys_qwertz1_left5.xml b/app/src/main/res/xml/rowkeys_qwertz1_left5.xml
index c12314e4e..8873bf768 100644
--- a/app/src/main/res/xml/rowkeys_qwertz1_left5.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz1_left5.xml
@@ -20,29 +20,60 @@
 
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="q"
-        latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1" />
-    <Key
-        latin:keySpec="w"
-        latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2"
-        latin:moreKeys="!text/morekeys_w" />
-    <Key
-        latin:keySpec="e"
-        latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3"
-        latin:moreKeys="!text/morekeys_e" />
-    <Key
-        latin:keySpec="r"
-        latin:keyHintLabel="4"
-        latin:additionalMoreKeys="4"
-        latin:moreKeys="!text/morekeys_r" />
-    <Key
-        latin:keySpec="t"
-        latin:keyHintLabel="5"
-        latin:additionalMoreKeys="5"
-        latin:moreKeys="!text/morekeys_t" />
+    >
+    <switch>
+        <case
+            latin:numberRowEnabled="true">
+            <Key
+                latin:keySpec="q"
+                latin:keyHintLabel="%"
+                latin:additionalMoreKeys="%"/>
+            <Key
+                latin:keySpec="w"
+                latin:keyHintLabel="\\"
+                latin:additionalMoreKeys="\\"
+                latin:moreKeys="!text/morekeys_w"/>
+            <Key
+                latin:keySpec="e"
+                latin:keyHintLabel="|"
+                latin:additionalMoreKeys="|"
+                latin:moreKeys="!text/morekeys_e"/>
+            <Key
+                latin:keySpec="r"
+                latin:keyHintLabel="="
+                latin:additionalMoreKeys="="
+                latin:moreKeys="!text/morekeys_r"/>
+            <Key
+                latin:keySpec="t"
+                latin:keyHintLabel="["
+                latin:additionalMoreKeys="["
+                latin:moreKeys="!text/morekeys_t"/>
+        </case>
+        <default>
+            <Key
+                latin:keySpec="q"
+                latin:keyHintLabel="1"
+                latin:additionalMoreKeys="1"/>
+            <Key
+                latin:keySpec="w"
+                latin:keyHintLabel="2"
+                latin:additionalMoreKeys="2"
+                latin:moreKeys="!text/morekeys_w"/>
+            <Key
+                latin:keySpec="e"
+                latin:keyHintLabel="3"
+                latin:additionalMoreKeys="3"
+                latin:moreKeys="!text/morekeys_e"/>
+            <Key
+                latin:keySpec="r"
+                latin:keyHintLabel="4"
+                latin:additionalMoreKeys="4"
+                latin:moreKeys="!text/morekeys_r"/>
+            <Key
+                latin:keySpec="t"
+                latin:keyHintLabel="5"
+                latin:additionalMoreKeys="5"
+                latin:moreKeys="!text/morekeys_t"/>
+        </default>
+    </switch>
 </merge>
diff --git a/app/src/main/res/xml/rowkeys_qwertz1_right5.xml b/app/src/main/res/xml/rowkeys_qwertz1_right5.xml
index 50b265d1d..b6bf76d64 100644
--- a/app/src/main/res/xml/rowkeys_qwertz1_right5.xml
+++ b/app/src/main/res/xml/rowkeys_qwertz1_right5.xml
@@ -20,29 +20,62 @@
 
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <Key
-        latin:keySpec="z"
-        latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6"
-        latin:moreKeys="!text/morekeys_z" />
-     <Key
-        latin:keySpec="u"
-        latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7"
-        latin:moreKeys="!text/morekeys_u" />
-    <Key
-        latin:keySpec="i"
-        latin:keyHintLabel="8"
-        latin:additionalMoreKeys="8"
-        latin:moreKeys="!text/morekeys_i" />
-    <Key
-        latin:keySpec="o"
-        latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9"
-        latin:moreKeys="!text/morekeys_o" />
-    <Key
-        latin:keySpec="p"
-        latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0" />
+    >
+    <switch>
+        <case
+            latin:numberRowEnabled="true">
+            <Key
+                latin:keySpec="z"
+                latin:keyHintLabel="]"
+                latin:additionalMoreKeys="]"
+                latin:moreKeys="!text/morekeys_z"/>
+            <!-- U+003C: "<" LESS-THAN SIGN -->
+            <Key
+                latin:keySpec="u"
+                latin:keyHintLabel="&#x003C;"
+                latin:additionalMoreKeys="&#x003C;"
+                latin:moreKeys="!text/morekeys_u"/>
+            <!-- U+003E: ">" GREATER-THAN SIGN -->
+            <Key
+                latin:keySpec="i"
+                latin:keyHintLabel="&#x003E;"
+                latin:additionalMoreKeys="&#x003E;"
+                latin:moreKeys="!text/morekeys_i"/>
+            <Key
+                latin:keySpec="o"
+                latin:keyHintLabel="{"
+                latin:additionalMoreKeys="{"
+                latin:moreKeys="!text/morekeys_o"/>
+            <Key
+                latin:keySpec="p"
+                latin:keyHintLabel="}"
+                latin:additionalMoreKeys="}"/>
+        </case>
+        <default>
+            <Key
+                latin:keySpec="z"
+                latin:keyHintLabel="6"
+                latin:additionalMoreKeys="6"
+                latin:moreKeys="!text/morekeys_z"/>
+            <Key
+                latin:keySpec="u"
+                latin:keyHintLabel="7"
+                latin:additionalMoreKeys="7"
+                latin:moreKeys="!text/morekeys_u"/>
+            <Key
+                latin:keySpec="i"
+                latin:keyHintLabel="8"
+                latin:additionalMoreKeys="8"
+                latin:moreKeys="!text/morekeys_i"/>
+            <Key
+                latin:keySpec="o"
+                latin:keyHintLabel="9"
+                latin:additionalMoreKeys="9"
+                latin:moreKeys="!text/morekeys_o"/>
+            <Key
+                latin:keySpec="p"
+                latin:keyHintLabel="0"
+                latin:additionalMoreKeys="0"/>
+        </default>
+    </switch>
 </merge>