TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-10 05:01:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix(quick settings): persisted settings after cancel

Browse Source
This commit is contained in:
Mathias-Boulay 2024-11-21 20:13:28 +01:00
parent a93d7b0825
commit 371494c43e
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java
View File

@ -422,7 +422,7 @@ public class ControlLayout extends FrameLayout {
imm.hideSoftInputFromWindow(getWindowToken(), 0); imm.hideSoftInputFromWindow(getWindowToken(), 0);
if(mControlDialog != null) { if(mControlDialog != null) {
mControlDialog.disappearColor(); mControlDialog.disappearColor();
mControlDialog.disappear(false); mControlDialog.disappear(true);
} }
if(mActionRow != null) mActionRow.setFollowedButton(null); if(mActionRow != null) mActionRow.setFollowedButton(null);

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlSideDialog.java
View File

@ -103,7 +103,9 @@ public class EditControlSideDialog extends SideDialogView<ConstraintLayout> {
@Override @Override
protected void onDisappear(boolean willDestroy) { protected void onDisappear(boolean willDestroy) {
if (willDestroy) {
mParent.removeView(mColorSelector.getRootView());
}
} }
/* While the selector could be retrofitted to side dialog, it's not worth the effort */ /* While the selector could be retrofitted to side dialog, it's not worth the effort */

28
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/QuickSettingSideDialog.java
View File

@ -11,6 +11,7 @@ import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_SCALE_FACTOR;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Switch; import android.widget.Switch;
@ -21,6 +22,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import com.kdt.CustomSeekbar; import com.kdt.CustomSeekbar;
import net.kdt.pojavlaunch.R; import net.kdt.pojavlaunch.R;
import net.kdt.pojavlaunch.Tools;
import net.kdt.pojavlaunch.utils.interfaces.SimpleSeekBarListener; import net.kdt.pojavlaunch.utils.interfaces.SimpleSeekBarListener;
/** /**
@ -29,6 +31,7 @@ import net.kdt.pojavlaunch.utils.interfaces.SimpleSeekBarListener;
*/ */
public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<ConstraintLayout> { public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<ConstraintLayout> {
private SharedPreferences.Editor mEditor;
@SuppressLint("UseSwitchCompatOrMaterialCode") @SuppressLint("UseSwitchCompatOrMaterialCode")
private Switch mGyroSwitch, mGyroXSwitch, mGyroYSwitch, mGestureSwitch; private Switch mGyroSwitch, mGyroXSwitch, mGyroYSwitch, mGestureSwitch;
private CustomSeekbar mGyroSensitivityBar, mMouseSpeedBar, mGestureDelayBar, mResolutionBar; private CustomSeekbar mGyroSensitivityBar, mMouseSpeedBar, mGestureDelayBar, mResolutionBar;
@ -48,7 +51,7 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<Cons
protected void onAppear(boolean hasBuilt) { protected void onAppear(boolean hasBuilt) {
if (hasBuilt) { if (hasBuilt) {
bindLayout(); bindLayout();
setupListeners(); Tools.runOnUiThread(this::setupListeners);
} }
} }
@ -78,6 +81,8 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<Cons
} }
private void setupListeners() { private void setupListeners() {
mEditor = LauncherPreferences.DEFAULT_PREF.edit();
mOriginalGyroEnabled = PREF_ENABLE_GYRO; mOriginalGyroEnabled = PREF_ENABLE_GYRO;
mOriginalGyroXEnabled = PREF_GYRO_INVERT_X; mOriginalGyroXEnabled = PREF_GYRO_INVERT_X;
mOriginalGyroYEnabled = PREF_GYRO_INVERT_Y; mOriginalGyroYEnabled = PREF_GYRO_INVERT_Y;
@ -97,32 +102,32 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<Cons
PREF_ENABLE_GYRO = isChecked; PREF_ENABLE_GYRO = isChecked;
onGyroStateChanged(); onGyroStateChanged();
updateGyroVisibility(isChecked); updateGyroVisibility(isChecked);
LauncherPreferences.DEFAULT_PREF.edit().putBoolean("enableGyro", isChecked).apply(); mEditor.putBoolean("enableGyro", isChecked);
}); });
mGyroXSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { mGyroXSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
PREF_GYRO_INVERT_X = isChecked; PREF_GYRO_INVERT_X = isChecked;
onGyroStateChanged(); onGyroStateChanged();
LauncherPreferences.DEFAULT_PREF.edit().putBoolean("gyroInvertX", isChecked).apply(); mEditor.putBoolean("gyroInvertX", isChecked);
}); });
mGyroYSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { mGyroYSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
PREF_GYRO_INVERT_Y = isChecked; PREF_GYRO_INVERT_Y = isChecked;
onGyroStateChanged(); onGyroStateChanged();
LauncherPreferences.DEFAULT_PREF.edit().putBoolean("gyroInvertY", isChecked).apply(); mEditor.putBoolean("gyroInvertY", isChecked);
}); });
mGestureSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { mGestureSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
PREF_DISABLE_GESTURES = isChecked; PREF_DISABLE_GESTURES = isChecked;
updateGestureVisibility(isChecked); updateGestureVisibility(isChecked);
LauncherPreferences.DEFAULT_PREF.edit().putBoolean("disableGestures", isChecked).apply(); mEditor.putBoolean("disableGestures", isChecked);
}); });
mGyroSensitivityBar.setRange(25, 300); mGyroSensitivityBar.setRange(25, 300);
mGyroSensitivityBar.setIncrement(5); mGyroSensitivityBar.setIncrement(5);
mGyroSensitivityBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> { mGyroSensitivityBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
PREF_GYRO_SENSITIVITY = progress / 100f; PREF_GYRO_SENSITIVITY = progress / 100f;
LauncherPreferences.DEFAULT_PREF.edit().putInt("gyroSensitivity", progress).apply(); mEditor.putInt("gyroSensitivity", progress);
mGyroSensitivityText.setText(progress + "%"); mGyroSensitivityText.setText(progress + "%");
}); });
mGyroSensitivityBar.setProgress((int) (mOriginalGyroSensitivity * 100f)); mGyroSensitivityBar.setProgress((int) (mOriginalGyroSensitivity * 100f));
@ -131,7 +136,7 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<Cons
mMouseSpeedBar.setIncrement(5); mMouseSpeedBar.setIncrement(5);
mMouseSpeedBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> { mMouseSpeedBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
PREF_MOUSESPEED = progress / 100f; PREF_MOUSESPEED = progress / 100f;
LauncherPreferences.DEFAULT_PREF.edit().putInt("mousespeed", progress).apply(); mEditor.putInt("mousespeed", progress);
mMouseSpeedText.setText(progress + "%"); mMouseSpeedText.setText(progress + "%");
}); });
mMouseSpeedBar.setProgress((int) (mOriginalMouseSpeed * 100f)); mMouseSpeedBar.setProgress((int) (mOriginalMouseSpeed * 100f));
@ -140,7 +145,7 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<Cons
mGestureDelayBar.setIncrement(10); mGestureDelayBar.setIncrement(10);
mGestureDelayBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> { mGestureDelayBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
PREF_LONGPRESS_TRIGGER = progress; PREF_LONGPRESS_TRIGGER = progress;
LauncherPreferences.DEFAULT_PREF.edit().putInt("timeLongPressTrigger", progress).apply(); mEditor.putInt("timeLongPressTrigger", progress);
mGestureDelayText.setText(progress + "ms"); mGestureDelayText.setText(progress + "ms");
}); });
mGestureDelayBar.setProgress(mOriginalGestureDelay); mGestureDelayBar.setProgress(mOriginalGestureDelay);
@ -149,7 +154,7 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<Cons
mResolutionBar.setIncrement(5); mResolutionBar.setIncrement(5);
mResolutionBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> { mResolutionBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
PREF_SCALE_FACTOR = progress/100f; PREF_SCALE_FACTOR = progress/100f;
LauncherPreferences.DEFAULT_PREF.edit().putInt("resolutionRatio", progress).apply(); mEditor.putInt("resolutionRatio", progress);
mResolutionText.setText(progress + "%"); mResolutionText.setText(progress + "%");
onResolutionChanged(); onResolutionChanged();
}); });
@ -191,7 +196,10 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView<Cons
private void setupCancelButton() { private void setupCancelButton() {
setStartButtonListener(android.R.string.cancel, v -> cancel()); setStartButtonListener(android.R.string.cancel, v -> cancel());
setEndButtonListener(android.R.string.ok, v -> disappear(true)); setEndButtonListener(android.R.string.ok, v -> {
mEditor.apply();
disappear(true);
});
} }
/** Resets all settings to their original values */ /** Resets all settings to their original values */