From 1a7cec304b1b90d06e22c0616767a77fef29e530 Mon Sep 17 00:00:00 2001
From: Lee0701 <hgl1002@naver.com>
Date: Sat, 15 May 2021 06:16:40 +0900
Subject: [PATCH] Fix row heights for layout without number keys

---
 .../xml-sw600dp/rows_korean_sebeolsik_390.xml | 136 +++++++++++------
 .../rows_korean_sebeolsik_final.xml           | 138 ++++++++++++------
 .../res/xml/rows_korean_sebeolsik_390.xml     | 117 ++++++++++-----
 .../res/xml/rows_korean_sebeolsik_final.xml   | 119 ++++++++++-----
 4 files changed, 352 insertions(+), 158 deletions(-)

diff --git a/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_390.xml b/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_390.xml
index 40fe1e964..4d35382a7 100644
--- a/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_390.xml
+++ b/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_390.xml
@@ -22,49 +22,101 @@
     xmlns:latin="http://schemas.android.com/apk/res-auto"
 >
     <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-        >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
-    </Row>
-    <Row latin:keyWidth="9%p"
-        latin:rowHeight="25%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="9%p"
-        latin:rowHeight="25%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2"
-            latin:keyXPos="4%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="9%p"
-        latin:rowHeight="25%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
-        <switch>
-            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="25%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
                 <Key
-                    latin:keySpec="&#x003f;" />
-            </case>
-            <default>
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="25%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2"
+                    latin:keyXPos="4%p" />
                 <Key
-                    latin:keySpec="&#x1169;"
-                    latin:keyHintLabel="&#x003f;"
-                    latin:additionalMoreKeys="&#x003f;" />
-            </default>
-        </switch>
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="25%p" >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
+                <switch>
+                    <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+                        <Key
+                            latin:keySpec="&#x003f;" />
+                    </case>
+                    <default>
+                        <Key
+                            latin:keySpec="&#x1169;"
+                            latin:keyHintLabel="&#x003f;"
+                            latin:additionalMoreKeys="&#x003f;" />
+                    </default>
+                </switch>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+        </case>
+        <default>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="15%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="20%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="20%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2"
+                    latin:keyXPos="4%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="20%p" >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
+                <switch>
+                    <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+                        <Key
+                            latin:keySpec="&#x003f;" />
+                    </case>
+                    <default>
+                        <Key
+                            latin:keySpec="&#x1169;"
+                            latin:keyHintLabel="&#x003f;"
+                            latin:additionalMoreKeys="&#x003f;" />
+                    </default>
+                </switch>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+        </default>
+    </switch>
     <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_final.xml b/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_final.xml
index 3b87840ce..2f7dc9eaa 100644
--- a/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_final.xml
+++ b/app/src/main/res/xml-sw600dp/rows_korean_sebeolsik_final.xml
@@ -20,51 +20,103 @@
 
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
->
+    >
     <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-        >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
-    </Row>
-    <Row latin:keyWidth="9%p"
-        latin:rowHeight="25%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="9%p"
-        latin:rowHeight="25%p" >
-        <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2"
-            latin:keyXPos="4%p" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
-    <Row latin:keyWidth="9%p"
-        latin:rowHeight="25%p" >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
-        <switch>
-            <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="25%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
                 <Key
-                    latin:keySpec="&#x0021;" />
-            </case>
-            <default>
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="25%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2"
+                    latin:keyXPos="4%p" />
                 <Key
-                    latin:keySpec="&#x1169;"
-                    latin:keyHintLabel="&#x0021;"
-                    latin:additionalMoreKeys="&#x0021;" />
-            </default>
-        </switch>
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="25%p" >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
+                <switch>
+                    <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+                        <Key
+                            latin:keySpec="&#x0021;" />
+                    </case>
+                    <default>
+                        <Key
+                            latin:keySpec="&#x1169;"
+                            latin:keyHintLabel="&#x0021;"
+                            latin:additionalMoreKeys="&#x0021;" />
+                    </default>
+                </switch>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+        </case>
+        <default>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="15%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="20%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="20%p" >
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2"
+                    latin:keyXPos="4%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+            <Row latin:keyWidth="9%p"
+                latin:rowHeight="20%p" >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <include latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
+                <switch>
+                    <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
+                        <Key
+                            latin:keySpec="&#x0021;" />
+                    </case>
+                    <default>
+                        <Key
+                            latin:keySpec="&#x1169;"
+                            latin:keyHintLabel="&#x0021;"
+                            latin:additionalMoreKeys="&#x0021;" />
+                    </default>
+                </switch>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+        </default>
+    </switch>
     <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/app/src/main/res/xml/rows_korean_sebeolsik_390.xml b/app/src/main/res/xml/rows_korean_sebeolsik_390.xml
index 7ed0566b1..9f4f2f280 100644
--- a/app/src/main/res/xml/rows_korean_sebeolsik_390.xml
+++ b/app/src/main/res/xml/rows_korean_sebeolsik_390.xml
@@ -23,42 +23,87 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-        >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
+
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10%p"
+                    latin:visualInsetsRight="1%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight"
+                    latin:visualInsetsLeft="1%p" />
+            </Row>
+        </case>
+        <default>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="15%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_0" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="20%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_1" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="20%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_2" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="20%p"
+                >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10%p"
+                    latin:visualInsetsRight="1%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_390_3" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight"
+                    latin:visualInsetsLeft="1%p" />
+            </Row>
+        </default>
+    </switch>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/app/src/main/res/xml/rows_korean_sebeolsik_final.xml b/app/src/main/res/xml/rows_korean_sebeolsik_final.xml
index 7f59290ae..b7e4f5631 100644
--- a/app/src/main/res/xml/rows_korean_sebeolsik_final.xml
+++ b/app/src/main/res/xml/rows_korean_sebeolsik_final.xml
@@ -20,45 +20,90 @@
 
 <merge
     xmlns:latin="http://schemas.android.com/apk/res-auto"
->
+    >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-        >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2" />
-    </Row>
-    <Row
-        latin:keyWidth="10%p"
-        latin:rowHeight="25%p"
-    >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10%p"
-            latin:visualInsetsRight="1%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
-    </Row>
+
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="25%p"
+                >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10%p"
+                    latin:visualInsetsRight="1%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight"
+                    latin:visualInsetsLeft="1%p" />
+            </Row>
+        </case>
+        <default>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="15%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_0" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="20%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_1" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="20%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_2" />
+            </Row>
+            <Row
+                latin:keyWidth="10%p"
+                latin:rowHeight="20%p"
+                >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10%p"
+                    latin:visualInsetsRight="1%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_korean_sebeolsik_final_3" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight"
+                    latin:visualInsetsLeft="1%p" />
+            </Row>
+        </default>
+    </switch>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>