StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat: implement close app functionality with confirmation dialog
David Nashash8f8f86a90732
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.ktindex 92e28b93..54721c88 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt@@ -13,6 +13,7 @@ import androidx.navigation.NavHostControllerimport androidx.navigation.compose.currentBackStackEntryAsStateimport androidx.navigation.compose.rememberNavControllerimport com.streamvault.app.playback.rememberPlaybackPlatformHost+import com.streamvault.app.ui.components.shell.LocalAppCloseActionimport com.streamvault.app.ui.components.shell.LocalAppDestinationItemsimport com.streamvault.app.ui.components.shell.rememberAppDestinationItemsimport com.streamvault.core.navigation.AppDestination@@ -52,7 +53,10 @@ fun AppNavigation(catalogLayout = state.catalogLayout ?: CatalogLayout.SPLIT)- CompositionLocalProvider(LocalAppDestinationItems provides navigationDestinations) {+ CompositionLocalProvider(+ LocalAppDestinationItems provides navigationDestinations,+ LocalAppCloseAction provides onCloseApp+ ) {AppNavHost(navController = navController,actions = navigator,diff --git a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.kt b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.ktindex 5bdc82ab..c46f9053 100644--- a/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/shell/AppShellNavigation.kt@@ -25,6 +25,7 @@ import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.unit.dpimport com.streamvault.app.Rimport com.streamvault.app.navigation.Routes+import com.streamvault.core.ui.components.shell.AppTopBarCloseActionimport com.streamvault.core.ui.components.shell.CoreAppScreenScaffoldimport com.streamvault.core.ui.components.shell.NavigationChromeimport com.streamvault.core.ui.components.shell.UiDestination@@ -38,6 +39,8 @@ enum class AppNavigationChrome {internal val LocalAppDestinationItems = staticCompositionLocalOf<List<UiDestination>?> { null }+internal val LocalAppCloseAction = staticCompositionLocalOf<(() -> Unit)?> { null }+@Composablefun AppScreenScaffold(currentRoute: String,@@ -59,6 +62,8 @@ fun AppScreenScaffold(configuredDestinations = AppTopLevelDestination.defaultOrder,catalogLayout = CatalogLayout.SPLIT)+ val closeAppAction = LocalAppCloseAction.current+ val closeAppLabel = stringResource(R.string.nav_close_app)CoreAppScreenScaffold(currentDestinationId = currentRoute,@@ -75,7 +80,15 @@ fun AppScreenScaffold(compactHeader = compactHeader,showScreenHeader = showScreenHeader,header = header,- topBarActions = topBarActions,+ topBarActions = {+ topBarActions?.invoke(this)+ if (closeAppAction != null) {+ AppTopBarCloseAction(+ onClick = closeAppAction,+ contentDescription = closeAppLabel+ )+ }+ },contentPadding = contentPadding,content = content)diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex febf1045..5c70b156 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -10,6 +10,7 @@<string name="nav_epg">Guide</string><string name="nav_settings">Settings</string><string name="nav_plugins">Plugins</string>+ <string name="nav_close_app">Close app</string><string name="welcome_enter_app">Enter App</string>diff --git a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.ktindex df82c235..e3b37928 100644--- a/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/player/PlayerScreen.kt@@ -96,6 +96,8 @@ import com.streamvault.core.navigation.AppDestination+private const val CLOSE_PLAYBACK_CONFIRM_GUARD_MS = 350L+@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class)@Composablefun PlayerScreen(@@ -180,6 +182,7 @@ fun PlayerScreen(var modalState by remember { mutableStateOf(PlayerModalState()) }var channelInfoSubPanelOpen by remember { mutableStateOf(false) }var showClosePlaybackConfirmation by rememberSaveable { mutableStateOf(false) }+ var closePlaybackConfirmationOpenedAtMs by remember { mutableStateOf(0L) }val focusRequester = remember { FocusRequester() }val channelListFocusRequester = remember { FocusRequester() }@@ -407,6 +410,22 @@ fun PlayerScreen(}}+ fun openClosePlaybackConfirmation() {+ closePlaybackConfirmationOpenedAtMs = System.currentTimeMillis()+ showClosePlaybackConfirmation = true+ }++ // The BACK press that opens the confirmation can still deliver a tail event+ // (for example the matching ACTION_UP, or a back callback for the same+ // press) to the freshly shown dialog. Ignore cancels that arrive within the+ // same press window so a single BACK opens the dialog instead of toggling it.+ fun dismissClosePlaybackConfirmation() {+ if (System.currentTimeMillis() - closePlaybackConfirmationOpenedAtMs < CLOSE_PLAYBACK_CONFIRM_GUARD_MS) {+ return+ }+ showClosePlaybackConfirmation = false+ }+val handleBackPress: () -> Unit = {when (playerBackActionAtEvent {PlayerBackNavigationState(@@ -454,10 +473,10 @@ fun PlayerScreen(PlayerBackAction.CLOSE_CHANNEL_INFO -> viewModel.closeChannelInfoOverlay()PlayerBackAction.CLOSE_LIVE_OVERLAYS -> viewModel.closeOverlays()PlayerBackAction.TOGGLE_CONTROLS -> viewModel.toggleControls()- PlayerBackAction.CANCEL_CLOSE_PLAYBACK -> showClosePlaybackConfirmation = false+ PlayerBackAction.CANCEL_CLOSE_PLAYBACK -> dismissClosePlaybackConfirmation()PlayerBackAction.NAVIGATE_BACK -> {if (playerPreferences.confirmClosePlayback) {- showClosePlaybackConfirmation = true+ openClosePlaybackConfirmation()} else {onBack()}@@ -661,7 +680,7 @@ fun PlayerScreen(true}PlayerInputAction.CancelClosePlayback -> {- showClosePlaybackConfirmation = false+ dismissClosePlaybackConfirmation()true}}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.ktindex 635e9f0a..fb8e079d 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsContentPane.kt@@ -59,6 +59,7 @@ public fun SettingsContentPane(compact: Boolean = false,onCategoryBack: (() -> Unit)? = null,onSearch: (() -> Unit)? = null,+ onExit: (() -> Unit)? = null,searchModifier: Modifier = Modifier,requestedDestination: SettingsSearchTarget? = null,onSearchResultBack: (() -> Unit)? = null,@@ -220,6 +221,7 @@ public fun SettingsContentPane(},onBack = headerBack,onSearch = onSearch,+ onExit = onExit,searchModifier = searchModifier,backModifier = Modifier.focusRequester(pageHeaderFocus)diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.ktindex 019344b6..703ebfb6 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt@@ -53,6 +53,7 @@ public fun SettingsNavigationRail(onCategorySelected: (Int) -> Unit,onBack: () -> Unit = {},onSearch: () -> Unit = {},+ onExit: (() -> Unit)? = null,searchModifier: Modifier = Modifier,compact: Boolean = LocalConfiguration.current.screenWidthDp < 600) {@@ -103,6 +104,7 @@ public fun SettingsNavigationRail(parentTitle = stringResource(R.string.settings_back_to_app),onBack = onBack,onSearch = onSearch,+ onExit = onExit,searchModifier = searchModifier,)LazyColumn(diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.ktindex 985d2062..ce7b51fb 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsScreen.kt@@ -512,6 +512,7 @@ public fun SettingsScreen(},onBack = onBack,onSearch = ::openSettingsSearch,+ onExit = onCloseApp,searchModifier = searchButtonModifier,compact = compact)@@ -620,6 +621,7 @@ public fun SettingsScreen(}} else null,onSearch = if (compact) (::openSettingsSearch) else null,+ onExit = onCloseApp,searchModifier = searchButtonModifier,requestedDestination = requestedDestination,onSearchResultBack = ::returnToSearchResults,diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsShell.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsShell.ktindex 07483de7..73f762d3 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsShell.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsShell.kt@@ -25,6 +25,7 @@ import androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.Iconimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Text+import com.streamvault.core.ui.components.shell.AppTopBarCloseActionimport com.streamvault.core.ui.design.AppColorsimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvIconButton@@ -37,6 +38,7 @@ internal fun SettingsLocalHeader(parentTitle: String?,onBack: (() -> Unit)?,onSearch: (() -> Unit)? = null,+ onExit: (() -> Unit)? = null,searchModifier: Modifier = Modifier,backModifier: Modifier = Modifier,) {@@ -115,5 +117,11 @@ internal fun SettingsLocalHeader()}}+ if (onExit != null) {+ AppTopBarCloseAction(+ onClick = onExit,+ contentDescription = stringResource(R.string.settings_close_app),+ )+ }}}