From 1eea9e25d25afa04f0f98618df07820d27c8fe2e Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Sun, 6 Aug 2023 16:58:44 +0200 Subject: [PATCH] Remove the Accents option This option makes less sense since per-script extra keys. It's also getting in the way of an eventual "dead-key or accented-letters" option. --- res/values-cs/strings.xml | 4 ---- res/values-de/strings.xml | 4 ---- res/values-es/strings.xml | 4 ---- res/values-fa/strings.xml | 4 ---- res/values-fr/strings.xml | 4 ---- res/values-it/strings.xml | 4 ---- res/values-ko/strings.xml | 4 ---- res/values-lv/strings.xml | 4 ---- res/values-pl/strings.xml | 4 ---- res/values-pt/strings.xml | 4 ---- res/values-ro/strings.xml | 4 ---- res/values-ru/strings.xml | 4 ---- res/values-tr/strings.xml | 4 ---- res/values-vi/strings.xml | 6 ------ res/values-zh-rCN/strings.xml | 4 ---- res/values/arrays.xml | 10 ---------- res/values/strings.xml | 4 ---- res/xml/settings.xml | 1 - srcs/juloo.keyboard2/Config.java | 2 -- srcs/juloo.keyboard2/Keyboard2.java | 18 ++++-------------- 20 files changed, 4 insertions(+), 93 deletions(-) diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index d23fdff..d821436 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -14,10 +14,6 @@ Vlastní rozvržení - (Univerzální) Diakritická znaménka - Zobrazovat znaménka pro všechny instalované systémové jazyky - Zobrazovat znaménka pouze pro současně zvolený jazyk - Skrýt (univerzální) diakritická znaménka Zobrazit NumPad Nikdy Pouze v režimu na šířku diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 525eb00..c9405bb 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -14,10 +14,6 @@ Eigenes Layout - Akzente - Akzente für alle installierten Sprachen anzeigen - Akzente nur für die gewählte Sprache anzeigen - Akzente verbergen Ziffernblock anzeigen Nie Nur im Querformat diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 19a5ce3..b1bd0d3 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -14,10 +14,6 @@ Formato personalizado - Acentos - Mostrar acentos para todos los lenguajes instalados - Solo mostrar acentos para el lenguaje seleccionado - Ocultar acentos Mostrar pad numérico Nunca Solo en modo paisaje diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 7a51cac..3b80b14 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -14,10 +14,6 @@ طرح صفارشی - لهجه‌ها - نمایش لهجه‌ها برای تمام زبان‌هی نصب شده - فقط نمایش لهجه‌ها برای زبان‌های انتخاب شده - پنهان کردن لهجه‌ها نمایش پد شماره‌ها هرگز فقط در حالت افقی diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index a67e9b0..dd16ea6 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -14,10 +14,6 @@ Disposition personnalisée Ajouter un clavier alternatif Disposition %1$d: %2$s - Accents - Afficher les accents pour les langues installées - Afficher les accents pour la langue sélectionnée - Cacher les accents Afficher le pavé numérique Jamais Seulement en mode paysage diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index eb1c814..9170f19 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -14,10 +14,6 @@ - Accenti - Mostra accenti per tutte le lingue installate - Mostra accenti solo per le lingue selezionate - Nascondi accenti diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index b821996..0f224ea 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -14,10 +14,6 @@ - 악센트 - 설치된 모든 언어의 악센트 표시 - 선택한 언어의 악센트만 표시 - 모든 언어의 악센트 숨기기 diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 31d54b3..131d986 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -14,10 +14,6 @@ Pielāgots izkārtojums - Uzsvara zīmes - Rādīt uzsvara zīmes visām uzstādītajām valodām - Rādīt uzsvara zīmes tikai atlasītajām valodām - Paslēpt uzsvara zīmes Rādīt ciparnīcu Nekad Tikai guleniskajā skatā diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index ef29072..89eff91 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -14,10 +14,6 @@ Własny układ Dodaj dodatkowy układ Układ %1$d: %2$s - Znaki diakrytyczne - Pokaż znaki diakryt. dla wszystkich zainstalowanych języków - Pokaż znaki diakryt. tylko dla wybranego języka - Ukryj znaki diakrytyczne Pokaż klawiaturę numeryczną Nigdy Tylko w orientacji poziomej diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index ce5ccb2..75c4fb5 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -14,10 +14,6 @@ Layout personalizado Adicione um layout alternativo Layout %1$d: %2$s - Acentuação - Mostrar acentos de todos os idiomas instalados - Mostrar acentos apenas do idioma selecionado - Ocultar acentos Mostrar Teclado Numérico Nunca Somente no modo paisagem diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 85d7f99..ccf682f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -14,10 +14,6 @@ Aranjament personalizat - Accente - Arată accentele pentru toate limbile instalate - Aratp accentele doar pentru limba selectată - Ascunde accentele Arată NumPad Niciodată Doar în mod panoramă diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 05eacb4..727c78f 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -14,10 +14,6 @@ Пользовательская раскладка - Акцент - Показывать акценты для всех установленных языков - Показывать акценты только для выбранного языка - Скрыть акценты Показывать NumPad Никогда Только в ландшафтном режиме diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 5f7dccf..6f3df29 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -14,10 +14,6 @@ - Aksanlar - Yüklü tüm dillerin aksanlarını göster - Sadece seçili dilin aksanlarını göster - Aksanları gizle diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 291af47..707417f 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -14,12 +14,6 @@ Tùy chỉnh bố cục - Dấu phụ - Hiển thị cho các ngôn ngữ đã cài đặt - Chỉ hiển thị cho các ngôn ngữ đã chọn - - Ẩn dấu phụ - Hiện NumPad Không bao giờ Chỉ trong chế độ phong cảnh diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index f80e102..0e77a26 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -14,10 +14,6 @@ 自定义布局 - 声调 - 显示所有安装的语言的声调符号 - 只显示选择的语言的声调符号 - 隐藏声调符号 显示数字小键盘 从不 只在横屏显示 diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 14a536d..2bbb9b6 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,10 +1,5 @@ - - @string/pref_accents_e_all_installed - @string/pref_accents_e_selected - @string/pref_accents_e_none - never landscape @@ -23,11 +18,6 @@ @string/pref_numpad_layout_e_high_first @string/pref_numpad_layout_e_low_first - - 1 - 2 - 4 - @string/pref_theme_e_system @string/pref_theme_e_dark diff --git a/res/values/strings.xml b/res/values/strings.xml index 2a164e0..7ba2a16 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -14,10 +14,6 @@ Custom layout Add an alternate layout Layout %1$d: %2$s - Accents - Show accents for all installed languages - Only show accents for the selected language - Hide accents Show NumPad Never Only in landscape mode diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 71d16d4..c670dfb 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -11,7 +11,6 @@ - diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index 53bd2d2..8a81556 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -49,7 +49,6 @@ final class Config public int keyActivatedOpacity; // 0 - 255 public boolean double_tap_lock_shift; public float characterSize; // Ratio - public int accents; // Values are R.values.pref_accents_v_* public int theme; // Values are R.style.* public boolean autocapitalisation; public boolean switch_input_immediate; @@ -153,7 +152,6 @@ final class Config characterSize = _prefs.getFloat("character_size", 1.f) * characterSizeScale; - accents = Integer.valueOf(_prefs.getString("accents", "1")); theme = getThemeId(res, _prefs.getString("theme", "")); autocapitalisation = _prefs.getBoolean("autocapitalisation", true); switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false); diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 51026e1..5f7442b 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -124,20 +124,10 @@ public class Keyboard2 extends InputMethodService { List enabled_subtypes = getEnabledSubtypes(imm); List extra_keys = new ArrayList(); - switch (_config.accents) - { - // '3' was "all accents", now unused - case 1: case 3: - extra_keys.add(extra_keys_of_subtype(subtype)); - for (InputMethodSubtype s : enabled_subtypes) - extra_keys.add(extra_keys_of_subtype(s)); - break; - case 2: - extra_keys.add(extra_keys_of_subtype(subtype)); - break; - case 4: break; - default: throw new IllegalArgumentException(); - } + // Gather extra keys from all enabled subtypes + extra_keys.add(extra_keys_of_subtype(subtype)); + for (InputMethodSubtype s : enabled_subtypes) + extra_keys.add(extra_keys_of_subtype(s)); _config.extra_keys_subtype = ExtraKeys.merge(extra_keys); if (enabled_subtypes.size() > 1) _config.shouldOfferSwitchingToNextInputMethod = true;