Add phonetic layout for east slavic

java/res/values/strings.xml

@@ -585,6 +585,7 @@ Tip: You can download and remove dictionaries by going to <b>Languages &
     <string name="layout_colemak">Colemak</string>
     <string name="layout_dvorak">Dvorak</string>
     <string name="layout_east_slavic">East Slavic</string>
+    <string name="layout_east_slavic_phonetic">East Slavic (Phonetic)</string>
     <string name="layout_farsi">Farsi</string>
     <string name="layout_georgian">Georgian</string>
     <string name="layout_greek">Greek</string>

java/res/xml/kbd_east_slavic_phonetic.xml

@@ -0,0 +1,26 @@
+<?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.
+*/
+-->
+
+<Keyboard
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <include
+        latin:keyboardLayout="@xml/rows_east_slavic_phonetic" />
+</Keyboard>

java/res/xml/keyboard_layout_set_east_slavic_phonetic.xml

@@ -0,0 +1,44 @@
+<?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.
+*/
+-->
+
+<KeyboardLayoutSet
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <Feature
+        latin:supportedScript="cyrillic" />
+    <Element
+        latin:elementName="alphabet"
+        latin:elementKeyboard="@xml/kbd_east_slavic_phonetic"
+        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>

java/res/xml/rowkeys_east_slavic_phonetic1.xml

@@ -0,0 +1,61 @@
+<?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="я"
+        latin:additionalMoreKeys="1" />
+    <Key
+        latin:keySpec="ш"
+        latin:additionalMoreKeys="ч,щ,2" />
+    <Key
+        latin:keySpec="е"
+        latin:additionalMoreKeys="э,ё,3" />
+    <Key
+        latin:keySpec="р"
+        latin:keyHintLabel="4"
+        latin:additionalMoreKeys="4" />
+    <Key
+        latin:keySpec="т"
+        latin:keyHintLabel="5"
+        latin:additionalMoreKeys="5" />
+    <Key
+        latin:keySpec="!text/keyspec_east_slavic_row2_2"
+        latin:moreKeys="!text/morekeys_east_slavic_row2_2"
+        latin:keyHintLabel="6"
+        latin:additionalMoreKeys="6" />
+    <Key
+        latin:keySpec="у"
+        latin:additionalMoreKeys="ю,7" />
+    <Key
+        latin:keySpec="и"
+        latin:keyHintLabel="8"
+        latin:additionalMoreKeys="8" />
+    <Key
+        latin:keySpec="о"
+        latin:keyHintLabel="9"
+        latin:additionalMoreKeys="9" />
+    <Key
+        latin:keySpec="п"
+        latin:keyHintLabel="0"
+        latin:additionalMoreKeys="0" />
+</merge>

java/res/xml/rowkeys_east_slavic_phonetic2.xml

@@ -0,0 +1,42 @@
+<?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="а" />
+    <Key
+        latin:keySpec="с" />
+    <Key
+        latin:keySpec="д" />
+    <Key
+        latin:keySpec="ф" />
+    <Key
+        latin:keySpec="г" />
+    <Key
+        latin:keySpec="х" />
+    <Key
+        latin:keySpec="й" />
+    <Key
+        latin:keySpec="к" />
+    <Key
+        latin:keySpec="л" />
+</merge>

java/res/xml/rowkeys_east_slavic_phonetic3.xml

@@ -0,0 +1,40 @@
+<?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="з"
+        latin:additionalMoreKeys="ж" />
+    <Key
+        latin:keySpec="ь"
+        latin:additionalMoreKeys="ъ" />
+    <Key
+        latin:keySpec="ц" />
+    <Key
+        latin:keySpec="в" />
+    <Key
+        latin:keySpec="б" />
+    <Key
+        latin:keySpec="н" />
+    <Key
+        latin:keySpec="м" />
+</merge>

java/res/xml/rows_east_slavic_phonetic.xml

@@ -0,0 +1,56 @@
+<?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" />
+    <include latin:keyboardLayout="@xml/row_number_switch" />
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_east_slavic_phonetic1" />
+    </Row>
+    <Row
+            latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_east_slavic_phonetic2"
+            latin:keyXPos="5%p" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="15%p"
+            latin:visualInsetsRight="1%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_east_slavic_phonetic3" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"
+            latin:visualInsetsLeft="1%p" />
+    </Row>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>

java/src/org/futo/inputmethod/latin/uix/settings/pages/AddLanguage.kt

@@ -27,7 +27,7 @@ val LocaleLayoutMap = mapOf(
     "af"     to   listOf("qwerty"),
     "ar"     to   listOf("arabic"),
     "az_AZ"  to   listOf("qwerty"),
-    "be_BY"  to   listOf("east_slavic"),
+    "be_BY"  to   listOf("east_slavic", "east_slavic_phonetic"),
     "bg"     to   listOf("bulgarian"),
     "bg"     to   listOf("bulgarian_bds"),
     "bn_BD"  to   listOf("bengali_akkhor"),
@@ -64,10 +64,10 @@ val LocaleLayoutMap = mapOf(
     "it_CH"  to   listOf("swiss"),
     "iw"     to   listOf("hebrew"),
     "ka_GE"  to   listOf("georgian"),
-    "kk"     to   listOf("east_slavic"),
+    "kk"     to   listOf("east_slavic", "east_slavic_phonetic"),
     "km_KH"  to   listOf("khmer"),
     "kn_IN"  to   listOf("kannada"),
-    "ky"     to   listOf("east_slavic"),
+    "ky"     to   listOf("east_slavic", "east_slavic_phonetic"),
     "lo_LA"  to   listOf("lao"),
     "lt"     to   listOf("qwerty"),
     "lv"     to   listOf("qwerty"),
@@ -84,7 +84,7 @@ val LocaleLayoutMap = mapOf(
     "pt_BR"  to   listOf("qwerty"),
     "pt_PT"  to   listOf("qwerty"),
     "ro"     to   listOf("qwerty"),
-    "ru"     to   listOf("east_slavic"),
+    "ru"     to   listOf("east_slavic", "east_slavic_phonetic"),
     "si_LK"  to   listOf("sinhala"),
     "sk"     to   listOf("qwerty"),
     "sl"     to   listOf("qwerty"),
@@ -99,7 +99,7 @@ val LocaleLayoutMap = mapOf(
     "th"     to   listOf("thai"),
     "tl"     to   listOf("spanish"),
     "tr"     to   listOf("qwerty"),
-    "uk"     to   listOf("east_slavic"),
+    "uk"     to   listOf("east_slavic", "east_slavic_phonetic"),
     "uz_UZ"  to   listOf("uzbek"),
     "vi"     to   listOf("qwerty"),
     "zu"     to   listOf("qwerty"),