refactor settings buttons

UrAvgCode · UrAvgCode · commit d5f64671cbb7 · 2025-04-10T15:08:12.000+02:00
diff --git a/app/src/main/java/com/uravgcode/chooser/settings/presentation/SettingsScreen.kt b/app/src/main/java/com/uravgcode/chooser/settings/presentation/SettingsScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
@@ -170,7 +169,7 @@ fun SettingsScreen(
             }
 
             item {
-                HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
+                SettingsSeparator()
                 SettingsButtonImport(dataStore)
                 SettingsButtonExport(dataStore)
                 SettingsButtonReset(dataStore)
diff --git a/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButton.kt b/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButton.kt
@@ -0,0 +1,23 @@
+package com.uravgcode.chooser.settings.presentation.button
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ElevatedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun SettingsButton(
+    text: String,
+    onClick: () -> Unit,
+) {
+    ElevatedButton(
+        content = { Text(text) },
+        onClick = onClick,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 4.dp)
+    )
+}
diff --git a/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonExport.kt b/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonExport.kt
@@ -3,15 +3,9 @@ package com.uravgcode.chooser.settings.presentation.button
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ElevatedButton
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
 import androidx.datastore.core.DataStore
 import com.uravgcode.chooser.settings.data.SettingsData
 import com.uravgcode.chooser.settings.data.SettingsSerializer
@@ -20,14 +14,14 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun SettingsButtonExport(dataStore: DataStore<SettingsData>) {
-    val coroutineScope = rememberCoroutineScope()
+    val scope = rememberCoroutineScope()
     val context = LocalContext.current
 
-    val exportLauncher = rememberLauncherForActivityResult(
+    val launcher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.CreateDocument("application/json")
     ) { uri ->
         uri?.let {
-            coroutineScope.launch {
+            scope.launch {
                 try {
                     context.contentResolver.openOutputStream(uri)?.use { outputStream ->
                         SettingsSerializer.writeTo(dataStore.data.first(), outputStream)
@@ -40,11 +34,8 @@ fun SettingsButtonExport(dataStore: DataStore<SettingsData>) {
         }
     }
 
-    ElevatedButton(
-        content = { Text("Export Settings") },
-        onClick = { exportLauncher.launch("chooser_settings.json") },
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 8.dp)
+    SettingsButton(
+        text = "Export Settings",
+        onClick = { launcher.launch("settings.json") }
     )
 }
diff --git a/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonImport.kt b/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonImport.kt
@@ -3,34 +3,28 @@ package com.uravgcode.chooser.settings.presentation.button
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ElevatedButton
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
 import androidx.datastore.core.DataStore
 import com.uravgcode.chooser.settings.data.SettingsData
 import com.uravgcode.chooser.settings.data.SettingsSerializer
 import kotlinx.coroutines.launch
 
 @Composable
 fun SettingsButtonImport(dataStore: DataStore<SettingsData>) {
-    val coroutineScope = rememberCoroutineScope()
+    val scope = rememberCoroutineScope()
     val context = LocalContext.current
 
-    val importLauncher = rememberLauncherForActivityResult(
+    val launcher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.OpenDocument()
     ) { uri ->
         uri?.let {
-            coroutineScope.launch {
+            scope.launch {
                 try {
                     context.contentResolver.openInputStream(uri)?.use { inputStream ->
-                        val importedSettings = SettingsSerializer.readFrom(inputStream)
-                        dataStore.updateData { importedSettings }
+                        val imported = SettingsSerializer.readFrom(inputStream)
+                        dataStore.updateData { imported }
                     }
                     Toast.makeText(context, "Settings imported successfully", Toast.LENGTH_SHORT).show()
                 } catch (e: Exception) {
@@ -40,11 +34,8 @@ fun SettingsButtonImport(dataStore: DataStore<SettingsData>) {
         }
     }
 
-    ElevatedButton(
-        content = { Text("Import Settings") },
-        onClick = { importLauncher.launch(arrayOf("application/json")) },
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 8.dp)
+    SettingsButton(
+        text = "Import Settings",
+        onClick = { launcher.launch(arrayOf("application/json")) }
     )
 }
diff --git a/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonReset.kt b/app/src/main/java/com/uravgcode/chooser/settings/presentation/button/SettingsButtonReset.kt
@@ -1,19 +1,14 @@
 package com.uravgcode.chooser.settings.presentation.button
 
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
-import androidx.compose.material3.ElevatedButton
 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.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
 import androidx.datastore.core.DataStore
 import com.uravgcode.chooser.settings.data.SettingsData
 import kotlinx.coroutines.launch
@@ -50,11 +45,8 @@ fun SettingsButtonReset(dataStore: DataStore<SettingsData>) {
         )
     }
 
-    ElevatedButton(
-        content = { Text("Reset Settings") },
-        onClick = { showResetDialog = true },
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 8.dp)
+    SettingsButton(
+        text = "Reset Settings",
+        onClick = { showResetDialog = true }
     )
 }
diff --git a/app/src/main/java/com/uravgcode/chooser/settings/presentation/component/SettingsSeparator.kt b/app/src/main/java/com/uravgcode/chooser/settings/presentation/component/SettingsSeparator.kt
@@ -25,15 +25,19 @@ import androidx.compose.ui.unit.dp
 
 @Composable
 fun SettingsSeparator(
-    heading: String,
+    heading: String? = null,
     showDivider: Boolean = true
 ) {
     if (showDivider) {
-        HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
+        HorizontalDivider(
+            modifier = Modifier.padding(vertical = 8.dp)
+        )
+    }
+    heading?.let {
+        Text(
+            text = it.uppercase(),
+            style = MaterialTheme.typography.titleMedium,
+            modifier = Modifier.padding(vertical = 8.dp)
+        )
     }
-    Text(
-        text = heading.uppercase(),
-        style = MaterialTheme.typography.titleMedium,
-        modifier = Modifier.padding(vertical = 8.dp)
-    )
 }
