- fixed latin and glagolitic input

- fixed sublayouts for all three scripts - added glagolitic script - refactoring
Slqavjanskqi · Aug 6, 2024 · 98a45ae · 98a45ae
1 parent 21c63c8
commit 98a45ae
Show file tree

Hide file tree

Showing 23 changed files with 103 additions and 121 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,14 +1,30 @@
 ### TODO
 
-- [ ] Glagolitic Script Support
+- [x] Glagolitic Script Support
 - [x] Non-ISO Language Codes Support
-
 
-- [ ] Church Slavonic
-    - [ ] Cyrillic Script
+
+- [ ] Slavonic
+    - [x] Cyrillic Script
         - [x] Bulgarian BDS Keyboard Layout
         - [x] European E1 Keyboard Layout
         - [x] Russian UCOUKEN Keyboard Layout
+    - [x] Glagolitic Script
+        - [x] European E1 Keyboard Layout
+        - [x] Russian UCOUKEN Keyboard Layout
+    - [x] Latin Script
+        - [x] European E1 Keyboard Layout
+    - [ ] Spellchecker
+        - [ ] Cyrillic
+        - [ ] Glagolitic
+        - [ ] Latin
+
+
+- [ ] Church Slavonic
+    - [ ] Cyrillic Script
+        - [ ] Bulgarian BDS Keyboard Layout
+        - [ ] European E1 Keyboard Layout
+        - [ ] Russian UCOUKEN Keyboard Layout
     - [ ] Glagolitic Script
         - [ ] European E1 Keyboard Layout
         - [ ] Russian UCOUKEN Keyboard Layout
@@ -22,9 +38,9 @@
 
 - [ ] Interslavic
     - [ ] Cyrillic Script
-        - [x] Bulgarian BDS Keyboard Layout
-        - [x] European E1 Keyboard Layout
-        - [x] Russian UCOUKEN Keyboard Layout
+        - [ ] Bulgarian BDS Keyboard Layout
+        - [ ] European E1 Keyboard Layout
+        - [ ] Russian UCOUKEN Keyboard Layout
     - [ ] Glagolitic Script
         - [ ] European E1 Keyboard Layout
         - [ ] Russian UCOUKEN Keyboard Layout
@@ -38,22 +54,6 @@
         - [ ] Latin Etymological
 
 
-- [ ] Modern Slavonic
-    - [ ] Cyrillic Script
-        - [x] Bulgarian BDS Keyboard Layout
-        - [x] European E1 Keyboard Layout
-        - [x] Russian UCOUKEN Keyboard Layout
-    - [ ] Glagolitic Script
-        - [ ] European E1 Keyboard Layout
-        - [ ] Russian UCOUKEN Keyboard Layout
-    - [ ] Latin Script
-        - [ ] European E1 Keyboard Layout
-    - [ ] Spellchecker
-        - [ ] Cyrillic
-        - [ ] Glagolitic
-        - [ ] Latin
-
-
 - [ ] Translations
     - [ ] (Old) Church Slavonic (cu/chu)
     - [ ] Interslavic (isv)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -582,45 +582,45 @@ disposition rather than other common dispositions for Latin languages. [CHAR LIM
     <!-- Description indicating amoled mode can lower power usage depending on the screen of the device. -->
     <string name="amoled_mode_summary">Can reduce power usage depending on the device’s screen technology</string>
 
-    <string name="subtype_chu_BGBDS">Church Slavonic (Cyrillic Bulgarian)</string>
+    <string name="subtype_chu_BGBDS">Church Slavonic (Cyrillic BDS)</string>
     <string name="subtype_chu_CyrlE1">Church Slavonic (Cyrillic E1)</string>
-    <string name="subtype_chu_CyrsUcouke">Church Slavonic (Cyrillic Russian)</string>
-    <string name="subtype_chu_GlagUcouke">Church Slavonic (Glagolitic Russian)</string>
+    <string name="subtype_chu_CyrsUcouke">Church Slavonic (Cyrillic UCOUKE)</string>
+    <string name="subtype_chu_GlagUcouke">Church Slavonic (Glagolitic UCOUKE)</string>
     <string name="subtype_chu_GlagE1">Church Slavonic (Glagolitic E1)</string>
     <string name="subtype_chu_LatnE1">Church Slavonic (Latin E1)</string>
 
-    <string name="subtype_isv_BGBDS">Interslavic (Cyrillic Bulgarian)</string>
+    <string name="subtype_isv_BGBDS">Interslavic (Cyrillic BDS)</string>
     <string name="subtype_isv_CyrlE1">Interslavic (Cyrillic E1)</string>
-    <string name="subtype_isv_CyrsUcouke">Interslavic (Cyrillic Russian)</string>
-    <string name="subtype_isv_GlagUcouke">Interslavic (Glagolitic Russian)</string>
+    <string name="subtype_isv_CyrsUcouke">Interslavic (Cyrillic UCOUKE)</string>
+    <string name="subtype_isv_GlagUcouke">Interslavic (Glagolitic UCOUKE)</string>
     <string name="subtype_isv_GlagE1">Interslavic (Glagolitic E1)</string>
     <string name="subtype_isv_LatnE1">Interslavic (Latin E1)</string>
 
-    <string name="subtype_sla_BGBDS">Slavonic (Cyrillic Bulgarian)</string>
+    <string name="subtype_sla_BGBDS">Slavonic (Cyrillic BDS)</string>
     <string name="subtype_sla_CyrlE1">Slavonic (Cyrillic E1)</string>
-    <string name="subtype_sla_CyrsUcouke">Slavonic (Cyrillic Russian)</string>
-    <string name="subtype_sla_GlagUcouke">Slavonic (Glagolitic Russian)</string>
+    <string name="subtype_sla_CyrsUcouke">Slavonic (Cyrillic UCOUKE)</string>
+    <string name="subtype_sla_GlagUcouke">Slavonic (Glagolitic UCOUKE)</string>
     <string name="subtype_sla_GlagE1">Slavonic (Glagolitic E1)</string>
     <string name="subtype_sla_LatnE1">Slavonic (Latin E1)</string>
 
-    <string name="subtype_with_layout_chu_BGBDS">Church Slavonic (Cyrillic Bulgarian)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪУЕИШК">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_chu_BGBDS">Church Slavonic (Cyrillic BDS)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪУЕИШК">%s</xliff:g>)</string>
     <string name="subtype_with_layout_chu_CyrlE1">Church Slavonic (Cyrillic E1)(<xliff:g id="KEYBOARD_LAYOUT" example="ЪУЕРТЗ">%s</xliff:g>)</string>
-    <string name="subtype_with_layout_chu_CyrsUcouke">Church Slavonic (Cyrillic Russian)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪЦУКЕН">%s</xliff:g>)</string>
-    <string name="subtype_with_layout_chu_GlagUcouke">Church Slavonic (Glagolitic Russian)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰦⰜⰖⰍⰅⰐ">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_chu_CyrsUcouke">Church Slavonic (Cyrillic UCOUKE)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪЦУКЕ">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_chu_GlagUcouke">Church Slavonic (Glagolitic UCOUKE)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰦⰜⰖⰍⰅ">%s</xliff:g>)</string>
     <string name="subtype_with_layout_chu_GlagE1">Church Slavonic (Glagolitic E1)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰟⰖⰅⰓⰕⰈ">%s</xliff:g>)</string>
     <string name="subtype_with_layout_chu_LatnE1">Church Slavonic (Latin E1)(<xliff:g id="KEYBOARD_LAYOUT" example="QWERTZ">%s</xliff:g>)</string>
 
-    <string name="subtype_with_layout_isv_BGBDS">Interslavic  (Cyrillic Bulgarian)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪУЕИШК">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_isv_BGBDS">Interslavic  (Cyrillic BDS)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪУЕИШК">%s</xliff:g>)</string>
     <string name="subtype_with_layout_isv_CyrlE1">Interslavic (Cyrillic E1)(<xliff:g id="KEYBOARD_LAYOUT" example="ЪУЕРТЗ">%s</xliff:g>)</string>
-    <string name="subtype_with_layout_isv_CyrsUcouke">Interslavic (Cyrillic Russian)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪЦУКЕН">%s</xliff:g>)</string>
-    <string name="subtype_with_layout_isv_GlagUcouke">Interslavic (Glagolitic Russian)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰦⰜⰖⰍⰅⰐ">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_isv_CyrsUcouke">Interslavic (Cyrillic UCOUKE)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪЦУКЕ">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_isv_GlagUcouke">Interslavic (Glagolitic UCOUKE)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰦⰜⰖⰍⰅ">%s</xliff:g>)</string>
     <string name="subtype_with_layout_isv_GlagE1">Interslavic (Glagolitic E1)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰟⰖⰅⰓⰕⰈ">%s</xliff:g>)</string>
     <string name="subtype_with_layout_isv_LatnE1">Interslavic (Latin E1)(<xliff:g id="KEYBOARD_LAYOUT" example="QWERTZ">%s</xliff:g>)</string>
 
-    <string name="subtype_with_layout_sla_BGBDS">Slavonic (Cyrillic Bulgarian)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪУЕИШК">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_sla_BGBDS">Slavonic (Cyrillic BDS)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪУЕИШК">%s</xliff:g>)</string>
     <string name="subtype_with_layout_sla_CyrlE1">Slavonic (Cyrillic E1)(<xliff:g id="KEYBOARD_LAYOUT" example="ЪУЕРТЗ">%s</xliff:g>)</string>
-    <string name="subtype_with_layout_sla_CyrsUcouke">Slavonic (Cyrillic Russian)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪЦУКЕНѪЦУКЕН">%s</xliff:g>)</string>
-    <string name="subtype_with_layout_sla_GlagUcouke">Slavonic (Glagolitic Russian)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰦⰜⰖⰍⰅⰐ">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_sla_CyrsUcouke">Slavonic (Cyrillic UCOUKE)(<xliff:g id="KEYBOARD_LAYOUT" example="ѪЦУКЕНѪЦУКЕ">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_sla_GlagUcouke">Slavonic (Glagolitic UCOUKE)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰦⰜⰖⰍⰅ">%s</xliff:g>)</string>
     <string name="subtype_with_layout_sla_GlagE1">Slavonic (Glagolitic E1)(<xliff:g id="KEYBOARD_LAYOUT" example="ⰟⰖⰅⰓⰕⰈ">%s</xliff:g>)</string>
     <string name="subtype_with_layout_sla_LatnE1">Slavonic (Latin E1)(<xliff:g id="KEYBOARD_LAYOUT" example="QWERTZ">%s</xliff:g>)</string>
 

diff --git a/app/src/main/res/xml/kbd_slavonic_glagolitic.xml b/app/src/main/res/xml/kbd_slavonic_glagolitic.xml
@@ -18,9 +18,6 @@
 */
 -->
 
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_slavonic_glagolitic" />
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <include latin:keyboardLayout="@xml/rows_slavonic_glagolitic" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_slavonic_latin.xml b/app/src/main/res/xml/kbd_slavonic_latin.xml
@@ -18,9 +18,6 @@
 */
 -->
 
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_slavonic_latin" />
+<Keyboard xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <include latin:keyboardLayout="@xml/rows_slavonic_latin" />
 </Keyboard>
diff --git a/app/src/main/res/xml/key_space_4kw.xml b/app/src/main/res/xml/key_space_4kw.xml
@@ -19,28 +19,6 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
-        <!--        <case-->
-        <!--            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"-->
-        <!--            latin:languageSwitchKeyEnabled="true"-->
-        <!--            >-->
-        <!--            <Key-->
-        <!--                latin:keyStyle="languageSwitchKeyStyle" />-->
-        <!--            <Key-->
-        <!--                latin:keyStyle="spaceKeyStyle"-->
-        <!--                latin:keyWidth="20%p" />-->
-        <!--            <Key-->
-        <!--                latin:keyStyle="zwnjKeyStyle" />-->
-        <!--        </case>-->
-        <!--        <case-->
-        <!--            latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu"-->
-        <!--            latin:languageSwitchKeyEnabled="false"-->
-        <!--            >-->
-        <!--            <Key-->
-        <!--                latin:keyStyle="spaceKeyStyle"-->
-        <!--                latin:keyWidth="30%p" />-->
-        <!--            <Key-->
-        <!--                latin:keyStyle="zwnjKeyStyle" />-->
-        <!--        </case>-->
 
         <case
             latin:emojiKeyEnabled="false"

diff --git a/app/src/main/res/xml/keyboard_layout_set_slavonic_cyrillic.xml b/app/src/main/res/xml/keyboard_layout_set_slavonic_cyrillic.xml
@@ -18,8 +18,8 @@
 -->
 
 <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature latin:supportedScript="cyrillic" />
-
+    <Feature
+        latin:supportedScript="cyrillic" />
     <Element
         latin:elementKeyboard="@xml/kbd_slavonic_cyrillic"
         latin:elementName="alphabet"

diff --git a/app/src/main/res/xml/keyboard_layout_set_slavonic_glagolitic.xml b/app/src/main/res/xml/keyboard_layout_set_slavonic_glagolitic.xml
@@ -18,8 +18,8 @@
 -->
 
 <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature latin:supportedScript="glagolitic" />
-
+    <Feature
+        latin:supportedScript="glagolitic" />
     <Element
         latin:elementKeyboard="@xml/kbd_slavonic_glagolitic"
         latin:elementName="alphabet"

diff --git a/app/src/main/res/xml/keyboard_layout_set_slavonic_latin.xml b/app/src/main/res/xml/keyboard_layout_set_slavonic_latin.xml
@@ -18,9 +18,10 @@
 -->
 
 <KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <Feature latin:supportedScript="latin" />
-
+    <Feature
+        latin:supportedScript="latin" />
     <Element
+        latin:allowRedundantMoreKeys="true"
         latin:elementKeyboard="@xml/kbd_slavonic_latin"
         latin:elementName="alphabet"
         latin:enableProximityCharsCorrection="true" />