refactor: Use IntervalDurationTile

app/src/main/java/app/myzel394/locationtest/ui/components/SettingsScreen/atoms/IntervalDurationTile.kt

@@ -0,0 +1,119 @@
+package app.myzel394.locationtest.ui.components.SettingsScreen.atoms
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Mic
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
+import app.myzel394.locationtest.dataStore
+import app.myzel394.locationtest.db.AppSettings
+import app.myzel394.locationtest.db.AudioRecorderSettings
+import app.myzel394.locationtest.ui.components.atoms.SettingsTile
+import app.myzel394.locationtest.ui.utils.formatDuration
+import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
+import com.maxkeppeler.sheets.duration.DurationDialog
+import com.maxkeppeler.sheets.duration.models.DurationConfig
+import com.maxkeppeler.sheets.duration.models.DurationFormat
+import com.maxkeppeler.sheets.duration.models.DurationSelection
+import kotlinx.coroutines.launch
+
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun IntervalDurationTile() {
+    val scope = rememberCoroutineScope()
+    val showDurationPicker = rememberUseCaseState()
+    val dataStore = LocalContext.current.dataStore
+    val settings = dataStore
+        .data
+        .collectAsState(initial = AppSettings.getDefaultInstance())
+        .value
+
+    DurationDialog(
+        state = showDurationPicker,
+        selection = DurationSelection { newTimeInSeconds ->
+            scope.launch {
+                dataStore.updateData {
+                    it.setAudioRecorderSettings(
+                        it.audioRecorderSettings.setIntervalDuration(newTimeInSeconds * 1000L)
+                    )
+                }
+            }
+        },
+        config = DurationConfig(
+            timeFormat = DurationFormat.MM_SS,
+            currentTime = settings.audioRecorderSettings.intervalDuration / 1000,
+            minTime = 10,
+            maxTime = 60 * 60,
+        )
+    )
+    SettingsTile(
+        title = "Batch duration",
+        description = "Record a single batch for this duration. Alibi records multiple batches and deletes the oldest one. When exporting the audio, all batches will be merged together",
+        leading = {
+            Icon(
+                Icons.Default.Mic,
+                contentDescription = null,
+            )
+        },
+        trailing = {
+            Button(
+                onClick = showDurationPicker::show,
+                colors = ButtonDefaults.filledTonalButtonColors(
+                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
+                ),
+                shape = MaterialTheme.shapes.medium,
+            ) {
+                Text(
+                    text = formatDuration(settings.audioRecorderSettings.intervalDuration),
+                )
+            }
+        },
+        extra = {
+            LazyRow(
+                modifier = Modifier
+                    .fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+                contentPadding = PaddingValues(
+                    horizontal = 32.dp,
+                ),
+            ) {
+                items(AudioRecorderSettings.EXAMPLE_DURATION_TIMES.size) {
+                    val duration = AudioRecorderSettings.EXAMPLE_DURATION_TIMES[it]
+
+                    Button(
+                        onClick = {
+                            scope.launch {
+                                dataStore.updateData {
+                                    it.setAudioRecorderSettings(
+                                        it.audioRecorderSettings.setIntervalDuration(duration)
+                                    )
+                                }
+                            }
+                        },
+                        colors = ButtonDefaults.textButtonColors(),
+                        shape = ButtonDefaults.textShape,
+                        contentPadding = ButtonDefaults.TextButtonContentPadding,
+                    ) {
+                        Text(
+                            text = formatDuration(duration),
+                        )
+                    }
+                }
+            }
+        }
+    )
+}

app/src/main/java/app/myzel394/locationtest/ui/components/atoms/GlobalSwitch.kt

@@ -1,4 +1,4 @@
-package app.myzel394.locationtest.ui.components
+package app.myzel394.locationtest.ui.components.atoms
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement

app/src/main/java/app/myzel394/locationtest/ui/components/atoms/SettingsTile.kt

@@ -1,4 +1,4 @@
-package app.myzel394.locationtest.ui.components
+package app.myzel394.locationtest.ui.components.atoms
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -29,7 +29,7 @@ import kotlinx.serialization.json.JsonNull.content
 @Composable
 fun SettingsTile(
     title: String,
-    description: String,
+    description: String? = null,
     leading: @Composable () -> Unit = {},
     trailing: @Composable () -> Unit = {},
     extra: (@Composable () -> Unit)? = null,
@@ -51,10 +51,11 @@ fun SettingsTile(
                     style = MaterialTheme.typography.labelLarge,
                 )
                 Spacer(modifier = Modifier.height(4.dp))
-                Text(
+                if (description != null)
-                    text = description,
+                    Text(
-                    style = MaterialTheme.typography.bodySmall,
+                        text = description,
-                )
+                        style = MaterialTheme.typography.bodySmall,
+                    )
             }
             Spacer(modifier = Modifier.width(16.dp))
             trailing()

app/src/main/java/app/myzel394/locationtest/ui/screens/SettingsScreen.kt

@@ -1,24 +1,16 @@
 package app.myzel394.locationtest.ui.screens
 
-import android.app.ProgressDialog.show
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Mic
-import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.Tune
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -27,42 +19,28 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchColors
-import androidx.compose.material3.SwitchDefaults
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
-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.Alignment
 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.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.datastore.dataStore
 import androidx.navigation.NavController
 import app.myzel394.locationtest.dataStore
 import app.myzel394.locationtest.db.AppSettings
 import app.myzel394.locationtest.db.AudioRecorderSettings
-import app.myzel394.locationtest.ui.components.GlobalSwitch
+import app.myzel394.locationtest.ui.components.SettingsScreen.atoms.IntervalDurationTile
-import app.myzel394.locationtest.ui.components.SettingsTile
+import app.myzel394.locationtest.ui.components.atoms.GlobalSwitch
+import app.myzel394.locationtest.ui.components.atoms.SettingsTile
 import app.myzel394.locationtest.ui.utils.formatDuration
-import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
 import com.maxkeppeler.sheets.duration.DurationDialog
 import com.maxkeppeler.sheets.duration.models.DurationConfig
 import com.maxkeppeler.sheets.duration.models.DurationFormat
 import com.maxkeppeler.sheets.duration.models.DurationSelection
 import kotlinx.coroutines.launch
-import org.intellij.lang.annotations.JdkConstants.HorizontalAlignment
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -112,82 +90,7 @@ fun SettingsScreen(
             )
             AnimatedVisibility(visible = settings.showAdvancedSettings) {
                 Column {
-                    val showDurationPicker = rememberUseCaseState()
+                    IntervalDurationTile()
-
-                    DurationDialog(
-                        state = showDurationPicker,
-                        selection = DurationSelection { newTimeInSeconds ->
-                            scope.launch {
-                                dataStore.updateData {
-                                    it.setAudioRecorderSettings(
-                                        it.audioRecorderSettings.setIntervalDuration(newTimeInSeconds * 1000L)
-                                    )
-                                }
-                            }
-                        },
-                        config = DurationConfig(
-                            timeFormat = DurationFormat.MM_SS,
-                            currentTime = settings.audioRecorderSettings.intervalDuration / 1000,
-                            minTime = 10,
-                            maxTime = 60 * 60,
-                        )
-                    )
-                    SettingsTile(
-                        title = "Batch duration",
-                        description = "Record a single batch for this duration. Alibi records multiple batches and deletes the oldest one. When exporting the audio, all batches will be merged together",
-                        leading = {
-                            Icon(
-                                Icons.Default.Mic,
-                                contentDescription = null,
-                            )
-                        },
-                        trailing = {
-                            Button(
-                                onClick = showDurationPicker::show,
-                                colors = ButtonDefaults.filledTonalButtonColors(
-                                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                                ),
-                                shape = MaterialTheme.shapes.medium,
-                            ) {
-                                Text(
-                                    text = formatDuration(settings.audioRecorderSettings.intervalDuration),
-                                )
-                            }
-                        },
-                        extra = {
-                            LazyRow(
-                                modifier = Modifier
-                                    .fillMaxWidth(),
-                                horizontalArrangement = Arrangement.spacedBy(16.dp),
-                                contentPadding = PaddingValues(
-                                    horizontal = 32.dp,
-                                ),
-                            ) {
-                                items(AudioRecorderSettings.EXAMPLE_DURATION_TIMES.size) {
-                                    val duration = AudioRecorderSettings.EXAMPLE_DURATION_TIMES[it]
-
-                                    Button(
-                                        onClick = {
-                                            scope.launch {
-                                                dataStore.updateData {
-                                                    it.setAudioRecorderSettings(
-                                                        it.audioRecorderSettings.setIntervalDuration(duration)
-                                                    )
-                                                }
-                                            }
-                                        },
-                                        colors = ButtonDefaults.textButtonColors(),
-                                        shape = ButtonDefaults.textShape,
-                                        contentPadding = ButtonDefaults.TextButtonContentPadding,
-                                    ) {
-                                        Text(
-                                            text = formatDuration(duration),
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    )
                 }
             }
         }