wip

GrakovNe · Nov 29, 2024 · 570afe0 · 570afe0
1 parent e97a08f
commit 570afe0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/settings/SettingsScreen.kt
@@ -34,6 +34,7 @@ import org.grakovne.lissen.ui.screens.settings.composable.AdditionalComposable
 import org.grakovne.lissen.ui.screens.settings.composable.AdvancedSettingsItemComposable
 import org.grakovne.lissen.ui.screens.settings.composable.CommonSettingsComposable
 import org.grakovne.lissen.ui.screens.settings.composable.ServerSettingsComposable
+import org.grakovne.lissen.viewmodel.PlayerViewModel
 import org.grakovne.lissen.viewmodel.SettingsViewModel
 
 @Composable
@@ -43,6 +44,7 @@ fun SettingsScreen(
     navController: AppNavigationService,
 ) {
     val viewModel: SettingsViewModel = hiltViewModel()
+    val playerViewModel: PlayerViewModel = hiltViewModel()
     val host by viewModel.host.observeAsState("")
 
     LaunchedEffect(Unit) {
@@ -90,7 +92,10 @@ fun SettingsScreen(
                     if (host?.isNotEmpty() == true) {
                         ServerSettingsComposable(navController, viewModel)
                     }
-                    CommonSettingsComposable(viewModel)
+                    CommonSettingsComposable(
+                        viewModel = viewModel,
+                        playerViewModel = playerViewModel,
+                    )
                     AdvancedSettingsItemComposable(
                         title = stringResource(R.string.settings_screen_custom_headers_title),
                         description = stringResource(R.string.settings_screen_custom_header_hint),

diff --git a/.../main/java/org/grakovne/lissen/ui/screens/settings/composable/CommonSettingsComposable.kt b/.../main/java/org/grakovne/lissen/ui/screens/settings/composable/CommonSettingsComposable.kt
@@ -28,10 +28,14 @@ import org.grakovne.lissen.R
 import org.grakovne.lissen.channel.common.LibraryType
 import org.grakovne.lissen.common.ColorScheme
 import org.grakovne.lissen.ui.icons.Book
+import org.grakovne.lissen.viewmodel.PlayerViewModel
 import org.grakovne.lissen.viewmodel.SettingsViewModel
 
 @Composable
-fun CommonSettingsComposable(viewModel: SettingsViewModel) {
+fun CommonSettingsComposable(
+    viewModel: SettingsViewModel,
+    playerViewModel: PlayerViewModel,
+) {
     val libraries by viewModel.libraries.observeAsState(emptyList())
     val preferredLibrary by viewModel.preferredLibrary.observeAsState()
     val preferredColorScheme by viewModel.preferredColorScheme.observeAsState()
@@ -103,6 +107,7 @@ fun CommonSettingsComposable(viewModel: SettingsViewModel) {
                 libraries
                     .find { it.id == item.id }
                     ?.let { viewModel.preferLibrary(it) }
+                    ?.also { playerViewModel.clearPlayingBook() }
             },
         )
     }