Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-08-18 05:15:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: keep home tab mounted

Browse source
This commit is contained in:
tapframe 2026-07-09 19:05:05 +05:30
parent 62d4297063
commit 2309970f20
1 changed files with 73 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
composeApp/src/commonMain/kotlin/com/nuvio/app/App.kt
View file

@ -3141,63 +3141,79 @@ private fun AppTabHost(
onInitialHomeContentRendered: () -> Unit = {},
) {
val tabStateHolder = rememberSaveableStateHolder()
val isHomeSelected = selectedTab == AppScreenTab.Home
Box(modifier = modifier.fillMaxSize()) {
tabStateHolder.SaveableStateProvider(selectedTab.name) {
when (selectedTab) {
AppScreenTab.Home -> {
AppHomeTabContent(
tabsRouteActiveState = tabsRouteActiveState,
homeScrollToTopRequests = homeScrollToTopRequests,
onCatalogClick = onCatalogClick,
onPosterClick = onPosterClick,
onPosterLongClick = onPosterLongClick,
onContinueWatchingClick = onContinueWatchingClick,
onContinueWatchingLongPress = onContinueWatchingLongPress,
onFolderClick = onFolderClick,
onInitialHomeContentRendered = onInitialHomeContentRendered,
)
}
tabStateHolder.SaveableStateProvider(AppScreenTab.Home.name) {
AppHomeTabContent(
tabsRouteActiveState = tabsRouteActiveState,
homeSelected = isHomeSelected,
homeScrollToTopRequests = homeScrollToTopRequests,
modifier = Modifier
.fillMaxSize()
.zIndex(if (isHomeSelected) 1f else 0f)
.alpha(if (isHomeSelected) 1f else 0f),
onCatalogClick = onCatalogClick,
onPosterClick = onPosterClick,
onPosterLongClick = onPosterLongClick,
onContinueWatchingClick = onContinueWatchingClick,
onContinueWatchingLongPress = onContinueWatchingLongPress,
onFolderClick = onFolderClick,
onInitialHomeContentRendered = onInitialHomeContentRendered,
)
}
AppScreenTab.Search -> {
AppSearchTabContent(
onPosterClick = onPosterClick,
onPosterLongClick = onPosterLongClick,
searchFocusRequestCount = searchFocusRequestCount,
searchScrollToTopRequests = searchScrollToTopRequests,
)
}
if (!isHomeSelected) {
tabStateHolder.SaveableStateProvider(selectedTab.name) {
Box(
modifier = Modifier
.fillMaxSize()
.zIndex(1f),
) {
when (selectedTab) {
AppScreenTab.Home -> Unit
AppScreenTab.Library -> {
AppLibraryTabContent(
libraryScrollToTopRequests = libraryScrollToTopRequests,
onPosterClick = onLibraryPosterClick,
onPosterLongClick = onLibraryPosterLongClick,
onSectionViewAllClick = onLibrarySectionViewAllClick,
onCloudFilePlay = onCloudFilePlay,
onConnectCloudClick = onConnectCloudClick,
)
}
AppScreenTab.Search -> {
AppSearchTabContent(
onPosterClick = onPosterClick,
onPosterLongClick = onPosterLongClick,
searchFocusRequestCount = searchFocusRequestCount,
searchScrollToTopRequests = searchScrollToTopRequests,
)
}
AppScreenTab.Settings -> {
AppSettingsTabContent(
tabsRouteActiveState = tabsRouteActiveState,
rootActionRequests = settingsRootActionRequests,
requestedPageName = requestedSettingsPageName,
onRequestedPageConsumed = onRequestedSettingsPageConsumed,
onSwitchProfile = onSwitchProfile,
onHomescreenClick = onHomescreenSettingsClick,
onMetaScreenClick = onMetaScreenSettingsClick,
onContinueWatchingClick = onContinueWatchingSettingsClick,
onDownloadsClick = onDownloadsSettingsClick,
onAddonsClick = onAddonsSettingsClick,
onPluginsClick = onPluginsSettingsClick,
onAccountClick = onAccountSettingsClick,
onSupportersContributorsClick = onSupportersContributorsSettingsClick,
onLicensesAttributionsClick = onLicensesAttributionsSettingsClick,
onCheckForUpdatesClick = onCheckForUpdatesClick,
onCollectionsClick = onCollectionsSettingsClick,
)
AppScreenTab.Library -> {
AppLibraryTabContent(
libraryScrollToTopRequests = libraryScrollToTopRequests,
onPosterClick = onLibraryPosterClick,
onPosterLongClick = onLibraryPosterLongClick,
onSectionViewAllClick = onLibrarySectionViewAllClick,
onCloudFilePlay = onCloudFilePlay,
onConnectCloudClick = onConnectCloudClick,
)
}
AppScreenTab.Settings -> {
AppSettingsTabContent(
tabsRouteActiveState = tabsRouteActiveState,
rootActionRequests = settingsRootActionRequests,
requestedPageName = requestedSettingsPageName,
onRequestedPageConsumed = onRequestedSettingsPageConsumed,
onSwitchProfile = onSwitchProfile,
onHomescreenClick = onHomescreenSettingsClick,
onMetaScreenClick = onMetaScreenSettingsClick,
onContinueWatchingClick = onContinueWatchingSettingsClick,
onDownloadsClick = onDownloadsSettingsClick,
onAddonsClick = onAddonsSettingsClick,
onPluginsClick = onPluginsSettingsClick,
onAccountClick = onAccountSettingsClick,
onSupportersContributorsClick = onSupportersContributorsSettingsClick,
onLicensesAttributionsClick = onLicensesAttributionsSettingsClick,
onCheckForUpdatesClick = onCheckForUpdatesClick,
onCollectionsClick = onCollectionsSettingsClick,
)
}
}
}
}
}
@ -3207,7 +3223,9 @@ private fun AppTabHost(
@Composable
private fun AppHomeTabContent(
tabsRouteActiveState: State<Boolean>,
homeSelected: Boolean,
homeScrollToTopRequests: Flow<Unit>,
modifier: Modifier,
onCatalogClick: ((HomeCatalogSection) -> Unit)?,
onPosterClick: ((MetaPreview) -> Unit)?,
onPosterLongClick: ((MetaPreview) -> Unit)?,
@ -3216,11 +3234,11 @@ private fun AppHomeTabContent(
onFolderClick: ((collectionId: String, folderId: String) -> Unit)?,
onInitialHomeContentRendered: () -> Unit,
) {
val animateCollectionGifsProvider = remember(tabsRouteActiveState) {
{ tabsRouteActiveState.value }
val animateCollectionGifsProvider = remember(tabsRouteActiveState, homeSelected) {
{ homeSelected && tabsRouteActiveState.value }
}
HomeScreen(
modifier = Modifier.fillMaxSize(),
modifier = modifier,
animateCollectionGifsProvider = animateCollectionGifsProvider,
scrollToTopRequests = homeScrollToTopRequests,
onCatalogClick = onCatalogClick,