From 4ed8594794691e5991c414337fd4ede7a9e857cc Mon Sep 17 00:00:00 2001 From: Matej Drobnič Date: Sun, 29 Jun 2025 16:50:56 +0200 Subject: Add option to also disable number entry layout (#1007) --- res/values-cs/strings.xml | 6 ++++-- res/values-de/strings.xml | 6 ++++-- res/values-es/strings.xml | 6 ++++-- res/values-fa/strings.xml | 6 ++++-- res/values-fr/strings.xml | 6 ++++-- res/values-it/strings.xml | 6 ++++-- res/values-ja/strings.xml | 6 ++++-- res/values-ko/strings.xml | 6 ++++-- res/values-lv/strings.xml | 6 ++++-- res/values-pl/strings.xml | 6 ++++-- res/values-pt/strings.xml | 6 ++++-- res/values-ro/strings.xml | 6 ++++-- res/values-ru/strings.xml | 6 ++++-- res/values-tr/strings.xml | 6 ++++-- res/values-uk/strings.xml | 6 ++++-- res/values-vi/strings.xml | 6 ++++-- res/values-zh-rCN/strings.xml | 6 ++++-- res/values/arrays.xml | 10 ++++++++++ res/values/strings.xml | 6 ++++-- res/xml/settings.xml | 2 +- srcs/juloo.keyboard2/Config.java | 11 ++++++++--- srcs/juloo.keyboard2/Keyboard2.java | 4 ++-- srcs/juloo.keyboard2/NumberLayout.java | 7 +++++++ 23 files changed, 100 insertions(+), 42 deletions(-) create mode 100644 srcs/juloo.keyboard2/NumberLayout.java diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 96b2447..6c8982d 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -49,8 +49,10 @@ Jak bude klávesa pro přepnutí klávesnice reagovat Vlastní vibrace Síla vibrace - Rozvržení zadávání PIN kódu - Automaticky při psaní čísel, datumů a telefonních čísel + + + + Styl Spodní odsazení Výška klávesnice diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 626edc4..91f723c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -49,8 +49,10 @@ Verhalten der Tastaturumschalttaste Benutzerdefinierte Vibration Vibrationsstärke - PIN-Eingabe-Layout - Für die Nummern-, Datums- und Telefonnummern-Eingabe + + + + Design Unterer Abstand Höhe der Tastatur diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index a3556da..38b4a74 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -49,8 +49,10 @@ Comportamiento de la tecla para cambiar diseño Vibración personalizada Intensidad de vibración - Diseño de introducción de PIN - Para escribir cifras, fechas y números telefónicos + + + + Estilo Margen inferior Altura del teclado diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 8e2b20c..e383325 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -49,8 +49,10 @@ رفتار کلید تغییردهنده صفحه کلید - - + + + + سبک حاشیه پایین ارتفاع صفحه کلید diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 0e9a6eb..692e850 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -49,8 +49,10 @@ Comportement de la touche de changement de clavier Vibrations personnalisées Intensité des vibrations - Clavier PIN - Lors de la saisie de nombres, de dates et de numéros de téléphone + + + + Style Marge du bas Hauteur du clavier diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index f1cea65..dd3d20d 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -49,8 +49,10 @@ - - + + + + Stile Margine inferiore Altezza tastiera diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 6ab7511..c1af875 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -49,8 +49,10 @@ キーボード切替キーの挙動 キーボード独自の振動設定 振動の時間 - PIN入力 - 数字・日付・電話番号入力時 + + + + 表示 下の余白 キーボードの高さ diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 5be9f9f..c572341 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -49,8 +49,10 @@ 키보드 전환 키의 동작 방식입니다. 사용자 정의 진동 진동 강도 - Pin 입력 레이아웃 - 숫자를 입력할 때, 날짜와 전화번호를 입력할 때 해당 레이아웃이 사용됩니다. + + + + 스타일 아래 넓이 키보드 높이 diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index b2f31d7..49c4349 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -49,8 +49,10 @@ Tastatūras pārslēgšanas taustiņa uzvedība Pielāgota trīcēšana Trīcēšanas stiprums - Piespraust ievadīšanas izkārtojumu - Kad ievada skaitļus, datumus un tālruņa numurus + + + + Izskata pielāgojumi Apakšējā apmale Tastatūras augstums diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5455759..9c5de80 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -49,8 +49,10 @@ Działanie klawisza przełączającego klawiaturę Własna wibracja Intensywność wibracji - Układ klawiatury PIN - Podczas wpisywania liczb, dat i numerów telefonu + + + + Styl Margines dolny Wysokość klawiatury diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 358c493..8caeabe 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -49,8 +49,10 @@ Comportamento da tecla de troca de teclado Vibração personalizada Intensidade da vibração - Layout PIN - Quando digitando números, datas ou números de telefone + + + + Estilo Margem inferior Altura do teclado diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index d11341f..1699408 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -49,8 +49,10 @@ Comportamentul tastei pentru schimbarea tastaturii - - + + + + Stil Marginea de jos Înălțimea tastaturii diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index ad4331e..f1c6699 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -49,8 +49,10 @@ Поведение клавиши переключения клавиатуры Настройка вибрации Интенсивность вибрации - Закрепить раскладку - При вводе чисел, дат и телефонных номеров + + + + Стиль Нижняя граница поля Высота клавиатуры diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 68210c1..6a342d7 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -49,8 +49,10 @@ Klavye değistirme tuşunun davranışını belirler Özel titreşim Titreşim yoğunluğu - NumPad - Sayıları, tarihleri ve telefon numaralarını yazarken + + + + Tarz Alt boşluk Klavye yüksekliği diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index f2ed35e..c2d51e2 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -49,8 +49,10 @@ Поведінка клавіші перемикання клавіатури Спеціальна вібрація Інтенсивність вібрації - Макет введення PIN-коду - При наборі чисел, дат і номерів телефонів + + + + Стиль Поле знизу Висота клавіатури diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 4dcb6b8..e36f71d 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -49,8 +49,10 @@ - - + + + + Kiểu cách Căn lề dưới Chiều cao bàn phím diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 0c7051e..870601e 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -49,8 +49,10 @@ 切换键盘按钮的行为 自定义振动 振动强度 - 数字输入布局 - 输入数字、日期与电话号码时 + + + + 样式 键盘下边距 键盘高度 diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 95e62df..b82298e 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -84,4 +84,14 @@ 4 12 + + @string/pref_number_entry_layout_pin + @string/pref_number_entry_layout_number + @string/pref_number_entry_layout_normal + + + pin + number + normal + diff --git a/res/values/strings.xml b/res/values/strings.xml index fad8b41..286fef4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -49,8 +49,10 @@ Behavior of the keyboard-switching key Custom vibration Vibration intensity - Pin entry layout - When typing numbers, dates and phone numbers + Layout when typing numbers, dates and phone numbers + PIN Entry + Number pane + Use the main layout Style Margin bottom Keyboard height diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 0575877..40e3676 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -25,7 +25,7 @@ - + diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index d746ccb..b2b01da 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -58,7 +58,7 @@ public final class Config public int theme; // Values are R.style.* public boolean autocapitalisation; public boolean switch_input_immediate; - public boolean pin_entry_enabled; + public NumberLayout selected_number_layout; public boolean borderConfig; public int circle_sensitivity; public boolean clipboard_history_enabled; @@ -169,7 +169,7 @@ public final class Config switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false); extra_keys_param = ExtraKeysPreference.get_extra_keys(_prefs); extra_keys_custom = CustomExtraKeysPreference.get(_prefs); - pin_entry_enabled = _prefs.getBoolean("pin_entry_enabled", true); + selected_number_layout = NumberLayout.valueOf(_prefs.getString("number_entry_layout", "pin").toUpperCase()); current_layout_portrait = _prefs.getInt("current_layout_portrait", 0); current_layout_landscape = _prefs.getInt("current_layout_landscape", 0); current_layout_unfolded_portrait = _prefs.getInt("current_layout_unfolded_portrait", 0); @@ -300,7 +300,7 @@ public final class Config /** Config migrations. */ - private static int CONFIG_VERSION = 2; + private static int CONFIG_VERSION = 3; public static void migrate(SharedPreferences prefs) { @@ -332,6 +332,11 @@ public final class Config e.putString("number_row", add_number_row ? "no_symbols" : "no_number_row"); // Fallthrough case 2: + if (!prefs.contains("number_entry_layout")) { + e.putString("number_entry_layout", prefs.getBoolean("pin_entry_enabled", true) ? "pin" : "number"); + } + // Fallthrough + case 3: default: break; } e.apply(); diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 2858dfa..3d33721 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -265,9 +265,9 @@ public class Keyboard2 extends InputMethodService case InputType.TYPE_CLASS_NUMBER: case InputType.TYPE_CLASS_PHONE: case InputType.TYPE_CLASS_DATETIME: - if (_config.pin_entry_enabled) + if (_config.selected_number_layout == NumberLayout.PIN) return loadPinentry(R.xml.pin); - else + else if (_config.selected_number_layout == NumberLayout.NUMBER) return loadNumpad(R.xml.numeric); default: break; diff --git a/srcs/juloo.keyboard2/NumberLayout.java b/srcs/juloo.keyboard2/NumberLayout.java new file mode 100644 index 0000000..b059e10 --- /dev/null +++ b/srcs/juloo.keyboard2/NumberLayout.java @@ -0,0 +1,7 @@ +package juloo.keyboard2; + +public enum NumberLayout { + PIN, + NUMBER, + NORMAL +} -- cgit v1.2.3