mirror of
https://github.com/bbara04/Purefin.git
synced 2026-07-24 03:36:51 +00:00
refactor: replace collectAsState with lifecycle-aware collectAsStateWithLifecycle
Migrate all Flow state collection to collectAsStateWithLifecycle for proper lifecycle awareness, ensuring collection stops when the composable is not in the STARTED state. - Added lifecycle-runtime-compose dependency to app and app-tv modules - Replaced all collectAsState() calls with collectAsStateWithLifecycle() - Updated initial parameter to initialValue for the lifecycle-aware variant
This commit is contained in:
@@ -59,6 +59,7 @@ dependencies {
|
|||||||
implementation(project(":core-ui"))
|
implementation(project(":core-ui"))
|
||||||
implementation(libs.androidx.core.ktx)
|
implementation(libs.androidx.core.ktx)
|
||||||
implementation(libs.androidx.lifecycle.runtime.ktx)
|
implementation(libs.androidx.lifecycle.runtime.ktx)
|
||||||
|
implementation(libs.androidx.lifecycle.runtime.compose)
|
||||||
implementation(libs.androidx.lifecycle.viewmodel.compose)
|
implementation(libs.androidx.lifecycle.viewmodel.compose)
|
||||||
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
|
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
|
||||||
implementation(libs.androidx.activity.compose)
|
implementation(libs.androidx.activity.compose)
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ import androidx.compose.material3.TextButton
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.CompositionLocalProvider
|
import androidx.compose.runtime.CompositionLocalProvider
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -147,8 +147,8 @@ class TvActivity : ComponentActivity() {
|
|||||||
updateViewModel: AppUpdateViewModel = hiltViewModel()
|
updateViewModel: AppUpdateViewModel = hiltViewModel()
|
||||||
) {
|
) {
|
||||||
var sessionLoaded by remember { mutableStateOf(false) }
|
var sessionLoaded by remember { mutableStateOf(false) }
|
||||||
val isLoggedIn by userSessionRepository.isLoggedIn.collectAsState(initial = false)
|
val isLoggedIn by userSessionRepository.isLoggedIn.collectAsStateWithLifecycle(initialValue = false)
|
||||||
val availableUpdate by updateViewModel.availableUpdate.collectAsState()
|
val availableUpdate by updateViewModel.availableUpdate.collectAsStateWithLifecycle()
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import androidx.compose.material.icons.outlined.Movie
|
|||||||
import androidx.compose.material.icons.outlined.Settings
|
import androidx.compose.material.icons.outlined.Settings
|
||||||
import androidx.compose.material.icons.outlined.Tv
|
import androidx.compose.material.icons.outlined.Tv
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
import androidx.hilt.navigation.compose.hiltViewModel
|
||||||
@@ -35,10 +35,10 @@ fun TvAppScreen(
|
|||||||
viewModel: AppViewModel = hiltViewModel(),
|
viewModel: AppViewModel = hiltViewModel(),
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val libraries by viewModel.libraries.collectAsState()
|
val libraries by viewModel.libraries.collectAsStateWithLifecycle()
|
||||||
val continueWatching by viewModel.continueWatching.collectAsState()
|
val continueWatching by viewModel.continueWatching.collectAsStateWithLifecycle()
|
||||||
val nextUp by viewModel.nextUp.collectAsState()
|
val nextUp by viewModel.nextUp.collectAsStateWithLifecycle()
|
||||||
val latestLibraryContent by viewModel.latestLibraryContent.collectAsState()
|
val latestLibraryContent by viewModel.latestLibraryContent.collectAsStateWithLifecycle()
|
||||||
val navigationManager = LocalNavigationManager.current
|
val navigationManager = LocalNavigationManager.current
|
||||||
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
|||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.withFrameNanos
|
import androidx.compose.runtime.withFrameNanos
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@@ -40,8 +40,8 @@ fun TvEpisodeScreen(
|
|||||||
viewModel.selectEpisode(episode)
|
viewModel.selectEpisode(episode)
|
||||||
}
|
}
|
||||||
|
|
||||||
val episode = viewModel.episode.collectAsState()
|
val episode = viewModel.episode.collectAsStateWithLifecycle()
|
||||||
val seriesTitle = viewModel.seriesTitle.collectAsState()
|
val seriesTitle = viewModel.seriesTitle.collectAsStateWithLifecycle()
|
||||||
val selectedEpisode = episode.value
|
val selectedEpisode = episode.value
|
||||||
|
|
||||||
if (selectedEpisode == null) {
|
if (selectedEpisode == null) {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import androidx.compose.material3.Scaffold
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
import androidx.hilt.navigation.compose.hiltViewModel
|
||||||
@@ -35,7 +35,7 @@ fun TvLibraryScreen(
|
|||||||
viewModel.selectLibrary(libraryId = library.id)
|
viewModel.selectLibrary(libraryId = library.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
val libraryItems = viewModel.contents.collectAsState()
|
val libraryItems = viewModel.contents.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package hu.bbara.purefin.ui.screen.login
|
package hu.bbara.purefin.ui.screen.login
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@@ -16,18 +16,18 @@ fun TvLoginScreen(
|
|||||||
viewModel: LoginViewModel = hiltViewModel(),
|
viewModel: LoginViewModel = hiltViewModel(),
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val serverUrl by viewModel.url.collectAsState()
|
val serverUrl by viewModel.url.collectAsStateWithLifecycle()
|
||||||
val phase by viewModel.phase.collectAsState()
|
val phase by viewModel.phase.collectAsStateWithLifecycle()
|
||||||
val selectedServer by viewModel.selectedServer.collectAsState()
|
val selectedServer by viewModel.selectedServer.collectAsStateWithLifecycle()
|
||||||
val discoveredServers by viewModel.discoveredServers.collectAsState()
|
val discoveredServers by viewModel.discoveredServers.collectAsStateWithLifecycle()
|
||||||
val username by viewModel.username.collectAsState()
|
val username by viewModel.username.collectAsStateWithLifecycle()
|
||||||
val password by viewModel.password.collectAsState()
|
val password by viewModel.password.collectAsStateWithLifecycle()
|
||||||
val isSearching by viewModel.isSearching.collectAsState()
|
val isSearching by viewModel.isSearching.collectAsStateWithLifecycle()
|
||||||
val isLoggingIn by viewModel.isLoggingIn.collectAsState()
|
val isLoggingIn by viewModel.isLoggingIn.collectAsStateWithLifecycle()
|
||||||
val quickConnectAvailable by viewModel.quickConnectAvailable.collectAsState()
|
val quickConnectAvailable by viewModel.quickConnectAvailable.collectAsStateWithLifecycle()
|
||||||
val quickConnectCode by viewModel.quickConnectCode.collectAsState()
|
val quickConnectCode by viewModel.quickConnectCode.collectAsStateWithLifecycle()
|
||||||
val isQuickConnecting by viewModel.isQuickConnecting.collectAsState()
|
val isQuickConnecting by viewModel.isQuickConnecting.collectAsStateWithLifecycle()
|
||||||
val errorMessage by viewModel.errorMessage.collectAsState()
|
val errorMessage by viewModel.errorMessage.collectAsStateWithLifecycle()
|
||||||
val coroutineScope = rememberCoroutineScope()
|
val coroutineScope = rememberCoroutineScope()
|
||||||
|
|
||||||
val state = remember(
|
val state = remember(
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
|||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.withFrameNanos
|
import androidx.compose.runtime.withFrameNanos
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@@ -32,7 +32,7 @@ fun TvMovieScreen(
|
|||||||
viewModel.selectMovie(movie)
|
viewModel.selectMovie(movie)
|
||||||
}
|
}
|
||||||
|
|
||||||
val movieItem = viewModel.movie.collectAsState()
|
val movieItem = viewModel.movie.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
if (movieItem.value != null) {
|
if (movieItem.value != null) {
|
||||||
TvMovieScreenContent(
|
TvMovieScreenContent(
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.DisposableEffect
|
import androidx.compose.runtime.DisposableEffect
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -85,8 +85,8 @@ fun TvPlayerScreen(
|
|||||||
viewModel.loadMedia(mediaId)
|
viewModel.loadMedia(mediaId)
|
||||||
}
|
}
|
||||||
|
|
||||||
val uiState by viewModel.uiState.collectAsState()
|
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
|
||||||
val controlsVisible by viewModel.controlsVisible.collectAsState()
|
val controlsVisible by viewModel.controlsVisible.collectAsStateWithLifecycle()
|
||||||
var isPlaylistExpanded by remember { mutableStateOf(false) }
|
var isPlaylistExpanded by remember { mutableStateOf(false) }
|
||||||
var trackPanelType by remember { mutableStateOf<TvTrackPanelType?>(null) }
|
var trackPanelType by remember { mutableStateOf<TvTrackPanelType?>(null) }
|
||||||
var pendingTrackButtonFocus by remember { mutableStateOf<TvTrackPanelType?>(null) }
|
var pendingTrackButtonFocus by remember { mutableStateOf<TvTrackPanelType?>(null) }
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import androidx.compose.foundation.layout.height
|
|||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -46,7 +46,7 @@ fun TvSeriesScreen(
|
|||||||
viewModel.selectSeries(series)
|
viewModel.selectSeries(series)
|
||||||
}
|
}
|
||||||
|
|
||||||
val series = viewModel.series.collectAsState()
|
val series = viewModel.series.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
val seriesData = series.value
|
val seriesData = series.value
|
||||||
if (seriesData != null && seriesData.seasons.isNotEmpty()) {
|
if (seriesData != null && seriesData.seasons.isNotEmpty()) {
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ import androidx.compose.material3.Switch
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -53,7 +53,7 @@ fun TvSettingsScreen(
|
|||||||
onBack: () -> Unit = viewModel::onBack,
|
onBack: () -> Unit = viewModel::onBack,
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val settingGroups by viewModel.settingGroups.collectAsState()
|
val settingGroups by viewModel.settingGroups.collectAsStateWithLifecycle()
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|
||||||
LaunchedEffect(viewModel, context) {
|
LaunchedEffect(viewModel, context) {
|
||||||
@@ -117,7 +117,7 @@ private fun TvSettingOptionItem(
|
|||||||
) {
|
) {
|
||||||
when (option) {
|
when (option) {
|
||||||
is RangeSetting -> {
|
is RangeSetting -> {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
TvNumberSettingItem(
|
TvNumberSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
@@ -129,7 +129,7 @@ private fun TvSettingOptionItem(
|
|||||||
}
|
}
|
||||||
|
|
||||||
is BooleanSetting -> {
|
is BooleanSetting -> {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
TvBooleanSettingItem(
|
TvBooleanSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
@@ -140,7 +140,7 @@ private fun TvSettingOptionItem(
|
|||||||
}
|
}
|
||||||
|
|
||||||
is StringSetting -> {
|
is StringSetting -> {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
TvStringSettingItem(
|
TvStringSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
@@ -178,7 +178,7 @@ private fun <T> TvDropdownSettingOptionItem(
|
|||||||
option: DropdownSetting<T>,
|
option: DropdownSetting<T>,
|
||||||
viewModel: SettingsViewModel
|
viewModel: SettingsViewModel
|
||||||
) {
|
) {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
TvDropdownSettingItem(
|
TvDropdownSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ dependencies {
|
|||||||
implementation(project(":core-ui"))
|
implementation(project(":core-ui"))
|
||||||
implementation(libs.androidx.core.ktx)
|
implementation(libs.androidx.core.ktx)
|
||||||
implementation(libs.androidx.lifecycle.runtime.ktx)
|
implementation(libs.androidx.lifecycle.runtime.ktx)
|
||||||
|
implementation(libs.androidx.lifecycle.runtime.compose)
|
||||||
implementation(libs.androidx.lifecycle.viewmodel.compose)
|
implementation(libs.androidx.lifecycle.viewmodel.compose)
|
||||||
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
|
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
|
||||||
implementation(libs.androidx.activity.compose)
|
implementation(libs.androidx.activity.compose)
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ import androidx.compose.foundation.layout.fillMaxSize
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.CompositionLocalProvider
|
import androidx.compose.runtime.CompositionLocalProvider
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -146,7 +146,7 @@ class PurefinActivity : ComponentActivity() {
|
|||||||
navigationManager: NavigationManager
|
navigationManager: NavigationManager
|
||||||
) {
|
) {
|
||||||
var sessionLoaded by remember { mutableStateOf(false) }
|
var sessionLoaded by remember { mutableStateOf(false) }
|
||||||
val isLoggedIn by userSessionRepository.isLoggedIn.collectAsState(initial = false)
|
val isLoggedIn by userSessionRepository.isLoggedIn.collectAsStateWithLifecycle(initialValue = false)
|
||||||
|
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
userSessionRepository.isLoggedIn.collect {
|
userSessionRepository.isLoggedIn.collect {
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ import androidx.compose.material3.Text
|
|||||||
import androidx.compose.material3.TextButton
|
import androidx.compose.material3.TextButton
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.hilt.navigation.compose.hiltViewModel
|
import androidx.hilt.navigation.compose.hiltViewModel
|
||||||
@@ -38,15 +38,15 @@ fun AppScreen(
|
|||||||
updateViewModel: AppUpdateViewModel = hiltViewModel(),
|
updateViewModel: AppUpdateViewModel = hiltViewModel(),
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val libraries by viewModel.libraries.collectAsState()
|
val libraries by viewModel.libraries.collectAsStateWithLifecycle()
|
||||||
val libraryContent by viewModel.latestLibraryContent.collectAsState()
|
val libraryContent by viewModel.latestLibraryContent.collectAsStateWithLifecycle()
|
||||||
val suggestions by viewModel.suggestions.collectAsState()
|
val suggestions by viewModel.suggestions.collectAsStateWithLifecycle()
|
||||||
val continueWatching by viewModel.continueWatching.collectAsState()
|
val continueWatching by viewModel.continueWatching.collectAsStateWithLifecycle()
|
||||||
val nextUp by viewModel.nextUp.collectAsState()
|
val nextUp by viewModel.nextUp.collectAsStateWithLifecycle()
|
||||||
val isRefreshing by viewModel.isRefreshing.collectAsState()
|
val isRefreshing by viewModel.isRefreshing.collectAsStateWithLifecycle()
|
||||||
val isOnline by viewModel.isOnline.collectAsState()
|
val isOnline by viewModel.isOnline.collectAsStateWithLifecycle()
|
||||||
val isCheckingForUpdates by updateViewModel.isCheckingForUpdates.collectAsState()
|
val isCheckingForUpdates by updateViewModel.isCheckingForUpdates.collectAsStateWithLifecycle()
|
||||||
val availableUpdate by updateViewModel.availableUpdate.collectAsState()
|
val availableUpdate by updateViewModel.availableUpdate.collectAsStateWithLifecycle()
|
||||||
val navigationManager = LocalNavigationManager.current
|
val navigationManager = LocalNavigationManager.current
|
||||||
val snackbarHostState = remember { SnackbarHostState() }
|
val snackbarHostState = remember { SnackbarHostState() }
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import androidx.compose.material3.Icon
|
|||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.platform.testTag
|
import androidx.compose.ui.platform.testTag
|
||||||
@@ -32,8 +32,8 @@ fun DownloadsContent(
|
|||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
viewModel: DownloadsViewModel = hiltViewModel(),
|
viewModel: DownloadsViewModel = hiltViewModel(),
|
||||||
) {
|
) {
|
||||||
val downloads = viewModel.downloads.collectAsState(emptyList())
|
val downloads = viewModel.downloads.collectAsStateWithLifecycle(initialValue = emptyList())
|
||||||
val activeDownloads = viewModel.activeDownloads.collectAsState()
|
val activeDownloads = viewModel.activeDownloads.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
val isEmpty = downloads.value.isEmpty() && activeDownloads.value.isEmpty()
|
val isEmpty = downloads.value.isEmpty() && activeDownloads.value.isEmpty()
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
@@ -46,8 +46,8 @@ fun EpisodeScreen(
|
|||||||
viewModel.selectEpisode(episode)
|
viewModel.selectEpisode(episode)
|
||||||
}
|
}
|
||||||
|
|
||||||
val episode = viewModel.episode.collectAsState()
|
val episode = viewModel.episode.collectAsStateWithLifecycle()
|
||||||
val downloadState = viewModel.downloadState.collectAsState()
|
val downloadState = viewModel.downloadState.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
val notificationPermissionLauncher = rememberLauncherForActivityResult(
|
val notificationPermissionLauncher = rememberLauncherForActivityResult(
|
||||||
ActivityResultContracts.RequestPermission()
|
ActivityResultContracts.RequestPermission()
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ import androidx.compose.material3.SearchBar
|
|||||||
import androidx.compose.material3.SearchBarDefaults
|
import androidx.compose.material3.SearchBarDefaults
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.saveable.rememberSaveable
|
import androidx.compose.runtime.saveable.rememberSaveable
|
||||||
@@ -55,7 +55,7 @@ fun SearchOverlay(
|
|||||||
BackHandler(onBack = onDismiss)
|
BackHandler(onBack = onDismiss)
|
||||||
|
|
||||||
var query by rememberSaveable { mutableStateOf("") }
|
var query by rememberSaveable { mutableStateOf("") }
|
||||||
val searchResults by searchViewModel.searchResult.collectAsState()
|
val searchResults by searchViewModel.searchResult.collectAsStateWithLifecycle()
|
||||||
val dismissInteractionSource = remember { MutableInteractionSource() }
|
val dismissInteractionSource = remember { MutableInteractionSource() }
|
||||||
|
|
||||||
Box(
|
Box(
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.platform.testTag
|
import androidx.compose.ui.platform.testTag
|
||||||
@@ -40,7 +40,7 @@ fun LibraryScreen(
|
|||||||
viewModel.selectLibrary(libraryId = library.id)
|
viewModel.selectLibrary(libraryId = library.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
val libraryItems = viewModel.contents.collectAsState()
|
val libraryItems = viewModel.contents.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = modifier.testTag(LibraryScreenTag),
|
modifier = modifier.testTag(LibraryScreenTag),
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package hu.bbara.purefin.ui.screen.login
|
package hu.bbara.purefin.ui.screen.login
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
import androidx.compose.runtime.rememberCoroutineScope
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
@@ -16,18 +16,18 @@ fun LoginScreen(
|
|||||||
viewModel: LoginViewModel = hiltViewModel(),
|
viewModel: LoginViewModel = hiltViewModel(),
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val serverUrl by viewModel.url.collectAsState()
|
val serverUrl by viewModel.url.collectAsStateWithLifecycle()
|
||||||
val phase by viewModel.phase.collectAsState()
|
val phase by viewModel.phase.collectAsStateWithLifecycle()
|
||||||
val selectedServer by viewModel.selectedServer.collectAsState()
|
val selectedServer by viewModel.selectedServer.collectAsStateWithLifecycle()
|
||||||
val discoveredServers by viewModel.discoveredServers.collectAsState()
|
val discoveredServers by viewModel.discoveredServers.collectAsStateWithLifecycle()
|
||||||
val username by viewModel.username.collectAsState()
|
val username by viewModel.username.collectAsStateWithLifecycle()
|
||||||
val password by viewModel.password.collectAsState()
|
val password by viewModel.password.collectAsStateWithLifecycle()
|
||||||
val isSearching by viewModel.isSearching.collectAsState()
|
val isSearching by viewModel.isSearching.collectAsStateWithLifecycle()
|
||||||
val isLoggingIn by viewModel.isLoggingIn.collectAsState()
|
val isLoggingIn by viewModel.isLoggingIn.collectAsStateWithLifecycle()
|
||||||
val quickConnectAvailable by viewModel.quickConnectAvailable.collectAsState()
|
val quickConnectAvailable by viewModel.quickConnectAvailable.collectAsStateWithLifecycle()
|
||||||
val quickConnectCode by viewModel.quickConnectCode.collectAsState()
|
val quickConnectCode by viewModel.quickConnectCode.collectAsStateWithLifecycle()
|
||||||
val isQuickConnecting by viewModel.isQuickConnecting.collectAsState()
|
val isQuickConnecting by viewModel.isQuickConnecting.collectAsStateWithLifecycle()
|
||||||
val errorMessage by viewModel.errorMessage.collectAsState()
|
val errorMessage by viewModel.errorMessage.collectAsStateWithLifecycle()
|
||||||
val coroutineScope = rememberCoroutineScope()
|
val coroutineScope = rememberCoroutineScope()
|
||||||
|
|
||||||
val state = remember(
|
val state = remember(
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
@@ -39,8 +39,8 @@ fun MovieScreen(
|
|||||||
viewModel.selectMovie(movie)
|
viewModel.selectMovie(movie)
|
||||||
}
|
}
|
||||||
|
|
||||||
val movieItem = viewModel.movie.collectAsState()
|
val movieItem = viewModel.movie.collectAsStateWithLifecycle()
|
||||||
val downloadState = viewModel.downloadState.collectAsState()
|
val downloadState = viewModel.downloadState.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
val notificationPermissionLauncher = rememberLauncherForActivityResult(
|
val notificationPermissionLauncher = rememberLauncherForActivityResult(
|
||||||
ActivityResultContracts.RequestPermission()
|
ActivityResultContracts.RequestPermission()
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ import androidx.compose.material3.Text
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.DisposableEffect
|
import androidx.compose.runtime.DisposableEffect
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -71,8 +71,8 @@ fun PlayerScreen(
|
|||||||
viewModel: PlayerViewModel,
|
viewModel: PlayerViewModel,
|
||||||
onBack: () -> Unit
|
onBack: () -> Unit
|
||||||
) {
|
) {
|
||||||
val uiState by viewModel.uiState.collectAsState()
|
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
|
||||||
val controlsVisible by viewModel.controlsVisible.collectAsState()
|
val controlsVisible by viewModel.controlsVisible.collectAsStateWithLifecycle()
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val activity = context as? Activity
|
val activity = context as? Activity
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
@@ -49,7 +49,7 @@ fun SeriesScreen(
|
|||||||
viewModel.selectSeries(series)
|
viewModel.selectSeries(series)
|
||||||
}
|
}
|
||||||
|
|
||||||
val seriesState = viewModel.series.collectAsState()
|
val seriesState = viewModel.series.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
val seriesData = seriesState.value
|
val seriesData = seriesState.value
|
||||||
if (seriesData != null && seriesData.seasons.isNotEmpty()) {
|
if (seriesData != null && seriesData.seasons.isNotEmpty()) {
|
||||||
@@ -58,9 +58,9 @@ fun SeriesScreen(
|
|||||||
}
|
}
|
||||||
SeriesScreenInternal(
|
SeriesScreenInternal(
|
||||||
series = seriesData,
|
series = seriesData,
|
||||||
seriesDownloadState = viewModel.seriesDownloadState.collectAsState().value,
|
seriesDownloadState = viewModel.seriesDownloadState.collectAsStateWithLifecycle().value,
|
||||||
seasonDownloadState = viewModel.seasonDownloadState.collectAsState().value,
|
seasonDownloadState = viewModel.seasonDownloadState.collectAsStateWithLifecycle().value,
|
||||||
isSmartDownloadEnabled = viewModel.isSmartDownloadEnabled.collectAsState().value,
|
isSmartDownloadEnabled = viewModel.isSmartDownloadEnabled.collectAsStateWithLifecycle().value,
|
||||||
onDownloadOptionSelected = { option, selectedSeason ->
|
onDownloadOptionSelected = { option, selectedSeason ->
|
||||||
when (option) {
|
when (option) {
|
||||||
SeriesDownloadOption.SEASON ->
|
SeriesDownloadOption.SEASON ->
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ import androidx.compose.material3.SnackbarHostState
|
|||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
import androidx.compose.runtime.LaunchedEffect
|
||||||
import androidx.compose.runtime.collectAsState
|
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
@@ -42,7 +42,7 @@ fun SettingsScreen(
|
|||||||
viewModel: SettingsViewModel = hiltViewModel(),
|
viewModel: SettingsViewModel = hiltViewModel(),
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val settingGroups by viewModel.settingGroups.collectAsState()
|
val settingGroups by viewModel.settingGroups.collectAsStateWithLifecycle()
|
||||||
val snackbarHostState = remember { SnackbarHostState() }
|
val snackbarHostState = remember { SnackbarHostState() }
|
||||||
|
|
||||||
LaunchedEffect(viewModel) {
|
LaunchedEffect(viewModel) {
|
||||||
@@ -107,7 +107,7 @@ private fun SettingOptionItem(
|
|||||||
) {
|
) {
|
||||||
when (option) {
|
when (option) {
|
||||||
is RangeSetting -> {
|
is RangeSetting -> {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
RangeSettingItem(
|
RangeSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
@@ -119,7 +119,7 @@ private fun SettingOptionItem(
|
|||||||
}
|
}
|
||||||
|
|
||||||
is BooleanSetting -> {
|
is BooleanSetting -> {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
BooleanSettingItem(
|
BooleanSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
@@ -130,7 +130,7 @@ private fun SettingOptionItem(
|
|||||||
}
|
}
|
||||||
|
|
||||||
is StringSetting -> {
|
is StringSetting -> {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
StringSettingItem(
|
StringSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
@@ -168,7 +168,7 @@ private fun <T> DropdownSettingOptionItem(
|
|||||||
option: DropdownSetting<T>,
|
option: DropdownSetting<T>,
|
||||||
viewModel: SettingsViewModel
|
viewModel: SettingsViewModel
|
||||||
) {
|
) {
|
||||||
val value by viewModel.value(option).collectAsState(initial = null)
|
val value by viewModel.value(option).collectAsStateWithLifecycle(initialValue = null)
|
||||||
value?.let {
|
value?.let {
|
||||||
DropdownSettingItem(
|
DropdownSettingItem(
|
||||||
title = option.title,
|
title = option.title,
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-co
|
|||||||
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
|
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
|
||||||
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntimeKtx" }
|
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntimeKtx" }
|
||||||
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" }
|
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" }
|
||||||
|
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" }
|
||||||
androidx-lifecycle-viewmodel-navigation3 = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-navigation3", version.ref = "lifecycleRuntimeKtx" }
|
androidx-lifecycle-viewmodel-navigation3 = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-navigation3", version.ref = "lifecycleRuntimeKtx" }
|
||||||
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
|
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
|
||||||
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
|
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
|
||||||
|
|||||||
Reference in New Issue
Block a user