From ea9c82167616a0a383b0df9e743e59c5a1ddec71 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Wed, 11 Aug 2021 15:38:52 +0200
Subject: [PATCH] Reduce clutter through convenience function

---
 .../prefs/CustomSeekBarPreference.java        | 18 ++++++++++---
 .../prefs/LauncherPreferenceFragment.java     | 26 ++++++++-----------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java
index 85f03cea7..f973c8813 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java
@@ -44,9 +44,7 @@ public class CustomSeekBarPreference extends SeekBarPreference {
     public void setMin(int min) {
         //Note: since the max (setMax is a final function) is not taken into account properly, setting the min over the max may produce funky results
         super.setMin(min);
-        if (min != mMin) {
-            mMin = min;
-        }
+        if (min != mMin) mMin = min;
     }
 
 
@@ -92,7 +90,21 @@ public class CustomSeekBarPreference extends SeekBarPreference {
 
     }
 
+    /**
+     * Set a suffix to be appended on the TextView associated to the value
+     * @param suffix The suffix to append as a String
+     */
     public void setSuffix(String suffix) {
         this.suffix = suffix;
     }
+
+    /**
+     * Convenience function to set both min and max at the same time.
+     * @param min The minimum value
+     * @param max The maximum value
+     */
+    public void setRange(int min, int max){
+        setMin(min);
+        setMax(max);
+    }
 }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
index 723b8cc9c..019e7a117 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
@@ -22,37 +22,33 @@ public class LauncherPreferenceFragment extends PreferenceFragmentCompat impleme
         //Disable notch checking behavior on android 8.1 and below.
         findPreference("ignoreNotch").setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && PREF_NOTCH_SIZE != 0);
 		
-        CustomSeekBarPreference seek2 = (CustomSeekBarPreference) findPreference("timeLongPressTrigger");
-        seek2.setMin(100);
-        seek2.setMax(1000);
+        CustomSeekBarPreference seek2 = findPreference("timeLongPressTrigger");
+        seek2.setRange(100, 1000);
         seek2.setValue(LauncherPreferences.PREF_LONGPRESS_TRIGGER);
         seek2.setSuffix(" ms");
         
-        CustomSeekBarPreference seek3 = (CustomSeekBarPreference) findPreference("buttonscale");
-        seek3.setMin(80);
-        seek3.setMax(250);
+        CustomSeekBarPreference seek3 = findPreference("buttonscale");
+        seek3.setRange(80, 250);
         seek3.setValue((int) LauncherPreferences.PREF_BUTTONSIZE);
         seek3.setSuffix(" %");
 
-        CustomSeekBarPreference seek4 = (CustomSeekBarPreference) findPreference("mousescale");
-        seek4.setMin(25);
-        seek4.setMax(300);
+        CustomSeekBarPreference seek4 = findPreference("mousescale");
+        seek4.setRange(25, 300);
         seek4.setValue((int) LauncherPreferences.PREF_MOUSESCALE);
         seek4.setSuffix(" %");
 
-        CustomSeekBarPreference seek5 = (CustomSeekBarPreference) findPreference("resolutionRatio");
+        CustomSeekBarPreference seek5 = findPreference("resolutionRatio");
         seek5.setMin(25);
         seek5.setSuffix(" %");
 
-	    CustomSeekBarPreference seek6 = (CustomSeekBarPreference) findPreference("mousespeed");
-        seek6.setMin(25);
-        seek6.setMax(300);
-	  seek6.setValue((int)(LauncherPreferences.PREF_MOUSESPEED*100f));
+	    CustomSeekBarPreference seek6 = findPreference("mousespeed");
+	    seek6.setRange(25, 300);
+	    seek6.setValue((int)(LauncherPreferences.PREF_MOUSESPEED*100f));
         seek6.setSuffix(" %");
 
         int freeMem = (int) (Runtime.getRuntime().freeMemory() / 1048576l);
 
-        CustomSeekBarPreference seek7 = (CustomSeekBarPreference) findPreference("allocation");
+        CustomSeekBarPreference seek7 = findPreference("allocation");
         seek7.setMin(256);
         if(Tools.CURRENT_ARCHITECTURE.contains("32")) seek7.setMax(1100);
         else seek7.setMax(freeMem > 4096 ? freeMem : 4096);