From 608ebc7d87276e0f23e646189884e9ea7b6ae4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A1ssio?= <cassioavila@yandex.com>
Date: Sat, 13 Feb 2021 19:21:14 -0300
Subject: [PATCH] adds Colemak Mod-DH keyboard layout

---
 app/src/main/res/values/donottranslate.xml    |  5 +-
 app/src/main/res/values/strings.xml           |  1 +
 .../main/res/xml-sw600dp/rows_colemak_dh.xml  | 60 ++++++++++++++
 app/src/main/res/xml/kbd_colemak_dh.xml       | 26 ++++++
 .../xml/keyboard_layout_set_colemak_dh.xml    | 23 +++++
 app/src/main/res/xml/rowkeys_colemak_dh1.xml  | 83 +++++++++++++++++++
 app/src/main/res/xml/rowkeys_colemak_dh2.xml  | 75 +++++++++++++++++
 app/src/main/res/xml/rowkeys_colemak_dh3.xml  | 57 +++++++++++++
 app/src/main/res/xml/rows_colemak_dh.xml      | 54 ++++++++++++
 9 files changed, 383 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
 create mode 100644 app/src/main/res/xml/kbd_colemak_dh.xml
 create mode 100644 app/src/main/res/xml/keyboard_layout_set_colemak_dh.xml
 create mode 100644 app/src/main/res/xml/rowkeys_colemak_dh1.xml
 create mode 100644 app/src/main/res/xml/rowkeys_colemak_dh2.xml
 create mode 100644 app/src/main/res/xml/rowkeys_colemak_dh3.xml
 create mode 100644 app/src/main/res/xml/rows_colemak_dh.xml

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index ae5aecf1a..6604417d6 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -53,6 +53,7 @@
         <item>azerty</item>
         <item>dvorak</item>
         <item>colemak</item>
+        <item>colemak_dh</item>
         <item>bepo</item>
         <item>pcqwerty</item>
     </string-array>
@@ -63,6 +64,7 @@
         <item>AZERTY</item>
         <item>Dvorak</item>
         <item>Colemak</item>
+        <item>Colemak Mod-DH</item>
         <item>Bépo</item>
         <item>PC</item>
     </string-array>
@@ -75,7 +77,8 @@
     <string name="subtype_generic_azerty" translatable="false">%s (AZERTY)</string>
     <string name="subtype_generic_dvorak" translatable="false">%s (Dvorak)</string>
     <string name="subtype_generic_colemak" translatable="false">%s (Colemak)</string>
-    <string name="subtype_generic_bepo" translatable="false">%s (Bépo)</string>
+    <string name="subtype_generic_colemak_dh" translatable="false">%s (Colemak Mod-DH)</string>
+    <string name="subtype_generic_bepo" translatable="false">c%s (Bépo)</string>
     <string name="subtype_generic_pcqwerty" translatable="false">%s (PC)</string>
 
     <!-- Description for Bulgarian (BDS) subtype. -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dac79eb97..149148215 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -344,6 +344,7 @@ are used to. This keyboard does not provide a dictionary, and it is not tied to
 language among those that use the Latin alphabet. This keyboard is laid out in the QWERTY PC
 disposition that offers additional keys, but smaller keys compared to other common dispositions for
 mobile devices. [CHAR LIMIT=25] -->
+    <string name="subtype_no_language_colemak_dh">Alphabet (Colemak Mod-DH)</string>
     <string name="subtype_no_language_pcqwerty">Alphabet (PC)</string>
     <!-- Description for Emoji keyboard subtype [CHAR LIMIT=25] -->
     <string name="subtype_emoji">Emoji</string>
diff --git a/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml b/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
new file mode 100644
index 000000000..cf3f26073
--- /dev/null
+++ b/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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" />
+    <Row
+        latin:keyWidth="9.0%p"
+        >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_colemak_dh1" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0%p"
+        >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_colemak_dh2" />
+        <Key
+            latin:keyStyle="enterKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0%p"
+        >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="10.0%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_colemak_dh3" />
+        <include
+            latin:keyboardLayout="@xml/keys_exclamation_question" />
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/app/src/main/res/xml/kbd_colemak_dh.xml b/app/src/main/res/xml/kbd_colemak_dh.xml
new file mode 100644
index 000000000..e8ab680d8
--- /dev/null
+++ b/app/src/main/res/xml/kbd_colemak_dh.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<Keyboard
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+    >
+    <include
+        latin:keyboardLayout="@xml/rows_colemak_dh" />
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/keyboard_layout_set_colemak_dh.xml b/app/src/main/res/xml/keyboard_layout_set_colemak_dh.xml
new file mode 100644
index 000000000..a960d40e6
--- /dev/null
+++ b/app/src/main/res/xml/keyboard_layout_set_colemak_dh.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<KeyboardLayoutSet
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <Element
+        latin:elementName="alphabet"
+        latin:elementKeyboard="@xml/kbd_colemak_dh"
+        latin:enableProximityCharsCorrection="true" />
+    <Element
+        latin:elementName="symbols"
+        latin:elementKeyboard="@xml/kbd_symbols" />
+    <Element
+        latin:elementName="symbolsShifted"
+        latin:elementKeyboard="@xml/kbd_symbols_shift" />
+    <Element
+        latin:elementName="phone"
+        latin:elementKeyboard="@xml/kbd_phone" />
+    <Element
+        latin:elementName="phoneSymbols"
+        latin:elementKeyboard="@xml/kbd_phone_symbols" />
+    <Element
+        latin:elementName="number"
+        latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardLayoutSet>
diff --git a/app/src/main/res/xml/rowkeys_colemak_dh1.xml b/app/src/main/res/xml/rowkeys_colemak_dh1.xml
new file mode 100644
index 000000000..25cd4b1e0
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_colemak_dh1.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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"
+    >
+    <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="f"
+        latin:keyHintLabel="3"
+        latin:additionalMoreKeys="3" />
+    <Key
+        latin:keySpec="p"
+        latin:keyHintLabel="4"
+        latin:additionalMoreKeys="4" />
+    <Key
+        latin:keySpec="b"
+        latin:keyHintLabel="5"
+        latin:additionalMoreKeys="5"
+        latin:moreKeys="!text/morekeys_g" />
+    <Key
+        latin:keySpec="j"
+        latin:keyHintLabel="6"
+        latin:additionalMoreKeys="6"
+        latin:moreKeys="!text/morekeys_j" />
+    <Key
+        latin:keySpec="l"
+        latin:keyHintLabel="7"
+        latin:additionalMoreKeys="7"
+        latin:moreKeys="!text/morekeys_l" />
+    <Key
+        latin:keySpec="u"
+        latin:keyHintLabel="8"
+        latin:additionalMoreKeys="8"
+        latin:moreKeys="!text/morekeys_u" />
+    <Key
+        latin:keySpec="y"
+        latin:keyHintLabel="9"
+        latin:additionalMoreKeys="9"
+        latin:moreKeys="!text/morekeys_y" />
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted"
+            >
+            <Key
+                latin:keySpec=":"
+                latin:keyHintLabel="0"
+                latin:additionalMoreKeys="0" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec=";"
+                latin:keyHintLabel="0"
+                latin:additionalMoreKeys="0"
+                latin:moreKeys=":" />
+        </default>
+    </switch>
+</merge>
diff --git a/app/src/main/res/xml/rowkeys_colemak_dh2.xml b/app/src/main/res/xml/rowkeys_colemak_dh2.xml
new file mode 100644
index 000000000..d610d1e4c
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_colemak_dh2.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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"
+    >
+    <Key
+        latin:keySpec="a"
+        latin:keyHintLabel="\@"
+        latin:additionalMoreKeys="\\@"
+        latin:moreKeys="!text/morekeys_a" />
+    <Key
+        latin:keySpec="r"
+        latin:keyHintLabel="#"
+        latin:additionalMoreKeys="#"
+        latin:moreKeys="!text/morekeys_r" />
+    <Key
+        latin:keySpec="s"
+        latin:keyHintLabel="$"
+        latin:additionalMoreKeys="$"
+        latin:moreKeys="!text/morekeys_s" />
+    <Key
+        latin:keySpec="t"
+        latin:keyHintLabel="%"
+        latin:additionalMoreKeys="%"
+        latin:moreKeys="!text/morekeys_t" />
+    <Key
+        latin:keySpec="g"
+        latin:keyHintLabel="&amp;"
+        latin:additionalMoreKeys="&amp;"
+        latin:moreKeys="!text/morekeys_d" />
+    <Key
+        latin:keySpec="m"
+        latin:keyHintLabel="-"
+        latin:additionalMoreKeys="-"
+        latin:moreKeys="!text/morekeys_h" />
+    <Key
+        latin:keySpec="n"
+        latin:keyHintLabel="+"
+        latin:additionalMoreKeys="+"
+        latin:moreKeys="!text/morekeys_n" />
+    <Key
+        latin:keySpec="e"
+        latin:keyHintLabel="("
+        latin:additionalMoreKeys="("
+        latin:moreKeys="!text/morekeys_e" />
+    <Key
+        latin:keySpec="i"
+        latin:keyHintLabel=")"
+        latin:additionalMoreKeys=")"
+        latin:moreKeys="!text/morekeys_i" />
+    <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
+    <Key
+        latin:keySpec="o"
+        latin:keyHintLabel="&#x2026;"
+        latin:additionalMoreKeys="&#x2026;"
+        latin:moreKeys="!text/morekeys_o" />
+</merge>
diff --git a/app/src/main/res/xml/rowkeys_colemak_dh3.xml b/app/src/main/res/xml/rowkeys_colemak_dh3.xml
new file mode 100644
index 000000000..631307681
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_colemak_dh3.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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"
+    >
+    <Key
+        latin:keySpec="z"
+        latin:keyHintLabel="*"
+        latin:additionalMoreKeys="*"
+        latin:moreKeys="!text/morekeys_z" />
+    <Key
+        latin:keySpec="!text/keyspec_x"
+        latin:keyHintLabel="&quot;"
+        latin:additionalMoreKeys="&quot;"
+        latin:moreKeys="!text/morekeys_x" />
+    <Key
+        latin:keySpec="c"
+        latin:keyHintLabel="&apos;"
+        latin:additionalMoreKeys="&apos;"
+        latin:moreKeys="!text/morekeys_c" />
+    <Key
+        latin:keySpec="d"
+        latin:keyHintLabel=":"
+        latin:additionalMoreKeys=":"
+        latin:moreKeys="!text/morekeys_v" />
+    <Key
+        latin:keySpec="v"
+        latin:keyHintLabel=";"
+        latin:additionalMoreKeys=";" />
+    <Key
+        latin:keySpec="k"
+        latin:keyHintLabel="!"
+        latin:additionalMoreKeys="!"
+        latin:moreKeys="!text/morekeys_k" />
+    <Key
+        latin:keySpec="h"
+        latin:keyHintLabel="\?"
+        latin:additionalMoreKeys="\\?" />
+</merge>
diff --git a/app/src/main/res/xml/rows_colemak_dh.xml b/app/src/main/res/xml/rows_colemak_dh.xml
new file mode 100644
index 000000000..5acc83728
--- /dev/null
+++ b/app/src/main/res/xml/rows_colemak_dh.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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" />
+    <Row
+        latin:keyWidth="10%p"
+        >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_colemak_dh1" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+        >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_colemak_dh2" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+        >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="15%p"
+            latin:visualInsetsRight="1%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_colemak_dh3" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"
+            latin:visualInsetsLeft="1%p" />
+    </Row>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>