refactor: Move settings out of SettingsScreen's atoms

Myzel394 · Oct 26, 2023 · 68438a6 · 68438a6
1 parent ca33e57
commit 68438a6
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 184 deletions.
diff --git a/...src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/SaveRecordingButton.kt b/...src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/atoms/SaveRecordingButton.kt
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/BitrateTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/BitrateTile.kt
@@ -36,14 +36,12 @@ import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun BitrateTile() {
+fun BitrateTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
     val showDialog = rememberUseCaseState()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     fun updateValue(bitRate: Int) {
         scope.launch {

diff --git a/...main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/CustomNotificationTile.kt b/...main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/CustomNotificationTile.kt
@@ -22,12 +22,9 @@ import app.myzel394.alibi.ui.enums.Screen
 @Composable
 fun CustomNotificationTile(
     navController: NavController,
+    settings: AppSettings,
 ) {
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     val label = if (settings.notificationSettings == null)
         stringResource(R.string.ui_settings_option_customNotification_description_setup)

diff --git a/.../app/myzel394/alibi/ui/components/SettingsScreen/atoms/DeleteRecordingsImmediatelyTile.kt b/.../app/myzel394/alibi/ui/components/SettingsScreen/atoms/DeleteRecordingsImmediatelyTile.kt
@@ -16,14 +16,12 @@ import app.myzel394.alibi.ui.components.atoms.SettingsTile
 import kotlinx.coroutines.launch
 
 @Composable
-fun DeleteRecordingsImmediatelyTile() {
+fun DeleteRecordingsImmediatelyTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
 
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     SettingsTile(
         title = stringResource(R.string.ui_settings_option_deleteRecordingsImmediately_title),

diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/EncoderTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/EncoderTile.kt
@@ -2,7 +2,6 @@ package app.myzel394.alibi.ui.components.SettingsScreen.atoms
 
 import android.media.MediaRecorder
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AudioFile
 import androidx.compose.material.icons.filled.Memory
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -35,17 +34,15 @@ import kotlinx.coroutines.launch
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun EncoderTile(
-    snackbarHostState: SnackbarHostState
+    snackbarHostState: SnackbarHostState,
+    settings: AppSettings,
 ) {
     val scope = rememberCoroutineScope()
     val showDialog = rememberUseCaseState()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
-    val updatedOutputFormatLabel = stringResource(R.string.ui_settings_option_encoder_extra_outputFormatChanged)
+    val updatedOutputFormatLabel =
+        stringResource(R.string.ui_settings_option_encoder_extra_outputFormatChanged)
 
     fun updateValue(encoder: Int?) {
         scope.launch {
@@ -92,7 +89,7 @@ fun EncoderTile(
                     selected = settings.audioRecorderSettings.encoder == index,
                 )
             }.toList()
-        ) {index, option ->
+        ) { index, _ ->
             updateValue(index)
         },
     )

diff --git a/...n/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/ForceExactMaxDurationTile.kt b/...n/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/ForceExactMaxDurationTile.kt
@@ -18,14 +18,11 @@ import kotlinx.coroutines.launch
 
 
 @Composable
-fun ForceExactMaxDurationTile() {
+fun ForceExactMaxDurationTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
-    val showDialog = rememberUseCaseState()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     fun updateValue(forceExactMaxDuration: Boolean) {
         scope.launch {

diff --git a/...rc/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/InAppLanguagePicker.kt b/...rc/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/InAppLanguagePicker.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.core.os.LocaleListCompat
 import app.myzel394.alibi.R
 import app.myzel394.alibi.SUPPORTED_LOCALES
+import app.myzel394.alibi.db.AppSettings
 import app.myzel394.alibi.db.AudioRecorderSettings
 import app.myzel394.alibi.ui.components.atoms.SettingsTile
 import app.myzel394.alibi.ui.utils.IconResource

diff --git a/...c/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/IntervalDurationTile.kt b/...c/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/IntervalDurationTile.kt
@@ -34,14 +34,12 @@ import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun IntervalDurationTile() {
+fun IntervalDurationTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
     val showDialog = rememberUseCaseState()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     fun updateValue(intervalDuration: Long) {
         scope.launch {

diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/MaxDurationTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/MaxDurationTile.kt
@@ -33,14 +33,12 @@ import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun MaxDurationTile() {
+fun MaxDurationTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
     val showDialog = rememberUseCaseState()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     fun updateValue(maxDuration: Long) {
         scope.launch {

diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/OutputFormatTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/OutputFormatTile.kt
@@ -1,20 +1,14 @@
 package app.myzel394.alibi.ui.components.SettingsScreen.atoms
 
-import android.media.MediaRecorder
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AudioFile
 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.SnackbarDuration
-import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.SnackbarVisuals
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -35,14 +29,12 @@ import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun OutputFormatTile() {
+fun OutputFormatTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
     val showDialog = rememberUseCaseState()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
     val availableOptions = if (settings.audioRecorderSettings.encoder == null)
         AudioRecorderSettings.OUTPUT_FORMAT_INDEX_TEXT_MAP.keys.toTypedArray()
     else AudioRecorderSettings.ENCODER_SUPPORTED_OUTPUT_FORMATS_MAP[settings.audioRecorderSettings.encoder]!!
@@ -74,7 +66,7 @@ fun OutputFormatTile() {
                     selected = settings.audioRecorderSettings.outputFormat == option,
                 )
             }.toList()
-        ) {index, option ->
+        ) { index, _ ->
             updateValue(availableOptions[index])
         },
     )

diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/SamplingRateTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/SamplingRateTile.kt
@@ -36,14 +36,12 @@ import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SamplingRateTile() {
+fun SamplingRateTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
     val showDialog = rememberUseCaseState()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     fun updateValue(samplingRate: Int?) {
         scope.launch {

diff --git a/...main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/ShowAllMicrophonesTile.kt b/...main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/ShowAllMicrophonesTile.kt
@@ -19,13 +19,11 @@ import kotlinx.coroutines.launch
 
 
 @Composable
-fun ShowAllMicrophonesTile() {
+fun ShowAllMicrophonesTile(
+    settings: AppSettings,
+) {
     val scope = rememberCoroutineScope()
     val dataStore = LocalContext.current.dataStore
-    val settings = dataStore
-        .data
-        .collectAsState(initial = AppSettings.getDefaultInstance())
-        .value
 
     fun updateValue(showAllMicrophones: Boolean) {
         scope.launch {