Add a delay after a Keyevent key in a macro

Add a delay before sending the next key to avoid race conditions causing keys to be handled in the wrong order. Notably, KeyEvent keys handling is scheduled differently than the other edit functions.
Construct a single handler
2025-08-17 20:11:14 +02:00 · 2025-03-08 13:52:56 +01:00 · 2025-03-08 13:47:55 +01:00
43 changed files with 270 additions and 403 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -190,46 +190,18 @@ As translations need to be updated regularly, you can subscribe to this issue
 to receive a notification when an update is needed:
 https://github.com/Julow/Unexpected-Keyboard/issues/373

-### Adding symbols to Shift, Fn, Compose and other modifiers
+### Adding Compose key sequences

-New key combinations can be added to builtin modifiers in the following files:
+New Compose sequences can be added into `srcs/compose/compose/extra.json`.
+If a entirely new family of sequences were to be added, a new `.json` file can
+be created in the same directory to host them.

- Shift in `srcs/compose/shift.json`.
- Fn in `srcs/compose/fn.json`.
- Compose in `srcs/compose/compose/extra.json`.
- Other modifiers are defined in the `accent_*.json` files in `srcs/compose`.
+### Adding key combinations

-Generated code must then be updated by running:
+Key combinations are defined in `srcs/juloo.keyboard2/KeyModifier.java`.
+For example, keys modified by the `Fn` key are defined in method
+`apply_fn_char`.

-```
-./gradlew compileComposeSequences
-```
-
-These files describe each symbols that get transformed when a given modifier is
-activated, in JSON format. For example:
-
-Example from `fn.json`, when `Fn` is activated, `<` becomes `«`:
-```json
-{
-  "<": "«",
-}
-```
-
-The result of a sequence can be a key name. See the list of key names in
-[doc/Possible-key-values.md](doc/Possible-key-values.md). For example from
-`fn.json`, when `Fn` is activated, space becomes `nbsp`:
-```json
-{
-  " ": "nbsp",
-}
-```
-
-Compose sequences are made of several steps. For example, the sequence
-`Compose V s = Š` is defined as:
-```json
-{
-  "V": {
-    "s": "Š"
-  }
-}
-```
+Keys with special meaning are defined in `KeyValue.java` in method
+`getKeyByName`. Their special action are defined in `KeyEventHandler.java` in
+method `key_up`
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Unexpected Keyboard [<img src="https://hosted.weblate.org/widget/unexpected-keyboard/svg-badge.svg" alt="État de la traduction" />](https://hosted.weblate.org/engage/unexpected-keyboard/)
+# Unexpected Keyboard

 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Get it on F-Droid"
@ -24,14 +24,7 @@ Usage: to apply the symbols located in the corners of each key, slide your finge
 | --- | --- | --- |
 | <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |

-## Help translate the application
-
-Improve the application translations [using Weblate](https://hosted.weblate.org/engage/unexpected-keyboard/).
-
-[<img src="https://hosted.weblate.org/widget/unexpected-keyboard/multi-auto.svg" alt="État de la traduction" />](https://hosted.weblate.org/engage/unexpected-keyboard/)
-
 ## Similar apps
-
 * [Calculator++](https://git.bubu1.eu/Bubu/android-calculatorpp) - Calculator with a similar UX, swipe to corners for advanced math symbols and operators.

 ## Contributing
--- a/build.gradle
+++ b/build.gradle
@ -14,8 +14,8 @@ android {
    applicationId "juloo.keyboard2"
    minSdk 21
    targetSdkVersion 35
-    versionCode 48
-    versionName "1.31.1"
+    versionCode 46
+    versionName "1.30.3"
  }

  sourceSets {
--- a/doc/Possible-key-values.md
+++ b/doc/Possible-key-values.md
@ -95,8 +95,6 @@ Value                 | Meaning
 `delete_word`         | Delete the word to the left of the cursor.
 `forward_delete_word` | Delete the word to the right of the cursor.

-The values with `cursor_` are new in v1.31.0. Previous custom layouts specified the slider with `slider="true"`, which should be removed.
-
 ## Whitespace
 Value   | Meaning
 :------ | :------
--- a/fastlane/metadata/android/en-US/changelogs/47.txt
+++ b/fastlane/metadata/android/en-US/changelogs/47.txt
@ -1,8 +0,0 @@
-Delete a word with a circle gesture on the delete key.
-Compose key can be unselected.
-Improved space bar slider and added selection mode.
-Lock shift with a circle gesture.
-Improvements to layouts.
-Various bug fixes and improvements to themes.
-
-Huge thanks to the contributors: @0skar2 @chuckwagoncomputing @dzaima @eandersons Lokesh Kumar @lrvideckis @ms-jagadeeshan @quantenzitrone @Sestowner @solokot @Spike-from-NH @srikanban @tenextractor
--- a/fastlane/metadata/android/en-US/changelogs/48.txt
+++ b/fastlane/metadata/android/en-US/changelogs/48.txt
@ -1,9 +0,0 @@
-Bug fixes
-
-Delete a word with a circle gesture on the delete key.
-Compose key can be unselected.
-Improved space bar slider and added selection mode.
-Lock shift with a circle gesture.
-Various bug fixes and improvements to themes and layouts.
-
-Many thanks to the contributors: @HaleyHalcyon @Jaoheah @Spike-from-NH
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Klávesnice Unexpected</string>
    <string name="app_name_debug">Klávesnice Unexpected (pro ladění)</string>
    <string name="short_description">Nenáročná virtuální klávesnice pro vývojáře.</string>
-    <string name="store_description">Hlavní funkcí je možnost psát více znaků posunutím kláves směrem k rohům.\n\nTato aplikace byla původně navržena pro programátory používající Termux.\nNyní je ideální pro každodenní použití.\n\nTato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je Open Source.</string>
+    <string name="store_description">"Hlavní funkcí je možnost psát více znaků posunutím kláves směrem k rohům.
+
+Tato aplikace byla původně navržena pro programátory používající Termux.
+Nyní je ideální pro každodenní použití.
+
+Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je Open Source."</string>
    <string name="settings_activity_label">Nastavení Klávesnice Unexpected</string>
    <string name="pref_portrait">V režimu na výšku</string>
    <string name="pref_landscape">V režimu na šířku</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Rozložení %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Odebrat rozložení</string>
    <string name="pref_custom_layout_title">Vlastní rozložení</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Zobrazit NumPad</string>
    <string name="pref_show_numpad_never">Nikdy</string>
    <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (Debug)</string>
    <string name="short_description">Eine schlanke, datenschutzfreundliche Bildschirmtastatur für Android.</string>
-    <string name="store_description">Diese Tastatur zeichnet sich dadurch aus, dass man zusätzliche Zeichen durch Wischgesten in Richtung der Tastenecken eingeben kann.\n\nDie Anwendung wurde ursprünglich für das Programmieren in Termux entwickelt.\nMittlerweile ist sie auch für den täglichen Gebrauch perfekt geeignet.\n\nDiese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quelloffen.</string>
+    <string name="store_description">"Diese Tastatur zeichnet sich dadurch aus, dass man zusätzliche Zeichen durch Wischgesten in Richtung der Tastenecken eingeben kann.
+
+Die Anwendung wurde ursprünglich für das Programmieren in Termux entwickelt.
+Mittlerweile ist sie auch für den täglichen Gebrauch perfekt geeignet.
+
+Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quelloffen."</string>
    <string name="settings_activity_label">Unexpected Keyboard - Einstellungen</string>
    <string name="pref_portrait">Im Hochformatmodus</string>
    <string name="pref_landscape">Im Querformatmodus</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Layout %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Layout entfernen</string>
    <string name="pref_custom_layout_title">Eigenes Layout</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
    <string name="pref_show_numpad_never">Nie</string>
    <string name="pref_show_numpad_landscape">Nur im Querformat</string>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (debug)</string>
    <string name="short_description">Un teclado virtual ligero para Android consciente de su privacidad.</string>
-    <string name="store_description">La característica principal es que hay acceso a más caractéres deslizando hacia las esquinas de las teclas.\n\nEsta aplicación fue originalmente diseñada para programadores que usaran Termux.\nAhora es perfecta para uso cotidiano.\n\nLa misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y es de Fuente Abierta.</string>
+    <string name="store_description">"La característica principal es que hay acceso a más caractéres deslizando hacia las esquinas de las teclas.
+
+Esta aplicación fue originalmente diseñada para programadores que usaran Termux.
+Ahora es perfecta para uso cotidiano.
+
+La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y es de Fuente Abierta."</string>
    <string name="settings_activity_label">Ajustes de Unexpected Keyboard</string>
    <string name="pref_portrait">En modo vertical</string>
    <string name="pref_landscape">En modo horizontal</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Diseño %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Quitar diseño</string>
    <string name="pref_custom_layout_title">Diseño personalizado</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Mostrar teclado numérico</string>
    <string name="pref_show_numpad_never">Nunca</string>
    <string name="pref_show_numpad_landscape">Solo en modo horizontal</string>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">صفحه کلید غیرمنتظره</string>
    <string name="app_name_debug">صفحه کلید غیرمنتظره</string>
    <!-- <string name="short_description">Lightweight and privacy-conscious virtual keyboard for Android.</string> -->
-    <!-- <string name="store_description">The main feature is that you can type more characters by swiping the keys towards the corners.\n\nThis application was originally designed for programmers using Termux.\nNow perfect for everyday use.\n\nThis application contains no ads, doesn\'t make any network requests and is Open Source.</string> -->
+    <!-- <string name="store_description">"The main feature is that you can type more characters by swiping the keys towards the corners.
+
+This application was originally designed for programmers using Termux.
+Now perfect for everyday use.
+
+This application contains no ads, doesn't make any network requests and is Open Source."</string> -->
    <string name="settings_activity_label">تنظیمات صفحه کلید غیرمنتظره</string>
    <string name="pref_portrait">در حالت عمودی</string>
    <string name="pref_landscape">در حالت افقی</string>
@ -18,9 +23,6 @@
    <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
    <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
    <string name="pref_custom_layout_title">طرح شخصی</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">نمایش پد شماره‌ها</string>
    <string name="pref_show_numpad_never">هرگز</string>
    <string name="pref_show_numpad_landscape">فقط در حالت افقی</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (debug)</string>
    <string name="short_description">Clavier virtuel léger et respectueux de la vie privée pour Android.</string>
-    <string name="store_description">La fonctionnalité principale est l\'accès rapide à plus de caractères en balayant les touches vers les coins.\n\nCette application a été conçue à l\'origine pour les programmeurs utilisant Termux.\nElle est maintenant parfaite pour une utilisation quotidienne.\n\nCette application ne contient pas de publicité, n\'accède pas au réseau et est Open Source.</string>
+    <string name="store_description">"La fonctionnalité principale est l'accès rapide à plus de caractères en balayant les touches vers les coins.
+
+Cette application a été conçue à l'origine pour les programmeurs utilisant Termux.
+Elle est maintenant parfaite pour une utilisation quotidienne.
+
+Cette application ne contient pas de publicité, n'accède pas au réseau et est Open Source."</string>
    <string name="settings_activity_label">Unexpected Keyboard Paramètres</string>
    <string name="pref_portrait">En mode portrait</string>
    <string name="pref_landscape">En mode landscape</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Supprimer</string>
    <string name="pref_custom_layout_title">Disposition personnalisée</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
    <string name="pref_show_numpad_never">Jamais</string>
    <string name="pref_show_numpad_landscape">Seulement en mode paysage</string>
@ -64,12 +66,12 @@
    <string name="pref_theme_e_altblack">Noir 2</string>
    <string name="pref_theme_e_white">Blanc</string>
    <string name="pref_theme_e_epaper">ePaper</string>
-    <string name="pref_theme_e_desert">Désert</string>
+    <string name="pref_theme_e_desert">Desert</string>
    <string name="pref_theme_e_jungle">Jungle</string>
    <string name="pref_theme_e_monet">Monet (Système)</string>
    <string name="pref_theme_e_monetlight">Monet (Clair)</string>
    <string name="pref_theme_e_monetdark">Monet (Sombre)</string>
-    <string name="pref_theme_e_rosepine">Rosé Pine</string>
+    <!-- <string name="pref_theme_e_rosepine">Rosé Pine</string> -->
    <string name="pref_swipe_dist_e_very_short">Très courte</string>
    <string name="pref_swipe_dist_e_short">Courte</string>
    <string name="pref_swipe_dist_e_default">Normale</string>
@ -86,7 +88,7 @@
    <string name="pref_circle_sensitivity_e_low">Basse</string>
    <string name="pref_circle_sensitivity_e_disabled">Désactivée</string>
    <string name="key_action_next">Suiv.</string>
-    <string name="key_action_done">Fini</string>
+    <string name="key_action_done">Fin</string>
    <string name="key_action_go">Aller</string>
    <string name="key_action_prev">Prec.</string>
    <string name="key_action_search">Chercher</string>
@ -95,10 +97,10 @@
    <string name="launcher_button_imepicker">Selectionner le keyboard</string>
    <string name="launcher_description">Cette application est un clavier virtuel. Activez-le dans les paramètres système en cliquant sur le bouton ci-dessous.</string>
    <string name="launcher_sourcecode">Cette application est libre et open-source. Lisez le source code et reportez des problèmes sur Github.</string>
-    <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici :</string>
+    <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
    <string name="launcher_tryhere_hint">Essayer ici</string>
    <string name="key_descr_capslock">Verrouillage majuscules</string>
-    <string name="key_descr_compose">Composition</string>
+    <string name="key_descr_compose">Compose</string>
    <string name="key_descr_switch_greekmath">Symboles mathématiques</string>
    <string name="key_descr_change_method">Changer de clavier</string>
    <string name="key_descr_voice_typing">Saisie vocale</string>
@ -108,8 +110,8 @@
    <string name="key_descr_selectAll">Sel. tout</string>
    <string name="key_descr_shareText">Partager</string>
    <string name="key_descr_pasteAsPlainText">Copier en texte brut</string>
-    <string name="key_descr_undo">Annuler</string>
-    <string name="key_descr_redo">Refaire</string>
+    <string name="key_descr_undo">Undo</string>
+    <string name="key_descr_redo">Redo</string>
    <string name="key_descr_ª">Ordinal</string>
    <string name="key_descr_º">Ordinal</string>
    <string name="key_descr_superscript">Exposant</string>
@ -119,12 +121,12 @@
    <string name="key_descr_home">Début</string>
    <string name="key_descr_end">Fin</string>
    <string name="key_descr_clipboard">Presse-papiers</string>
-    <string name="key_descr_combining">Diacritique combinant</string>
-    <string name="key_descr_dead_key">Touche morte</string>
-    <string name="key_descr_zwj">Liant sans chasse</string>
-    <string name="key_descr_zwnj">Antiliant sans chasse</string>
-    <string name="key_descr_nbsp">Espace insécable</string>
-    <string name="key_descr_nnbsp">Espace fine insécable</string>
+    <!-- <string name="key_descr_combining">Combining diacritic</string> -->
+    <!-- <string name="key_descr_dead_key">Dead key</string> -->
+    <!-- <string name="key_descr_zwj">Zero width joiner</string> -->
+    <!-- <string name="key_descr_zwnj">Zero width non-joiner</string> -->
+    <!-- <string name="key_descr_nbsp">Non-breaking space</string> -->
+    <!-- <string name="key_descr_nnbsp">Narrow non-breaking space</string> -->
    <!-- <string name="key_descr_delete_word">Delete a word</string> -->
    <!-- <string name="key_descr_forward_delete_word">Delete a word on the right</string> -->
    <!-- <string name="key_descr_gesture">Gesture</string> -->
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (debug)</string>
    <string name="short_description">Una Tastiera Virtuale Leggera Per La Programmazione</string>
-    <!-- <string name="store_description">The main feature is that you can type more characters by swiping the keys towards the corners.\n\nThis application was originally designed for programmers using Termux.\nNow perfect for everyday use.\n\nThis application contains no ads, doesn\'t make any network requests and is Open Source.</string> -->
+    <!-- <string name="store_description">"The main feature is that you can type more characters by swiping the keys towards the corners.
+
+This application was originally designed for programmers using Termux.
+Now perfect for everyday use.
+
+This application contains no ads, doesn't make any network requests and is Open Source."</string> -->
    <string name="settings_activity_label">Impostazioni di Unexpected Keyboard</string>
    <!-- <string name="pref_portrait">In portrait mode</string> -->
    <!-- <string name="pref_landscape">In landscape mode</string> -->
@ -18,9 +23,6 @@
    <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
    <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
    <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
    <!-- <string name="pref_show_numpad_never">Never</string> -->
    <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@ -3,7 +3,13 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (Debug)</string>
    <string name="short_description">軽量でプライバシーに配慮したAndroid用仮想キーボード</string>
-    <string name="store_description">このキーボードは、キーの角をスワイプすることで様々なキーを入力できます。\n\nこのアプリは元々はTermuxでのプログラミング用に設計されました。\nしかし、今では普段の入力にも適しています。\nPCキーボードでの半角入力を再現しています。日本語入力、変換は出来ません。\n\nこのアプリは広告を含まず、インターネットに接続せず、そしてオープンソースです。</string>
+    <string name="store_description">"このキーボードは、キーの角をスワイプすることで様々なキーを入力できます。
+
+このアプリは元々はTermuxでのプログラミング用に設計されました。
+しかし、今では普段の入力にも適しています。
+PCキーボードでの半角入力を再現しています。日本語入力、変換は出来ません。
+
+このアプリは広告を含まず、インターネットに接続せず、そしてオープンソースです。"</string>
    <string name="settings_activity_label">Unexpected Keyboardの設定</string>
    <string name="pref_portrait">縦向き</string>
    <string name="pref_landscape">横向き</string>
@ -18,9 +24,6 @@
    <string name="pref_layouts_item">レイアウト %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">レイアウトを削除</string>
    <string name="pref_custom_layout_title">カスタムレイアウト</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">テンキーを表示</string>
    <string name="pref_show_numpad_never">表示しない</string>
    <string name="pref_show_numpad_landscape">横向きの時は表示</string>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <!-- <string name="app_name_debug">Unexpected Keyboard (Debug)</string> -->
    <string name="short_description">개발자들을 위한 가벼운 가상 키보드.</string>
-    <string name="store_description">주요 기능은 모서리 방향으로 키를 스와이프하여 더 많은 문자를 입력할 수 있다는 것입니다.\n\n이 앱은 처음에는 Termux를 사용하는 프로그래머들을 위한 것으로 개발되었습니다.\n지금은 일상적인 용도로도 완벽합니다.\n\n이 응용 프로그램에는 광고가 없으며 네트워크 요청을 하지 않고 오픈 소스입니다.</string>
+    <string name="store_description">"주요 기능은 모서리 방향으로 키를 스와이프하여 더 많은 문자를 입력할 수 있다는 것입니다.
+
+이 앱은 처음에는 Termux를 사용하는 프로그래머들을 위한 것으로 개발되었습니다.
+지금은 일상적인 용도로도 완벽합니다.
+
+이 응용 프로그램에는 광고가 없으며 네트워크 요청을 하지 않고 오픈 소스입니다."</string>
    <string name="settings_activity_label">Unexpected Keyboard 설정</string>
    <string name="pref_portrait">세로 화면</string>
    <string name="pref_landscape">가로 화면</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">레이아웃 %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">레이아웃 제거</string>
    <string name="pref_custom_layout_title">사용자 정의 레이아웃</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">NumPad 표시</string>
    <string name="pref_show_numpad_never">안 함</string>
    <string name="pref_show_numpad_landscape">가로 모드에서만</string>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (atkļūdošana)</string>
    <string name="short_description">Mazizmēra un privātumu ievērojoša virtuālā Android tastatūra.</string>
-    <string name="store_description">Galvenā iezīme ir iespēja ievadīt vairāk rakstzīmju ar pavilkšanu uz taustiņu stūriem.\n\nŠī lietotne sākotnēji tika izstrādāta programmētājiem, kas izmanto Termux.\nTagad lieliski piemērota izmantošanai ikdienā.\n\nŠī lietotne nesatur reklāmas, neveic nekādus tīkla pieprasījumus, un tās pirmkods ir pieejams visiem.</string>
+    <string name="store_description">"Galvenā iezīme ir iespēja ievadīt vairāk rakstzīmju ar pavilkšanu uz taustiņu stūriem.
+
+Šī lietotne sākotnēji tika izstrādāta programmētājiem, kas izmanto Termux.
+Tagad lieliski piemērota izmantošanai ikdienā.
+
+Šī lietotne nesatur reklāmas, neveic nekādus tīkla pieprasījumus, un tās pirmkods ir pieejams visiem."</string>
    <string name="settings_activity_label">Unexpected Keyboard iestatījumi</string>
    <string name="pref_portrait">Stateniski</string>
    <string name="pref_landscape">Guleniski</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Izkārtojums %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Noņemt izkārtojumu</string>
    <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
    <string name="pref_show_numpad_never">Nekad</string>
    <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
@ -93,8 +95,10 @@
    <string name="key_action_send">Sūtīt</string>
    <string name="launcher_button_imesettings">Iespējot tastatūru</string>
    <string name="launcher_button_imepicker">Izvēlēties tastatūru</string>
-    <string name="launcher_description">Šī lietotne ir virtuālā tastatūra. Ar zemāk esošo pogu var atvērt sistēmas iestatījumus un iespējot Unexpected Keyboard.</string>
-    <string name="launcher_sourcecode">Šī ir bezmaksas un atvērtā pirmkoda lietotne. GitHub var atrast pirmkodu un ziņot par nepilnībām.</string>
+    <string name="launcher_description">Šī lietotne ir virtuālā tastatūra.
+    Ar zemāk esošo pogu var atvērt sistēmas iestatījumus un iespējot Unexpected Keyboard.</string>
+    <string name="launcher_sourcecode">Šī ir bezmaksas un atvērtā pirmkoda lietotne.
+    GitHub var atrast pirmkodu un ziņot par nepilnībām.</string>
    <string name="launcher_tryhere">Pēc iespējošanas šeit var izmēģināt tastatūru:</string>
    <string name="launcher_tryhere_hint">Izmēģināt šeit</string>
    <string name="key_descr_capslock">Burtslēgs</string>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (debug)</string>
    <string name="short_description">Lekka i dbająca o prywatność klawiatura wirtualna dla Androida.</string>
-    <string name="store_description">Główną cechą tej klawiatury jest możliwość wprowadzania więcej znaków poprzez przesuwanie po klawiszach do ich rogów.\n\nTa aplikacja została pierwotnie zaprojektowana z myślą o programistach używających Termuxa.\nObecnie nadaje się doskonale do codziennego użytku.\n\nAplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źródłowy jest dostępny publicznie.</string>
+    <string name="store_description">"Główną cechą tej klawiatury jest możliwość wprowadzania więcej znaków poprzez przesuwanie po klawiszach do ich rogów.
+
+Ta aplikacja została pierwotnie zaprojektowana z myślą o programistach używających Termuxa.
+Obecnie nadaje się doskonale do codziennego użytku.
+
+Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źródłowy jest dostępny publicznie."</string>
    <string name="settings_activity_label">Ustawienia Unexpected Keyboard</string>
    <string name="pref_portrait">W widoku pionowym</string>
    <string name="pref_landscape">W widoku poziomym</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Układ %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Usuń układ</string>
    <string name="pref_custom_layout_title">Własny układ</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Pokaż klawiaturę numeryczną</string>
    <string name="pref_show_numpad_never">Nigdy</string>
    <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Teclado Unexpected</string>
    <string name="app_name_debug">Teclado Unexpected</string>
    <string name="short_description">Um teclado virtual leve para desenvolvedores.</string>
-    <string name="store_description">A principal característica é que você pode digitar mais caracteres deslizando as teclas para os cantos.\n\nO app foi criado originalmente para desenvolvedores que usam Termux.\nAgora aperfeiçoado para o uso diário.\n\nEste aplicativo não contém anúncios, não faz nenhuma solicitação de rede e é Open Source.</string>
+    <string name="store_description">"A principal característica é que você pode digitar mais caracteres deslizando as teclas para os cantos.
+
+O app foi criado originalmente para desenvolvedores que usam Termux.
+Agora aperfeiçoado para o uso diário.
+
+Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e é Open Source."</string>
    <string name="settings_activity_label">Configurações</string>
    <string name="pref_portrait">No modo retrato</string>
    <string name="pref_landscape">No modo paisagem</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Layout %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Remover layout</string>
    <string name="pref_custom_layout_title">Layout personalizado</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
    <string name="pref_show_numpad_never">Nunca</string>
    <string name="pref_show_numpad_landscape">Somente no modo paisagem</string>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Tastatură Unexpected (depanare)</string>
    <string name="short_description">Tastatură virtuală pentru Android, ușoară și respectuoasă cu viața privată.</string>
-    <string name="store_description">Funcționalitatea principală este accesul rapid la o mulțime de caractere ASCII prin glisarea către colțurile tastelor.\n\nAceastă aplicație a fost concepută inițial pentru programatori care folosec Termux.\nEste perfectă pentru uzul cotidian.\n\nAceastă aplicație nu conține publicitate, nu folosește rețeaua deloc și e Open Source.</string>
+    <string name="store_description">"Funcționalitatea principală este accesul rapid la o mulțime de caractere ASCII prin glisarea către colțurile tastelor.
+
+Această aplicație a fost concepută inițial pentru programatori care folosec Termux.
+Este perfectă pentru uzul cotidian.
+
+Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e Open Source."</string>
    <string name="settings_activity_label">Setări Tastatură Unexpected</string>
    <string name="pref_portrait">În mod portret</string>
    <string name="pref_landscape">În mod panoramă</string>
@ -18,9 +23,6 @@
    <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
    <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
    <string name="pref_custom_layout_title">Aranjament personalizat</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Arată NumPad</string>
    <string name="pref_show_numpad_never">Niciodată</string>
    <string name="pref_show_numpad_landscape">Doar în mod panoramă</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (отладка)</string>
    <string name="short_description">Легкая клавиатура для пользователей, заботящихся о конфиденциальности.</string>
-    <string name="store_description">Главная особенность клавиатуры — это возможность легко напечатать любой ASCII-символ жестами в углы клавиш.\n\nПриложение изначально было разработано для использования с Termux.\nНа данный момент оно также удобно в повседневном использовании.\n\nПриложение не содержит рекламы, не осуществляет никаких запросов в сеть и имеет открытый исходный код.</string>
+    <string name="store_description">"Главная особенность клавиатуры — это возможность легко напечатать любой ASCII-символ жестами в углы клавиш.
+
+Приложение изначально было разработано для использования с Termux.
+На данный момент оно также удобно в повседневном использовании.
+
+Приложение не содержит рекламы, не осуществляет никаких запросов в сеть и имеет открытый исходный код."</string>
    <string name="settings_activity_label">Настройки Unexpected Keyboard</string>
    <string name="pref_portrait">В портретном режиме</string>
    <string name="pref_landscape">В ландшафтном режиме</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Раскладка %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Удалить раскладку</string>
    <string name="pref_custom_layout_title">Пользовательская раскладка</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Показывать цифровой блок</string>
    <string name="pref_show_numpad_never">Никогда</string>
    <string name="pref_show_numpad_landscape">Только в ландшафтном режиме</string>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (debug)</string>
    <string name="short_description">Android için hafif ve güvenlik odaklı bir sanal klavye uygulaması.</string>
-    <string name="store_description">Bu uygulama özünde tuşların kenarlarından kaydırarak daha fazla karakter yazabilmek amacıyla geliştirildi.\n\nBu uygulama aslında Termux kullanıcıları için geliştirildi.\nArtık gündelik kullanım için de uygun.\n\nBu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz.</string>
+    <string name="store_description">"Bu uygulama özünde tuşların kenarlarından kaydırarak daha fazla karakter yazabilmek amacıyla geliştirildi.
+
+Bu uygulama aslında Termux kullanıcıları için geliştirildi.
+Artık gündelik kullanım için de uygun.
+
+Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</string>
    <string name="settings_activity_label">Unexpected Keyboard Ayarları</string>
    <string name="pref_portrait">Portre modunda</string>
    <string name="pref_landscape">Manzara modunda</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Tuş düzeni %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Tuş düzenini kaldır</string>
    <string name="pref_custom_layout_title">Özel tuş düzeni</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">NumPadi göster</string>
    <string name="pref_show_numpad_never">Asla</string>
    <string name="pref_show_numpad_landscape">Sadece manzara modunda</string>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (Налагодження)</string>
    <string name="short_description">Легка та конфіденційна віртуальна клавіатура для Android.</string>
-    <string name="store_description">Головна особливість полягає в тому, що ви можете вводити більше символів, проводячи клавіші до кутів.\n\nЦя програма спочатку була розроблена для програмістів, які використовують Termux.\nТепер ідеально підходить для щоденного використання.\n\nЦя програма не містить реклами, не надсилає жодних мережевих запитів і має відкритий код.</string>
+    <string name="store_description">"Головна особливість полягає в тому, що ви можете вводити більше символів, проводячи клавіші до кутів.
+
+Ця програма спочатку була розроблена для програмістів, які використовують Termux.
+Тепер ідеально підходить для щоденного використання.
+
+Ця програма не містить реклами, не надсилає жодних мережевих запитів і має відкритий код."</string>
    <string name="settings_activity_label">Unexpected Keyboard Налаштування</string>
    <string name="pref_portrait">У портретному режимі</string>
    <string name="pref_landscape">У альбомному режимі</string>
@ -18,10 +23,7 @@
    <string name="pref_layouts_item">Макет %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Видалити макет</string>
    <string name="pref_custom_layout_title">Власний макет</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
-    <string name="pref_show_numpad_title">Показувати числову клавіатуру</string>
+    <string name="pref_show_numpad_title">Показувати числову клавіатуру </string>
    <string name="pref_show_numpad_never">Ніколи</string>
    <string name="pref_show_numpad_landscape">Тільки в альбомному режимі</string>
    <string name="pref_show_numpad_always">Завжди</string>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (gỡ lỗi)</string>
    <string name="short_description">Bàn phím ảo gọn nhẹ và tôn trọng quyền riêng tư cho Android.</string>
-    <string name="store_description">Chức năng chính là dễ dàng gõ nhiều ký tự bằng cách kéo phím về góc của nó.\n\nỨng dụng này ban đầu được thiết kế cho các lập trình viên dùng Termux.\nBây giờ đã hoàn hảo cho việc sử dụng hàng ngày.\n\nỨng dụng này không chứa quảng cáo, không cần đến mạng, và có mã nguồn mở.</string>
+    <string name="store_description">"Chức năng chính là dễ dàng gõ nhiều ký tự bằng cách kéo phím về góc của nó.
+
+Ứng dụng này ban đầu được thiết kế cho các lập trình viên dùng Termux.
+Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
+
+Ứng dụng này không chứa quảng cáo, không cần đến mạng, và có mã nguồn mở."</string>
    <string name="settings_activity_label">Cài đặt Unexpected Keyboard</string>
    <string name="pref_portrait">Trong chế độ chân dung</string>
    <string name="pref_landscape">Trong chế độ phong cảnh</string>
@ -18,9 +23,6 @@
    <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
    <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
    <string name="pref_custom_layout_title">Tùy chỉnh bố cục</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">Hiện NumPad</string>
    <string name="pref_show_numpad_never">Không bao giờ</string>
    <string name="pref_show_numpad_landscape">Chỉ trong chế độ phong cảnh</string>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (debug)</string>
    <string name="short_description">适用于 Android 的轻量级、注重隐私的虚拟键盘。</string>
-    <string name="store_description">此应用的主要功能是，通过将按键沿四角滑动，您可以输入更多字符。\n\n此应用最初是为使用 Termux 的程序员而设计的。\n现在对于日常使用来说也很完美。\n\n此应用没有广告，不会发送任何网络请求，而且是开源的。</string>
+    <string name="store_description">"此应用的主要功能是，通过将按键沿四角滑动，您可以输入更多字符。
+
+此应用最初是为使用 Termux 的程序员而设计的。
+现在对于日常使用来说也很完美。
+
+此应用没有广告，不会发送任何网络请求，而且是开源的。"</string>
    <string name="settings_activity_label">Unexpected Keyboard 设置</string>
    <string name="pref_portrait">在竖屏模式下</string>
    <string name="pref_landscape">在横屏模式下</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">布局 %1$d：%2$s</string>
    <string name="pref_layouts_remove_custom">移除布局</string>
    <string name="pref_custom_layout_title">自定义布局</string>
-    <!-- <string name="pref_show_number_row_no_number_row">No number row</string> -->
-    <!-- <string name="pref_show_number_row_no_symbols">Number row without symbols</string> -->
-    <!-- <string name="pref_show_number_row_symbols">Number row with symbols</string> -->
    <string name="pref_show_numpad_title">显示数字小键盘</string>
    <string name="pref_show_numpad_never">从不</string>
    <string name="pref_show_numpad_landscape">只在横屏显示</string>
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string-array name="pref_show_number_row_values">
-    <item>no_number_row</item>
-    <item>no_symbols</item>
-    <item>symbols</item>
-  </string-array>
-  <string-array name="pref_show_number_row_entries">
-    <item>@string/pref_show_number_row_no_number_row</item>
-    <item>@string/pref_show_number_row_no_symbols</item>
-    <item>@string/pref_show_number_row_symbols</item>
-  </string-array>
  <string-array name="pref_show_numpad_values">
    <item>never</item>
    <item>landscape</item>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@ -3,7 +3,12 @@
    <string name="app_name_release">Unexpected Keyboard</string>
    <string name="app_name_debug">Unexpected Keyboard (Debug)</string>
    <string name="short_description">Lightweight and privacy-conscious virtual keyboard for Android.</string>
-    <string name="store_description">The main feature is that you can type more characters by swiping the keys towards the corners.\n\nThis application was originally designed for programmers using Termux.\nNow perfect for everyday use.\n\nThis application contains no ads, doesn\'t make any network requests and is Open Source.</string>
+    <string name="store_description">"The main feature is that you can type more characters by swiping the keys towards the corners.
+
+This application was originally designed for programmers using Termux.
+Now perfect for everyday use.
+
+This application contains no ads, doesn't make any network requests and is Open Source."</string>
    <string name="settings_activity_label">Unexpected Keyboard Settings</string>
    <string name="pref_portrait">In portrait mode</string>
    <string name="pref_landscape">In landscape mode</string>
@ -18,9 +23,6 @@
    <string name="pref_layouts_item">Layout %1$d: %2$s</string>
    <string name="pref_layouts_remove_custom">Remove layout</string>
    <string name="pref_custom_layout_title">Custom layout</string>
-    <string name="pref_show_number_row_no_number_row">No number row</string>
-    <string name="pref_show_number_row_no_symbols">Number row without symbols</string>
-    <string name="pref_show_number_row_symbols">Number row with symbols</string>
    <string name="pref_show_numpad_title">Show NumPad</string>
    <string name="pref_show_numpad_never">Never</string>
    <string name="pref_show_numpad_landscape">Only in landscape mode</string>
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@ -181,27 +181,27 @@
  </style>
  <style name="MonetLight" parent="@style/BaseTheme">
    <item name="android:isLightTheme">true</item>
-    <item name="colorKeyboard">@android:color/system_neutral1_100</item>
-    <item name="colorKey">@android:color/system_neutral1_50</item>
-    <item name="colorKeyActivated">?colorKeyboard</item>
-    <item name="colorLabel">@android:color/system_neutral1_800</item>
-    <item name="colorLabelActivated">@android:color/system_accent1_400</item>
-    <item name="colorLabelLocked">@android:color/system_accent1_600</item>
-    <item name="colorSubLabel">@android:color/system_neutral1_500</item>
+    <item name="colorKeyboard">@android:color/system_accent1_100</item>
+    <item name="colorKey">@android:color/system_accent1_0</item>
+    <item name="colorKeyActivated">@android:color/system_accent1_300</item>
+    <item name="colorLabel">@android:color/system_accent1_1000</item>
+    <item name="colorLabelActivated">@android:color/system_accent1_1000</item>
+    <item name="colorLabelLocked">@android:color/system_accent1_500</item>
+    <item name="colorSubLabel">@android:color/system_accent1_900</item>
    <item name="emoji_button_bg">?colorKeyActivated</item>
-    <item name="emoji_color">?colorKeyboard</item>
+    <item name="emoji_color">@android:color/system_accent1_1000</item>
  </style>
  <style name="MonetDark" parent="@style/BaseTheme">
    <item name="android:isLightTheme">false</item>
    <item name="colorKeyboard">@android:color/system_neutral1_900</item>
-    <item name="colorKey">@android:color/system_neutral1_800</item>
-    <item name="colorKeyActivated">?colorKeyboard</item>
+    <item name="colorKey">@android:color/system_accent2_800</item>
+    <item name="colorKeyActivated">@android:color/system_accent1_800</item>
    <item name="colorLabel">@android:color/system_neutral1_0</item>
    <item name="colorLabelActivated">@android:color/system_accent1_400</item>
-    <item name="colorLabelLocked">@android:color/system_accent1_600</item>
-    <item name="colorSubLabel">@android:color/system_neutral1_400</item>
+    <item name="colorLabelLocked">@android:color/system_accent1_100</item>
+    <item name="colorSubLabel">@android:color/system_neutral1_300</item>
    <item name="emoji_button_bg">?colorKeyActivated</item>
-    <item name="emoji_color">?colorKeyboard</item>
+    <item name="emoji_color">@android:color/system_neutral1_900</item>
  </style>
  <style name="RosePine" parent="BaseTheme">
    <item name="android:isLightTheme">false</item>
--- a/res/xml/number_row.xml
+++ b/res/xml/number_row.xml
@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- See [number_row_no_symbols.xml] for the number row with no symbols. -->
 <row height="0.75">
-  <key key0="1" se="!"/>
-  <key key0="2" se="@"/>
-  <key key0="3" se="#"/>
-  <key key0="4" se="$"/>
-  <key key0="5" se="%"/>
-  <key key0="6" sw="^"/>
-  <key key0="7" sw="&amp;"/>
-  <key key0="8" sw="*"/>
-  <key key0="9" sw="("/>
-  <key key0="0" sw=")"/>
+    <key key0="1" se="!"/>
+    <key key0="2" se="@"/>
+    <key key0="3" se="#"/>
+    <key key0="4" se="$"/>
+    <key key0="5" se="%"/>
+    <key key0="6" sw="^"/>
+    <key key0="7" sw="&amp;"/>
+    <key key0="8" sw="*"/>
+    <key key0="9" sw="("/>
+    <key key0="0" sw=")"/>
 </row>
--- a/res/xml/number_row_no_symbols.xml
+++ b/res/xml/number_row_no_symbols.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<row height="0.75">
-  <key key0="1"/>
-  <key key0="2"/>
-  <key key0="3"/>
-  <key key0="4"/>
-  <key key0="5"/>
-  <key key0="6"/>
-  <key key0="7"/>
-  <key key0="8"/>
-  <key key0="9"/>
-  <key key0="0"/>
-</row>
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@ -8,7 +8,7 @@
      </PreferenceCategory>
      <juloo.keyboard2.prefs.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
    </PreferenceScreen>
-    <ListPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="%s" android:defaultValue="no_number_row" android:entries="@array/pref_show_number_row_entries" android:entryValues="@array/pref_show_number_row_values"/>
+    <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
    <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
    <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
  </PreferenceCategory>
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@ -30,7 +30,6 @@ public final class Config
  // From the 'numpad_layout' option, also apply to the numeric pane.
  public boolean inverse_numpad = false;
  public boolean add_number_row;
-  public boolean number_row_symbols;
  public float swipe_dist_px;
  public float slide_step_px;
  // Let the system handle vibration when false.
@ -123,9 +122,7 @@ public final class Config
    }
    layouts = LayoutsPreference.load_from_preferences(res, _prefs);
    inverse_numpad = _prefs.getString("numpad_layout", "default").equals("low_first");
-    String number_row = _prefs.getString("number_row", "no_number_row");
-    add_number_row = !number_row.equals("no_number_row");
-    number_row_symbols = number_row.equals("symbols");
+    add_number_row = _prefs.getBoolean("number_row", false);
    // The baseline for the swipe distance correspond to approximately the
    // width of a key in portrait mode, as most layouts have 10 columns.
    // Multipled by the DPI ratio because most swipes are made in the diagonals.
@ -275,7 +272,7 @@ public final class Config

  /** Config migrations. */

-  private static int CONFIG_VERSION = 2;
+  private static int CONFIG_VERSION = 1;

  public static void migrate(SharedPreferences prefs)
  {
@ -287,7 +284,7 @@ public final class Config
    e.putInt("version", CONFIG_VERSION);
    // Migrations might run on an empty [prefs] for new installs, in this case
    // they set the default values of complex options.
-    switch (saved_version)
+    switch (saved_version) // Fallback switch
    {
      case 0:
        // Primary, secondary and custom layout options are merged into the new
@ -301,12 +298,7 @@ public final class Config
        if (custom_layout != null && !custom_layout.equals(""))
          l.add(LayoutsPreference.CustomLayout.parse(custom_layout));
        LayoutsPreference.save_to_preferences(e, l);
-        // Fallthrough
      case 1:
-        boolean add_number_row = prefs.getBoolean("number_row", false);
-        e.putString("number_row", add_number_row ? "no_symbols" : "no_number_row");
-        // Fallthrough
-      case 2:
      default: break;
    }
    e.apply();
--- a/srcs/juloo.keyboard2/Emoji.java
+++ b/srcs/juloo.keyboard2/Emoji.java
@ -51,14 +51,8 @@ public class Emoji
      if ((line = reader.readLine()) != null)
      {
        String[] tokens = line.split(" ");
-        int last = 0;
-        for (int i = 1; i < tokens.length; i++)
-        {
-          int next = Integer.parseInt(tokens[i]);
-          _groups.add(_all.subList(last, next));
-          last = next;
-        }
-        _groups.add(_all.subList(last, _all.size()));
+        for (int i = 0; i < tokens.length-1; i++)
+          _groups.add(_all.subList(Integer.parseInt(tokens[i]), Integer.parseInt(tokens[i+1])));
      }
    }
    catch (IOException e) { Logs.exn("Emoji.init() failed", e); }
--- a/srcs/juloo.keyboard2/KeyEventHandler.java
+++ b/srcs/juloo.keyboard2/KeyEventHandler.java
@ -242,7 +242,6 @@ public final class KeyEventHandler
      case AUTOFILL: send_context_menu_action(android.R.id.autofill); break;
      case DELETE_WORD: send_key_down_up(KeyEvent.KEYCODE_DEL, KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON); break;
      case FORWARD_DELETE_WORD: send_key_down_up(KeyEvent.KEYCODE_FORWARD_DEL, KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON); break;
-      case SELECTION_CANCEL: cancel_selection(); break;
    }
  }

@ -260,17 +259,15 @@ public final class KeyEventHandler
    return conn.getExtractedText(_move_cursor_req, 0);
  }

-  /** [r] might be negative, in which case the direction is reversed. */
-  void handle_slider(KeyValue.Slider s, int r)
+  /** [repeatition] might be negative, in which case the direction is reversed. */
+  void handle_slider(KeyValue.Slider s, int repeatition)
  {
    switch (s)
    {
-      case Cursor_left: move_cursor(-r); break;
-      case Cursor_right: move_cursor(r); break;
-      case Cursor_up: move_cursor_vertical(-r); break;
-      case Cursor_down: move_cursor_vertical(r); break;
-      case Selection_cursor_left: move_cursor_sel(r, true); break;
-      case Selection_cursor_right: move_cursor_sel(r, false); break;
+      case Cursor_left: move_cursor(-repeatition); break;
+      case Cursor_right: move_cursor(repeatition); break;
+      case Cursor_up: move_cursor_vertical(-repeatition); break;
+      case Cursor_down: move_cursor_vertical(repeatition); break;
    }
  }

@ -284,7 +281,12 @@ public final class KeyEventHandler
    if (conn == null)
      return;
    ExtractedText et = get_cursor_pos(conn);
-    if (et != null && can_set_selection(conn))
+    int system_mods =
+      KeyEvent.META_CTRL_ON | KeyEvent.META_ALT_ON | KeyEvent.META_META_ON;
+    // Fallback to sending key events if system modifiers are activated or
+    // ExtractedText is not supported, for example on Termux.
+    if (!_move_cursor_force_fallback && et != null
+        && (_meta_state & system_mods) == 0)
    {
      int sel_start = et.selectionStart;
      int sel_end = et.selectionEnd;
@ -303,45 +305,8 @@ public final class KeyEventHandler
          sel_start = sel_end;
      }
      if (conn.setSelection(sel_start, sel_end))
-        return; // Fallback to sending key events if [setSelection] failed
+        return; // [setSelection] succeeded, don't fallback to key events
    }
-    move_cursor_fallback(d);
-  }
-
-  /** Move one of the two side of a selection. If [sel_left] is true, the left
-      position is moved, otherwise the right position is moved. */
-  void move_cursor_sel(int d, boolean sel_left)
-  {
-    InputConnection conn = _recv.getCurrentInputConnection();
-    if (conn == null)
-      return;
-    ExtractedText et = get_cursor_pos(conn);
-    if (et != null && can_set_selection(conn))
-    {
-      int sel_start = et.selectionStart;
-      int sel_end = et.selectionEnd;
-      if (sel_left == (sel_start <= sel_end))
-        sel_start += d;
-      else
-        sel_end += d;
-      if (conn.setSelection(sel_start, sel_end))
-        return; // Fallback to sending key events if [setSelection] failed
-    }
-    move_cursor_fallback(d);
-  }
-
-  /** Returns whether the selection can be set using [conn.setSelection()].
-      This can happen on Termux or when system modifiers are activated for
-      example. */
-  boolean can_set_selection(InputConnection conn)
-  {
-    final int system_mods =
-      KeyEvent.META_CTRL_ON | KeyEvent.META_ALT_ON | KeyEvent.META_META_ON;
-    return !_move_cursor_force_fallback && (_meta_state & system_mods) == 0;
-  }
-
-  void move_cursor_fallback(int d)
-  {
    if (d < 0)
      send_key_down_up_repeat(KeyEvent.KEYCODE_DPAD_LEFT, -d);
    else
@ -435,25 +400,11 @@ public final class KeyEventHandler
      send_key_down_up(event_code);
  }

-  void cancel_selection()
-  {
-    InputConnection conn = _recv.getCurrentInputConnection();
-    if (conn == null)
-      return;
-    ExtractedText et = get_cursor_pos(conn);
-    if (et == null) return;
-    final int curs = et.selectionStart;
-    // Notify the receiver as Android's [onUpdateSelection] is not triggered.
-    if (conn.setSelection(curs, curs));
-      _recv.selection_state_changed(false);
-  }
-
  public static interface IReceiver
  {
    public void handle_event_key(KeyValue.Event ev);
    public void set_shift_state(boolean state, boolean lock);
    public void set_compose_pending(boolean pending);
-    public void selection_state_changed(boolean selection_is_ongoing);
    public InputConnection getCurrentInputConnection();
    public Handler getHandler();
  }
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@ -82,7 +82,6 @@ public final class KeyModifier
      case HOOK_ABOVE: return apply_compose(k, ComposeKeyData.accent_hook_above);
      case DOUBLE_GRAVE: return apply_compose(k, ComposeKeyData.accent_double_grave);
      case ARROW_RIGHT: return apply_combining_char(k, "\u20D7");
-      case SELECTION_MODE: return apply_selection_mode(k);
      default: return k;
    }
  }
@ -393,34 +392,6 @@ public final class KeyModifier
    return (name == null) ? k : KeyValue.getKeyByName(name);
  }

-  private static KeyValue apply_selection_mode(KeyValue k)
-  {
-    String name = null;
-    switch (k.getKind())
-    {
-      case Char:
-        switch (k.getChar())
-        {
-          case ' ': name = "selection_cancel"; break;
-        }
-        break;
-      case Slider:
-        switch (k.getSlider())
-        {
-          case Cursor_left: name = "selection_cursor_left"; break;
-          case Cursor_right: name = "selection_cursor_right"; break;
-        }
-        break;
-      case Keyevent:
-        switch (k.getKeyevent())
-        {
-          case KeyEvent.KEYCODE_ESCAPE: name = "selection_cancel"; break;
-        }
-        break;
-    }
-    return (name == null) ? k : KeyValue.getKeyByName(name);
-  }
-
  /** Compose the precomposed initial with the medial [kv]. */
  private static KeyValue combine_hangul_initial(KeyValue kv, int precomposed)
  {
--- a/srcs/juloo.keyboard2/KeyValue.java
+++ b/srcs/juloo.keyboard2/KeyValue.java
@ -59,7 +59,6 @@ public final class KeyValue implements Comparable<KeyValue>
    BREVE,
    BAR,
    FN,
-    SELECTION_MODE,
  } // Last is be applied first

  public static enum Editing
@ -78,7 +77,6 @@ public final class KeyValue implements Comparable<KeyValue>
    AUTOFILL,
    DELETE_WORD,
    FORWARD_DELETE_WORD,
-    SELECTION_CANCEL,
  }

  public static enum Placeholder
@ -717,9 +715,6 @@ public final class KeyValue implements Comparable<KeyValue>
      case "cursor_right": return sliderKey(Slider.Cursor_right, 1);
      case "cursor_up": return sliderKey(Slider.Cursor_up, 1);
      case "cursor_down": return sliderKey(Slider.Cursor_down, 1);
-      case "selection_cancel": return editingKey("Esc", Editing.SELECTION_CANCEL, FLAG_SMALLER_FONT);
-      case "selection_cursor_left": return sliderKey(Slider.Selection_cursor_left, -1); // Move the left side of the selection
-      case "selection_cursor_right": return sliderKey(Slider.Selection_cursor_right, 1);
      // These keys are not used
      case "replaceText": return editingKey("repl", Editing.REPLACE);
      case "textAssist": return editingKey(0xE038, Editing.ASSIST);
@ -769,9 +764,6 @@ public final class KeyValue implements Comparable<KeyValue>
      case "௲": case "௳":
        return makeStringKey(name, FLAG_SMALLER_FONT);

-      /* Internal keys */
-      case "selection_mode": return makeInternalModifier(Modifier.SELECTION_MODE);
-
      default: return null;
    }
  }
@ -788,9 +780,7 @@ public final class KeyValue implements Comparable<KeyValue>
    Cursor_left(0xE008),
    Cursor_right(0xE006),
    Cursor_up(0xE005),
-    Cursor_down(0xE007),
-    Selection_cursor_left(0xE008),
-    Selection_cursor_right(0xE006);
+    Cursor_down(0xE007);

    final String symbol;

--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@ -362,8 +362,6 @@ public class Keyboard2 extends InputMethodService
  {
    super.onUpdateSelection(oldSelStart, oldSelEnd, newSelStart, newSelEnd, candidatesStart, candidatesEnd);
    _keyeventhandler.selection_updated(oldSelStart, newSelStart);
-    if ((oldSelStart == oldSelEnd) != (newSelStart == newSelEnd))
-      _keyboardView.set_selection_state(newSelStart != newSelEnd);
  }

  @Override
@ -482,11 +480,6 @@ public class Keyboard2 extends InputMethodService
      _keyboardView.set_compose_pending(pending);
    }

-    public void selection_state_changed(boolean selection_is_ongoing)
-    {
-      _keyboardView.set_selection_state(selection_is_ongoing);
-    }
-
    public InputConnection getCurrentInputConnection()
    {
      return Keyboard2.this.getCurrentInputConnection();
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@ -139,13 +139,6 @@ public class Keyboard2View extends View
    set_fake_ptr_latched(_compose_key, _compose_kv, pending, false);
  }

-  /** Called from [Keybard2.onUpdateSelection].  */
-  public void set_selection_state(boolean selection_state)
-  {
-    set_fake_ptr_latched(KeyboardData.Key.EMPTY,
-        KeyValue.getKeyByName("selection_mode"), selection_state, true);
-  }
-
  public KeyValue modifyKey(KeyValue k, Pointers.Modifiers mods)
  {
    return KeyModifier.modify(k, mods);
@ -441,7 +434,8 @@ public class Keyboard2View extends View
    if (kv == null)
      return;
    float textSize = scaleTextSize(kv, _config.labelTextSize, keyH);
-    Paint p = tc.label_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), labelColor(kv, isKeyDown, false), textSize);
+    Paint p = tc.label_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), textSize);
+    p.setColor(labelColor(kv, isKeyDown, false));
    canvas.drawText(kv.getString(), x, (keyH - p.ascent() - p.descent()) / 2f + y, p);
  }

@ -455,7 +449,8 @@ public class Keyboard2View extends View
    if (kv == null)
      return;
    float textSize = scaleTextSize(kv, _config.sublabelTextSize, keyH);
-    Paint p = tc.sublabel_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), labelColor(kv, isKeyDown, true), textSize, a);
+    Paint p = tc.sublabel_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), textSize, a);
+    p.setColor(labelColor(kv, isKeyDown, true));
    float subPadding = _config.keyPadding;
    if (v == Vertical.CENTER)
      y += (keyH - p.ascent() - p.descent()) / 2f;
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@ -177,9 +177,14 @@ public final class KeyboardData

  private static Map<Integer, KeyboardData> _layoutCache = new HashMap<Integer, KeyboardData>();

-  public static Row load_row(Resources res, int res_id) throws Exception
+  public static Row load_bottom_row(Resources res) throws Exception
  {
-    return parse_row(res.getXml(res_id));
+    return parse_row(res.getXml(R.xml.bottom_row));
+  }
+
+  public static Row load_number_row(Resources res) throws Exception
+  {
+    return parse_row(res.getXml(R.xml.number_row));
  }

  public static KeyboardData load_num_pad(Resources res) throws Exception
@ -417,8 +422,6 @@ public final class KeyboardData
      indication = i;
    }

-    static final Key EMPTY = new Key(new KeyValue[9], null, 0, 1.f, 1.f, null);
-
    /** Read a key value attribute that have a synonym. Having both synonyms
        present at the same time is an error.
        Returns [null] if the attributes are not present. */
--- a/srcs/juloo.keyboard2/LayoutModifier.java
+++ b/srcs/juloo.keyboard2/LayoutModifier.java
@ -11,8 +11,7 @@ public final class LayoutModifier
 {
  static Config globalConfig;
  static KeyboardData.Row bottom_row;
-  static KeyboardData.Row number_row_no_symbols;
-  static KeyboardData.Row number_row_symbols;
+  static KeyboardData.Row number_row;
  static KeyboardData num_pad;

  /** Update the layout according to the configuration.
@ -45,7 +44,7 @@ public final class LayoutModifier
    }
    else if (globalConfig.add_number_row && !kw.embedded_number_row) // The numpad removes the number row
    {
-      added_number_row = modify_number_row(globalConfig.number_row_symbols ? number_row_symbols : number_row_no_symbols, kw);
+      added_number_row = modify_number_row(number_row, kw);
      remove_keys.addAll(added_number_row.getKeys(0).keySet());
    }
    // Add the bottom row before computing the extra keys
@ -205,9 +204,8 @@ public final class LayoutModifier
    globalConfig = globalConfig_;
    try
    {
-      number_row_no_symbols = KeyboardData.load_row(res, R.xml.number_row_no_symbols);
-      number_row_symbols = KeyboardData.load_row(res, R.xml.number_row);
-      bottom_row = KeyboardData.load_row(res, R.xml.bottom_row);
+      number_row = KeyboardData.load_number_row(res);
+      bottom_row = KeyboardData.load_bottom_row(res);
      num_pad = KeyboardData.load_num_pad(res);
    }
    catch (Exception e)
--- a/srcs/juloo.keyboard2/Pointers.java
+++ b/srcs/juloo.keyboard2/Pointers.java
@ -219,7 +219,7 @@ public final class Pointers implements Handler.Callback
   * [direction] is an int between [0] and [15] that represent 16 sections of a
   * circle, clockwise, starting at the top.
   */
-  static KeyValue getKeyAtDirection(KeyboardData.Key k, int direction)
+  KeyValue getKeyAtDirection(KeyboardData.Key k, int direction)
  {
    return k.keys[DIRECTION_TO_INDEX[direction]];
  }
@ -234,24 +234,16 @@ public final class Pointers implements Handler.Callback
  private KeyValue getNearestKeyAtDirection(Pointer ptr, int direction)
  {
    KeyValue k;
-    // [i] is [0, -1, +1, ..., -3, +3], scanning 43% of the circle's area,
-    // centered on the initial swipe direction.
-    for (int i = 0; i > -4; i = (~i>>31) - i)
+    // [i] is [0, -1, 1, -2, 2], scanning a 1/4 of the circle's area, centered
+    // on the initial direction.
+    for (int i = 0; i > -2; i = (~i>>31) - i)
    {
      int d = (direction + i + 16) % 16;
      // Don't make the difference between a key that doesn't exist and a key
      // that is removed by [_handler]. Triggers side effects.
      k = _handler.modifyKey(getKeyAtDirection(ptr.key, d), ptr.modifiers);
      if (k != null)
-      {
-        // When the nearest key is a slider, it is only selected if it's placed
-        // within 18% of the original swipe direction.
-        // This reduces accidental swipes on the slider and allow typing circle
-        // gestures without being interrupted by the slider.
-        if (k.getKind() == KeyValue.Kind.Slider && Math.abs(i) >= 2)
-          continue;
        return k;
-      }
    }
    return null;
  }
--- a/srcs/juloo.keyboard2/Theme.java
+++ b/srcs/juloo.keyboard2/Theme.java
@ -126,7 +126,6 @@ public class Theme
      final Paint _special_label_paint;
      final Paint _sublabel_paint;
      final Paint _special_sublabel_paint;
-      final int _label_alpha_bits;

      public Key(Theme theme, Config config, float keyWidth, boolean activated)
      {
@ -150,21 +149,18 @@ public class Theme
        _special_label_paint = init_label_paint(config, _key_font);
        _sublabel_paint = init_label_paint(config, null);
        _special_sublabel_paint = init_label_paint(config, _key_font);
-        _label_alpha_bits = (config.labelBrightness & 0xFF) << 24;
      }

-      public Paint label_paint(boolean special_font, int color, float text_size)
+      public Paint label_paint(boolean special_font, float text_size)
      {
        Paint p = special_font ? _special_label_paint : _label_paint;
-        p.setColor((color & 0x00FFFFFF) | _label_alpha_bits);
        p.setTextSize(text_size);
        return p;
      }

-      public Paint sublabel_paint(boolean special_font, int color, float text_size, Paint.Align align)
+      public Paint sublabel_paint(boolean special_font, float text_size, Paint.Align align)
      {
        Paint p = special_font ? _special_sublabel_paint : _sublabel_paint;
-        p.setColor((color & 0x00FFFFFF) | _label_alpha_bits);
        p.setTextSize(text_size);
        p.setTextAlign(align);
        return p;
@ -185,6 +181,7 @@ public class Theme
    {
      Paint p = new Paint(Paint.ANTI_ALIAS_FLAG);
      p.setTextAlign(Paint.Align.CENTER);
+      p.setAlpha(config.labelBrightness);
      if (font != null)
        p.setTypeface(font);
      return p;
--- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
+++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java
@ -3,7 +3,6 @@ package juloo.keyboard2.prefs;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
-import android.os.Build.VERSION;
 import android.preference.CheckBoxPreference;
 import android.preference.PreferenceCategory;
 import android.util.AttributeSet;
@ -306,38 +305,70 @@ public class ExtraKeysPreference extends PreferenceCategory
      + KeyValue.getKeyByName(key_name).getString();
  }

-  /** Place an extra key next to the key specified by the first argument, on
-      bottom-right preferably or on the bottom-left. If the specified key is not
-      on the layout, place on the specified row and column. */
-  static KeyboardData.PreferredPos mk_preferred_pos(String next_to_key, int row, int col, boolean prefer_bottom_right)
-  {
-    KeyValue next_to = (next_to_key == null) ? null : KeyValue.getKeyByName(next_to_key);
-    int d1, d2; // Preferred direction and fallback direction
-    if (prefer_bottom_right) { d1 = 4; d2 = 3; } else { d1 = 3; d2 = 4; }
-    return new KeyboardData.PreferredPos(next_to,
-            new KeyboardData.KeyPos[]{
-              new KeyboardData.KeyPos(row, col, d1),
-              new KeyboardData.KeyPos(row, col, d2),
-              new KeyboardData.KeyPos(row, -1, d1),
-              new KeyboardData.KeyPos(row, -1, d2),
-              new KeyboardData.KeyPos(-1, -1, -1),
-            });
-  }
-
  static KeyboardData.PreferredPos key_preferred_pos(String key_name)
  {
    switch (key_name)
    {
-      case "cut": return mk_preferred_pos("x", 2, 2, true);
-      case "copy": return mk_preferred_pos("c", 2, 3, true);
-      case "paste": return mk_preferred_pos("v", 2, 4, true);
-      case "undo": return mk_preferred_pos("z", 2, 1, true);
-      case "selectAll": return mk_preferred_pos("a", 1, 0, true);
-      case "redo": return mk_preferred_pos("y", 0, 5, true);
-      case "f11_placeholder": return mk_preferred_pos("9", 0, 8, false);
-      case "f12_placeholder": return mk_preferred_pos("0", 0, 9, false);
-      case "delete_word": return mk_preferred_pos("backspace", -1, -1, false);
-      case "forward_delete_word": return mk_preferred_pos("backspace", -1, -1, true);
+      case "cut":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("x"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(2, 2, 8),
+              new KeyboardData.KeyPos(2, -1, 8),
+              new KeyboardData.KeyPos(-1, -1, 8),
+            });
+      case "copy":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("c"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(2, 3, 8),
+              new KeyboardData.KeyPos(2, -1, 8),
+              new KeyboardData.KeyPos(-1, -1, 8),
+            });
+      case "paste":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("v"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(2, 4, 8),
+              new KeyboardData.KeyPos(2, -1, 8),
+              new KeyboardData.KeyPos(-1, -1, 8),
+            });
+      case "undo":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("z"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(2, 1, 8),
+              new KeyboardData.KeyPos(2, -1, 8),
+              new KeyboardData.KeyPos(-1, -1, 8),
+            });
+      case "redo":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("y"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(0, -1, 8),
+              new KeyboardData.KeyPos(-1, -1, 8),
+            });
+      case "f11_placeholder":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("9"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(0, 8, 3),
+              new KeyboardData.KeyPos(0, 8, 4),
+              new KeyboardData.KeyPos(0, -1, 3),
+              new KeyboardData.KeyPos(0, -1, 4),
+            });
+      case "f12_placeholder":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("0"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(0, 9, 3),
+              new KeyboardData.KeyPos(0, 9, 4),
+              new KeyboardData.KeyPos(0, -1, 3),
+              new KeyboardData.KeyPos(0, -1, 4),
+            });
+      case "delete_word":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("backspace"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(-1, -1, 3),
+            });
+      case "forward_delete_word":
+        return new KeyboardData.PreferredPos(KeyValue.getKeyByName("backspace"),
+            new KeyboardData.KeyPos[]{
+              new KeyboardData.KeyPos(-1, -1, 4),
+            });
    }
    return KeyboardData.PreferredPos.DEFAULT;
  }
@ -394,8 +425,7 @@ public class ExtraKeysPreference extends PreferenceCategory
      setKey(pref_key_of_key_name(key_name));
      setDefaultValue(default_checked);
      setTitle(title);
-      if (VERSION.SDK_INT >= 26)
-        setSingleLineTitle(false);
+      setSingleLineTitle(false);
    }

    @Override
--- a/srcs/layouts/latn_colemak.xml
+++ b/srcs/layouts/latn_colemak.xml
@ -6,7 +6,7 @@
    <key key0="w" key1="loc accent_grave"       key2=" ́"              key3="~"            />
    <key key0="f" key1="`"                  key2="-"              key3="+" />
    <key key0="p"                           key2="="              key3="%"/>
-    <key key0="g" key1="|"                  key2="/"              key3="\\"/>
+    <key key0="g" key1="!"                  key2="/"              key3="\\"/>
    <key key0="j" key1="loc accent_caron"       key2="loc accent_trema"            />
    <key key0="l"/>
    <key key0="u" key1="loc accent_double_aigu" key2="loc accent_ring"    />
@ -34,7 +34,7 @@
    <key key0="v"         key1="["    key2="]"/>
    <key key0="b"         key1="("    key2=")"/>
    <key key0="k"         key1=";"    key2=":"/>
-    <key key0="m"         key1="!"    key2="\?" />
+    <key key0="m"         key1="|"    key2="\?" />
    <key key0="backspace" key1="delete" shift="0.25" width="1.25"/>

  </row>
--- a/srcs/layouts/latn_qwerty_jp.xml
+++ b/srcs/layouts/latn_qwerty_jp.xml
@ -9,7 +9,7 @@
    <key key0="y" key2="6" key3="&amp;"/>
    <key key0="u" key2="7" key3="'"/>
    <key key0="i" key2="8" key3="(" key4=")"/>
-    <key key0="o" key1="=" key2="9" key3="-" key4="accent-macron"/>
+    <key key0="o" key1="=" key2="9" key3="-"/>
    <key key0="p" key1="~" key2="0" key3="^"/>
  </row>
  <row>
Author	SHA1	Message	Date
Jules Aguillon	3d1383adfa	Add a delay after a Keyevent key in a macro Add a delay before sending the next key to avoid race conditions causing keys to be handled in the wrong order. Notably, KeyEvent keys handling is scheduled differently than the other edit functions.	2025-03-08 13:52:56 +01:00
Jules Aguillon	80bc21c4af	Construct a single handler	2025-03-08 13:47:55 +01:00