refactor settings sliders and buttons

Author: UrAvgCode

app/src/main/java/com/uravgcode/chooser/settings/presentation/SettingsScreen.kt

@@ -32,15 +32,15 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 import androidx.datastore.core.DataStore
 import com.uravgcode.chooser.settings.data.SettingsData
-import com.uravgcode.chooser.settings.presentation.button.SettingsButtonExport
-import com.uravgcode.chooser.settings.presentation.button.SettingsButtonImport
-import com.uravgcode.chooser.settings.presentation.button.SettingsButtonReset
+import com.uravgcode.chooser.settings.presentation.button.ExportButton
+import com.uravgcode.chooser.settings.presentation.button.ImportButton
+import com.uravgcode.chooser.settings.presentation.button.ResetButton
 import com.uravgcode.chooser.settings.presentation.component.SettingsSeparator
+import com.uravgcode.chooser.settings.presentation.component.SettingsSwitch
 import com.uravgcode.chooser.settings.presentation.component.SettingsTopAppBar
-import com.uravgcode.chooser.settings.presentation.row.SettingsRowPaddingSlider
-import com.uravgcode.chooser.settings.presentation.row.SettingsRowPercentSlider
-import com.uravgcode.chooser.settings.presentation.row.SettingsRowSwitch
-import com.uravgcode.chooser.settings.presentation.row.SettingsRowTimeSlider
+import com.uravgcode.chooser.settings.presentation.slider.PaddingSlider
+import com.uravgcode.chooser.settings.presentation.slider.PercentSlider
+import com.uravgcode.chooser.settings.presentation.slider.TimeSlider
 import kotlinx.coroutines.launch
 
 @Composable
@@ -76,7 +76,7 @@ fun SettingsScreen(
                     heading = "General Settings",
                     showDivider = false,
                 )
-                SettingsRowSwitch(
+                SettingsSwitch(
                     title = "Enable Sound",
                     isChecked = settings.soundEnabled,
                     onCheckedChange = { isChecked ->
@@ -85,7 +85,7 @@ fun SettingsScreen(
                         }
                     }
                 )
-                SettingsRowSwitch(
+                SettingsSwitch(
                     title = "Enable Vibration",
                     isChecked = settings.vibrationEnabled,
                     onCheckedChange = { isChecked ->
@@ -98,7 +98,7 @@ fun SettingsScreen(
 
             item {
                 SettingsSeparator("Display Settings")
-                SettingsRowSwitch(
+                SettingsSwitch(
                     title = "Full Screen Mode",
                     isChecked = settings.fullScreen,
                     onCheckedChange = { isChecked ->
@@ -107,7 +107,7 @@ fun SettingsScreen(
                         }
                     }
                 )
-                SettingsRowPaddingSlider(
+                PaddingSlider(
                     title = "Additional Button Padding",
                     value = settings.additionalButtonPadding,
                     onValueChange = { sliderValue ->
@@ -118,7 +118,7 @@ fun SettingsScreen(
                     valueRange = 0f..50f,
                     steps = 9
                 )
-                SettingsRowPercentSlider(
+                PercentSlider(
                     title = "Circle Size",
                     value = settings.circleSizeFactor,
                     onValueChange = { sliderValue ->
@@ -133,7 +133,7 @@ fun SettingsScreen(
 
             item {
                 SettingsSeparator("Circle Lifetimes")
-                SettingsRowTimeSlider(
+                TimeSlider(
                     title = "Circle Lifetime",
                     value = settings.circleLifetime,
                     onValueChange = { sliderValue ->
@@ -144,7 +144,7 @@ fun SettingsScreen(
                     valueRange = 0L..3000L,
                     steps = 5,
                 )
-                SettingsRowTimeSlider(
+                TimeSlider(
                     title = "Group Circle Lifetime",
                     value = settings.groupCircleLifetime,
                     onValueChange = { sliderValue ->
@@ -155,7 +155,7 @@ fun SettingsScreen(
                     valueRange = 0L..3000L,
                     steps = 5,
                 )
-                SettingsRowTimeSlider(
+                TimeSlider(
                     title = "Order Circle Lifetime",
                     value = settings.orderCircleLifetime,
                     onValueChange = { sliderValue ->
@@ -170,9 +170,9 @@ fun SettingsScreen(
 
             item {
                 SettingsSeparator()
-                SettingsButtonImport(dataStore)
-                SettingsButtonExport(dataStore)
-                SettingsButtonReset(dataStore)
+                ImportButton(dataStore)
+                ExportButton(dataStore)
+                ResetButton(dataStore)
             }
         }
     }

…sentation/button/SettingsButtonExport.kt …ings/presentation/button/ExportButton.ktapp/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonExport.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/button/ExportButton.kt app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonExport.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/button/ExportButton.kt

@@ -10,7 +10,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * @author UrAvgCode
- * @description SettingsButtonExport provides functionality to export settings to a file.
+ * @description ExportButton provides functionality to export settings to a file.
  */
 
 package com.uravgcode.chooser.settings.presentation.button
@@ -28,7 +28,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 
 @Composable
-fun SettingsButtonExport(dataStore: DataStore<SettingsData>) {
+fun ExportButton(dataStore: DataStore<SettingsData>) {
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
 

…sentation/button/SettingsButtonImport.kt …ings/presentation/button/ImportButton.ktapp/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonImport.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/button/ImportButton.kt app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonImport.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/button/ImportButton.kt

@@ -10,7 +10,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * @author UrAvgCode
- * @description SettingsButtonImport provides functionality to import settings from a previously exported file.
+ * @description ImportButton provides functionality to import settings from a previously exported file.
  */
 
 package com.uravgcode.chooser.settings.presentation.button
@@ -27,7 +27,7 @@ import com.uravgcode.chooser.settings.data.SettingsSerializer
 import kotlinx.coroutines.launch
 
 @Composable
-fun SettingsButtonImport(dataStore: DataStore<SettingsData>) {
+fun ImportButton(dataStore: DataStore<SettingsData>) {
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
 

…esentation/button/SettingsButtonReset.kt …tings/presentation/button/ResetButton.ktapp/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonReset.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/button/ResetButton.kt app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonReset.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/button/ResetButton.kt

@@ -10,7 +10,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * @author UrAvgCode
- * @description SettingsButtonReset allows users to restore all settings to their default values.
+ * @description ResetButton allows users to restore all settings to their default values.
  */
 
 package com.uravgcode.chooser.settings.presentation.button
@@ -29,7 +29,7 @@ import com.uravgcode.chooser.settings.data.SettingsData
 import kotlinx.coroutines.launch
 
 @Composable
-fun SettingsButtonReset(dataStore: DataStore<SettingsData>) {
+fun ResetButton(dataStore: DataStore<SettingsData>) {
     val coroutineScope = rememberCoroutineScope()
     var showResetDialog by remember { mutableStateOf(false) }
 

…gs/presentation/row/SettingsRowSwitch.kt …presentation/component/SettingsSwitch.ktapp/src/main/java/com/uravgcode/chooser/settings/presentation/row/SettingsRowSwitch.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/component/SettingsSwitch.kt app/src/main/java/com/uravgcode/chooser/settings/presentation/row/SettingsRowSwitch.kt renamed to app/src/main/java/com/uravgcode/chooser/settings/presentation/component/SettingsSwitch.kt

@@ -10,10 +10,10 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * @author UrAvgCode
- * @description SettingsRowSwitch is a component that provides a toggle switch for settings.
+ * @description SettingsSwitch is a component that provides a toggle switch for settings.
  */
 
-package com.uravgcode.chooser.settings.presentation.row
+package com.uravgcode.chooser.settings.presentation.component
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -28,7 +28,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun SettingsRowSwitch(
+fun SettingsSwitch(
     title: String,
     isChecked: Boolean,
     onCheckedChange: (Boolean) -> Unit

app/src/main/java/com/uravgcode/chooser/settings/presentation/row/SettingsRowPercentSlider.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2025 UrAvgCode
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * @author UrAvgCode
+ * @description PaddingSlider is a component that provides a settings slider for padding values.
+ */
+
+package com.uravgcode.chooser.settings.presentation.slider
+
+import androidx.compose.runtime.Composable
+import kotlin.math.roundToInt
+
+@Composable
+fun PaddingSlider(
+    title: String,
+    value: Float,
+    onValueChange: (Float) -> Unit,
+    valueRange: ClosedFloatingPointRange<Float> = 0f..50f,
+    steps: Int = 0
+) {
+    SettingsSlider(
+        title = title,
+        value = value,
+        onValueChange = onValueChange,
+        valueRange = valueRange,
+        steps = steps,
+        valueFormatter = { "${it.roundToInt()} dp" }
+    )
+}

app/src/main/java/com/uravgcode/chooser/settings/presentation/row/SettingsRowTimeSlider.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2025 UrAvgCode
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * @author UrAvgCode
+ * @description PercentSlider is a component that provides a settings slider for percent values.
+ */
+
+package com.uravgcode.chooser.settings.presentation.slider
+
+import androidx.compose.runtime.Composable
+import kotlin.math.roundToInt
+
+@Composable
+fun PercentSlider(
+    title: String,
+    value: Float,
+    onValueChange: (Float) -> Unit,
+    valueRange: ClosedFloatingPointRange<Float> = 0f..1f,
+    steps: Int = 0
+) {
+    SettingsSlider(
+        title = title,
+        value = value,
+        onValueChange = onValueChange,
+        valueRange = valueRange,
+        steps = steps,
+        valueFormatter = { "${(it * 100).roundToInt()}%" }
+    )
+}