Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

fix(trakt): hide discovery until account connected

David Nashashea111aa9a130
diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt
index 66da9b36..31fd2797 100644
--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt
+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/movies/MoviesViewModel.kt
@@ -211,12 +211,18 @@ class MoviesViewModel @Inject constructor(
viewModelScope.launch {
combine(
+ traktAccount.state,
preferencesRepository.showTraktTrendingMovies,
preferencesRepository.showTraktPopularMovies,
preferencesRepository.showTraktTrendingSeries,
preferencesRepository.showTraktPopularSeries
- ) { trendingMovies, popularMovies, trendingSeries, popularSeries ->
- listOf(trendingMovies, popularMovies, trendingSeries, popularSeries)
+ ) { account, trendingMovies, popularMovies, trendingSeries, popularSeries ->
+ listOf(
+ account.connected && trendingMovies,
+ account.connected && popularMovies,
+ account.connected && trendingSeries,
+ account.connected && popularSeries
+ )
}.distinctUntilChanged().collect { visibility ->
val showTrending = visibility[0]
val showPopular = visibility[1]
@@ -1674,10 +1680,10 @@ data class MoviesUiState(
val traktPopularCount: Int = 0,
val traktTrendingFailed: Boolean = false,
val traktPopularFailed: Boolean = false,
- val showTraktTrendingMovies: Boolean = true,
- val showTraktPopularMovies: Boolean = true,
- val showTraktTrendingSeries: Boolean = true,
- val showTraktPopularSeries: Boolean = true,
+ val showTraktTrendingMovies: Boolean = false,
+ val showTraktPopularMovies: Boolean = false,
+ val showTraktTrendingSeries: Boolean = false,
+ val showTraktPopularSeries: Boolean = false,
val favoriteCategoryName: String = "\u2605 Favorites",
val fullLibraryCategoryName: String = "__full_library__",
val libraryLensRows: Map<MovieLibraryLens, List<Movie>> = emptyMap(),
diff --git a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt
index 77646564..0d45f27a 100644
--- a/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt
+++ b/feature/catalog/src/main/java/com/streamvault/feature/catalog/presentation/series/SeriesViewModel.kt
@@ -211,12 +211,18 @@ class SeriesViewModel @Inject constructor(
viewModelScope.launch {
combine(
+ traktAccount.state,
preferencesRepository.showTraktTrendingMovies,
preferencesRepository.showTraktPopularMovies,
preferencesRepository.showTraktTrendingSeries,
preferencesRepository.showTraktPopularSeries
- ) { trendingMovies, popularMovies, trendingSeries, popularSeries ->
- listOf(trendingMovies, popularMovies, trendingSeries, popularSeries)
+ ) { account, trendingMovies, popularMovies, trendingSeries, popularSeries ->
+ listOf(
+ account.connected && trendingMovies,
+ account.connected && popularMovies,
+ account.connected && trendingSeries,
+ account.connected && popularSeries
+ )
}.distinctUntilChanged().collect { visibility ->
val showTrending = visibility[2]
val showPopular = visibility[3]
@@ -1678,10 +1684,10 @@ data class SeriesUiState(
val traktPopularCount: Int = 0,
val traktTrendingFailed: Boolean = false,
val traktPopularFailed: Boolean = false,
- val showTraktTrendingMovies: Boolean = true,
- val showTraktPopularMovies: Boolean = true,
- val showTraktTrendingSeries: Boolean = true,
- val showTraktPopularSeries: Boolean = true,
+ val showTraktTrendingMovies: Boolean = false,
+ val showTraktPopularMovies: Boolean = false,
+ val showTraktTrendingSeries: Boolean = false,
+ val showTraktPopularSeries: Boolean = false,
val favoriteCategoryName: String = "\u2605 Favorites",
val fullLibraryCategoryName: String = "__full_library__",
val libraryLensRows: Map<SeriesLibraryLens, List<Series>> = emptyMap(),