Skip to content

Commit a6b6d1b

Browse files
authored
Rework of UK and RU standard layout plus added extended layout (#1215)
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)
1 parent ba88129 commit a6b6d1b

File tree

7 files changed

+121
-10
lines changed

7 files changed

+121
-10
lines changed

Diff for: app/src/main/assets/layouts/main/russian.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
ш
99
щ
1010
з
11-
х
11+
х ъ [ {
1212

1313
ф
1414
ы
@@ -20,7 +20,7 @@
2020
л
2121
д
2222
ж
23-
э
23+
э э́ ] }
2424

2525
я
2626
ч
+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
й
2+
ц
3+
у
4+
к
5+
е
6+
н
7+
г
8+
ш
9+
щ
10+
з
11+
х [ {
12+
ъ ] }
13+
14+
ф
15+
ы
16+
в
17+
а
18+
п
19+
р
20+
о
21+
л
22+
д
23+
ж
24+
э э́
25+
26+
я
27+
ч
28+
с
29+
м
30+
и
31+
т
32+
ь
33+
б <
34+
ю >

Diff for: app/src/main/assets/layouts/main/ukrainian.txt

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
ш
99
щ
1010
з
11-
х
11+
х [ {
12+
ї ] }
1213

1314
ф
1415
і
@@ -20,7 +21,7 @@
2021
л
2122
д
2223
ж
23-
є
24+
є ' "
2425

2526
я
2627
ч
@@ -30,4 +31,4 @@
3031
т
3132
ь
3233
б <
33-
ю >
34+
ю > ґ
+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
й
2+
ц
3+
у
4+
к
5+
е
6+
н
7+
г
8+
ш
9+
щ
10+
з
11+
х [ {
12+
ї ] }
13+
14+
ф
15+
і
16+
в
17+
а
18+
п
19+
р
20+
о
21+
л
22+
д
23+
ж
24+
є ' "
25+
' "
26+
27+
я
28+
ч
29+
с
30+
м
31+
и
32+
т
33+
ь
34+
б <
35+
ю > ґ

Diff for: app/src/main/assets/locale_key_texts/ru.txt

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
[popup_keys]
2-
е ё
3-
ь ъ
2+
е ё е́ ѣ
3+
ф ѳ
4+
ы ы́
5+
а а́
6+
о о́
7+
я я́
8+
и и́
9+
ь ъ ы
10+
ю ю́
411
' ’ ‚ ‘ › ‹
512
" ” „ “ » «
613

14+
і ы
15+
є э э́
16+
717
[labels]
818
alphabet: АБВ
919

Diff for: app/src/main/assets/locale_key_texts/uk.txt

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
[popup_keys]
2+
е е́
23
г ґ
3-
ь
4+
ф ѳ
45
і ї
5-
' ’ ‚ ‘
6-
" ” „ “
6+
а а́
7+
о о́
8+
я я́
9+
и и́ і ї
10+
г ґ
11+
ю ю́
12+
' ’ ‚ ‘ › ‹
13+
" ” „ “ » «
14+
15+
ы і ї
16+
э є
717

818
[labels]
919
alphabet: АБВ

Diff for: app/src/main/res/xml/method.xml

+21
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
pt_PT: Portuguese (Portugal)/qwerty
9191
ro: Romanian/qwerty
9292
ru: Russian/russian
93+
ru: Russian (Extended)/russian_extended
9394
ru: Russian (Student)/russian_student
9495
si_LK: Sinhala (Sri Lanka)/sinhala # This is a preliminary keyboard layout.
9596
sk: Slovak/qwerty
@@ -107,6 +108,7 @@
107108
tr: Turkish/turkish
108109
ur_PK: Urdu Pakistan
109110
uk: Ukrainian/ukrainian
111+
uk: Ukrainian (Extended)/ukrainian_extended
110112
uz_UZ: Uzbek (Uzbekistan)/uzbek # This is a preliminary keyboard layout.
111113
vi: Vietnamese/qwerty
112114
zu: Zulu/qwerty
@@ -912,6 +914,16 @@
912914
android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:russian,SupportTouchPositionCorrection,EmojiCapable"
913915
android:isAsciiCapable="false"
914916
/>
917+
<subtype android:icon="@drawable/ic_ime_switcher"
918+
android:label="@string/subtype_generic_extended"
919+
android:subtypeId="0x91f35a0b"
920+
android:imeSubtypeLocale="ru"
921+
android:languageTag="ru"
922+
android:imeSubtypeMode="keyboard"
923+
android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:russian_extended,SupportTouchPositionCorrection,EmojiCapable"
924+
android:isAsciiCapable="false"
925+
926+
/>
915927
<subtype android:icon="@drawable/ic_ime_switcher"
916928
android:label="@string/subtype_generic_student"
917929
android:subtypeId="0x1bc335d0"
@@ -1064,6 +1076,15 @@
10641076
android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:ukrainian,EmojiCapable"
10651077
android:isAsciiCapable="false"
10661078
/>
1079+
<subtype android:icon="@drawable/ic_ime_switcher"
1080+
android:label="@string/subtype_generic_extended"
1081+
android:subtypeId="0x49dc95e4"
1082+
android:imeSubtypeLocale="uk"
1083+
android:languageTag="uk"
1084+
android:imeSubtypeMode="keyboard"
1085+
android:imeSubtypeExtraValue="KeyboardLayoutSet=MAIN:ukrainian_extended,EmojiCapable"
1086+
android:isAsciiCapable="false"
1087+
/>
10671088
<subtype android:icon="@drawable/ic_ime_switcher"
10681089
android:label="@string/subtype_generic"
10691090
android:subtypeId="0x1e8349fc"

0 commit comments

Comments
 (0)