rename settings, reset parser again

This commit is contained in:
Helium314 2023-12-19 23:32:30 +01:00
parent f98910ce7a
commit b4d0349d59
4 changed files with 5 additions and 5 deletions

View file

@ -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()

View file

@ -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_";

View file

@ -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);

View file

@ -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" />