From 14ba6e2fa247aa2baa79206408c82674ea714c1c Mon Sep 17 00:00:00 2001
From: artdeell <ultramaksim@gmail.com>
Date: Fri, 22 Nov 2024 14:06:51 +0300
Subject: [PATCH] Fix[quick_setting_dialog]: fix seek text format warning,
 apply defaults to seek texts on startup

---
 .../prefs/QuickSettingSideDialog.java         | 26 ++++++++++++++-----
 .../src/main/res/values/strings.xml           |  1 +
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/QuickSettingSideDialog.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/QuickSettingSideDialog.java
index c2f9cf6c9..18fd34a2c 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/QuickSettingSideDialog.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/QuickSettingSideDialog.java
@@ -17,8 +17,6 @@ import android.view.ViewGroup;
 import android.widget.Switch;
 import android.widget.TextView;
 
-import androidx.constraintlayout.widget.ConstraintLayout;
-
 import com.kdt.CustomSeekbar;
 
 import net.kdt.pojavlaunch.R;
@@ -126,43 +124,59 @@ public abstract class QuickSettingSideDialog extends com.kdt.SideDialogView {
         mGyroSensitivityBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
             PREF_GYRO_SENSITIVITY = progress / 100f;
             mEditor.putInt("gyroSensitivity", progress);
-            mGyroSensitivityText.setText(progress + "%");
+            setSeekTextPercent(mGyroSensitivityText, progress);
         });
         mGyroSensitivityBar.setProgress((int) (mOriginalGyroSensitivity * 100f));
+        setSeekTextPercent(mGyroSensitivityText, mGyroSensitivityBar.getProgress());
 
         mMouseSpeedBar.setRange(25, 300);
         mMouseSpeedBar.setIncrement(5);
         mMouseSpeedBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
             PREF_MOUSESPEED = progress / 100f;
             mEditor.putInt("mousespeed", progress);
-            mMouseSpeedText.setText(progress + "%");
+            setSeekTextPercent(mMouseSpeedText, progress);
         });
         mMouseSpeedBar.setProgress((int) (mOriginalMouseSpeed * 100f));
+        setSeekTextPercent(mMouseSpeedText, mMouseSpeedBar.getProgress());
 
         mGestureDelayBar.setRange(100, 1000);
         mGestureDelayBar.setIncrement(10);
         mGestureDelayBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
             PREF_LONGPRESS_TRIGGER = progress;
             mEditor.putInt("timeLongPressTrigger", progress);
-            mGestureDelayText.setText(progress + "ms");
+            setSeekTextMillisecond(mGestureDelayText, progress);
         });
         mGestureDelayBar.setProgress(mOriginalGestureDelay);
+        setSeekTextMillisecond(mGestureDelayText, mGestureDelayBar.getProgress());
 
         mResolutionBar.setRange(25, 100);
         mResolutionBar.setIncrement(5);
         mResolutionBar.setOnSeekBarChangeListener((SimpleSeekBarListener) (seekBar, progress, fromUser) -> {
             PREF_SCALE_FACTOR = progress/100f;
             mEditor.putInt("resolutionRatio", progress);
-            mResolutionText.setText(progress + "%");
+            setSeekTextPercent(mResolutionText, progress);
             onResolutionChanged();
         });
         mResolutionBar.setProgress((int) (mOriginalResolution * 100));
+        setSeekTextPercent(mResolutionText, mResolutionBar.getProgress());
 
 
         updateGyroVisibility(mOriginalGyroEnabled);
         updateGestureVisibility(mOriginalGestureDisabled);
     }
 
+    private static void setSeekTextMillisecond(TextView target, int value) {
+        setSeekText(target, R.string.millisecond_format, value);
+    }
+
+    private static void setSeekTextPercent(TextView target, int value) {
+        setSeekText(target, R.string.percent_format, value);
+    }
+
+    private static void setSeekText(TextView target, int format, int value) {
+        target.setText(target.getContext().getString(format, value));
+    }
+
     private void updateGyroVisibility(boolean isEnabled) {
         int visibility = isEnabled ? View.VISIBLE : View.GONE;
         mGyroXSwitch.setVisibility(visibility);
diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
index 580899b17..cda8a0947 100644
--- a/app_pojavlauncher/src/main/res/values/strings.xml
+++ b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -274,6 +274,7 @@
     <string name="preference_shader_dump_title">Enable shader dumping</string>
     <string name="preference_shader_dump_description">Log converted shaders into the log file.</string>
     <string name="percent_format">%d%%</string>
+    <string name="millisecond_format">%d ms</string>
     <string name="customctrl_editor_exit_title">Leaving?</string>
     <string name="customctrl_editor_exit_msg">Are you sure you want to exit?</string>
     <string name="customctrl_editor_exit">Leave editor</string>