From 98a45ae3edce39758ec3c499c602efecf404975d Mon Sep 17 00:00:00 2001 From: Yaksinikos <9306861+Yaksinikos@users.noreply.github.com> Date: Tue, 6 Aug 2024 22:38:16 +0200 Subject: [PATCH] - fixed latin and glagolitic input - fixed sublayouts for all three scripts - added glagolitic script - refactoring --- TODO.md | 46 +++++++++--------- app/src/main/res/values/strings.xml | 36 +++++++------- .../main/res/xml/kbd_slavonic_glagolitic.xml | 7 +-- app/src/main/res/xml/kbd_slavonic_latin.xml | 7 +-- app/src/main/res/xml/key_space_4kw.xml | 22 --------- .../keyboard_layout_set_slavonic_cyrillic.xml | 4 +- ...eyboard_layout_set_slavonic_glagolitic.xml | 4 +- .../keyboard_layout_set_slavonic_latin.xml | 5 +- app/src/main/res/xml/method.xml | 47 +++++++++++-------- app/src/main/res/xml/rowkeys_slavonic4.xml | 6 --- .../main/res/xml/rowkeys_slavonic_glage11.xml | 1 + .../main/res/xml/rowkeys_slavonic_glage12.xml | 1 + .../main/res/xml/rowkeys_slavonic_glage13.xml | 1 + .../res/xml/rowkeys_slavonic_glagucouke1.xml | 2 +- .../res/xml/rowkeys_slavonic_glagucouke2.xml | 1 + .../res/xml/rowkeys_slavonic_glagucouke3.xml | 1 + .../main/res/xml/rowkeys_slavonic_latne11.xml | 1 + .../main/res/xml/rowkeys_slavonic_latne12.xml | 1 + .../main/res/xml/rowkeys_slavonic_latne13.xml | 1 + .../main/res/xml/rows_slavonic_cyrillic.xml | 6 +-- .../main/res/xml/rows_slavonic_glagolitic.xml | 4 +- app/src/main/res/xml/rows_slavonic_latin.xml | 2 +- app/src/main/res/xml/spellchecker.xml | 18 +++---- 23 files changed, 103 insertions(+), 121 deletions(-) diff --git a/TODO.md b/TODO.md index b5461f085..204a6c19f 100644 --- 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 index 0e8ac135e..593e06fe3 100644 --- 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 Can reduce power usage depending on the device’s screen technology - Church Slavonic (Cyrillic Bulgarian) + Church Slavonic (Cyrillic BDS) Church Slavonic (Cyrillic E1) - Church Slavonic (Cyrillic Russian) - Church Slavonic (Glagolitic Russian) + Church Slavonic (Cyrillic UCOUKE) + Church Slavonic (Glagolitic UCOUKE) Church Slavonic (Glagolitic E1) Church Slavonic (Latin E1) - Interslavic (Cyrillic Bulgarian) + Interslavic (Cyrillic BDS) Interslavic (Cyrillic E1) - Interslavic (Cyrillic Russian) - Interslavic (Glagolitic Russian) + Interslavic (Cyrillic UCOUKE) + Interslavic (Glagolitic UCOUKE) Interslavic (Glagolitic E1) Interslavic (Latin E1) - Slavonic (Cyrillic Bulgarian) + Slavonic (Cyrillic BDS) Slavonic (Cyrillic E1) - Slavonic (Cyrillic Russian) - Slavonic (Glagolitic Russian) + Slavonic (Cyrillic UCOUKE) + Slavonic (Glagolitic UCOUKE) Slavonic (Glagolitic E1) Slavonic (Latin E1) - Church Slavonic (Cyrillic Bulgarian)(%s) + Church Slavonic (Cyrillic BDS)(%s) Church Slavonic (Cyrillic E1)(%s) - Church Slavonic (Cyrillic Russian)(%s) - Church Slavonic (Glagolitic Russian)(%s) + Church Slavonic (Cyrillic UCOUKE)(%s) + Church Slavonic (Glagolitic UCOUKE)(%s) Church Slavonic (Glagolitic E1)(%s) Church Slavonic (Latin E1)(%s) - Interslavic (Cyrillic Bulgarian)(%s) + Interslavic (Cyrillic BDS)(%s) Interslavic (Cyrillic E1)(%s) - Interslavic (Cyrillic Russian)(%s) - Interslavic (Glagolitic Russian)(%s) + Interslavic (Cyrillic UCOUKE)(%s) + Interslavic (Glagolitic UCOUKE)(%s) Interslavic (Glagolitic E1)(%s) Interslavic (Latin E1)(%s) - Slavonic (Cyrillic Bulgarian)(%s) + Slavonic (Cyrillic BDS)(%s) Slavonic (Cyrillic E1)(%s) - Slavonic (Cyrillic Russian)(%s) - Slavonic (Glagolitic Russian)(%s) + Slavonic (Cyrillic UCOUKE)(%s) + Slavonic (Glagolitic UCOUKE)(%s) Slavonic (Glagolitic E1)(%s) Slavonic (Latin E1)(%s) diff --git a/app/src/main/res/xml/kbd_slavonic_glagolitic.xml b/app/src/main/res/xml/kbd_slavonic_glagolitic.xml index 22077356b..b52e681fc 100644 --- a/app/src/main/res/xml/kbd_slavonic_glagolitic.xml +++ b/app/src/main/res/xml/kbd_slavonic_glagolitic.xml @@ -18,9 +18,6 @@ */ --> - - + + diff --git a/app/src/main/res/xml/kbd_slavonic_latin.xml b/app/src/main/res/xml/kbd_slavonic_latin.xml index d032b0eb2..36334dfb2 100644 --- a/app/src/main/res/xml/kbd_slavonic_latin.xml +++ b/app/src/main/res/xml/kbd_slavonic_latin.xml @@ -18,9 +18,6 @@ */ --> - - + + diff --git a/app/src/main/res/xml/key_space_4kw.xml b/app/src/main/res/xml/key_space_4kw.xml index 2c8773cb0..66410ed55 100644 --- a/app/src/main/res/xml/key_space_4kw.xml +++ b/app/src/main/res/xml/key_space_4kw.xml @@ -19,28 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - + diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml index f68aae004..5a1d0c783 100644 --- a/app/src/main/res/xml/method.xml +++ b/app/src/main/res/xml/method.xml @@ -98,10 +98,14 @@ chu_Cyrs: Church Slavonic Old Cyrillic chu_Glag: Church Slavonic Glagolitic chu_Latn: Church Slavonic Latin - sla_Cyrs: Modern Slavonic Old Cyrillic - sla_Cyrl: Interslavic Cyrillic - sla_Glag: Interslavic Glagolitic - sla_Latn: Interslavic Latin + sla_Cyrs: Slavonic Old Cyrillic + sla_Cyrl: Slavonic Cyrillic + sla_Glag: Slavonic Glagolitic + sla_Latn: Slavonic Latin + isv_Cyrs: Interslavic Old Cyrillic + isv_Cyrl: Interslavic Cyrillic + isv_Glag: Interslavic Glagolitic + isv_Latn: Interslavic Latin sr: Serbian/south_slavic sr_ZZ: Serbian (Latin)/serbian_qwertz # This is a preliminary keyboard layout. sv: Swedish/nordic @@ -728,6 +732,9 @@ android:isAsciiCapable="true" /> diff --git a/app/src/main/res/xml/rowkeys_slavonic_glage12.xml b/app/src/main/res/xml/rowkeys_slavonic_glage12.xml index 480238ab8..ede6005d9 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_glage12.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_glage12.xml @@ -15,6 +15,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ +TODO: add supplement glagolic letters --> diff --git a/app/src/main/res/xml/rowkeys_slavonic_glage13.xml b/app/src/main/res/xml/rowkeys_slavonic_glage13.xml index 5d4eb10ce..84c7db6e6 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_glage13.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_glage13.xml @@ -15,6 +15,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ +TODO: add supplement glagolic letters --> diff --git a/app/src/main/res/xml/rowkeys_slavonic_glagucouke1.xml b/app/src/main/res/xml/rowkeys_slavonic_glagucouke1.xml index ae6df19c3..c680dc631 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_glagucouke1.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_glagucouke1.xml @@ -15,7 +15,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ -// TODO: add supplement glagolic letters +TODO: add supplement glagolic letters --> diff --git a/app/src/main/res/xml/rowkeys_slavonic_glagucouke2.xml b/app/src/main/res/xml/rowkeys_slavonic_glagucouke2.xml index ad8f71fa2..660874bd3 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_glagucouke2.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_glagucouke2.xml @@ -15,6 +15,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ +TODO: add supplement glagolic letters --> diff --git a/app/src/main/res/xml/rowkeys_slavonic_glagucouke3.xml b/app/src/main/res/xml/rowkeys_slavonic_glagucouke3.xml index 93f153dc1..41cc53c6e 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_glagucouke3.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_glagucouke3.xml @@ -15,6 +15,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ +TODO: add supplement glagolic letters --> diff --git a/app/src/main/res/xml/rowkeys_slavonic_latne11.xml b/app/src/main/res/xml/rowkeys_slavonic_latne11.xml index 4cc58cac8..a6ca8d5af 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_latne11.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_latne11.xml @@ -16,6 +16,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ +TODO --> diff --git a/app/src/main/res/xml/rowkeys_slavonic_latne12.xml b/app/src/main/res/xml/rowkeys_slavonic_latne12.xml index b008f805b..891d12eac 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_latne12.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_latne12.xml @@ -16,6 +16,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ +TODO --> diff --git a/app/src/main/res/xml/rowkeys_slavonic_latne13.xml b/app/src/main/res/xml/rowkeys_slavonic_latne13.xml index 8bf69d901..6c7446e53 100644 --- a/app/src/main/res/xml/rowkeys_slavonic_latne13.xml +++ b/app/src/main/res/xml/rowkeys_slavonic_latne13.xml @@ -16,6 +16,7 @@ ** See the License for the specific language governing permissions and ** limitations under the License. */ +TODO --> diff --git a/app/src/main/res/xml/rows_slavonic_cyrillic.xml b/app/src/main/res/xml/rows_slavonic_cyrillic.xml index 25ac84268..31307cd5a 100644 --- a/app/src/main/res/xml/rows_slavonic_cyrillic.xml +++ b/app/src/main/res/xml/rows_slavonic_cyrillic.xml @@ -27,7 +27,7 @@ - + @@ -44,7 +44,7 @@ latin:keyWidth="fillRight" /> - + @@ -61,7 +61,7 @@ latin:keyWidth="fillRight" /> - + diff --git a/app/src/main/res/xml/rows_slavonic_glagolitic.xml b/app/src/main/res/xml/rows_slavonic_glagolitic.xml index f0cffcdb4..662388098 100644 --- a/app/src/main/res/xml/rows_slavonic_glagolitic.xml +++ b/app/src/main/res/xml/rows_slavonic_glagolitic.xml @@ -27,7 +27,7 @@ - + @@ -44,7 +44,7 @@ latin:keyWidth="fillRight" /> - + diff --git a/app/src/main/res/xml/rows_slavonic_latin.xml b/app/src/main/res/xml/rows_slavonic_latin.xml index 6113e6ef6..08cd3756f 100644 --- a/app/src/main/res/xml/rows_slavonic_latin.xml +++ b/app/src/main/res/xml/rows_slavonic_latin.xml @@ -27,7 +27,7 @@ - + diff --git a/app/src/main/res/xml/spellchecker.xml b/app/src/main/res/xml/spellchecker.xml index a97872583..5b9b3651b 100644 --- a/app/src/main/res/xml/spellchecker.xml +++ b/app/src/main/res/xml/spellchecker.xml @@ -146,39 +146,39 @@ />