Add step buttons to slider preferences and improve default value handling

Author: Mahmud0808

app/src/main/java/com/drdisagree/iconify/core/preferences/PreferenceCategoryScope.kt

@@ -142,6 +142,7 @@ class PreferenceCategoryScope {
         showResetButton: Boolean = false,
         showDefaultIndicator: Boolean = false,
         hideDefaultValue: Boolean = false,
+        showStepButtons: Boolean = true,
         summary: ((PrefParam<Float>) -> PrefStringRes?)? = null,
         isVisible: ((PreferenceController) -> Boolean) = { true },
         isEnabled: ((PreferenceController) -> Boolean) = { true },
@@ -152,7 +153,7 @@ class PreferenceCategoryScope {
             defaultValue = defaultValue.toPrefValue(),
             type = PreferenceType.Slider(
                 min, max, steps, valueLabel, applyImmediately,
-                showResetButton, showDefaultIndicator, hideDefaultValue
+                showResetButton, showDefaultIndicator, hideDefaultValue, showStepButtons
             ),
             icon = icon,
             summary = summary as ((PrefParam<Any?>) -> PrefStringRes?)?,
@@ -174,6 +175,7 @@ class PreferenceCategoryScope {
         showResetButton: Boolean = false,
         showDefaultIndicator: Boolean = false,
         hideDefaultValue: Boolean = false,
+        showStepButtons: Boolean = true,
         summary: ((PrefParam<Float>) -> PrefStringRes?)? = null,
         isVisible: ((PreferenceController) -> Boolean) = { true },
         isEnabled: ((PreferenceController) -> Boolean) = { true },
@@ -184,7 +186,7 @@ class PreferenceCategoryScope {
             defaultValue = defaultValue.toPrefValue(),
             type = PreferenceType.Slider(
                 min, max, steps, valueLabel, applyImmediately,
-                showResetButton, showDefaultIndicator, hideDefaultValue
+                showResetButton, showDefaultIndicator, hideDefaultValue, showStepButtons
             ),
             icon = icon,
             summary = summary as ((PrefParam<Any?>) -> PrefStringRes?)?,

app/src/main/java/com/drdisagree/iconify/core/preferences/PreferenceType.kt

@@ -14,7 +14,8 @@ sealed class PreferenceType {
         val applyImmediately: Boolean,
         val showResetButton: Boolean = false,
         val showDefaultIndicator: Boolean = false,
-        val hideDefaultValue: Boolean = false
+        val hideDefaultValue: Boolean = false,
+        val showStepButtons: Boolean = true
     ) : PreferenceType()
 
     data class ListPref(

app/src/main/java/com/drdisagree/iconify/core/ui/components/preferences/SliderPreferenceItem.kt

@@ -9,6 +9,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Add
+import androidx.compose.material.icons.rounded.Remove
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -67,16 +70,24 @@ fun SliderPreferenceItem(
     } else {
         0.0001f
     }
-    val isAtDefault = abs(sliderValue - defaultValue) <= defaultEpsilon
+
+    fun labelOf(value: Float) = type.valueLabel?.invoke(value)
+        ?: value.roundToInt().toString()
+
+    // Treat a value as default when it's within epsilon OR renders the same label as
+    // the default (a continuous slider snaps many raw floats to one rounded "Ndp" label).
+    fun isDefault(value: Float) =
+        abs(value - defaultValue) <= defaultEpsilon || labelOf(value) == labelOf(defaultValue)
+
+    val isAtDefault = isDefault(sliderValue)
 
     LaunchedEffect(persistedValue) {
         if (sliderValue != persistedValue) {
             sliderValue = persistedValue
         }
     }
 
-    val originalValueLabel = type.valueLabel?.invoke(sliderValue)
-        ?: sliderValue.roundToInt().toString()
+    val originalValueLabel = labelOf(sliderValue)
     val valueLabel = if (type.showDefaultIndicator && isAtDefault) {
         if (type.hideDefaultValue) {
             stringResource(R.string.opt_default).replaceAll("(" to "", ")" to "")
@@ -104,8 +115,7 @@ fun SliderPreferenceItem(
     fun updateUiValue(newValue: Float) {
         if (!isEnabled || sliderValue == newValue) return
 
-        val newLabel = type.valueLabel?.invoke(newValue)
-            ?: newValue.roundToInt().toString()
+        val newLabel = labelOf(newValue)
 
         if (newLabel != previousLabel) {
             onValueChangeWithHaptic()
@@ -116,14 +126,25 @@ fun SliderPreferenceItem(
     }
 
     fun persistValue(value: Float) {
-        val snapped = if (abs(value - defaultValue) <= defaultEpsilon) {
-            defaultValue
-        } else {
-            value
-        }
+        // Snap to exact default when it reads as default so the stored value stays clean
+        // and matches what the "Default" label and reset button report.
+        val snapped = if (isDefault(value)) defaultValue else value
         prefController.setFloat(prefDefinition.key, snapped)
     }
 
+    // One discrete step; matches the slider's tick spacing, or 1 for a continuous slider.
+    val stepIncrement = if (type.steps > 0) {
+        (type.max - type.min) / (type.steps + 1)
+    } else {
+        1f
+    }
+
+    fun stepBy(delta: Float) {
+        val newValue = (sliderValue + delta).coerceIn(type.min, type.max)
+        updateUiValue(newValue)
+        persistValue(newValue)
+    }
+
     PreferenceContainer(
         shape = shape,
         isEnabled = isEnabled,
@@ -148,8 +169,23 @@ fun SliderPreferenceItem(
                     .fillMaxWidth()
                     .padding(top = 6.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.spacedBy(16.dp)
+                horizontalArrangement = Arrangement.spacedBy(8.dp)
             ) {
+                if (type.showStepButtons) {
+                    IconButton(
+                        enabled = isEnabled && sliderValue > type.min,
+                        shapes = IconButtonDefaults.shapes(),
+                        colors = IconButtonDefaults.filledTonalIconButtonColors(),
+                        onClick = { stepBy(-stepIncrement) },
+                        modifier = Modifier.size(28.dp)
+                    ) {
+                        Icon(
+                            imageVector = Icons.Rounded.Remove,
+                            contentDescription = stringResource(R.string.btn_decrease),
+                            modifier = Modifier.size(16.dp)
+                        )
+                    }
+                }
                 Slider(
                     value = sliderValue,
                     onValueChange = { newValue ->
@@ -170,8 +206,22 @@ fun SliderPreferenceItem(
                     modifier = Modifier
                         .wrapContentHeight()
                         .weight(1f)
-                        .padding(top = 4.dp)
                 )
+                if (type.showStepButtons) {
+                    IconButton(
+                        enabled = isEnabled && sliderValue < type.max,
+                        shapes = IconButtonDefaults.shapes(),
+                        colors = IconButtonDefaults.filledTonalIconButtonColors(),
+                        onClick = { stepBy(stepIncrement) },
+                        modifier = Modifier.size(28.dp)
+                    ) {
+                        Icon(
+                            imageVector = Icons.Rounded.Add,
+                            contentDescription = stringResource(R.string.btn_increase),
+                            modifier = Modifier.size(16.dp)
+                        )
+                    }
+                }
                 if (type.showResetButton) {
                     IconButton(
                         enabled = isEnabled && !isAtDefault,

app/src/main/res/values/strings.xml

@@ -1180,6 +1180,8 @@
     <string name="btn_disable_custom_colors">Disable Custom Colors</string>
     <string name="btn_enable_custom_colors">Apply Colors</string>
     <string name="btn_reset">Reset</string>
+    <string name="btn_decrease">Decrease</string>
+    <string name="btn_increase">Increase</string>
     <string name="btn_reboot_now">Reboot Now</string>
     <string name="btn_download">Download</string>
     <string name="btn_restart_systemui">Restart SystemUI</string>