diff options
| author | Matej Drobnič | 2025-06-29 16:50:56 +0200 |
|---|---|---|
| committer | GitHub | 2025-06-29 16:50:56 +0200 |
| commit | 4ed8594794691e5991c414337fd4ede7a9e857cc (patch) | |
| tree | f3c77fa81bf000f4b617c57536989ed4da051464 /srcs | |
| parent | f36a7c8e9d123c268c559a946304c45360b36810 (diff) | |
| download | unexpected-keyboard-4ed8594794691e5991c414337fd4ede7a9e857cc.tar.gz unexpected-keyboard-4ed8594794691e5991c414337fd4ede7a9e857cc.zip | |
Add option to also disable number entry layout (#1007)
Diffstat (limited to 'srcs')
| -rw-r--r-- | srcs/juloo.keyboard2/Config.java | 11 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Keyboard2.java | 4 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/NumberLayout.java | 7 |
3 files changed, 17 insertions, 5 deletions
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 +} |