From a6b6d1b659f70edad816a9c6fe3f279e41fb5902 Mon Sep 17 00:00:00 2001
From: Quantom2 <113715737+Quantom2@users.noreply.github.com>
Date: Sat, 15 Mar 2025 15:05:05 +0200
Subject: [PATCH] Rework of UK and RU standard layout plus added extended
layout (#1215)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Rework of UK and RU standard layout plus added extended layout (similar to PC keyboard) as optional;
- Added 'ї' as separate letter (it used much more often, just to be optional key in popups)
- Added [ { } } popups to fill empty hint space (similar to PC layout)
- Added ' (apostrofee) suggestion onto 'є' key (similar to oter keyboards and to PC layout)
RU)
Added siggestion to 'ъ' on 'х' key (similar to other keyboards, anyway there was no popups at all)
- Added [ { } } popups to fill empty hint space (similar to PC layout)
- Added 'э́' suggestion similar to other keyboards
Both)
- Improvements to multilanguage typing (now this is possible to sue UK-RU or RU-UK pair, I added letters from other language as popups)
Added)
- UK Extended with separate ' key (used less often than 'ї', but still used pretty often)
- RU Extended, with separate 'ъ' key (similar to full desk PC layout)
---
app/src/main/assets/layouts/main/russian.txt | 4 +--
.../assets/layouts/main/russian_extended.txt | 34 ++++++++++++++++++
.../main/assets/layouts/main/ukrainian.txt | 7 ++--
.../layouts/main/ukrainian_extended.txt | 35 +++++++++++++++++++
app/src/main/assets/locale_key_texts/ru.txt | 14 ++++++--
app/src/main/assets/locale_key_texts/uk.txt | 16 +++++++--
app/src/main/res/xml/method.xml | 21 +++++++++++
7 files changed, 121 insertions(+), 10 deletions(-)
create mode 100644 app/src/main/assets/layouts/main/russian_extended.txt
create mode 100644 app/src/main/assets/layouts/main/ukrainian_extended.txt
diff --git a/app/src/main/assets/layouts/main/russian.txt b/app/src/main/assets/layouts/main/russian.txt
index 7ceb2435..7da99f64 100644
--- a/app/src/main/assets/layouts/main/russian.txt
+++ b/app/src/main/assets/layouts/main/russian.txt
@@ -8,7 +8,7 @@
ш
щ
з
-х
+х ъ [ {
ф
ы
@@ -20,7 +20,7 @@
л
д
ж
-э
+э э́ ] }
я
ч
diff --git a/app/src/main/assets/layouts/main/russian_extended.txt b/app/src/main/assets/layouts/main/russian_extended.txt
new file mode 100644
index 00000000..8b3249fe
--- /dev/null
+++ b/app/src/main/assets/layouts/main/russian_extended.txt
@@ -0,0 +1,34 @@
+й
+ц
+у
+к
+е
+н
+г
+ш
+щ
+з
+х [ {
+ъ ] }
+
+ф
+ы
+в
+а
+п
+р
+о
+л
+д
+ж
+э э́
+
+я
+ч
+с
+м
+и
+т
+ь
+б <
+ю >
diff --git a/app/src/main/assets/layouts/main/ukrainian.txt b/app/src/main/assets/layouts/main/ukrainian.txt
index 7e01cde3..ff1ed643 100644
--- a/app/src/main/assets/layouts/main/ukrainian.txt
+++ b/app/src/main/assets/layouts/main/ukrainian.txt
@@ -8,7 +8,8 @@
ш
щ
з
-х
+х [ {
+ї ] }
ф
і
@@ -20,7 +21,7 @@
л
д
ж
-є
+є ' "
я
ч
@@ -30,4 +31,4 @@
т
ь
б <
-ю >
+ю > ґ
diff --git a/app/src/main/assets/layouts/main/ukrainian_extended.txt b/app/src/main/assets/layouts/main/ukrainian_extended.txt
new file mode 100644
index 00000000..7e37e93c
--- /dev/null
+++ b/app/src/main/assets/layouts/main/ukrainian_extended.txt
@@ -0,0 +1,35 @@
+й
+ц
+у
+к
+е
+н
+г
+ш
+щ
+з
+х [ {
+ї ] }
+
+ф
+і
+в
+а
+п
+р
+о
+л
+д
+ж
+є ' "
+' "
+
+я
+ч
+с
+м
+и
+т
+ь
+б <
+ю > ґ
diff --git a/app/src/main/assets/locale_key_texts/ru.txt b/app/src/main/assets/locale_key_texts/ru.txt
index bbb9a247..59583da4 100644
--- a/app/src/main/assets/locale_key_texts/ru.txt
+++ b/app/src/main/assets/locale_key_texts/ru.txt
@@ -1,9 +1,19 @@
[popup_keys]
-е ё
-ь ъ
+е ё е́ ѣ
+ф ѳ
+ы ы́
+а а́
+о о́
+я я́
+и и́
+ь ъ ы
+ю ю́
' ’ ‚ ‘ › ‹
" ” „ “ » «
+і ы
+є э э́
+
[labels]
alphabet: АБВ
diff --git a/app/src/main/assets/locale_key_texts/uk.txt b/app/src/main/assets/locale_key_texts/uk.txt
index 9ee926c9..080bf826 100644
--- a/app/src/main/assets/locale_key_texts/uk.txt
+++ b/app/src/main/assets/locale_key_texts/uk.txt
@@ -1,9 +1,19 @@
[popup_keys]
+е е́
г ґ
-ь
+ф ѳ
і ї
-' ’ ‚ ‘
-" ” „ “
+а а́
+о о́
+я я́
+и и́ і ї
+г ґ
+ю ю́
+' ’ ‚ ‘ › ‹
+" ” „ “ » «
+
+ы і ї
+э є
[labels]
alphabet: АБВ
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index 2733268b..213f288d 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -90,6 +90,7 @@
pt_PT: Portuguese (Portugal)/qwerty
ro: Romanian/qwerty
ru: Russian/russian
+ ru: Russian (Extended)/russian_extended
ru: Russian (Student)/russian_student
si_LK: Sinhala (Sri Lanka)/sinhala # This is a preliminary keyboard layout.
sk: Slovak/qwerty
@@ -107,6 +108,7 @@
tr: Turkish/turkish
ur_PK: Urdu Pakistan
uk: Ukrainian/ukrainian
+ uk: Ukrainian (Extended)/ukrainian_extended
uz_UZ: Uzbek (Uzbekistan)/uzbek # This is a preliminary keyboard layout.
vi: Vietnamese/qwerty
zu: Zulu/qwerty
@@ -912,6 +914,16 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:russian,SupportTouchPositionCorrection,EmojiCapable"
android:isAsciiCapable="false"
/>
+
+