Skip to content

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

refactor: avoid duplicate modal state collection

David Nashash43c72a03e7e1
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerModalHosts.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerModalHosts.kt
index 14d73494..35537954 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerModalHosts.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerModalHosts.kt
@@ -74,12 +74,30 @@ internal fun PlayerControlsModalHost(
) {
if (showAudioVideoOffsetDialog) {
val audioVideoSyncEnabled by viewModel.audioVideoSyncEnabled.collectAsStateWithLifecycle()
+ val audioVideoOffsetState by viewModel.audioVideoOffsetUiState.collectAsStateWithLifecycle()
+ val castConnectionState by viewModel.castConnectionState.collectAsStateWithLifecycle()
LaunchedEffect(audioVideoSyncEnabled) {
if (!audioVideoSyncEnabled) {
onDismissModal()
viewModel.dismissAudioVideoOffsetPreview()
}
}
+ if (!isInPictureInPictureMode) {
+ PlayerAudioVideoOffsetDialog(
+ visible = audioVideoSyncEnabled && castConnectionState != com.streamvault.app.cast.CastConnectionState.CONNECTED,
+ state = audioVideoOffsetState,
+ canSaveChannel = canSaveChannel,
+ onDismiss = {
+ onDismissModal()
+ viewModel.dismissAudioVideoOffsetPreview()
+ },
+ onAdjust = viewModel::adjustAudioVideoOffset,
+ onReset = viewModel::resetAudioVideoOffsetPreview,
+ onSaveForChannel = viewModel::saveAudioVideoOffsetForChannel,
+ onSaveAsGlobal = viewModel::saveAudioVideoOffsetAsGlobal,
+ onUseGlobal = viewModel::useGlobalAudioVideoOffset
+ )
+ }
}
if (!isInPictureInPictureMode && showTrackSelection != null) {
@@ -153,25 +171,6 @@ internal fun PlayerControlsModalHost(
}
)
}
- if (!isInPictureInPictureMode && showAudioVideoOffsetDialog) {
- val audioVideoSyncEnabled by viewModel.audioVideoSyncEnabled.collectAsStateWithLifecycle()
- val audioVideoOffsetState by viewModel.audioVideoOffsetUiState.collectAsStateWithLifecycle()
- val castConnectionState by viewModel.castConnectionState.collectAsStateWithLifecycle()
- PlayerAudioVideoOffsetDialog(
- visible = audioVideoSyncEnabled && castConnectionState != com.streamvault.app.cast.CastConnectionState.CONNECTED,
- state = audioVideoOffsetState,
- canSaveChannel = canSaveChannel,
- onDismiss = {
- onDismissModal()
- viewModel.dismissAudioVideoOffsetPreview()
- },
- onAdjust = viewModel::adjustAudioVideoOffset,
- onReset = viewModel::resetAudioVideoOffsetPreview,
- onSaveForChannel = viewModel::saveAudioVideoOffsetForChannel,
- onSaveAsGlobal = viewModel::saveAudioVideoOffsetAsGlobal,
- onUseGlobal = viewModel::useGlobalAudioVideoOffset
- )
- }
if (!isInPictureInPictureMode && showEpisodePicker) {
PlayerEpisodeSelectionDialog(
visible = true,