From 20e78ef44720db505811b6a7763e00c4d430b8a5 Mon Sep 17 00:00:00 2001
From: Hagen Echzell <hagen.echzell@gmail.com>
Date: Mon, 18 Jan 2021 21:34:09 +0100
Subject: [PATCH] Make German (Germany) split layout

---
 .../main/res/xml-sw600dp-land/rows_german.xml | 155 ++++++++++++++++++
 app/src/main/res/xml-sw600dp/rows_german.xml  | 140 +++++++++++++---
 .../res/xml/keyboard_layout_set_german.xml    |   3 +-
 3 files changed, 273 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/xml-sw600dp-land/rows_german.xml

diff --git a/app/src/main/res/xml-sw600dp-land/rows_german.xml b/app/src/main/res/xml-sw600dp-land/rows_german.xml
new file mode 100644
index 000000000..a46a0c1d0
--- /dev/null
+++ b/app/src/main/res/xml-sw600dp-land/rows_german.xml
@@ -0,0 +1,155 @@
+<?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"
+>
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <!-- 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
+        latin:keyWidth="8.182%p"
+    >
+        <switch>
+            <!-- Split keyboard layout for the first row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz1_left5"
+                    latin:keyWidth="6.75%p" />
+                <Spacer
+                    latin:keyWidth="17%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz1_right5"
+                    latin:keyWidth="6.75%p" />
+                <Key
+        	     latin:keySpec="!text/keyspec_swiss_row1_11"
+                    latin:keyWidth="6.75%p" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </case>
+            <!-- Regular layout for the first row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz1"/>
+                <Key
+        	     latin:keySpec="!text/keyspec_swiss_row1_11"/>
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
+    </Row>
+    <!-- Second row -->
+    <Row
+        latin:keyWidth="8.182%p"
+    >
+        <switch>
+            <!-- Split keyboard layout for the second row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz2_left5"
+                    latin:keyWidth="6.75%p" />
+                <Spacer
+                    latin:keyWidth="17%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz2_right4"
+                    latin:keyWidth="6.75%p" />
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_10"
+                    latin:keyWidth="6.75%p" />
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_11"
+                    latin:keyWidth="6.75%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </case>
+            <!-- Regular layout for the second row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz2"/>
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_10"/>
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_11"/>
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
+    </Row>
+    <!-- Third row -->
+    <Row
+        latin:keyWidth="8.182%p"
+    >
+        <switch>
+            <!-- Split keyboard layout for the third row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyXPos="2.75%p"
+                    latin:keyWidth="8.5%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz3_left4"
+                    latin:keyWidth="6.75%p" />
+                <Spacer
+                    latin:keyWidth="17%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz3_right3"
+                    latin:keyWidth="6.75%p" />
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"
+                    latin:keyWidth="6.75%p" />
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </case>
+            <!-- Regular layout for the third row -->
+            <default>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <Spacer
+                    latin:keyWidth="3.181%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz3"/>
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"/>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyXPos="-10.0%p"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
+    </Row>
+    <!-- Fourth row -->
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/app/src/main/res/xml-sw600dp/rows_german.xml b/app/src/main/res/xml-sw600dp/rows_german.xml
index 2bb1d6b50..fdee1cce7 100644
--- a/app/src/main/res/xml-sw600dp/rows_german.xml
+++ b/app/src/main/res/xml-sw600dp/rows_german.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2013, The Android Open Source Project
+** 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.
@@ -23,41 +23,133 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <!-- 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
         latin:keyWidth="8.182%p"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_german1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
+        <switch>
+            <!-- Split keyboard layout for the first row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz1_left5"
+                    latin:keyWidth="7.5%p" />
+                <Spacer
+                    latin:keyWidth="8.5%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz1_right5"
+                    latin:keyWidth="7.5%p" />
+                <Key
+        	     latin:keySpec="!text/keyspec_swiss_row1_11"
+                    latin:keyWidth="7.5%p" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </case>
+            <!-- Regular layout for the first row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz1"/>
+                <Key
+        	     latin:keySpec="!text/keyspec_swiss_row1_11"/>
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
     </Row>
+    <!-- Second row -->
     <Row
         latin:keyWidth="8.182%p"
     >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_german2" />
-        <Key
-            latin:keyStyle="enterKeyStyle"
-            latin:keyWidth="fillRight" />
+        <switch>
+            <!-- Split keyboard layout for the second row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz2_left5"
+                    latin:keyWidth="7.5%p" />
+                <Spacer
+                    latin:keyWidth="8.5%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz2_right4"
+                    latin:keyWidth="7.5%p" />
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_10"
+                    latin:keyWidth="7.5%p" />
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_11"
+                    latin:keyWidth="7.5%p" />
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </case>
+            <!-- Regular layout for the second row -->
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz2"/>
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_10"/>
+                <Key
+                    latin:keySpec="!text/keyspec_swiss_row2_11"/>
+                <Key
+                    latin:keyStyle="enterKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
     </Row>
+    <!-- Third row -->
     <Row
         latin:keyWidth="8.182%p"
     >
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p" />
-        <Spacer
-            latin:keyWidth="3.181%p" />
-        <include
-            latin:keyboardLayout="@xml/rowkeys_german3" />
-        <include
-            latin:keyboardLayout="@xml/keys_exclamation_question" />
-        <Key
-            latin:keyStyle="shiftKeyStyle"
-            latin:keyXPos="-10.0%p"
-            latin:keyWidth="fillRight" />
+        <switch>
+            <!-- Split keyboard layout for the third row -->
+            <case
+                latin:isSplitLayout="true"
+            >
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyXPos="3.5%p"
+                    latin:keyWidth="8.5%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz3_left4"
+                    latin:keyWidth="7.5%p" />
+                <Spacer
+                    latin:keyWidth="8.5%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz3_right3"
+                    latin:keyWidth="7.5%p" />
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"
+                    latin:keyWidth="7.5%p" />
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </case>
+            <!-- Regular layout for the third row -->
+            <default>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyWidth="10.0%p" />
+                <Spacer
+                    latin:keyWidth="3.181%p" />
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_qwertz3"/>
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question"/>
+                <Key
+                    latin:keyStyle="shiftKeyStyle"
+                    latin:keyXPos="-10.0%p"
+                    latin:keyWidth="fillRight" />
+            </default>
+        </switch>
     </Row>
+    <!-- Fourth row -->
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/app/src/main/res/xml/keyboard_layout_set_german.xml b/app/src/main/res/xml/keyboard_layout_set_german.xml
index 31705c0ef..7edccb90d 100644
--- a/app/src/main/res/xml/keyboard_layout_set_german.xml
+++ b/app/src/main/res/xml/keyboard_layout_set_german.xml
@@ -24,7 +24,8 @@
         latin:elementName="alphabet"
         latin:elementKeyboard="@xml/kbd_german"
         latin:enableProximityCharsCorrection="true"
-        latin:allowRedundantMoreKeys="true" />
+        latin:allowRedundantMoreKeys="true"
+        latin:supportsSplitLayout="true" />
     <Element
         latin:elementName="symbols"
         latin:elementKeyboard="@xml/kbd_symbols" />