From b4d0349d591fdcf057b48a54c0d24fc781ff68de Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Tue, 19 Dec 2023 23:32:30 +0100
Subject: [PATCH] rename settings, reset parser again

---
 .../inputmethod/keyboard/internal/KeyboardBuilder.kt          | 2 +-
 .../dslul/openboard/inputmethod/latin/settings/Settings.java  | 2 +-
 .../openboard/inputmethod/latin/settings/SettingsValues.java  | 4 ++--
 app/src/main/res/xml/prefs_screen_advanced.xml                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardBuilder.kt b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardBuilder.kt
index 39ece1005..b0d57db17 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardBuilder.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardBuilder.kt
@@ -257,7 +257,7 @@ open class KeyboardBuilder<KP : KeyboardParams>(protected val mContext: Context,
     }
 
     private fun addSplit() {
-        val spacerRelativeWidth = Settings.getInstance().current.mSpacerRelativeWidth
+        val spacerRelativeWidth = Settings.getInstance().current.mSplitKeyboardSpacerRelativeWidth
         // adjust gaps for the whole keyboard, so it's the same for all rows
         mParams.mRelativeHorizontalGap *= 1f / (1f + spacerRelativeWidth)
         mParams.mHorizontalGap = (mParams.mRelativeHorizontalGap * mParams.mId.mWidth).toInt()
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
index f80815c85..f86fc5ebb 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
@@ -103,7 +103,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static final String PREF_GESTURE_FLOATING_PREVIEW_TEXT = "pref_gesture_floating_preview_text";
     public static final String PREF_GESTURE_SPACE_AWARE = "pref_gesture_space_aware";
     public static final String PREF_SHOW_SETUP_WIZARD_ICON = "pref_show_setup_wizard_icon";
-    public static final String PREF_USE_NEW_KEYBOARD_PARSING = "pref_use_new_keyboard_parsing2"; // todo: remove later
+    public static final String PREF_USE_NEW_KEYBOARD_PARSING = "pref_use_new_keyboard_parsing3"; // todo: remove later
 
     public static final String PREF_ONE_HANDED_MODE = "pref_one_handed_mode_enabled_p_";
     public static final String PREF_ONE_HANDED_GRAVITY = "pref_one_handed_mode_gravity_p_";
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
index 41c67ad76..8dcc9a838 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsValues.java
@@ -99,7 +99,7 @@ public class SettingsValues {
     public final boolean mShouldShowLxxSuggestionUi;
     // Use split layout for keyboard.
     public final boolean mIsSplitKeyboardEnabled;
-    public final float mSpacerRelativeWidth;
+    public final float mSplitKeyboardSpacerRelativeWidth;
     public final int mScreenMetrics;
     public final boolean mAddToPersonalDictionary;
     public final boolean mUseContactsDictionary;
@@ -174,7 +174,7 @@ public class SettingsValues {
         final float displayWidthDp = res.getDisplayMetrics().widthPixels / res.getDisplayMetrics().density;
         mIsSplitKeyboardEnabled = prefs.getBoolean(Settings.PREF_ENABLE_SPLIT_KEYBOARD, false) && displayWidthDp > 600; // require display width of 600 dp for split
         // determine spacerWidth from display width and scale setting
-        mSpacerRelativeWidth = mIsSplitKeyboardEnabled
+        mSplitKeyboardSpacerRelativeWidth = mIsSplitKeyboardEnabled
                 ? Math.min(Math.max((displayWidthDp - 600) / 6000f + 0.15f, 0.15f), 0.25f) * prefs.getFloat(Settings.PREF_SPLIT_SPACER_SCALE, DEFAULT_SIZE_SCALE)
                 : 0f;
         mScreenMetrics = Settings.readScreenMetrics(res);
diff --git a/app/src/main/res/xml/prefs_screen_advanced.xml b/app/src/main/res/xml/prefs_screen_advanced.xml
index 70f245769..ab5bad370 100644
--- a/app/src/main/res/xml/prefs_screen_advanced.xml
+++ b/app/src/main/res/xml/prefs_screen_advanced.xml
@@ -80,7 +80,7 @@
         android:title="@string/settings_category_experimental">
 
         <SwitchPreferenceCompat
-            android:key="pref_use_new_keyboard_parsing2"
+            android:key="pref_use_new_keyboard_parsing3"
             android:title="@string/use_new_keyboard_parsing"
             android:summary="@string/use_new_keyboard_parsing_summary"
             android:defaultValue="true" />