history entry: Swap the remove button for a paste button

Make the clipboard view 30% taller
Use the same icon for removing history and pin entries
2025-08-18 00:19:56 +02:00 · 2024-07-06 22:05:45 +02:00 · 2024-07-06 13:53:31 +02:00 · 2024-07-06 13:50:28 +02:00 · 2024-07-06 13:48:51 +02:00 · 2024-07-06 13:45:53 +02:00
27 changed files with 193 additions and 281 deletions
--- a/doc/Custom-layouts.md
+++ b/doc/Custom-layouts.md
@@ -38,8 +38,7 @@ The `<keyboard>`...`</keyboard>` pair follows the declaration tag and encloses t
 * `name`: The name of the keyboard. The name you specify will appear in the Settings menu. If not present, the layout will just appear as “Custom layout”.
 * `script`: The (main) writing system that the keyboard supports. The possible values are `arabic`, `armenian`, `bengali`, `cyrillic`, `devanagari`, `gujarati`, `hangul`, `hebrew`, `latin`, `persian`, `shavian`, and `urdu`. It defaults to `latin`.
 * `numpad_script`: The script to use for the numpad. This is useful for scripts where a different, non-ASCII set of numerals is used, like Devanagari and Arabic. It defaults to the same as `script`.
-* `bottom_row`: Whether or not to show the common bottom row. It accepts `true` or `false`, and defaults to `true`. If your custom layout defines the bottom row, then specify `bottom_row="false"` to disable the built-in bottom row.
-* `locale_extra_keys`: Whether Unexpected should add language-dependent extra keys from [method.xml](../res/xml/method.xml) to this layout. It accepts `true` or `false`, and defaults to `true`. To disable these automatic additions, specify `locale_extra_keys="false"`.
+* `bottom_row`: Whether or not to show the common bottom row. It accepts `true` or `false`, and defaults to `true`. If your custom layout defines the bottom row, then specify `bottom_row=false` to disable the built-in bottom row.

 ## Row
 The `<row>`...`</row>` pair encloses one row on the keyboard. It has only one optional property:
@@ -99,9 +98,11 @@ Normally, a key's width is 1.0 unit. Unexpected Keyboard occupies the full width
 * `indication`: An optional extra legend to show under the main label. For example, `<key key0="2" indication="ABC" />` displays ABC at the bottom of the 2 key, as on a pinpad or some telephones. If the key also defines a downward swipe with `s` or `key8`, the legends overlap.

 ### Possible key values
-Built-in strings that assign a special function to a key are described in [this page](Possible-key-values.md). For example, `se="copy"` means a southeasterly swipe produces the Copy key. If a key value does not match any of the built-in strings, it outputs that text _verbatim_. For example, `key0="a"` simply outputs the letter a.

-In a layout, a key value can also start with the `loc` prefix. These are place-holders; the tap or swipe does nothing unless enabled through the "Add keys to keyboard" option in the Settings menu, or implicitly enabled by the language the device is set to use. For example, `ne="loc accent_aigu"` says that a northeast swipe produces the acute accent combinatorial key—if enabled.
+The possible key values are described in [this page](Possible-key-values.md).
+
+In a layout, a key value can also start with the `loc` prefix. These are place-holders, the tap or swipe does nothing unless enabled through the "Add keys to keyboard" option in the Settings menu, or implicitly enabled by the language the device is set to use.
+For example, `ne="loc accent_aigu"` says that a northeast swipe produces the acute accent combinatorial key—if enabled.

 ## Modmap
 The `<modmap>`...`</modmap>` pair encloses custom mappings for modifier keys. The modmap is placed inside the `<keyboard>`...`</keyboard>` pair, but outside any row. A layout can have at most one modmap.
@@ -116,12 +117,20 @@ There can be as many of these tags inside `<modmap>` as needed.

 The clockwise circle and the round-trip gestures are affected by both Shift and Fn modmaps. The Shift mappings are used first and if that did not modify the key, the Fn mappings are used instead.

-### Example
-Turkish keyboards use the Latin alphabet, but when "i" is shifted, it should produce "İ". This is achieved with the following modmap: 
+### Examples
+① Turkish keyboards use the Latin alphabet, but when "i" is shifted, it should produce "İ". This is achieved with the following modmap: 

    <modmap>
        <shift a="i" b="İ" />
    </modmap>
+    
+② By default, `Fn`+`e` produces the € character. This can be inhibited with the following modmap, which maps the modified `e` key to itself:
+
+    <modmap>
+        <fn a="e" b="e" />
+    </modmap>
+
+These two examples are each shown in a modmap, for completeness. However, a layout can have at most one modmap, containing all the desired `<shift>` and `<fn>` tags.

 ## Portrait vs. landscape
 Unexpected Keyboard remembers *separately* which layout has last been used in portrait and landscape orientation. So you may have one custom layout for portrait orientation, but another custom layout for landscape orientation, and Unexpected Keyboard will switch between them without your intervention.
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -38,9 +38,9 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
  <string name="pref_category_typing">Psaní</string>
  <string name="pref_swipe_dist_title">Vzdálenost posunutí prstem</string>
  <string name="pref_swipe_dist_summary">Jak daleko je třeba posunout prst pro zadání znaku/znaménka v rohu klávey (%s)</string>
-  <string name="pref_long_timeout_title">Doba pro aktivaci dlouhého podržení</string>
+  <!-- <string name="pref_long_timeout_title">Long press timeout</string> -->
  <string name="pref_long_interval_title">Interval opakování znaků</string>
-  <string name="pref_keyrepeat_enabled">Opakování kláves při držení</string>
+  <!-- <string name="pref_keyrepeat_enabled">Key repeat on long press</string> -->
  <string name="pref_lock_double_tap_title">Dvojklik pro aktivaci Capslock(u)</string>
  <string name="pref_lock_double_tap_summary">Umožňuje zamknout Shift dvojklikem, namísto podržení</string>
  <string name="pref_category_behavior">Chování</string>
@@ -68,9 +68,6 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
  <string name="pref_theme_e_epaper">ePapír</string>
  <string name="pref_theme_e_desert">Poušťě</string>
  <string name="pref_theme_e_jungle">Džungle</string>
-  <string name="pref_theme_e_monet">Monet (dle systému)</string>
-  <string name="pref_theme_e_monetlight">Monet (Světlý)</string>
-  <string name="pref_theme_e_monetdark">Monet (Tmavý)</string>
  <string name="pref_swipe_dist_e_very_short">Velmi krátká</string>
  <string name="pref_swipe_dist_e_short">Krátká</string>
  <string name="pref_swipe_dist_e_default">Běžná</string>
@@ -81,11 +78,11 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
  <string name="pref_border_config_title">Přizpůsobit okraje</string>
  <string name="pref_border_width_title">Šířka okraje</string>
  <string name="pref_corners_radius_title">Poloměr okraje</string>
-  <string name="pref_circle_sensitivity_title">Citlivost kruhového gesta</string>
-  <string name="pref_circle_sensitivity_e_high">Vysoká</string>
-  <string name="pref_circle_sensitivity_e_medium">Střední</string>
-  <string name="pref_circle_sensitivity_e_low">Nízká</string>
-  <string name="pref_circle_sensitivity_e_disabled">Deaktivováno</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
  <string name="key_action_next">Další</string>
  <string name="key_action_done">Dokončit</string>
  <string name="key_action_go">Spustit</string>
@@ -119,9 +116,9 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
  <string name="key_descr_page_down">Page Down</string>
  <string name="key_descr_home">Home</string>
  <string name="key_descr_end">End</string>
-  <string name="key_descr_clipboard">Správce schránky</string>
-  <string name="clipboard_history_heading">Nedávno kopírovaný text</string>
-  <string name="clipboard_pin_heading">Připnout</string>
-  <string name="clipboard_remove_confirm">Odebrat ze schránky?</string>
-  <string name="clipboard_remove_confirmed">Ano</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -38,9 +38,9 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
  <string name="pref_category_typing">Tippen</string>
  <string name="pref_swipe_dist_title">Länge der Wischgeste</string>
  <string name="pref_swipe_dist_summary">Abstand der Zeichen in den Ecken der Tasten (%s)</string>
-  <string name="pref_long_timeout_title">Zeitüberschreitung durch langes Drücken</string>
+  <!-- <string name="pref_long_timeout_title">Long press timeout</string> -->
  <string name="pref_long_interval_title">Intervall der Tastenwiederholung</string>
-  <string name="pref_keyrepeat_enabled">Tastenwiederholung bei langem Drücken</string>
+  <!-- <string name="pref_keyrepeat_enabled">Key repeat on long press</string> -->
  <string name="pref_lock_double_tap_title">Umschalttaste mit Doppeltippen einrasten</string>
  <string name="pref_lock_double_tap_summary">Anstatt Taste längere Zeit gedrückt zu halten</string>
  <string name="pref_category_behavior">Verhalten</string>
@@ -68,9 +68,6 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_theme_e_desert">Wüste</string>
  <string name="pref_theme_e_jungle">Dschungel</string>
-  <string name="pref_theme_e_monet">Monet (System)</string>
-  <string name="pref_theme_e_monetlight">Monet (Hell)</string>
-  <string name="pref_theme_e_monetdark">Monet (Dunkel)</string>
  <string name="pref_swipe_dist_e_very_short">Sehr kurz</string>
  <string name="pref_swipe_dist_e_short">Kurz</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -119,9 +116,9 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
  <string name="key_descr_page_down">Bild ab</string>
  <string name="key_descr_home">Pos1</string>
  <string name="key_descr_end">Ende</string>
-  <string name="key_descr_clipboard">Clipboard-Manager</string>
-  <string name="clipboard_history_heading">Zuletzt kopierter Text</string>
-  <string name="clipboard_pin_heading">Angeheftet</string>
-  <string name="clipboard_remove_confirm">Aus der Zwischenablage entfernen?</string>
-  <string name="clipboard_remove_confirmed">Ja</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -38,9 +38,9 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
  <string name="pref_category_typing">Escritura</string>
  <string name="pref_swipe_dist_title">Distancia de deslizamiento</string>
  <string name="pref_swipe_dist_summary">Distancia de caracteres en las esquinas de las teclas (%s)</string>
-  <string name="pref_long_timeout_title">Duración para toque largo</string>
+  <!-- <string name="pref_long_timeout_title">Long press timeout</string> -->
  <string name="pref_long_interval_title">Intervalo de repetición de tecla</string>
-  <string name="pref_keyrepeat_enabled">Permitir repetición de toque largo</string>
+  <!-- <string name="pref_keyrepeat_enabled">Key repeat on long press</string> -->
  <string name="pref_lock_double_tap_title">Doble toque en Mayús para bloquear las mayúsculas</string>
  <string name="pref_lock_double_tap_summary">Se puede bloquear cualquier modificador manteniéndolo presionado</string>
  <string name="pref_category_behavior">Comportamiento</string>
@@ -68,9 +68,6 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_theme_e_desert">Desierto</string>
  <string name="pref_theme_e_jungle">Selva</string>
-  <string name="pref_theme_e_monet">Monet (de sistema)</string>
-  <string name="pref_theme_e_monetlight">Monet (claro)</string>
-  <string name="pref_theme_e_monetdark">Monet (oscuro)</string>
  <string name="pref_swipe_dist_e_very_short">Muy corta</string>
  <string name="pref_swipe_dist_e_short">Corta</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -81,11 +78,11 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
  <string name="pref_border_config_title">Bordes personalizados</string>
  <string name="pref_border_width_title">Ancho de bordes</string>
  <string name="pref_corners_radius_title">Radio de rincones</string>
-  <string name="pref_circle_sensitivity_title">Sensibilidad a gestos circulares</string>
-  <string name="pref_circle_sensitivity_e_high">Alta</string>
-  <string name="pref_circle_sensitivity_e_medium">Mediana</string>
-  <string name="pref_circle_sensitivity_e_low">Baja</string>
-  <string name="pref_circle_sensitivity_e_disabled">Apagada</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
  <string name="key_action_next">Siguiente</string>
  <string name="key_action_done">Hecho</string>
  <string name="key_action_go">Ir</string>
@@ -119,9 +116,9 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
  <string name="key_descr_page_down">Re Pág</string>
  <string name="key_descr_home">Inicio</string>
  <string name="key_descr_end">Fin</string>
-  <string name="key_descr_clipboard">Arreglar portapapeles</string>
-  <string name="clipboard_history_heading">Textos recién copiados</string>
-  <string name="clipboard_pin_heading">Pegado</string>
-  <string name="clipboard_remove_confirm">¿Sacar este portapapeles?</string>
-  <string name="clipboard_remove_confirmed">Sí</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -68,9 +68,6 @@ This application contains no ads, doesn't make any network requests and is Open
  <string name="pref_theme_e_epaper">ای-پیپر</string>
  <!-- <string name="pref_theme_e_desert">Desert</string> -->
  <!-- <string name="pref_theme_e_jungle">Jungle</string> -->
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">بسیار کوتاه</string>
  <string name="pref_swipe_dist_e_short">کوتاه</string>
  <string name="pref_swipe_dist_e_default">عادی</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -38,9 +38,9 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
  <string name="pref_category_typing">Saisie</string>
  <string name="pref_swipe_dist_title">Distance de swipe</string>
  <string name="pref_swipe_dist_summary">La distance des caractères dans les coins (%s)</string>
-  <string name="pref_long_timeout_title">Delai de l\'appui long</string>
+  <!-- <string name="pref_long_timeout_title">Long press timeout</string> -->
  <string name="pref_long_interval_title">Écart entre les répétitions</string>
-  <string name="pref_keyrepeat_enabled">Répétition par appui long</string>
+  <!-- <string name="pref_keyrepeat_enabled">Key repeat on long press</string> -->
  <string name="pref_lock_double_tap_title">Appuyer deux fois pour bloquer la majuscule</string>
  <string name="pref_lock_double_tap_summary">Un appui long bloque la majuscule</string>
  <string name="pref_category_behavior">Comportement</string>
@@ -48,8 +48,8 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
  <string name="pref_autocapitalisation_summary">Activer Shift au début des phrases</string>
  <string name="pref_switch_input_immediate_title">Changer vers le clavier utilisé en dernier</string>
  <string name="pref_switch_input_immediate_summary">Comportement de la touche de changement de clavier</string>
-  <string name="pref_vibrate_custom">Vibrations personnalisées</string>
-  <string name="pref_vibrate_duration_title">Intensité des vibrations</string>
+  <!-- <string name="pref_vibrate_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
  <string name="pref_pin_entry_enabled_title">Clavier PIN</string>
  <string name="pref_pin_entry_enabled_summary">Lors de la saisie de nombres, de dates et de numéros de téléphone</string>
  <string name="pref_category_style">Style</string>
@@ -68,9 +68,6 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
  <string name="pref_theme_e_epaper">ePaper</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_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>
@@ -78,14 +75,14 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
  <string name="pref_swipe_dist_e_very_far">Très longue</string>
  <string name="pref_key_horizontal_space">Espacement horizontal entre les touches</string>
  <string name="pref_key_vertical_space">Espacement vertical entre les touches</string>
-  <string name="pref_border_config_title">Bordures personnalisées</string>
-  <string name="pref_border_width_title">Largeur des bordures</string>
-  <string name="pref_corners_radius_title">Rayon des coins</string>
-  <string name="pref_circle_sensitivity_title">Sensibilité du mouvement en cercle</string>
-  <string name="pref_circle_sensitivity_e_high">Haute</string>
-  <string name="pref_circle_sensitivity_e_medium">Moyenne</string>
-  <string name="pref_circle_sensitivity_e_low">Basse</string>
-  <string name="pref_circle_sensitivity_e_disabled">Désactivée</string>
+  <!-- <string name="pref_border_config_title">Customize borders</string> -->
+  <!-- <string name="pref_border_width_title">Border Width</string> -->
+  <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
  <string name="key_action_next">Suiv.</string>
  <string name="key_action_done">Fin</string>
  <string name="key_action_go">Aller</string>
@@ -97,11 +94,11 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
  <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_hint">Essayer ici</string>
+  <!-- <string name="launcher_tryhere_hint">Try here</string> -->
  <string name="key_descr_capslock">Verrouillage majuscules</string>
-  <string name="key_descr_compose">Compose</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_change_method">Switch keyboard</string> -->
  <string name="key_descr_voice_typing">Saisie vocale</string>
  <string name="key_descr_copy">Copier</string>
  <string name="key_descr_paste">Coller</string>
@@ -119,9 +116,9 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
  <string name="key_descr_page_down">Page suivante</string>
  <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="clipboard_history_heading">Texte récemment copié</string>
-  <string name="clipboard_pin_heading">Épinglé</string>
-  <string name="clipboard_remove_confirm">Supprimer ce presse-papiers ?</string>
-  <string name="clipboard_remove_confirmed">Oui</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -68,9 +68,6 @@ This application contains no ads, doesn't make any network requests and is Open
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <!-- <string name="pref_theme_e_desert">Desert</string> -->
  <!-- <string name="pref_theme_e_jungle">Jungle</string> -->
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">Veramente breve</string>
  <string name="pref_swipe_dist_e_short">Breve</string>
  <string name="pref_swipe_dist_e_default">Normale</string>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -68,9 +68,6 @@ This application contains no ads, doesn't make any network requests and is Open
  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <!-- <string name="pref_theme_e_desert">Desert</string> -->
  <!-- <string name="pref_theme_e_jungle">Jungle</string> -->
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">매우 짧음</string>
  <string name="pref_swipe_dist_e_short">짧음</string>
  <string name="pref_swipe_dist_e_default">보통</string>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -38,9 +38,9 @@ Tagad lieliski piemērota izmantošanai ikdienā.
  <string name="pref_category_typing">Rakstīšana</string>
  <string name="pref_swipe_dist_title">Pavilkšanas attālums</string>
  <string name="pref_swipe_dist_summary">Taustiņu stūros esošo rakstzīmju attālums (%s)</string>
-  <string name="pref_long_timeout_title">Ilgas piepiešanas noildze</string>
+  <!-- <string name="pref_long_timeout_title">Long press timeout</string> -->
  <string name="pref_long_interval_title">Taustiņa atkārtošanās aizture</string>
-  <string name="pref_keyrepeat_enabled">Taustiņa atkārtošanās ar ilgu piespiešanu</string>
+  <!-- <string name="pref_keyrepeat_enabled">Key repeat on long press</string> -->
  <string name="pref_lock_double_tap_title">Divkāršs piesitiens burtslēgam</string>
  <string name="pref_lock_double_tap_summary">Tā vietā, lai ilstoši piespiestu pārveidotāju</string>
  <string name="pref_category_behavior">Uzvedība</string>
@@ -68,9 +68,6 @@ Tagad lieliski piemērota izmantošanai ikdienā.
  <string name="pref_theme_e_epaper">ePapīrs</string>
  <string name="pref_theme_e_desert">Tuksnesis</string>
  <string name="pref_theme_e_jungle">Džungļi</string>
-  <string name="pref_theme_e_monet">Monē (sistēmas)</string>
-  <string name="pref_theme_e_monetlight">Monē (gaišs)</string>
-  <string name="pref_theme_e_monetdark">Monē (tumšs)</string>
  <string name="pref_swipe_dist_e_very_short">Ļoti tuvs</string>
  <string name="pref_swipe_dist_e_short">Tuvs</string>
  <string name="pref_swipe_dist_e_default">Vidējs</string>
@@ -81,11 +78,11 @@ Tagad lieliski piemērota izmantošanai ikdienā.
  <string name="pref_border_config_title">Pielāgot apmales</string>
  <string name="pref_border_width_title">Apmales platums</string>
  <string name="pref_corners_radius_title">Stūru rādiuss</string>
-  <string name="pref_circle_sensitivity_title">Apļveida kustības jutīgums</string>
-  <string name="pref_circle_sensitivity_e_high">Augsts</string>
-  <string name="pref_circle_sensitivity_e_medium">Vidējs</string>
-  <string name="pref_circle_sensitivity_e_low">Zems</string>
-  <string name="pref_circle_sensitivity_e_disabled">Atspējots</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
  <string name="key_action_next">Nākamais</string>
  <string name="key_action_done">Darīts</string>
  <string name="key_action_go">Aiziet</string>
@@ -121,9 +118,9 @@ Tagad lieliski piemērota izmantošanai ikdienā.
  <string name="key_descr_page_down">Lejupšķirt</string>
  <string name="key_descr_home">Sākums</string>
  <string name="key_descr_end">Beigas</string>
-  <string name="key_descr_clipboard">Starpliktuves pārvaldnieks</string>
-  <string name="clipboard_history_heading">Nesen starpliktuvē ievietots teksts</string>
-  <string name="clipboard_pin_heading">Piesprausts</string>
-  <string name="clipboard_remove_confirm">Noņemt šo starpliktuves vienumu?</string>
-  <string name="clipboard_remove_confirmed">Jā</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -38,9 +38,9 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
  <string name="pref_category_typing">Pisanie</string>
  <string name="pref_swipe_dist_title">Odległość przesuwania</string>
  <string name="pref_swipe_dist_summary">Odległość znaków od rogów klawiszy (%s)</string>
-  <string name="pref_long_timeout_title">Opóźnienie przytrzymania klawisza</string>
-  <string name="pref_long_interval_title">Czas pomiędzy powtórzeniem klawisza</string>
-  <string name="pref_keyrepeat_enabled">Powtarzanie klawisza po przytrzymaniu</string>
+  <!-- <string name="pref_long_timeout_title">Long press timeout</string> -->
+  <string name="pref_long_interval_title">Czas pomiędzy powtórzeniami</string>
+  <!-- <string name="pref_keyrepeat_enabled">Key repeat on long press</string> -->
  <string name="pref_lock_double_tap_title">Naciśnij Shift podwójnie, aby włączyć caps lock</string>
  <string name="pref_lock_double_tap_summary">Możesz zablokować modyfikator poprzez jego długie naciśnięcie</string>
  <string name="pref_category_behavior">Zachowanie</string>
@@ -68,9 +68,6 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
  <string name="pref_theme_e_epaper">e-paper</string>
  <string name="pref_theme_e_desert">Pustynny</string>
  <string name="pref_theme_e_jungle">Dżunglowy</string>
-  <string name="pref_theme_e_monet">Monet (Systemowy)</string>
-  <string name="pref_theme_e_monetlight">Monet (Jasny)</string>
-  <string name="pref_theme_e_monetdark">Monet (Ciemny)</string>
  <string name="pref_swipe_dist_e_very_short">Bardzo mała</string>
  <string name="pref_swipe_dist_e_short">Mała</string>
  <string name="pref_swipe_dist_e_default">Normalna</string>
@@ -81,11 +78,11 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
  <string name="pref_border_config_title">Dostosuj krawędzie</string>
  <string name="pref_border_width_title">Grubość krawedzi</string>
  <string name="pref_corners_radius_title">Promień rogów</string>
-  <string name="pref_circle_sensitivity_title">Czułość gestu koła</string>
-  <string name="pref_circle_sensitivity_e_high">Wysoka</string>
-  <string name="pref_circle_sensitivity_e_medium">Średnia</string>
-  <string name="pref_circle_sensitivity_e_low">Mała</string>
-  <string name="pref_circle_sensitivity_e_disabled">Wyłączona</string>
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
  <string name="key_action_next">Dalej</string>
  <string name="key_action_done">OK</string>
  <string name="key_action_go">Przejdź</string>
@@ -119,9 +116,9 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
  <string name="key_descr_page_down">Page Down</string>
  <string name="key_descr_home">Home</string>
  <string name="key_descr_end">End</string>
-  <string name="key_descr_clipboard">Zarządzanie schowkiem</string>
-  <string name="clipboard_history_heading">Ostatnio skopiowane elementy</string>
-  <string name="clipboard_pin_heading">Przypięte</string>
-  <string name="clipboard_remove_confirm">Usunąć ten element ze schowka?</string>
-  <string name="clipboard_remove_confirmed">Tak</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -68,9 +68,6 @@ Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e
  <string name="pref_theme_e_epaper">Papel Eletrônico</string>
  <string name="pref_theme_e_desert">Deserto</string>
  <string name="pref_theme_e_jungle">Selva</string>
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">Bem curto</string>
  <string name="pref_swipe_dist_e_short">Curto</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -68,9 +68,6 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e
  <string name="pref_theme_e_epaper">ePaper</string>
  <!-- <string name="pref_theme_e_desert">Desert</string> -->
  <!-- <string name="pref_theme_e_jungle">Jungle</string> -->
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">Foarte apropiată</string>
  <string name="pref_swipe_dist_e_short">Apropiată</string>
  <string name="pref_swipe_dist_e_default">Normală</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -68,9 +68,6 @@
  <string name="pref_theme_e_epaper">Электронная бумага</string>
  <string name="pref_theme_e_desert">Пустыня</string>
  <string name="pref_theme_e_jungle">Джунгли</string>
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">Очень короткая</string>
  <string name="pref_swipe_dist_e_short">Короткая</string>
  <string name="pref_swipe_dist_e_default">Обычная</string>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -38,9 +38,9 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
  <string name="pref_category_typing">Yazma</string>
  <string name="pref_swipe_dist_title">Kaydırma mesafesi</string>
  <string name="pref_swipe_dist_summary">Tuşların köşelerinden kaydırma mesafesi (%s)</string>
-  <string name="pref_long_timeout_title">Uzun basma süresi</string>
+  <!-- <string name="pref_long_timeout_title">Long press timeout</string> -->
  <string name="pref_long_interval_title">Tuşların tekrarlama sıklığı</string>
-  <string name="pref_keyrepeat_enabled">Uzun basınca tuş tekrarlamaları</string>
+  <!-- <string name="pref_keyrepeat_enabled">Key repeat on long press</string> -->
  <string name="pref_lock_double_tap_title">CapsLock için Shift tuşuna çift bas</string>
  <string name="pref_lock_double_tap_summary">Uzun basarak CapsLock açılabilir</string>
  <string name="pref_category_behavior">Klavye davranışı</string>
@@ -68,9 +68,6 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
  <string name="pref_theme_e_epaper">E-Kağıt</string>
  <string name="pref_theme_e_desert">Çöl</string>
  <string name="pref_theme_e_jungle">Orman</string>
-  <string name="pref_theme_e_monet">Monet (Sisteme uyarla)</string>
-  <string name="pref_theme_e_monetlight">Monet (Açık)</string>
-  <string name="pref_theme_e_monetdark">Monet (Koyu)</string>
  <string name="pref_swipe_dist_e_very_short">Çok kısa</string>
  <string name="pref_swipe_dist_e_short">Kısa</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -78,14 +75,14 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
  <string name="pref_swipe_dist_e_very_far">Çok uzun</string>
  <string name="pref_key_horizontal_space">Tuşlar arasındaki yatay boşluk</string>
  <string name="pref_key_vertical_space">Tuşlar arasındaki dikey boşluk</string>
-  <string name="pref_border_config_title">Çerçeveyi özelleştir</string>
-  <string name="pref_border_width_title">Çerçeve kalınlığı</string>
-  <string name="pref_corners_radius_title">Kenar yumuşaklığı</string>
-  <string name="pref_circle_sensitivity_title">Dairesel hareket hassasiyeti</string>
-  <string name="pref_circle_sensitivity_e_high">Yüksek</string>
-  <string name="pref_circle_sensitivity_e_medium">Orta</string>
-  <string name="pref_circle_sensitivity_e_low">Düşük</string>
-  <string name="pref_circle_sensitivity_e_disabled">Devre dışı</string>
+  <!-- <string name="pref_border_config_title">Customize borders</string> -->
+  <!-- <string name="pref_border_width_title">Border Width</string> -->
+  <!-- <string name="pref_corners_radius_title">Corner radius</string> -->
+  <!-- <string name="pref_circle_sensitivity_title">Circle gesture sensitivity</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_high">High</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_medium">Medium</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_low">Low</string> -->
+  <!-- <string name="pref_circle_sensitivity_e_disabled">Disabled</string> -->
  <string name="key_action_next">Sonraki</string>
  <string name="key_action_done">Tamam</string>
  <string name="key_action_go">ileri</string>
@@ -97,9 +94,9 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
  <string name="launcher_description">Bu uygulama bir sanal klavye uygulamasıdır. Aşağıdaki butona basarak sistem ayarlarında etkinleştiriniz.</string>
  <string name="launcher_sourcecode">Bu uygulama ücretsiz ve açık kaynaklıdır. Kaynak koduna erişmek veya bir hata raporlamak için GitHub</string>
  <string name="launcher_tryhere">Ayarlardan aktif ettikten sonra klavyeyi burada test edebilirsin:</string>
-  <string name="launcher_tryhere_hint">Burada dene</string>
+  <!-- <string name="launcher_tryhere_hint">Try here</string> -->
  <string name="key_descr_capslock">CapsLock</string>
-  <string name="key_descr_compose">Oluştur</string>
+  <!-- <string name="key_descr_compose">Compose</string> -->
  <string name="key_descr_switch_greekmath">Greek &amp; math sembolleri</string>
  <string name="key_descr_change_method">Klavye değiştir</string>
  <string name="key_descr_voice_typing">Sesle yazma</string>
@@ -119,9 +116,9 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
  <string name="key_descr_page_down">Aşağı</string>
  <string name="key_descr_home">BAŞ(Sol yön tuşu)</string>
  <string name="key_descr_end">SON(Sağ yön tuşu)</string>
-  <string name="key_descr_clipboard">Pano</string>
-  <string name="clipboard_history_heading">Son kopyalanan metin</string>
-  <string name="clipboard_pin_heading">Sabitlendi</string>
-  <string name="clipboard_remove_confirm">Bu sabitlemeyi sil</string>
-  <string name="clipboard_remove_confirmed">Evet</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -68,9 +68,6 @@
  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_theme_e_desert">Пустеля</string>
  <string name="pref_theme_e_jungle">Джунглі</string>
-  <string name="pref_theme_e_monet">Моне (Системна)</string>
-  <string name="pref_theme_e_monetlight">Моне (Світла)</string>
-  <string name="pref_theme_e_monetdark">Моне (Темна)</string>
  <string name="pref_swipe_dist_e_very_short">Дуже коротка</string>
  <string name="pref_swipe_dist_e_short">Коротка</string>
  <string name="pref_swipe_dist_e_default">Звичайна</string>
@@ -119,9 +116,9 @@
  <string name="key_descr_page_down">Page Down</string>
  <string name="key_descr_home">Home</string>
  <string name="key_descr_end">End</string>
-  <string name="key_descr_clipboard">Менеджер буфера обміну</string>
-  <string name="clipboard_history_heading">Нещодавно скопійований текст</string>
-  <string name="clipboard_pin_heading">Закріплено</string>
-  <string name="clipboard_remove_confirm">Видалити цей буфер обміну?</string>
-  <string name="clipboard_remove_confirmed">Так</string>
+  <!-- <string name="key_descr_clipboard">Clipboard manager</string> -->
+  <!-- <string name="clipboard_history_heading">Recently copied text</string> -->
+  <!-- <string name="clipboard_pin_heading">Pinned</string> -->
+  <!-- <string name="clipboard_remove_confirm">Remove this clipboard?</string> -->
+  <!-- <string name="clipboard_remove_confirmed">Yes</string> -->
 </resources>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -68,9 +68,6 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
  <string name="pref_theme_e_epaper">ePaper</string>
  <!-- <string name="pref_theme_e_desert">Desert</string> -->
  <!-- <string name="pref_theme_e_jungle">Jungle</string> -->
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">Rất gần</string>
  <string name="pref_swipe_dist_e_short">Gần</string>
  <string name="pref_swipe_dist_e_default">Trungbình</string>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -68,9 +68,6 @@
  <string name="pref_theme_e_epaper">白色带边框</string>
  <string name="pref_theme_e_desert">沙漠</string>
  <string name="pref_theme_e_jungle">雨林</string>
-  <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
-  <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
-  <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
  <string name="pref_swipe_dist_e_very_short">非常短</string>
  <string name="pref_swipe_dist_e_short">短</string>
  <string name="pref_swipe_dist_e_default">中（默认）</string>
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -28,9 +28,6 @@
    <item>@string/pref_theme_e_epaper</item>
    <item>@string/pref_theme_e_desert</item>
    <item>@string/pref_theme_e_jungle</item>
-    <item>@string/pref_theme_e_monet</item>
-    <item>@string/pref_theme_e_monetlight</item>
-    <item>@string/pref_theme_e_monetdark</item>
  </string-array>
  <string-array name="pref_theme_values">
    <item>system</item>
@@ -42,9 +39,6 @@
    <item>epaper</item>
    <item>desert</item>
    <item>jungle</item>
-    <item>monet</item>
-    <item>monetlight</item>
-    <item>monetdark</item>
  </string-array>
  <string-array name="pref_swipe_dist_entries">
    <item>@string/pref_swipe_dist_e_very_short</item>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -68,9 +68,6 @@ This application contains no ads, doesn't make any network requests and is Open
  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_theme_e_desert">Desert</string>
  <string name="pref_theme_e_jungle">Jungle</string>
-  <string name="pref_theme_e_monet">Monet (System)</string>
-  <string name="pref_theme_e_monetlight">Monet (Light)</string>
-  <string name="pref_theme_e_monetdark">Monet (Dark)</string>
  <string name="pref_swipe_dist_e_very_short">Very short</string>
  <string name="pref_swipe_dist_e_short">Short</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -179,28 +179,4 @@
    <item name="emoji_button_bg">?colorKeyActivated</item>
    <item name="emoji_color">#000000</item>
  </style>
-  <style name="MonetLight" parent="@style/BaseTheme">
-    <item name="android:isLightTheme">true</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">@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_accent1_900</item>
-    <item name="colorKey">@android:color/system_accent1_800</item>
-    <item name="colorKeyActivated">@android:color/system_accent1_600</item>
-    <item name="colorLabel">@android:color/system_neutral1_0</item>
-    <item name="colorLabelActivated">@android:color/system_accent2_300</item>
-    <item name="colorLabelLocked">@android:color/system_accent2_100</item>
-    <item name="colorSubLabel">@android:color/system_neutral1_300</item>
-    <item name="emoji_button_bg">?colorKeyActivated</item>
-    <item name="emoji_color">@android:color/system_accent1_900</item>
-  </style>
 </resources>
--- a/res/xml/emoji_bottom_row.xml
+++ b/res/xml/emoji_bottom_row.xml
@@ -3,8 +3,8 @@
 <keyboard bottom_row="false">
  <row height="0.95">
    <key key0="switch_back_emoji"/>
-    <key width="3" key0="space" key5="cursor_left" key6="cursor_right" slider="true"/>
-    <key key0="backspace" key2="delete"/>
-    <key key0="enter" key2="action"/>
+    <key width="4" key0="space" key5="cursor_left" key6="cursor_right" slider="true"/>
+    <key key0="backspace"/>
+    <key key0="enter"/>
  </row>
 </keyboard>
--- a/srcs/compose/accent_aigu.json
+++ b/srcs/compose/accent_aigu.json
@@ -11,5 +11,15 @@
  "u": "ú",
  "y": "ý",
  "z": "ź",
-  "ü": "ǘ"
+  "ü": "ǘ",
+  "j": "j\u0301",
+  "у": "у\u0301",
+  "е": "е\u0301",
+  "а": "а\u0301",
+  "о": "о\u0301",
+  "и": "и\u0301",
+  "ы": "ы\u0301",
+  "э": "э\u0301",
+  "ю": "ю\u0301",
+  "я": "я\u0301"
 }
--- a/srcs/compose/accent_double_aigu.json
+++ b/srcs/compose/accent_double_aigu.json
@@ -1,5 +1,10 @@
 {
  "o": "ő",
  "u": "ű",
-  " ": "˝"
+  " ": "˝",
+  "a": "a\u030b",
+  "e": "e\u030b",
+  "i": "i\u030b",
+  "m": "m\u030b",
+  "y": "y\u030b"
 }
--- a/srcs/juloo.keyboard2/ComposeKeyData.java
+++ b/srcs/juloo.keyboard2/ComposeKeyData.java
@@ -100,13 +100,14 @@ public final class ComposeKeyData
    "/\u2274\u0000/\u2275\u0000/\u2278\u0000/\u2279\u0000/\u2280\u0000/\u2281\u0000/\u22e0\u0000/\u22e1\u0000/_|\u2284\u2286\u2367\u0000/_\u2285\u2287\u0000/\u2288\u0000/\u2289\u0000/\u22e2\u0000/\u22e3\u0000/\u22ac\u0000\u00a8\u00af\u2218\u22a5\u2361\u2351\u2355\u2336\u0000_\u2218\u22a4\u234a\u234e\u2336\u0000/\u22ad\u0000/\u22ae" +
    "\u0000/\u22af\u0000/\u22ea\u0000/\u22eb\u0000/\u22ec\u0000/\u22ed\u0000_\u2395\u235a\u233a\u0000_\u2378\u0000_\u2379\u0000_\u2376\u0000'/:<=>?\\\u00f7\u2190\u2191\u2192\u2193\u2206\u2207\u2218\u2227\u2228\u2260\u22c4\u25cb\u235e\u2341\u2360\u2343\u2338\u2344\u2370\u2342\u2339\u2347\u2350\u2348\u2357\u234d\u2354\u233b\u2353\u234c\u236f\u233a\u233c" +
    "\u0000*-.\\_|\u00a8\u2218\u2395\u235f\u2296\u2299\u2349\u235c\u233d\u2365\u233e\u233c\u0000/\u2adc\u0000cdeghklnrst\u00e7\u1e11\u0229\u0123\u1e29\u0137\u013c\u0146\u0157\u015f\u0163\u0000ou\u00f2\u00f3\u00f5\u00f9\u00fa\u0169\u1ecd\u1ecf\u1ee5\u1ee7\u01a1\u01b0\u1edd\u1edb\u1ee1\u1eeb\u1ee9\u1eef\u1ee3\u1edf\u1ef1\u1eed\u0000a" +
-    "u\u00e5\u016f\u0000acdeilnorstuz\u00fc\u01ce\u010d\u010f\u011b\u01d0\u013e\u0148\u01d2\u0159\u0161\u0165\u01d4\u017e\u01da\u0000aceghijouz\u015d\u00e2\u0109\u00ea\u011d\u0125\u00ee\u0135\u00f4\u00fb\u1e91\u015d\u0000 ou\u02dd\u0151\u0171\u0000.01234567" +
-    "89\u2502\u2500\u2514\u2534\u2518\u251c\u253c\u2524\u250c\u252c\u2510\u0000aeiou\u00fc\u00e0\u00e8\u00ec\u00f2\u00f9\u01dc\u0000abcegklnorst\u2c65\u2422\u023c\u0247\uFFFF\ua7a1\uFFFF\ua743\u0142\uFFFF\ua7a5\u00f8\uFFFF\ua7a7\uFFFF\ua7a9\u2c66\u0000aeiouy\u00e2\u00ea\u00f4\u0103\u01a1\u01b0\u1ea3\u1ebb\u1ec9" +
-    "\u1ecf\u1ee7\u1ef7\u1ea9\u1ec3\u1ed5\u1eb3\u1edf\u1eed\u0000()+-0123456789=aehijklmnoprstuvx\u208d\u208e\u208a\u208b\u2080\u2081\u2082\u2083\u2084\u2085\u2086\u2087\u2088\u2089\u208c\u2090\u2091\u2095\u1d62\u2c7c\u2096\u2097\u2098\u2099\u2092\u209a\u1d63\u209b\u209c\u1d64" +
-    "\u1d65\u2093\u0000aeiouy\u00e4\u00eb\u00ef\u00f6\u00fc\u00ff\u0000aeiouy\u00e2\u00ea\u00f4\u0103\u01a1\u01b0\u1ea1\u1eb9\u1ecb\u1ecd\u1ee5\u1ef5\u1ead\u1ec7\u1ed9\u1eb7\u1ee3\u1ef1\u0000()+-0123456789=abcdefghijklmnop" +
-    "rstuvwxyz\u207d\u207e\u207a\u207b\u2070\u00b9\u00b2\u00b3\u2074\u2075\u2076\u2077\u2078\u2079\u207c\u1d43\u1d47\u1d9c\u1d48\u1d49\u1da0\u1d4d\u02b0\u2071\u02b2\u1d4f\u02e1\u1d50\u207f\u1d52\u1d56\u02b3\u02e2\u1d57\u1d58\u1d5b\u02b7\u02e3\u02b8\u1dbb\u0000bcdgijklopqrtuyz\u0180\uFFFF\ua793\u0111\u01e5\u0268" +
-    "\u0249\uFFFF\ua741\u019a\u0275\u1d7d\uFFFF\ua757\u024d\u0167\u0289\u024f\u01b6\u0000*123456789ao\u00b0\u00aa\u00ba\u207f\u1d48\u1d49\u02b3\u02e2\u1d57\u02b0\u00aa\u00ba\u0000aeiou\u00fc\u0101\u0113\u012b\u014d\u016b\u01d6\u0000abcdefghmnoprstwxyz\u0227" +
-    "\u1e03\u010b\u1e0b\u0117\u1e1f\u0121\u1e23\u1e41\u1e45\u022f\u1e57\u1e59\u1e61\u1e6b\u1e87\u1e8b\u1e8f\u017c\u0000aceilorsuyz\u00fc\u0144\u00e1\u0107\u00e9\u00ed\u013a\u00f3\u0155\u015b\u00fa\u00fd\u017a\u01d8\u0144").toCharArray();
+    "u\u00e5\u016f\u0000acdeilnorstuz\u00fc\u01ce\u010d\u010f\u011b\u01d0\u013e\u0148\u01d2\u0159\u0161\u0165\u01d4\u017e\u01da\u0000aceghijouz\u015d\u00e2\u0109\u00ea\u011d\u0125\u00ee\u0135\u00f4\u00fb\u1e91\u015d\u0000 aeimouy\u02dd\uFFFF\u0061\u030b\uFFFF\u0065\u030b\uFFFF" +
+    "\u0069\u030b\uFFFF\u006d\u030b\u0151\u0171\uFFFF\u0079\u030b\u0000.0123456789\u2502\u2500\u2514\u2534\u2518\u251c\u253c\u2524\u250c\u252c\u2510\u0000aeiou\u00fc\u00e0\u00e8\u00ec\u00f2\u00f9\u01dc\u0000abcegklnorst\u2c65\u2422\u023c\u0247\uFFFF\ua7a1\uFFFF\ua743\u0142\uFFFF\ua7a5\u00f8\uFFFF" +
+    "\ua7a7\uFFFF\ua7a9\u2c66\u0000aeiouy\u00e2\u00ea\u00f4\u0103\u01a1\u01b0\u1ea3\u1ebb\u1ec9\u1ecf\u1ee7\u1ef7\u1ea9\u1ec3\u1ed5\u1eb3\u1edf\u1eed\u0000()+-0123456789=aehijklmnoprstuvx\u208d\u208e\u208a\u208b\u2080\u2081\u2082\u2083\u2084\u2085" +
+    "\u2086\u2087\u2088\u2089\u208c\u2090\u2091\u2095\u1d62\u2c7c\u2096\u2097\u2098\u2099\u2092\u209a\u1d63\u209b\u209c\u1d64\u1d65\u2093\u0000aeiouy\u00e4\u00eb\u00ef\u00f6\u00fc\u00ff\u0000aeiouy\u00e2\u00ea\u00f4\u0103\u01a1\u01b0\u1ea1\u1eb9\u1ecb\u1ecd\u1ee5\u1ef5\u1ead\u1ec7\u1ed9\u1eb7\u1ee3\u1ef1\u0000()+-0123456" +
+    "789=abcdefghijklmnoprstuvwxyz\u207d\u207e\u207a\u207b\u2070\u00b9\u00b2\u00b3\u2074\u2075\u2076\u2077\u2078\u2079\u207c\u1d43\u1d47\u1d9c\u1d48\u1d49\u1da0\u1d4d\u02b0\u2071\u02b2\u1d4f\u02e1\u1d50\u207f\u1d52\u1d56\u02b3\u02e2\u1d57\u1d58\u1d5b\u02b7\u02e3\u02b8\u1dbb\u0000bc" +
+    "dgijklopqrtuyz\u0180\uFFFF\ua793\u0111\u01e5\u0268\u0249\uFFFF\ua741\u019a\u0275\u1d7d\uFFFF\ua757\u024d\u0167\u0289\u024f\u01b6\u0000*123456789ao\u00b0\u00aa\u00ba\u207f\u1d48\u1d49\u02b3\u02e2\u1d57\u02b0\u00aa\u00ba\u0000aeiou\u00fc\u0101\u0113\u012b\u014d\u016b\u01d6\u0000" +
+    "abcdefghmnoprstwxyz\u0227\u1e03\u010b\u1e0b\u0117\u1e1f\u0121\u1e23\u1e41\u1e45\u022f\u1e57\u1e59\u1e61\u1e6b\u1e87\u1e8b\u1e8f\u017c\u0000aceijlorsuyz\u00fc\u0144\u0430\u0435\u0438\u043e\u0443\u044b\u044d\u044e\u044f\u00e1\u0107\u00e9\u00ed\uFFFF\u006a\u0301\u013a\u00f3\u0155" +
+    "\u015b\u00fa\u00fd\u017a\u01d8\u0144\uFFFF\u0430\u0301\uFFFF\u0435\u0301\uFFFF\u0438\u0301\uFFFF\u043e\u0301\uFFFF\u0443\u0301\uFFFF\u044b\u0301\uFFFF\u044d\u0301\uFFFF\u044e\u0301\uFFFF\u044f\u0301").toCharArray();

  public static final char[] edges =
    ("\u0001\u0009\n\u000b\u000c\r\u000e\u000f\u0010\u0011\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u000c\u001e\u001f\u0020\u0021\"\u0023\u0024\u0025\u0026\u0027\u0028\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u000c\u0035\u0036\u0037\u0038\u0039\u003a\u003b\u003c\u003d\u003e\u003f\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0108\u0148\u0159\u01be\u024b\u025a\u025d\u03fa" +
@@ -204,13 +205,14 @@ public final class ComposeKeyData
    "\u19e1\u0001\u0002\u19e4\u0001\u0002\u19e7\u0001\u0002\u19ea\u0001\u0002\u19ed\u0001\u0002\u19f0\u0001\u0002\u19f3\u0001\u0002\u19f6\u0001\u0004\u19fb\u19fc\u19fd\u0001\u0001\u0001\u0003\u1a01\u1a02\u0001\u0001\u0002\u1a05\u0001\u0002\u1a08\u0001\u0002\u1a0b\u0001\u0002\u1a0e\u0001\u0002\u1a11\u0001\u0005\u1a17\u1a18\u1a19\u1a1a\u0001\u0001\u0001\u0001\u0004\u1a1f\u1a20\u1a21\u0001\u0001\u0001\u0002\u1a24\u0001\u0002\u1a27\u0001" +
    "\u0002\u1a2a\u0001\u0002\u1a2d\u0001\u0002\u1a30\u0001\u0002\u1a33\u0001\u0002\u1a36\u0001\u0003\u1a3a\u1a3b\u0001\u0001\u0002\u1a3e\u0001\u0002\u1a41\u0001\u0002\u1a44\u0001\u0016\u1a5b\u1a5c\u1a5d\u1a5e\u1a5f\u1a60\u1a61\u1a62\u1a63\u1a64\u1a65\u1a66\u1a67\u1a68\u1a69\u1a6a\u1a6b\u1a6c\u1a6d\u1a6e\u1a6f\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001" +
    "\n\u1a7a\u1a7b\u1a7c\u1a7d\u1a7e\u1a7f\u1a80\u1a81\u1a82\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u1a85\u0001\u000c\u1a92\u1a93\u1a94\u1a95\u1a96\u1a97\u1a98\u1a99\u1a9a\u1a9b\u1a9c\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\r\u1aaa\u1aab\u1aac\u1aad\u1aae\u1aaf\u1ab0\u1ab1\u1ab2\u1ab3\u1ab4\u1ab5\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0003\u1ab9" +
-    "\u1aba\u0001\u0001\u000f\u1aca\u1acb\u1acc\u1acd\u1ace\u1acf\u1ad0\u1ad1\u1ad2\u1ad3\u1ad4\u1ad5\u1ad6\u1ad7\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u000c\u1ae4\u1ae5\u1ae6\u1ae7\u1ae8\u1ae9\u1aea\u1aeb\u1aec\u1aed\u1aee\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0004\u1af3\u1af4\u1af5\u0001\u0001\u0001\u000c\u1b02\u1b03\u1b04\u1b05\u1b06\u1b07\u1b08\u1b09\u1b0a" +
-    "\u1b0b\u1b0c\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0007\u1b14\u1b15\u1b16\u1b17\u1b18\u1b19\u0001\u0001\u0001\u0001\u0001\u0001\r\u1b27\u1b28\u1b29\u1b2a\u1b2b\u1b2d\u1b2f\u1b30\u1b32\u1b33\u1b35\u1b37\u0001\u0001\u0001\u0001\u0002\u0000\u0002\u0000\u0001\u0002\u0000\u0001\u0002\u0000\u0002\u0000\u0001\r\u1b45\u1b46\u1b47\u1b48\u1b49\u1b4a\u1b4b\u1b4c\u1b4d\u1b4e\u1b4f\u1b50\u0001\u0001\u0001" +
-    "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0021\u1b72\u1b73\u1b74\u1b75\u1b76\u1b77\u1b78\u1b79\u1b7a\u1b7b\u1b7c\u1b7d\u1b7e\u1b7f\u1b80\u1b81\u1b82\u1b83\u1b84\u1b85\u1b86\u1b87\u1b88\u1b89\u1b8a\u1b8b\u1b8c\u1b8d\u1b8e\u1b8f\u1b90\u1b91\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001" +
-    "\u0001\u0001\u0007\u1b99\u1b9a\u1b9b\u1b9c\u1b9d\u1b9e\u0001\u0001\u0001\u0001\u0001\u0001\r\u1bac\u1bad\u1bae\u1baf\u1bb0\u1bb1\u1bb2\u1bb3\u1bb4\u1bb5\u1bb6\u1bb7\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0029\u1be1\u1be2\u1be3\u1be4\u1be5\u1be6\u1be7\u1be8\u1be9\u1bea\u1beb\u1bec\u1bed\u1bee\u1bef\u1bf0\u1bf1\u1bf2\u1bf3\u1bf4\u1bf5\u1bf6\u1bf7\u1bf8\u1bf9\u1bfa\u1bfb\u1bfc\u1bfd\u1bfe\u1bff" +
-    "\u1c00\u1c01\u1c02\u1c03\u1c04\u1c05\u1c06\u1c07\u1c08\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0011\u1c1a\u1c1b\u1c1d\u1c1e\u1c1f\u1c20\u1c21\u1c23\u1c24\u1c25\u1c26\u1c28\u1c29\u1c2a\u1c2b\u1c2c\u0001\u0002\u0000\u0001\u0001\u0001" +
-    "\u0001\u0002\u0000\u0001\u0001\u0001\u0002\u0000\u0001\u0001\u0001\u0001\u0001\r\u1c3a\u1c3b\u1c3c\u1c3d\u1c3e\u1c3f\u1c40\u1c41\u1c42\u1c43\u1c44\u1c45\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0007\u1c4d\u1c4e\u1c4f\u1c50\u1c51\u1c52\u0001\u0001\u0001\u0001\u0001\u0001\u0014\u1c67\u1c68\u1c69\u1c6a\u1c6b\u1c6c\u1c6d\u1c6e\u1c6f\u1c70\u1c71\u1c72\u1c73\u1c74\u1c75\u1c76\u1c77\u1c78\u1c79\u0001" +
-    "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u000e\u1c88\u1c89\u1c8a\u1c8b\u1c8c\u1c8d\u1c8e\u1c8f\u1c90\u1c91\u1c92\u1c93\u1c94\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001").toCharArray();
+    "\u1aba\u0001\u0001\u000f\u1aca\u1acb\u1acc\u1acd\u1ace\u1acf\u1ad0\u1ad1\u1ad2\u1ad3\u1ad4\u1ad5\u1ad6\u1ad7\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u000c\u1ae4\u1ae5\u1ae6\u1ae7\u1ae8\u1ae9\u1aea\u1aeb\u1aec\u1aed\u1aee\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0009\u1af8\u1af9\u1afc\u1aff\u1b02\u1b05\u1b06\u1b07\u0001\u0003\u0000\u0000\u0003\u0000\u0000\u0003" +
+    "\u0000\u0000\u0003\u0000\u0000\u0001\u0001\u0003\u0000\u0000\u000c\u1b16\u1b17\u1b18\u1b19\u1b1a\u1b1b\u1b1c\u1b1d\u1b1e\u1b1f\u1b20\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0007\u1b28\u1b29\u1b2a\u1b2b\u1b2c\u1b2d\u0001\u0001\u0001\u0001\u0001\u0001\r\u1b3b\u1b3c\u1b3d\u1b3e\u1b3f\u1b41\u1b43\u1b44\u1b46\u1b47\u1b49\u1b4b\u0001\u0001\u0001\u0001\u0002\u0000\u0002\u0000\u0001\u0002\u0000\u0001\u0002" +
+    "\u0000\u0002\u0000\u0001\r\u1b59\u1b5a\u1b5b\u1b5c\u1b5d\u1b5e\u1b5f\u1b60\u1b61\u1b62\u1b63\u1b64\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0021\u1b86\u1b87\u1b88\u1b89\u1b8a\u1b8b\u1b8c\u1b8d\u1b8e\u1b8f\u1b90\u1b91\u1b92\u1b93\u1b94\u1b95\u1b96\u1b97\u1b98\u1b99\u1b9a\u1b9b\u1b9c\u1b9d\u1b9e\u1b9f\u1ba0\u1ba1\u1ba2\u1ba3\u1ba4\u1ba5\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001" +
+    "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0007\u1bad\u1bae\u1baf\u1bb0\u1bb1\u1bb2\u0001\u0001\u0001\u0001\u0001\u0001\r\u1bc0\u1bc1\u1bc2\u1bc3\u1bc4\u1bc5\u1bc6\u1bc7\u1bc8\u1bc9\u1bca\u1bcb\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0029\u1bf5\u1bf6\u1bf7\u1bf8\u1bf9\u1bfa\u1bfb\u1bfc\u1bfd\u1bfe\u1bff" +
+    "\u1c00\u1c01\u1c02\u1c03\u1c04\u1c05\u1c06\u1c07\u1c08\u1c09\u1c0a\u1c0b\u1c0c\u1c0d\u1c0e\u1c0f\u1c10\u1c11\u1c12\u1c13\u1c14\u1c15\u1c16\u1c17\u1c18\u1c19\u1c1a\u1c1b\u1c1c\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0011\u1c2e\u1c2f" +
+    "\u1c31\u1c32\u1c33\u1c34\u1c35\u1c37\u1c38\u1c39\u1c3a\u1c3c\u1c3d\u1c3e\u1c3f\u1c40\u0001\u0002\u0000\u0001\u0001\u0001\u0001\u0002\u0000\u0001\u0001\u0001\u0002\u0000\u0001\u0001\u0001\u0001\u0001\r\u1c4e\u1c4f\u1c50\u1c51\u1c52\u1c53\u1c54\u1c55\u1c56\u1c57\u1c58\u1c59\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0007\u1c61\u1c62\u1c63\u1c64\u1c65\u1c66\u0001\u0001\u0001\u0001\u0001\u0001\u0014" +
+    "\u1c7b\u1c7c\u1c7d\u1c7e\u1c7f\u1c80\u1c81\u1c82\u1c83\u1c84\u1c85\u1c86\u1c87\u1c88\u1c89\u1c8a\u1c8b\u1c8c\u1c8d\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0018\u1ca6\u1ca7\u1ca8\u1ca9\u1caa\u1cad\u1cae\u1caf\u1cb0\u1cb1\u1cb2\u1cb3\u1cb4\u1cb5\u1cb6\u1cb9\u1cbc\u1cbf\u1cc2\u1cc5\u1cc8\u1ccb\u1cce\u0001\u0001\u0001\u0001\u0003\u0000\u0000\u0001\u0001\u0001" +
+    "\u0001\u0001\u0001\u0001\u0001\u0001\u0003\u0000\u0000\u0003\u0000\u0000\u0003\u0000\u0000\u0003\u0000\u0000\u0003\u0000\u0000\u0003\u0000\u0000\u0003\u0000\u0000\u0003\u0000\u0000\u0003\u0000\u0000").toCharArray();

  public static final int accent_ogonek = 1;
  public static final int accent_arrows = 18;
@@ -222,17 +224,17 @@ public final class ComposeKeyData
  public static final int accent_caron = 6843;
  public static final int accent_circonflexe = 6872;
  public static final int accent_double_aigu = 6895;
-  public static final int accent_box = 6902;
-  public static final int accent_grave = 6925;
-  public static final int accent_slash = 6938;
-  public static final int accent_hook_above = 6968;
-  public static final int accent_subscript = 6993;
-  public static final int accent_trema = 7058;
-  public static final int accent_dot_below = 7071;
-  public static final int accent_superscript = 7096;
-  public static final int accent_bar = 7177;
-  public static final int accent_ordinal = 7213;
-  public static final int accent_macron = 7238;
-  public static final int accent_dot_above = 7251;
-  public static final int accent_aigu = 7290;
+  public static final int accent_box = 6922;
+  public static final int accent_grave = 6945;
+  public static final int accent_slash = 6958;
+  public static final int accent_hook_above = 6988;
+  public static final int accent_subscript = 7013;
+  public static final int accent_trema = 7078;
+  public static final int accent_dot_below = 7091;
+  public static final int accent_superscript = 7116;
+  public static final int accent_bar = 7197;
+  public static final int accent_ordinal = 7233;
+  public static final int accent_macron = 7258;
+  public static final int accent_dot_above = 7271;
+  public static final int accent_aigu = 7310;
 }
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -234,7 +234,7 @@ public final class Config
    extra_keys.put(KeyValue.getKeyByName("config"), KeyboardData.PreferredPos.ANYWHERE);
    extra_keys.putAll(extra_keys_param);
    extra_keys.putAll(extra_keys_custom);
-    if (extra_keys_subtype != null && kw.locale_extra_keys)
+    if (extra_keys_subtype != null)
    {
      Set<KeyValue> present = new HashSet<KeyValue>();
      present.addAll(kw.getKeys().keySet());
@@ -405,7 +405,6 @@ public final class Config

  private int getThemeId(Resources res, String theme_name)
  {
-    int night_mode = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
    switch (theme_name)
    {
      case "light": return R.style.Light;
@@ -416,14 +415,9 @@ public final class Config
      case "epaper": return R.style.ePaper;
      case "desert": return R.style.Desert;
      case "jungle": return R.style.Jungle;
-      case "monetlight": return R.style.MonetLight;
-      case "monetdark": return R.style.MonetDark;
-      case "monet":
-        if ((night_mode & Configuration.UI_MODE_NIGHT_NO) != 0)
-          return R.style.MonetLight;
-        return R.style.MonetDark;
      default:
      case "system":
+        int night_mode = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
        if ((night_mode & Configuration.UI_MODE_NIGHT_NO) != 0)
          return R.style.Light;
        return R.style.Dark;
--- a/srcs/juloo.keyboard2/KeyModifier.java
+++ b/srcs/juloo.keyboard2/KeyModifier.java
@@ -2,7 +2,6 @@ package juloo.keyboard2;

 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
-import java.util.Arrays;
 import java.util.HashMap;

 public final class KeyModifier
@@ -59,7 +58,7 @@ public final class KeyModifier
      case GESTURE: return apply_gesture(k);
      case SHIFT: return apply_shift(k);
      case GRAVE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_grave, '\u02CB');
-      case AIGU: return apply_diacritics(k, ComposeKeyData.accent_aigu, '\u00B4', '\u0301');
+      case AIGU: return apply_compose_or_dead_char(k, ComposeKeyData.accent_aigu, '\u00B4');
      case CIRCONFLEXE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_circonflexe, '\u02C6');
      case TILDE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_tilde, '\u02DC');
      case CEDILLE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_cedille, '\u00B8');
@@ -70,7 +69,7 @@ public final class KeyModifier
      case OGONEK: return apply_compose_or_dead_char(k, ComposeKeyData.accent_ogonek, '\u02DB');
      case DOT_ABOVE: return apply_compose_or_dead_char(k, ComposeKeyData.accent_dot_above, '\u02D9');
      case BREVE: return apply_dead_char(k, '\u02D8');
-      case DOUBLE_AIGU: return apply_diacritics(k, ComposeKeyData.accent_double_aigu, '\0', '\u030b');
+      case DOUBLE_AIGU: return apply_compose(k, ComposeKeyData.accent_double_aigu);
      case ORDINAL: return apply_compose(k, ComposeKeyData.accent_ordinal);
      case SUPERSCRIPT: return apply_compose(k, ComposeKeyData.accent_superscript);
      case SUBSCRIPT: return apply_compose(k, ComposeKeyData.accent_subscript);
@@ -132,51 +131,43 @@ public final class KeyModifier
    return k;
  }

-  /** Apply the following mapping, in this order, and stop at the first that
-      changes the key.
-
-      - The compose state, unless it is [0].
-      - The dead char, unless it is ['\0'].
-      - The combining diacritic, unless it is ['\0'].
-        This is not done if the initial key matches [combining_disabled]. */
-  private static KeyValue apply_diacritics(KeyValue k, int state, char dead_char, char combining)
+  /** Apply the given compose state or fallback to the dead_char. */
+  private static KeyValue apply_compose_or_dead_char(KeyValue k, int state, char dead_char)
  {
    switch (k.getKind())
    {
      case Char:
        char c = k.getChar();
-        if (state != 0)
-        {
-          KeyValue r = ComposeKey.apply(state, c);
-          if (r != null)
-            return r;
-        }
-        if (dead_char != '\0')
-        {
-          char modified = (char)KeyCharacterMap.getDeadChar(dead_char, c);
-          if (modified != 0 && modified != c)
-            return KeyValue.makeStringKey(String.valueOf(modified));
-        }
-        if (combining != '\0' && !combining_disabled(c))
-          return KeyValue.makeStringKey(new String(new char[]{ c, combining }));
-        break;
+        KeyValue r = ComposeKey.apply(state, c);
+        if (r != null)
+          return r;
    }
-    return k;
+    return apply_dead_char(k, dead_char);
  }

  private static KeyValue apply_compose(KeyValue k, int state)
  {
-    return apply_diacritics(k, state, '\0', '\0');
+    switch (k.getKind())
+    {
+      case Char:
+        KeyValue r = ComposeKey.apply(state, k.getChar());
+        if (r != null)
+          return r;
+    }
+    return k;
  }

  private static KeyValue apply_dead_char(KeyValue k, char dead_char)
  {
-    return apply_diacritics(k, 0, dead_char, '\0');
-  }
-
-  private static KeyValue apply_compose_or_dead_char(KeyValue k, int state, char dead_char)
-  {
-    return apply_diacritics(k, state, dead_char, '\0');
+    switch (k.getKind())
+    {
+      case Char:
+        char c = k.getChar();
+        char modified = (char)KeyCharacterMap.getDeadChar(dead_char, c);
+        if (modified != 0 && modified != c)
+          return KeyValue.makeStringKey(String.valueOf(modified));
+    }
+    return k;
  }

  private static KeyValue apply_shift(KeyValue k)
@@ -815,18 +806,4 @@ public final class KeyModifier
    }
    return KeyValue.makeHangulFinal(precomposed, final_idx);
  }
-
-  /** Characters for which combining diacritics should not be appeneded. */
-  private static final char[] combining_disabled_chars =
-    "0123456789@`!\"#$%&'()*:+;[{,<\\|-=]}.>^~/?_ \t\n¡¿«»‹›‘’“”‚„–—¬‰≈°…·¦¶‡∙€£₹¥¢₽₱₴₿".toCharArray();
-
-  static
-  {
-    Arrays.sort(combining_disabled_chars);
-  }
-
-  private static boolean combining_disabled(char c)
-  {
-    return (Arrays.binarySearch(combining_disabled_chars, c) >= 0);
-  }
 }
--- a/srcs/juloo.keyboard2/KeyboardData.java
+++ b/srcs/juloo.keyboard2/KeyboardData.java
@@ -31,8 +31,6 @@ public final class KeyboardData
  public final String name;
  /** Whether the bottom row should be added. */
  public final boolean bottom_row;
-  /** Whether extra keys from [method.xml] should be added to this layout. */
-  public final boolean locale_extra_keys;
  /** Position of every keys on the layout, see [getKeys()]. */
  private Map<KeyValue, KeyPos> _key_pos = null;

@@ -236,7 +234,6 @@ public final class KeyboardData
    if (!expect_tag(parser, "keyboard"))
      throw error(parser, "Expected tag <keyboard>");
    boolean bottom_row = attribute_bool(parser, "bottom_row", true);
-    boolean locale_extra_keys = attribute_bool(parser, "locale_extra_keys", true);
    float specified_kw = attribute_float(parser, "width", 0f);
    String script = parser.getAttributeValue(null, "script");
    if (script != null && script.equals(""))
@@ -266,7 +263,7 @@ public final class KeyboardData
      }
    }
    float kw = (specified_kw != 0f) ? specified_kw : compute_max_width(rows);
-    return new KeyboardData(rows, kw, modmap, script, numpad_script, name, bottom_row, locale_extra_keys);
+    return new KeyboardData(rows, kw, modmap, script, numpad_script, name, bottom_row);
  }

  private static float compute_max_width(List<Row> rows)
@@ -285,7 +282,7 @@ public final class KeyboardData
  }

  protected KeyboardData(List<Row> rows_, float kw, Modmap mm, String sc,
-      String npsc, String name_, boolean bottom_row_, boolean locale_extra_keys_)
+      String npsc, String name_, boolean bottom_row_)
  {
    float kh = 0.f;
    for (Row r : rows_)
@@ -298,14 +295,13 @@ public final class KeyboardData
    keysWidth = Math.max(kw, 1f);
    keysHeight = kh;
    bottom_row = bottom_row_;
-    locale_extra_keys = locale_extra_keys_;
  }

-  /** Copies the fields of a keyboard, with rows changed. */
+  /** Copies the fields of an other keyboard, with rows changed. */
  protected KeyboardData(KeyboardData src, List<Row> rows)
  {
    this(rows, compute_max_width(rows), src.modmap, src.script,
-        src.numpad_script, src.name, src.bottom_row, src.locale_extra_keys);
+        src.numpad_script, src.name, src.bottom_row);
  }

  public static class Row
Author	SHA1	Message	Date
Jules Aguillon	e22fc226a1	history entry: Swap the remove button for a paste button	2024-07-06 22:05:45 +02:00
Jules Aguillon	076177ab45	Make the clipboard view 30% taller	2024-07-06 13:53:31 +02:00
Jules Aguillon	26ce238435	Use the same icon for removing history and pin entries	2024-07-06 13:50:28 +02:00
Jules Aguillon	618aac254a	clipboard: Add the backspace/delete key	2024-07-06 13:48:51 +02:00
Jules Aguillon	32ae63341d	clipboard: Remove keyboard switching keys These don't have any effect.	2024-07-06 13:45:53 +02:00
Jules Aguillon	caa397dd70	Merge branch 'master' into clipboard	2024-07-06 13:44:55 +02:00
Jules Aguillon	318d979f14	Update check_layout.output	2024-06-29 23:56:14 +02:00
Jules Aguillon	f7cd55e965	clipboard: Night mode icons	2024-06-29 23:44:32 +02:00
Jules Aguillon	9b00e33c44	Place the clipboard key on the bottom row	2024-06-29 23:29:36 +02:00
Jules Aguillon	a3bf491c9a	Icon for the clipboard key	2024-06-29 23:28:03 +02:00
Jules Aguillon	1b401e55c4	Change the "paste as plain text" icon To make it less ambiguous with the clipboard key icon.	2024-06-29 23:25:48 +02:00
Jules Aguillon	100e1574d5	Key description for the clipboard key	2024-06-29 23:15:01 +02:00
Jules Aguillon	dcfda35cee	Enable the clipboard key by default	2024-06-29 23:12:55 +02:00
Jules Aguillon	143718b1de	clipboard: Improve bottom row	2024-06-29 23:10:36 +02:00
Jules Aguillon	2f8a2917a2	clipboard: Confirmation dialog for history entries	2024-06-29 23:06:24 +02:00
Jules Aguillon	8d29d80fce	clipboard: Confirmation dialog before deletion Prevent accidentally deleting a saved clipboard.	2024-06-29 22:53:08 +02:00
Jules Aguillon	700b7e9d19	clipboard: Pasting The paste button send the content of the pinned clip to the editor the same way as a string key.	2024-06-29 22:53:08 +02:00
Jules Aguillon	59d2d05c50	clipboard: Add icons for the buttons	2024-06-29 22:53:08 +02:00
Jules Aguillon	d5f36885c4	clipboard: Enable history collection with a checkbox The feature is off by default for privacy reasons. The checkbox state is persisted in the configuration. The history is immediately cleared when it's disabled. The content of the system clipboard is visible when the history is enabled.	2024-06-29 22:53:08 +02:00
Jules Aguillon	461f966e6e	clipboard: Allow removing history entries	2024-06-29 22:53:08 +02:00
Jules Aguillon	3b2fad8996	clipboard: Vertical layout Put the recently copied text at the top and the pinned text at the bottom. This should remain intuitive as the recent history should stay small.	2024-06-29 22:53:08 +02:00
Jules Aguillon	d657d51c2b	clipboard: Forget recent copied text after 5 minutes Slightly improves privacy. Entries older than that are not useful in the intended use case.	2024-06-29 22:53:08 +02:00
Jules Aguillon	3d95af5806	clipboard: Pinning Allow recent clips to be pinned. Pinned clips are put a different place and are persistent. The pane is split in two columns, the clipboard history and the pinned clips. Pinned clips are stored in a new preference file. Improved pinning layout clipboard: Remove history entry after pinning	2024-06-29 22:53:08 +02:00
Jules Aguillon	58cb6ca232	Clipboard history pane Work in progress: It's not yet possible to paste from the pane. The pane can be switched to and from and displays the strings recently added to the clipboard. ClipboardHistoryService listens for change to the system clipboard and keep the history in memory. This data is not persisted to the storage. The maximum size limits the amount of user data stored in memory but also gives a sense to the user that the history is not persisted and can be forgotten as soon as the app stops.	2024-06-29 22:53:08 +02:00