ABC layout fixes

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "rkr.simplekeyboard.inputmethod"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 57
-        versionName "3.72"
+        versionCode 58
+        versionName "3.8"
     }
     buildTypes {
         release {

app/src/main/res/values/donottranslate.xml

@@ -50,7 +50,7 @@
         <item>dvorak</item>
         <item>colemak</item>
         <item>pcqwerty</item>
-        <item>alphabet</item>
+        <item>abc</item>
     </string-array>
     <!-- Predefined keyboard layout display names -->
     <string-array name="predefined_layout_display_names">
@@ -60,7 +60,7 @@
         <item>Dvorak</item>
         <item>Colemak</item>
         <item>PC</item>
-        <item>ALPHABET</item>
+        <item>ABC</item>-->
     </string-array>
     <!-- Description for generic subtype that has predefined layout.
          The string resource name must be "subtype_generic_<layout name>".
@@ -72,7 +72,7 @@
     <string name="subtype_generic_dvorak">%s (Dvorak)</string>
     <string name="subtype_generic_colemak">%s (Colemak)</string>
     <string name="subtype_generic_pcqwerty">%s (PC)</string>
-    <string name="subtype_generic_alphabet">%s (ALPHABET)</string>
+    <string name="subtype_generic_abc">%s (ABC)</string>
 
     <!-- Description for Bulgarian (BDS) subtype. -->
     <string name="subtype_bulgarian_bds">%s (BDS)</string>

app/src/main/res/xml-sw600dp/rows_abc.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <!-- TODO: Consolidate the layout specification between protrait and landscape.
+         Ideally just the keyWidth should be different and the spacer should adjust to fill
+         the available space. -->
+    <!-- First row -->
+    <Row>
+        <include
+            latin:keyboardLayout="@xml/rowkeys_abc1"
+            latin:keyWidth="9.0%p" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <!-- Second row -->
+    <Row>
+        <include
+            latin:keyboardLayout="@xml/rowkeys_abc2"
+            latin:keyXPos="4.5%p"
+            latin:keyWidth="9.0%p" />
+        <Key
+            latin:keyStyle="enterKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <!-- Third row -->
+    <Row>
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="10.0%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_abc3"
+            latin:keyWidth="9.0%p" />
+        <include
+            latin:keyboardLayout="@xml/keys_exclamation_question"
+            latin:keyWidth="9.0%p" />
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <!-- Fourth row -->
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>

app/src/main/res/xml/kbd_alphabet.xml → app/src/main/res/xml/kbd_abc.xml

@@ -24,14 +24,14 @@
 
     <switch>
         <case latin:showNumberRow="true">
-            <include latin:keyboardLayout="@xml/rowkeys_alphabet0" />
+            <include latin:keyboardLayout="@xml/rowkeys_qwerty0" />
 
             <include
-                latin:keyboardLayout="@xml/rows_alphabet"
+                latin:keyboardLayout="@xml/rows_abc"
                 latin:rowHeight="21.25%p" />
         </case>
         <default>
-            <include latin:keyboardLayout="@xml/rows_alphabet" />
+            <include latin:keyboardLayout="@xml/rows_abc" />
         </default>
     </switch>
 </Keyboard>

app/src/main/res/xml/keyboard_layout_set_alphabet.xml → app/src/main/res/xml/keyboard_layout_set_abc.xml

@@ -22,7 +22,7 @@
     xmlns:latin="http://schemas.android.com/apk/res-auto">
     <Element
         latin:elementName="alphabet"
-        latin:elementKeyboard="@xml/kbd_alphabet"
+        latin:elementKeyboard="@xml/kbd_abc"
         latin:enableProximityCharsCorrection="true" />
     <Element
         latin:elementName="symbols"

app/src/main/res/xml/rows_alphabet.xml → app/src/main/res/xml/rows_abc.xml

@@ -23,13 +23,13 @@
         latin:keyWidth="10%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_alphabet1" />
+            latin:keyboardLayout="@xml/rowkeys_abc1" />
     </Row>
     <Row
         latin:keyWidth="10%p"
     >
         <include
-            latin:keyboardLayout="@xml/rowkeys_alphabet2"
+            latin:keyboardLayout="@xml/rowkeys_abc2"
             latin:keyXPos="5%p" />
     </Row>
     <Row
@@ -40,12 +40,12 @@
             latin:keyWidth="15%p"
             latin:visualInsetsRight="1%p" />
         <include
-            latin:keyboardLayout="@xml/rowkeys_alphabet3" />
+            latin:keyboardLayout="@xml/rowkeys_abc3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
             latin:visualInsetsLeft="1%p" />
     </Row>
     <include
-        latin:keyboardLayout="@xml/row_alphabet4" />
+        latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>