From e40558677ef40184c28fbfe721a4be69a4955fa6 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sat, 17 Feb 2024 19:46:09 +0100 Subject: [PATCH] Allow to remove the compose key in the settings --- res/values-cs/strings.xml | 1 + res/values-de/strings.xml | 1 + res/values-es/strings.xml | 1 + res/values-fa/strings.xml | 1 + res/values-fr/strings.xml | 1 + res/values-it/strings.xml | 1 + res/values-ko/strings.xml | 1 + res/values-lv/strings.xml | 1 + res/values-pl/strings.xml | 1 + res/values-pt/strings.xml | 1 + res/values-ro/strings.xml | 1 + res/values-ru/strings.xml | 1 + res/values-tr/strings.xml | 1 + res/values-uk/strings.xml | 1 + res/values-vi/strings.xml | 1 + res/values-zh-rCN/strings.xml | 1 + res/values/strings.xml | 1 + res/xml/bottom_row.xml | 2 +- res/xml/greekmath.xml | 2 +- res/xml/numeric.xml | 2 +- .../prefs/ExtraKeysPreference.java | 25 +++++++++++-------- 21 files changed, 34 insertions(+), 14 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 771053be0..199f97db5 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -102,6 +102,7 @@ Nezapomeňte... Jako každá virtuální klávesnice, i tato musí být aktivov Po aktivaci můžete klávesnici rovnou vyzkoušet zde: Caps lock + Řecké a matematické symboly Hlasové zadávání diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 84f3e2648..5fbdd85f9 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -90,6 +90,7 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell Nach Aktivierung kannst du die Tastatur hier ausprobieren: Feststelltaste + Griechische & mathematische Symbole Spracheingabe diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index e58048d0b..b52017816 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -90,6 +90,7 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y Tras habilitarlo, puedes probar el teclado en este campo: Bloq Mayús + Símb. griegos y matemáticos Dictado por voz diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 1cbc7c76a..76e8db131 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید: + diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 971fef947..4450819e2 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -90,6 +90,7 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est Après l\'avoir activé, vous pouvez l\'essayer ici: Verrouillage majuscules + Symboles mathématiques Saisie vocale diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b6a278dbd..414adf970 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open + diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 06ee38043..81812b825 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -102,6 +102,7 @@ + diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index fc3201361..ac8c357bf 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -92,6 +92,7 @@ Tagad lieliski piemērota izmantošanai ikdienā. Pēc iespējošanas šeit var izmēģināt tastatūru: Burtslēgs + Grieķu un matemātikas rakstzīmes Rakstīšana ar balsi diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index aa983b4e3..343fbb337 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -90,6 +90,7 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród Po jej włączeniu, możesz wypróbować klawiaturę tutaj: Caps lock + Symbole greckie i matematyczne Pisanie głosowe diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 7a603f61e..26ecc0873 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -102,6 +102,7 @@ Sistema > Idioma e entrada > Teclado virtual > Gerenciar teclados virtu Após ativar, experimente aqui: Caps lock + Grego & símbolos matemáticos Trocar de teclado Digitação por voz diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index f4b814b25..5e4d358af 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -90,6 +90,7 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e După activare, puteți să încercați tastatura aici: + diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index a2defbaec..b7875d517 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -90,6 +90,7 @@ После активации вы можете попробовать клавиатуру прямо здесь: + diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 0dc19f928..da0367318 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -90,6 +90,7 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."Ayarlardan aktif ettikten sonra klavyeyi burada test edebilirsin: CapsLock + Greek & math sembolleri Klavye değiştir Sesle yazma diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index eb7f4c4ce..efbc3a83c 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open Після ввімкнення ви можете спробувати клавіатуру тут: Caps lock + Грецькі та математичні символи Переключити клавіатуру Голосове введення diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index fc028b112..e81ec1fde 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -90,6 +90,7 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày. + diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e2c8415fd..50c63bcdc 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open 启用键盘后，可以在这里测试效果： + diff --git a/res/values/strings.xml b/res/values/strings.xml index e3347065f..d518b595d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -90,6 +90,7 @@ This application contains no ads, doesn't make any network requests and is Open After enabling, you can try the keyboard here: Try here Caps lock + Compose Greek & math symbols Switch keyboard Voice typing diff --git a/res/xml/bottom_row.xml b/res/xml/bottom_row.xml index d0562d13d..2f4de2be2 100644 --- a/res/xml/bottom_row.xml +++ b/res/xml/bottom_row.xml @@ -3,6 +3,6 @@ - + diff --git a/res/xml/greekmath.xml b/res/xml/greekmath.xml index b655b5048..48218406b 100644 --- a/res/xml/greekmath.xml +++ b/res/xml/greekmath.xml @@ -41,7 +41,7 @@ - + diff --git a/res/xml/numeric.xml b/res/xml/numeric.xml index 82f52e874..ca4eeb9fa 100644 --- a/res/xml/numeric.xml +++ b/res/xml/numeric.xml @@ -30,7 +30,7 @@ - + diff --git a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java index 6802d975d..c15dff37b 100644 --- a/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java +++ b/srcs/juloo.keyboard2/prefs/ExtraKeysPreference.java @@ -22,6 +22,7 @@ public class ExtraKeysPreference extends PreferenceCategory { "alt", "meta", + "compose", "voice_typing", "accent_aigu", "accent_grave", @@ -74,6 +75,7 @@ public static boolean default_checked(String name) { case "voice_typing": case "change_method": + case "compose": return true; default: return false; @@ -87,25 +89,26 @@ static String key_description(Resources res, String name) switch (name) { case "capslock": id = R.string.key_descr_capslock; break; - case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break; case "change_method": id = R.string.key_descr_change_method; break; - case "voice_typing": id = R.string.key_descr_voice_typing; break; + case "compose": id = R.string.key_descr_compose; break; case "copy": id = R.string.key_descr_copy; break; - case "paste": id = R.string.key_descr_paste; break; case "cut": id = R.string.key_descr_cut; break; + case "end": id = R.string.key_descr_end; break; + case "home": id = R.string.key_descr_home; break; + case "page_down": id = R.string.key_descr_page_down; break; + case "page_up": id = R.string.key_descr_page_up; break; + case "paste": id = R.string.key_descr_paste; break; + case "pasteAsPlainText": id = R.string.key_descr_pasteAsPlainText; break; + case "redo": id = R.string.key_descr_redo; break; case "selectAll": id = R.string.key_descr_selectAll; break; case "shareText": id = R.string.key_descr_shareText; break; - case "pasteAsPlainText": id = R.string.key_descr_pasteAsPlainText; break; + case "subscript": id = R.string.key_descr_subscript; break; + case "superscript": id = R.string.key_descr_superscript; break; + case "switch_greekmath": id = R.string.key_descr_switch_greekmath; break; case "undo": id = R.string.key_descr_undo; break; - case "redo": id = R.string.key_descr_redo; break; + case "voice_typing": id = R.string.key_descr_voice_typing; break; case "ª": id = R.string.key_descr_ª; break; case "º": id = R.string.key_descr_º; break; - case "superscript": id = R.string.key_descr_superscript; break; - case "subscript": id = R.string.key_descr_subscript; break; - case "page_up": id = R.string.key_descr_page_up; break; - case "page_down": id = R.string.key_descr_page_down; break; - case "home": id = R.string.key_descr_home; break; - case "end": id = R.string.key_descr_end; break; } if (id == 0) return null;