Feature/43 blank screen on default library is podcast (#44)

* fix blank screen when default library is a podcast
GrakovNe · Nov 10, 2024 · aad5abd · aad5abd
1 parent 0301659
commit aad5abd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         applicationId = "org.grakovne.lissen"
         minSdk = 28
         targetSdk = 35
-        versionCode = 26
-        versionName = "1.0.25"
+        versionCode = 27
+        versionName = "1.0.26"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/main/java/org/grakovne/lissen/ui/screens/login/LoginScreen.kt b/app/src/main/java/org/grakovne/lissen/ui/screens/login/LoginScreen.kt
@@ -185,9 +185,7 @@ fun LoginScreen(
                             .padding(top = 32.dp)
                     ) {
                         Button(
-                            onClick = {
-                                viewModel.login()
-                            },
+                            onClick = { viewModel.login() },
                             modifier = Modifier.weight(1f),
                             shape = RoundedCornerShape(
                                 topStart = 16.dp,

diff --git a/app/src/main/java/org/grakovne/lissen/viewmodel/LoginViewModel.kt b/app/src/main/java/org/grakovne/lissen/viewmodel/LoginViewModel.kt
@@ -115,11 +115,12 @@ class LoginViewModel @Inject constructor(
             .fetchLibraries()
             .fold(
                 onSuccess = {
-                    it
+                    val preferredLibrary = it
                         .find { item -> item.id == account.preferredLibraryId }
-                        ?.let { library ->
-                            preferences.savePreferredLibrary(Library(library.id, library.title))
-                        }
+                        ?: it.firstOrNull()
+
+                    preferredLibrary
+                        ?.let { library -> preferences.savePreferredLibrary(Library(library.id, library.title)) }
                 },
                 onFailure = {
                     account

diff --git a/app/src/main/java/org/grakovne/lissen/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/grakovne/lissen/viewmodel/SettingsViewModel.kt
@@ -53,13 +53,9 @@ class SettingsViewModel @Inject constructor(
                     _libraries.value = libraries
 
                     val preferredLibrary = preferences.getPreferredLibrary()
-
                     _preferredLibrary.value = when (preferredLibrary) {
                         null -> libraries.firstOrNull()
-                        else ->
-                            libraries
-                                .find { it.id == preferredLibrary.id }
-                                ?: libraries.firstOrNull()
+                        else -> libraries.find { it.id == preferredLibrary.id }
                     }
                 }