Refactor preference items to use rememberSaveable for state management and improve localization

Author: Mahmud0808

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

@@ -13,7 +13,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
@@ -71,7 +70,7 @@ fun EditTextPreferenceItem(
     }
 
     if (showDialog) {
-        var draft by remember { mutableStateOf(storedValue) }
+        var draft by rememberSaveable { mutableStateOf(storedValue) }
         AlertDialog(
             onDismissRequest = { showDialog = false },
             title = { Text(prefDefinition.title.resolve()) },

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

@@ -44,6 +44,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.drdisagree.iconify.R
@@ -249,7 +250,7 @@ fun FilePickerPreferenceItem(
 
             if (uri != null && type.saveFileUri) {
                 FilenameChip(
-                    name = fileName ?: "Unknown file",
+                    name = fileName ?: stringResource(R.string.file_unknown_name),
                     type = type.pickerType,
                     isEnabled = isEnabled,
                     onClear = withHaptic {
@@ -269,7 +270,10 @@ fun FilePickerPreferenceItem(
                 shapes = ButtonDefaults.shapes(),
                 contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
             ) {
-                Text(text = if (uri != null) "Replace" else type.pickerType.label.resolve())
+                Text(
+                    text = if (uri != null) stringResource(R.string.btn_replace_file)
+                    else type.pickerType.label.resolve()
+                )
             }
         }
     }
@@ -341,7 +345,7 @@ private fun FilenameChip(
         ) {
             Icon(
                 imageVector = Icons.Outlined.Close,
-                contentDescription = "Clear",
+                contentDescription = stringResource(R.string.file_clear),
                 tint = contentColor,
                 modifier = Modifier.size(14.dp),
             )

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

@@ -25,6 +25,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -93,7 +94,12 @@ fun MultiListPreferenceItem(
     }
 
     if (showDialog) {
-        var localSelected by remember { mutableStateOf(selectedValues) }
+        var localSelected by rememberSaveable(
+            stateSaver = listSaver(
+                save = { it.toList() },
+                restore = { it.toSet() }
+            )
+        ) { mutableStateOf(selectedValues) }
 
         AlertDialog(
             onDismissRequest = { showDialog = false },

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

@@ -17,6 +17,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Slider
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -39,6 +40,7 @@ import com.drdisagree.iconify.core.preferences.resolveOrNull
 import com.drdisagree.iconify.core.preferences.toValueOrNull
 import com.drdisagree.iconify.core.ui.components.others.withHaptic
 import com.drdisagree.iconify.helpers.replaceAll
+import kotlin.math.abs
 import kotlin.math.roundToInt
 
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
@@ -59,9 +61,23 @@ fun SliderPreferenceItem(
     val persistedValue by prefController.observe(prefDefinition.key, defaultValue)
     var sliderValue by remember { mutableFloatStateOf(persistedValue) }
     var previousLabel by remember { mutableStateOf<String?>(null) }
+
+    val defaultEpsilon = if (type.steps > 0) {
+        (type.max - type.min) / (type.steps + 1) / 2f
+    } else {
+        0.0001f
+    }
+    val isAtDefault = abs(sliderValue - defaultValue) <= defaultEpsilon
+
+    LaunchedEffect(persistedValue) {
+        if (sliderValue != persistedValue) {
+            sliderValue = persistedValue
+        }
+    }
+
     val originalValueLabel = type.valueLabel?.invoke(sliderValue)
         ?: sliderValue.roundToInt().toString()
-    val valueLabel = if (type.showDefaultIndicator && sliderValue == defaultValue) {
+    val valueLabel = if (type.showDefaultIndicator && isAtDefault) {
         if (type.hideDefaultValue) {
             stringResource(R.string.opt_default).replaceAll("(" to "", ")" to "")
         } else {
@@ -100,7 +116,12 @@ fun SliderPreferenceItem(
     }
 
     fun persistValue(value: Float) {
-        prefController.setFloat(prefDefinition.key, value)
+        val snapped = if (abs(value - defaultValue) <= defaultEpsilon) {
+            defaultValue
+        } else {
+            value
+        }
+        prefController.setFloat(prefDefinition.key, snapped)
     }
 
     PreferenceContainer(
@@ -153,7 +174,7 @@ fun SliderPreferenceItem(
                 )
                 if (type.showResetButton) {
                     IconButton(
-                        enabled = isEnabled && sliderValue != defaultValue,
+                        enabled = isEnabled && !isAtDefault,
                         shapes = IconButtonDefaults.shapes(),
                         colors = IconButtonDefaults.filledIconButtonColors(),
                         onClick = {

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

@@ -1518,6 +1518,9 @@
     <string name="btn_pick_pdf">Pick PDF</string>
     <string name="btn_pick_document">Pick document</string>
     <string name="btn_pick_file">Pick file</string>
+    <string name="btn_replace_file">Replace</string>
+    <string name="file_unknown_name">Unknown file</string>
+    <string name="file_clear">Clear</string>
     <string name="advanced_color_settings_title">Advanced Settings</string>
     <string name="advanced_color_settings_desc">Get advanced color customizations</string>
     <string name="look_and_feel_title">Look &amp; Feel</string>