StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat: adopt Lifecycle 2.10 + Kotlin 2.2 best practices
Davidona2b1162388a30
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex c99e7d3c..0f45a908 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -58,10 +58,6 @@ android {targetCompatibility = JavaVersion.VERSION_17}- kotlinOptions {- jvmTarget = "17"- }-buildFeatures {compose = truebuildConfig = true@@ -72,6 +68,12 @@ android {}}+kotlin {+ compilerOptions {+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)+ }+}+dependencies {implementation(project(":domain"))implementation(project(":data"))diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.ktindex 4d5698b4..eacd528c 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt@@ -1,7 +1,10 @@package com.streamvault.app.navigationimport androidx.compose.runtime.Composable+import androidx.lifecycle.Lifecycle+import androidx.lifecycle.compose.dropUnlessResumedimport androidx.navigation.NavHostController+import androidx.navigation.NavOptionsBuilderimport androidx.navigation.NavTypeimport androidx.navigation.compose.NavHostimport androidx.navigation.compose.composable@@ -153,7 +156,14 @@ private fun isStreamUrlSafe(url: String?): Boolean {return scheme in setOf("http", "https", "rtsp", "rtmp", "rtsps", "mms", "xtream")}+/** Navigate only when the current destination is fully resumed – prevents double-navigation during transitions. */+private fun NavHostController.navigateIfResumed(route: String, builder: NavOptionsBuilder.() -> Unit = {}) {+ if (currentBackStackEntry?.lifecycle?.currentState?.isAtLeast(Lifecycle.State.RESUMED) != true) return+ navigate(route, builder)+}+private fun NavHostController.navigateToPlayer(request: PlayerNavigationRequest) {+ if (currentBackStackEntry?.lifecycle?.currentState?.isAtLeast(Lifecycle.State.RESUMED) != true) returncurrentBackStackEntry?.savedStateHandle?.set(PLAYER_REQUEST_KEY, request)navigate(Routes.PLAYER) { launchSingleTop = true }}@@ -165,7 +175,9 @@ fun AppNavigation() {// NAV-M02/NAV-H02: Single helper replacing repeated tab lambdas without serializing// each tab's full UI tree into saved state on every switch.fun tabNavigate(route: String) {- val currentRoute = navController.currentBackStackEntry?.destination?.route+ val entry = navController.currentBackStackEntry ?: return+ if (!entry.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) return+ val currentRoute = entry.destination?.routeif (currentRoute == route || currentRoute?.startsWith("$route?") == true) returnnavController.navigate(route) {@@ -180,12 +192,12 @@ fun AppNavigation() {) {composable(Routes.WELCOME) {WelcomeScreen(- onNavigateToHome = {+ onNavigateToHome = dropUnlessResumed {navController.navigate(Routes.HOME) {popUpTo(Routes.WELCOME) { inclusive = true }}},- onNavigateToSetup = {+ onNavigateToSetup = dropUnlessResumed {navController.navigate(Routes.PROVIDER_SETUP) {popUpTo(Routes.WELCOME) { inclusive = true }}@@ -203,7 +215,7 @@ fun AppNavigation() {ProviderSetupScreen(editProviderId = providerId,- onProviderAdded = {+ onProviderAdded = dropUnlessResumed {navController.navigate(Routes.HOME) {popUpTo(Routes.PROVIDER_SETUP) { inclusive = true }}@@ -215,7 +227,7 @@ fun AppNavigation() {composable(Routes.HOME) {DashboardScreen(onNavigate = { route -> tabNavigate(route) },- onAddProvider = {+ onAddProvider = dropUnlessResumed {navController.navigate(Routes.providerSetup(null))},onChannelClick = { channel ->@@ -232,7 +244,7 @@ fun AppNavigation() {navController.navigateToPlayer(Routes.moviePlayer(movie))},onSeriesClick = { series ->- navController.navigate(Routes.seriesDetail(series.id))+ navController.navigateIfResumed(Routes.seriesDetail(series.id))},onPlaybackHistoryClick = { history ->val route = when (history.contentType) {@@ -270,7 +282,7 @@ fun AppNavigation() {if (route is PlayerNavigationRequest) {navController.navigateToPlayer(route)} else {- navController.navigate(route) { launchSingleTop = true }+ navController.navigateIfResumed(route as String) { launchSingleTop = true }}},currentRoute = Routes.HOME@@ -315,7 +327,7 @@ fun AppNavigation() {composable(Routes.SERIES) {SeriesScreen(onSeriesClick = { seriesId ->- navController.navigate(Routes.seriesDetail(seriesId))+ navController.navigateIfResumed(Routes.seriesDetail(seriesId))},onNavigate = { route -> tabNavigate(route) },currentRoute = Routes.SERIES@@ -353,7 +365,7 @@ fun AppNavigation() {if (route is PlayerNavigationRequest) {navController.navigateToPlayer(route)} else {- navController.navigate(route) { launchSingleTop = true }+ navController.navigateIfResumed(route as String) { launchSingleTop = true }}},onHistoryClick = { item ->@@ -395,7 +407,7 @@ fun AppNavigation() {if (route is PlayerNavigationRequest) {navController.navigateToPlayer(route)} else {- navController.navigate(route) { launchSingleTop = true }+ navController.navigateIfResumed(route as String) { launchSingleTop = true }}},onNavigate = { route -> tabNavigate(route) },@@ -455,14 +467,14 @@ fun AppNavigation() {composable(Routes.SETTINGS) {SettingsScreen(onNavigate = { route -> tabNavigate(route) },- onAddProvider = {+ onAddProvider = dropUnlessResumed {navController.navigate(Routes.providerSetup(null))},onEditProvider = { provider ->- navController.navigate(Routes.providerSetup(provider.id))+ navController.navigateIfResumed(Routes.providerSetup(provider.id))},onNavigateToParentalControl = { providerId ->- navController.navigate(Routes.parentalControlGroups(providerId))+ navController.navigateIfResumed(Routes.parentalControlGroups(providerId))},currentRoute = Routes.SETTINGS)@@ -497,7 +509,7 @@ fun AppNavigation() {navController.navigateToPlayer(Routes.moviePlayer(movie))},onSeriesClick = { series ->- navController.navigate(Routes.seriesDetail(series.id))+ navController.navigateIfResumed(Routes.seriesDetail(series.id))},onNavigate = { route -> tabNavigate(route) },currentRoute = Routes.SEARCHdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.ktindex a83e060d..58c68529 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/dashboard/DashboardScreen.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.dashboard+package com.streamvault.app.ui.screens.dashboardimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.Arrangement@@ -17,9 +17,13 @@ import androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValue+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.rememberimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -81,7 +85,7 @@ fun DashboardScreen(currentRoute: String,viewModel: DashboardViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val provider = uiState.providerAppScreenScaffold(diff --git a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.ktindex 397e86b9..b5107ed1 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/epg/EpgScreen.kt@@ -25,14 +25,23 @@ import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScrollimport androidx.compose.material3.LinearProgressIndicatorimport androidx.compose.material3.TextButton+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.LaunchedEffect+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValue+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.mutableStateOf+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.produceState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.remember+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.saveable.rememberSaveable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -89,7 +98,7 @@ fun FullEpgScreen(onNavigate: (String) -> Unit,viewModel: EpgViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()var selectedProgram by remember { mutableStateOf<Pair<Channel, Program>?>(null) }var showAdvancedOptions by rememberSaveable { mutableStateOf(false) }val now = rememberGuideNow()diff --git a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.ktindex ba899981..bf831c8d 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/favorites/FavoritesScreen.kt@@ -24,10 +24,15 @@ import androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.rememberLazyListStateimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValue+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.remember+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.material3.SnackbarHostimport androidx.compose.material3.SnackbarHostState@@ -78,7 +83,7 @@ fun FavoritesScreen(currentRoute: String,viewModel: FavoritesViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val activeReorderSection = uiState.sections.firstOrNull { it.key == uiState.reorderSectionKey }val listState = rememberLazyListState()val scope = rememberCoroutineScope()diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.ktindex 431de55e..9cd2b6e7 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt@@ -13,6 +13,7 @@ import androidx.compose.foundation.borderimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Alignment@@ -98,7 +99,7 @@ fun HomeScreen(viewModel: HomeViewModel = hiltViewModel(),multiViewViewModel: MultiViewViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val isProMode = uiState.liveTvChannelMode == LiveTvChannelMode.PROval isDenseMode = uiState.liveTvChannelMode != LiveTvChannelMode.COMFORTABLEval channelRowHeight = when (uiState.liveTvChannelMode) {@@ -117,7 +118,7 @@ fun HomeScreen(val snackbarHostState = remember { SnackbarHostState() }// Split screen state- val splitSlots by multiViewViewModel.slotsFlow.collectAsState()+ val splitSlots by multiViewViewModel.slotsFlow.collectAsStateWithLifecycle()val hasSplitChannels = splitSlots.any { it != null }var showSplitManagerDialog by rememberSaveable { mutableStateOf(false) }var pendingSplitPlannerChannel by remember { mutableStateOf<Channel?>(null) }diff --git a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.ktindex b73c64a9..7ee9ced4 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/movies/MoviesScreen.kt@@ -10,6 +10,7 @@ import androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.items as gridItemsimport androidx.compose.foundation.lazy.grid.GridItemSpanimport androidx.compose.foundation.text.BasicTextField+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -79,7 +80,7 @@ fun MoviesScreen(currentRoute: String,viewModel: MoviesViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val snackbarHostState = remember { SnackbarHostState() }var showPinDialog by remember { mutableStateOf(false) }var pinError by remember { mutableStateOf<String?>(null) }diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.ktindex a307ae90..4fe93089 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt@@ -12,12 +12,19 @@ import androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.LaunchedEffect+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValue+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.mutableStateOf+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.remember+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -52,7 +59,7 @@ fun MultiViewPlannerDialog(onLaunch: () -> Unit,viewModel: MultiViewViewModel = hiltViewModel()) {- val slots by viewModel.slotsFlow.collectAsState()+ val slots by viewModel.slotsFlow.collectAsStateWithLifecycle()val isPickerMode = pendingChannel != nullval hasAny = slots.any { it != null }var channelPlaced by remember { mutableStateOf(false) }diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.ktindex e7f24b72..d40a0011 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt@@ -21,13 +21,21 @@ import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Text+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.LaunchedEffect+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValue+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.mutableStateOf+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.remember+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.saveable.rememberSaveable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -63,7 +71,7 @@ fun MultiViewScreen(onBack: () -> Unit,viewModel: MultiViewViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val firstSlotFocusRequester = remember { FocusRequester() }val firstControlFocusRequester = remember { FocusRequester() }var showReplacementPicker by remember { mutableStateOf(false) }@@ -337,7 +345,7 @@ private fun PlayerCell(}// Buffering indicator for active streams- val playbackState = slot.playerEngine?.playbackState?.collectAsState()+ val playbackState = slot.playerEngine?.playbackState?.collectAsStateWithLifecycle()if (playbackState?.value == com.streamvault.player.PlaybackState.BUFFERING) {CircularProgressIndicator(color = Color.White.copy(alpha = 0.7f),diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.ktindex 7383070e..1e558810 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt@@ -6,6 +6,7 @@ import androidx.activity.compose.BackHandlerimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.layout.*import androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Alignment@@ -110,42 +111,42 @@ fun PlayerScreen(?.collectAsState(initial = mainActivity.isInPictureInPictureMode)?.value?: false- val playbackState by viewModel.playerEngine.playbackState.collectAsState()- val isPlaying by viewModel.playerEngine.isPlaying.collectAsState()- val showControls by viewModel.showControls.collectAsState()- val videoFormat by viewModel.videoFormat.collectAsState()- val playerError by viewModel.playerError.collectAsState()- val currentProgram by viewModel.currentProgram.collectAsState()- val nextProgram by viewModel.nextProgram.collectAsState()- val programHistory by viewModel.programHistory.collectAsState()- val currentChannel by viewModel.currentChannel.collectAsState()- val resumePrompt by viewModel.resumePrompt.collectAsState()+ val playbackState by viewModel.playerEngine.playbackState.collectAsStateWithLifecycle()+ val isPlaying by viewModel.playerEngine.isPlaying.collectAsStateWithLifecycle()+ val showControls by viewModel.showControls.collectAsStateWithLifecycle()+ val videoFormat by viewModel.videoFormat.collectAsStateWithLifecycle()+ val playerError by viewModel.playerError.collectAsStateWithLifecycle()+ val currentProgram by viewModel.currentProgram.collectAsStateWithLifecycle()+ val nextProgram by viewModel.nextProgram.collectAsStateWithLifecycle()+ val programHistory by viewModel.programHistory.collectAsStateWithLifecycle()+ val currentChannel by viewModel.currentChannel.collectAsStateWithLifecycle()+ val resumePrompt by viewModel.resumePrompt.collectAsStateWithLifecycle()- val showChannelListOverlay by viewModel.showChannelListOverlay.collectAsState()- val showCategoryListOverlay by viewModel.showCategoryListOverlay.collectAsState()- val availableCategories by viewModel.availableCategories.collectAsState()- val activeCategoryId by viewModel.activeCategoryId.collectAsState()- val showEpgOverlay by viewModel.showEpgOverlay.collectAsState()- val currentChannelList by viewModel.currentChannelList.collectAsState()- val recentChannels by viewModel.recentChannels.collectAsState()- val lastVisitedCategory by viewModel.lastVisitedCategory.collectAsState()- val displayChannelNumber by viewModel.displayChannelNumber.collectAsState()- val upcomingPrograms by viewModel.upcomingPrograms.collectAsState()- val showChannelInfoOverlay by viewModel.showChannelInfoOverlay.collectAsState()- val numericChannelInput by viewModel.numericChannelInput.collectAsState()+ val showChannelListOverlay by viewModel.showChannelListOverlay.collectAsStateWithLifecycle()+ val showCategoryListOverlay by viewModel.showCategoryListOverlay.collectAsStateWithLifecycle()+ val availableCategories by viewModel.availableCategories.collectAsStateWithLifecycle()+ val activeCategoryId by viewModel.activeCategoryId.collectAsStateWithLifecycle()+ val showEpgOverlay by viewModel.showEpgOverlay.collectAsStateWithLifecycle()+ val currentChannelList by viewModel.currentChannelList.collectAsStateWithLifecycle()+ val recentChannels by viewModel.recentChannels.collectAsStateWithLifecycle()+ val lastVisitedCategory by viewModel.lastVisitedCategory.collectAsStateWithLifecycle()+ val displayChannelNumber by viewModel.displayChannelNumber.collectAsStateWithLifecycle()+ val upcomingPrograms by viewModel.upcomingPrograms.collectAsStateWithLifecycle()+ val showChannelInfoOverlay by viewModel.showChannelInfoOverlay.collectAsStateWithLifecycle()+ val numericChannelInput by viewModel.numericChannelInput.collectAsStateWithLifecycle()- val availableAudioTracks by viewModel.availableAudioTracks.collectAsState()- val availableSubtitleTracks by viewModel.availableSubtitleTracks.collectAsState()- val availableVideoQualities by viewModel.availableVideoQualities.collectAsState()- val aspectRatio by viewModel.aspectRatio.collectAsState()- val showDiagnostics by viewModel.showDiagnostics.collectAsState()- val playerDiagnostics by viewModel.playerDiagnostics.collectAsState()- val currentPosition by viewModel.playerEngine.currentPosition.collectAsState()- val duration by viewModel.playerEngine.duration.collectAsState()- val playerNotice by viewModel.playerNotice.collectAsState()- val currentChannelRecording by viewModel.currentChannelRecording.collectAsState()- val isMuted by viewModel.isMuted.collectAsState()- val mediaTitle by viewModel.mediaTitle.collectAsState()+ val availableAudioTracks by viewModel.availableAudioTracks.collectAsStateWithLifecycle()+ val availableSubtitleTracks by viewModel.availableSubtitleTracks.collectAsStateWithLifecycle()+ val availableVideoQualities by viewModel.availableVideoQualities.collectAsStateWithLifecycle()+ val aspectRatio by viewModel.aspectRatio.collectAsStateWithLifecycle()+ val showDiagnostics by viewModel.showDiagnostics.collectAsStateWithLifecycle()+ val playerDiagnostics by viewModel.playerDiagnostics.collectAsStateWithLifecycle()+ val currentPosition by viewModel.playerEngine.currentPosition.collectAsStateWithLifecycle()+ val duration by viewModel.playerEngine.duration.collectAsStateWithLifecycle()+ val playerNotice by viewModel.playerNotice.collectAsStateWithLifecycle()+ val currentChannelRecording by viewModel.currentChannelRecording.collectAsStateWithLifecycle()+ val isMuted by viewModel.isMuted.collectAsStateWithLifecycle()+ val mediaTitle by viewModel.mediaTitle.collectAsStateWithLifecycle()var showTrackSelection by remember { mutableStateOf<TrackType?>(null) }var showProgramHistory by remember { mutableStateOf(false) }@@ -654,7 +655,7 @@ fun PlayerScreen(// --- Overlays ---if (!isInPictureInPictureMode && showDiagnostics) {- val playerStats by viewModel.playerStats.collectAsState()+ val playerStats by viewModel.playerStats.collectAsStateWithLifecycle()DiagnosticsOverlay(stats = playerStats,diagnostics = playerDiagnostics,diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.ktindex 73bbb5bc..e069bc0e 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt@@ -10,6 +10,7 @@ import androidx.compose.foundation.focusableimport androidx.compose.foundation.layout.*import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.CircularProgressIndicator+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Alignment@@ -50,8 +51,8 @@ fun ProviderSetupScreen(editProviderId: Long? = null,viewModel: ProviderSetupViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()- val knownLocalM3uUrls by viewModel.knownLocalM3uUrls.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()+ val knownLocalM3uUrls by viewModel.knownLocalM3uUrls.collectAsStateWithLifecycle()val context = LocalContext.currentval coroutineScope = rememberCoroutineScope()diff --git a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.ktindex fe51d20a..a588d001 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/search/SearchScreen.kt@@ -14,6 +14,7 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGridimport androidx.compose.foundation.lazy.grid.itemsimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.TextButton+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -199,10 +200,10 @@ fun SearchScreen(currentRoute: String,viewModel: SearchViewModel = hiltViewModel()) {- val query by viewModel.query.collectAsState()- val selectedTab by viewModel.selectedTab.collectAsState()- val recentQueries by viewModel.recentQueries.collectAsState()- val uiState by viewModel.uiState.collectAsState()+ val query by viewModel.query.collectAsStateWithLifecycle()+ val selectedTab by viewModel.selectedTab.collectAsStateWithLifecycle()+ val recentQueries by viewModel.recentQueries.collectAsStateWithLifecycle()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val focusManager = LocalFocusManager.currentval searchFocusRequester = remember { FocusRequester() }val context = androidx.compose.ui.platform.LocalContext.currentdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.ktindex 94c52bb5..532e1901 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesDetailScreen.kt@@ -18,8 +18,11 @@ import androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -56,7 +59,7 @@ fun SeriesDetailScreen(onBack: () -> Unit,viewModel: SeriesDetailViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val series = uiState.seriesif (uiState.isLoading) {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.ktindex 35ce612b..9a5b6647 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/series/SeriesScreen.kt@@ -10,6 +10,7 @@ import androidx.compose.foundation.lazy.grid.GridCellsimport androidx.compose.foundation.lazy.grid.items as gridItemsimport androidx.compose.foundation.lazy.grid.GridItemSpanimport androidx.compose.foundation.text.BasicTextField+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -79,7 +80,7 @@ fun SeriesScreen(currentRoute: String,viewModel: SeriesViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val snackbarHostState = remember { SnackbarHostState() }var showPinDialog by remember { mutableStateOf(false) }var pinError by remember { mutableStateOf<String?>(null) }diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.ktindex dc9e643b..3e6d1de5 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsScreen.kt@@ -7,6 +7,7 @@ import androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.*import androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.ui.Alignment@@ -64,7 +65,7 @@ fun SettingsScreen(currentRoute: String,viewModel: SettingsViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val snackbarHostState = remember { SnackbarHostState() }val scope = rememberCoroutineScope()diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.ktindex fcfdf664..ab99f6e1 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt@@ -12,12 +12,19 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.items+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.LaunchedEffect+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValue+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.mutableStateOf+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.remember+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.setValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -52,7 +59,7 @@ fun ParentalControlGroupScreen(onBack: () -> Unit,viewModel: ParentalControlGroupViewModel = hiltViewModel()) {- val uiState by viewModel.uiState.collectAsState()+ val uiState by viewModel.uiState.collectAsStateWithLifecycle()val backButtonFocusRequester = remember { FocusRequester() }val searchFocusRequester = remember { FocusRequester() }val focusManager = androidx.compose.ui.platform.LocalFocusManager.currentdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.ktindex 4b4b69a3..13751c76 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/welcome/WelcomeScreen.kt@@ -8,9 +8,13 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.Composable+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.LaunchedEffect+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.collectAsState+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.compose.runtime.getValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier@@ -61,7 +65,7 @@ fun WelcomeScreen(onNavigateToSetup: () -> Unit,viewModel: WelcomeViewModel = hiltViewModel()) {- val hasProviders by viewModel.hasProviders.collectAsState()+ val hasProviders by viewModel.hasProviders.collectAsStateWithLifecycle()LaunchedEffect(hasProviders) {when (hasProviders) {diff --git a/data/build.gradle.kts b/data/build.gradle.ktsindex e8fdad32..6de9b823 100644--- a/data/build.gradle.kts+++ b/data/build.gradle.kts@@ -20,10 +20,6 @@ android {targetCompatibility = JavaVersion.VERSION_17}- kotlinOptions {- jvmTarget = "17"- }-testOptions {unitTests.isReturnDefaultValues = true}@@ -33,6 +29,12 @@ android {}}+kotlin {+ compilerOptions {+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)+ }+}+dependencies {implementation(project(":domain"))diff --git a/player/build.gradle.kts b/player/build.gradle.ktsindex 5d3a74c2..ab6adcdc 100644--- a/player/build.gradle.kts+++ b/player/build.gradle.kts@@ -17,9 +17,11 @@ android {sourceCompatibility = JavaVersion.VERSION_17targetCompatibility = JavaVersion.VERSION_17}+}- kotlinOptions {- jvmTarget = "17"+kotlin {+ compilerOptions {+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)}}