luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-31 20:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consistently check for landscape when looking for portrait/landscape orientation

Browse source
This commit is contained in:
Helium314 2025-02-09 13:36:25 +01:00
parent e845e38e42
commit deb9dda7e7
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/helium314/keyboard/latin/settings/Settings.java
View file

@ -492,8 +492,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
return prefs.getBoolean(PREF_SHOW_SETUP_WIZARD_ICON, false);
}
public static boolean readOneHandedModeEnabled(final SharedPreferences prefs, final boolean portrait) {
return prefs.getBoolean(PREF_ONE_HANDED_MODE_PREFIX + portrait, false);
public static boolean readOneHandedModeEnabled(final SharedPreferences prefs, final boolean isLandscape) {
return prefs.getBoolean(PREF_ONE_HANDED_MODE_PREFIX + !isLandscape, false);
}
public void writeOneHandedModeEnabled(final boolean enabled) {
@ -501,8 +501,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
(getCurrent().mDisplayOrientation == Configuration.ORIENTATION_PORTRAIT), enabled).apply();
}
public static float readOneHandedModeScale(final SharedPreferences prefs, final boolean portrait) {
return prefs.getFloat(PREF_ONE_HANDED_SCALE_PREFIX + portrait, 1f);
public static float readOneHandedModeScale(final SharedPreferences prefs, final boolean isLandscape) {
return prefs.getFloat(PREF_ONE_HANDED_SCALE_PREFIX + !isLandscape, 1f);
}
public void writeOneHandedModeScale(final Float scale) {
@ -511,8 +511,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
}
@SuppressLint("RtlHardcoded")
public static int readOneHandedModeGravity(final SharedPreferences prefs, final boolean portrait) {
return prefs.getInt(PREF_ONE_HANDED_GRAVITY_PREFIX + portrait, Gravity.LEFT);
public static int readOneHandedModeGravity(final SharedPreferences prefs, final boolean isLandscape) {
return prefs.getInt(PREF_ONE_HANDED_GRAVITY_PREFIX + !isLandscape, Gravity.LEFT);
}
public void writeOneHandedModeGravity(final int gravity) {

10
app/src/main/java/helium314/keyboard/latin/settings/SettingsValues.java
View file

@ -240,11 +240,11 @@ public class SettingsValues {
mClipboardHistoryEnabled = Settings.readClipboardHistoryEnabled(prefs);
mClipboardHistoryRetentionTime = Settings.readClipboardHistoryRetentionTime(prefs, res);
mOneHandedModeEnabled = Settings.readOneHandedModeEnabled(prefs, mDisplayOrientation == Configuration.ORIENTATION_PORTRAIT);
mOneHandedModeGravity = Settings.readOneHandedModeGravity(prefs, mDisplayOrientation == Configuration.ORIENTATION_PORTRAIT);
mOneHandedModeEnabled = Settings.readOneHandedModeEnabled(prefs, isLandscape);
mOneHandedModeGravity = Settings.readOneHandedModeGravity(prefs, isLandscape);
if (mOneHandedModeEnabled) {
final float baseScale = res.getFraction(R.fraction.config_one_handed_mode_width, 1, 1);
final float extraScale = Settings.readOneHandedModeScale(prefs, mDisplayOrientation == Configuration.ORIENTATION_PORTRAIT);
final float extraScale = Settings.readOneHandedModeScale(prefs, isLandscape);
mOneHandedModeScale = 1 - (1 - baseScale) * extraScale;
} else
mOneHandedModeScale = 1f;
@ -270,8 +270,8 @@ public class SettingsValues {
prefs.getBoolean(Settings.PREF_GESTURE_SPACE_AWARE, false)
);
mSpacingAndPunctuations = new SpacingAndPunctuations(res, mUrlDetectionEnabled);
mBottomPaddingScale = Settings.readBottomPaddingScale(prefs, mDisplayOrientation == Configuration.ORIENTATION_LANDSCAPE);
mSidePaddingScale = Settings.readSidePaddingScale(prefs, mDisplayOrientation == Configuration.ORIENTATION_LANDSCAPE);
mBottomPaddingScale = Settings.readBottomPaddingScale(prefs, isLandscape);
mSidePaddingScale = Settings.readSidePaddingScale(prefs, isLandscape);
mLongPressSymbolsForNumpad = prefs.getBoolean(Settings.PREFS_LONG_PRESS_SYMBOLS_FOR_NUMPAD, false);
mAutoShowToolbar = prefs.getBoolean(Settings.PREF_AUTO_SHOW_TOOLBAR, false);
mAutoHideToolbar = readSuggestionsEnabled(prefs) && prefs.getBoolean(Settings.PREF_AUTO_HIDE_TOOLBAR, false);