From 76e66d74833ecae2e74f1810e42ed7ddc954fb5a Mon Sep 17 00:00:00 2001 From: Mathias-Boulay Date: Wed, 1 Mar 2023 10:40:49 +0100 Subject: [PATCH] Cleanup: Remove offset preference from code It was already removed from user UI a few months ago --- .../prefs/ControlOffsetPreference.java | 127 ------------------ .../prefs/LauncherPreferences.java | 8 -- .../dialog_control_offset_preference.xml | 64 --------- 3 files changed, 199 deletions(-) delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/ControlOffsetPreference.java delete mode 100644 app_pojavlauncher/src/main/res/layout/dialog_control_offset_preference.xml diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/ControlOffsetPreference.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/ControlOffsetPreference.java deleted file mode 100644 index a378017a5..000000000 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/ControlOffsetPreference.java +++ /dev/null @@ -1,127 +0,0 @@ -package net.kdt.pojavlaunch.prefs; - -import static net.kdt.pojavlaunch.prefs.LauncherPreferences.DEFAULT_PREF; -import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_CONTROL_BOTTOM_OFFSET; -import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_CONTROL_LEFT_OFFSET; -import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_CONTROL_RIGHT_OFFSET; -import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_CONTROL_TOP_OFFSET; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.util.AttributeSet; -import android.widget.SeekBar; -import android.widget.TextView; - -import androidx.preference.Preference; - -import net.kdt.pojavlaunch.R; - -/** Custom preference class displaying a dialog */ -public class ControlOffsetPreference extends Preference { - - private AlertDialog mPreferenceDialog; - - public ControlOffsetPreference(Context context, AttributeSet attrs) { - super(context, attrs); - init(); - } - - public ControlOffsetPreference(Context context) { - super(context); - init(); - } - - @Override - protected void onClick() { - mPreferenceDialog.show(); - - SeekBar topOffsetSeekbar = mPreferenceDialog.findViewById(R.id.control_offset_top_seekbar); - SeekBar rightOffsetSeekbar = mPreferenceDialog.findViewById(R.id.control_offset_right_seekbar); - SeekBar bottomOffsetSeekbar = mPreferenceDialog.findViewById(R.id.control_offset_bottom_seekbar); - SeekBar leftOffsetSeekbar = mPreferenceDialog.findViewById(R.id.control_offset_left_seekbar); - - TextView topOffsetTextView = mPreferenceDialog.findViewById(R.id.control_offset_top_textview); - TextView rightOffsetTextView = mPreferenceDialog.findViewById(R.id.control_offset_right_textview); - TextView bottomOffsetTextView = mPreferenceDialog.findViewById(R.id.control_offset_bottom_textview); - TextView leftOffsetTextView = mPreferenceDialog.findViewById(R.id.control_offset_left_textview); - - SeekBar.OnSeekBarChangeListener seekBarChangeListener = new SeekBar.OnSeekBarChangeListener() { - @Override - public void onProgressChanged(SeekBar seekBar, int i, boolean b) { - if(seekBar == topOffsetSeekbar){ - String text = String.format("%s %d%s", getContext().getString(R.string.control_top_offset), i, " px"); - topOffsetTextView.setText(text); - return; - } - if(seekBar == rightOffsetSeekbar){ - String text = String.format("%s %d%s", getContext().getString(R.string.control_right_offset), i, " px"); - rightOffsetTextView.setText(text); - return; - } - if(seekBar == bottomOffsetSeekbar){ - String text = String.format("%s %d%s", getContext().getString(R.string.control_bottom_offset), i, " px"); - bottomOffsetTextView.setText(text); - return; - } - if(seekBar == leftOffsetSeekbar){ - String text = String.format("%s %d%s", getContext().getString(R.string.control_left_offset), i, " px"); - leftOffsetTextView.setText(text); - return; - } - } - @Override - public void onStartTrackingTouch(SeekBar seekBar) {} - @Override - public void onStopTrackingTouch(SeekBar seekBar) {} - }; - - topOffsetSeekbar.setOnSeekBarChangeListener(seekBarChangeListener); - rightOffsetSeekbar.setOnSeekBarChangeListener(seekBarChangeListener); - bottomOffsetSeekbar.setOnSeekBarChangeListener(seekBarChangeListener); - leftOffsetSeekbar.setOnSeekBarChangeListener(seekBarChangeListener); - - topOffsetSeekbar.setProgress(PREF_CONTROL_TOP_OFFSET); - rightOffsetSeekbar.setProgress(PREF_CONTROL_RIGHT_OFFSET); - bottomOffsetSeekbar.setProgress(PREF_CONTROL_BOTTOM_OFFSET); - leftOffsetSeekbar.setProgress(PREF_CONTROL_LEFT_OFFSET); - - seekBarChangeListener.onProgressChanged(topOffsetSeekbar, PREF_CONTROL_TOP_OFFSET, false); - seekBarChangeListener.onProgressChanged(rightOffsetSeekbar, PREF_CONTROL_RIGHT_OFFSET, false); - seekBarChangeListener.onProgressChanged(bottomOffsetSeekbar, PREF_CONTROL_BOTTOM_OFFSET, false); - seekBarChangeListener.onProgressChanged(leftOffsetSeekbar, PREF_CONTROL_LEFT_OFFSET, false); - - // Custom writing to preferences - mPreferenceDialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(view -> { - DEFAULT_PREF.edit().putInt("controlTopOffset", topOffsetSeekbar.getProgress()).apply(); - DEFAULT_PREF.edit().putInt("controlRightOffset", rightOffsetSeekbar.getProgress()).apply(); - DEFAULT_PREF.edit().putInt("controlBottomOffset", bottomOffsetSeekbar.getProgress()).apply(); - DEFAULT_PREF.edit().putInt("controlLeftOffset", leftOffsetSeekbar.getProgress()).apply(); - - - mPreferenceDialog.dismiss(); - }); - } - - private void init(){ - // Setup visual values - if(getTitle() == null){ - setTitle(R.string.preference_control_offset_title); - setSummary(R.string.preference_control_offset_description); - } - if(getIcon() == null){ - setIcon(android.R.drawable.radiobutton_off_background); - } - - // Prepare Alert dialog - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setView(R.layout.dialog_control_offset_preference); - dialogBuilder.setTitle(getContext().getString(R.string.control_offset_title)); - - dialogBuilder.setPositiveButton(android.R.string.ok, null); - dialogBuilder.setNegativeButton(android.R.string.cancel, null); - - mPreferenceDialog = dialogBuilder.create(); - } - -} diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java index 84cab0cef..53df2c179 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java @@ -43,10 +43,6 @@ public class LauncherPreferences { public static float PREF_MOUSESPEED = 1f; public static int PREF_RAM_ALLOCATION; public static String PREF_DEFAULT_RUNTIME; - public static int PREF_CONTROL_TOP_OFFSET = 0; - public static int PREF_CONTROL_RIGHT_OFFSET = 0; - public static int PREF_CONTROL_BOTTOM_OFFSET = 0; - public static int PREF_CONTROL_LEFT_OFFSET = 0; public static boolean PREF_SUSTAINED_PERFORMANCE = false; public static boolean PREF_VIRTUAL_MOUSE_START = false; public static boolean PREF_ARC_CAPES = false; @@ -87,10 +83,6 @@ public class LauncherPreferences { PREF_DISABLE_GESTURES = DEFAULT_PREF.getBoolean("disableGestures",false); PREF_RAM_ALLOCATION = DEFAULT_PREF.getInt("allocation", findBestRAMAllocation(ctx)); PREF_CUSTOM_JAVA_ARGS = DEFAULT_PREF.getString("javaArgs", ""); - PREF_CONTROL_TOP_OFFSET = DEFAULT_PREF.getInt("controlTopOffset", 0); - PREF_CONTROL_RIGHT_OFFSET = DEFAULT_PREF.getInt("controlRightOffset", 0); - PREF_CONTROL_BOTTOM_OFFSET = DEFAULT_PREF.getInt("controlBottomOffset", 0); - PREF_CONTROL_LEFT_OFFSET = DEFAULT_PREF.getInt("controlLeftOffset", 0); PREF_SUSTAINED_PERFORMANCE = DEFAULT_PREF.getBoolean("sustainedPerformance", false); PREF_VIRTUAL_MOUSE_START = DEFAULT_PREF.getBoolean("mouse_start", false); PREF_ARC_CAPES = DEFAULT_PREF.getBoolean("arc_capes",false); diff --git a/app_pojavlauncher/src/main/res/layout/dialog_control_offset_preference.xml b/app_pojavlauncher/src/main/res/layout/dialog_control_offset_preference.xml deleted file mode 100644 index 3475e309c..000000000 --- a/app_pojavlauncher/src/main/res/layout/dialog_control_offset_preference.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -