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)

---
 srcs/juloo.keyboard2/Config.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'srcs/juloo.keyboard2/Config.java')

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();
-- 
cgit v1.2.3