From 4530335bd753335717749de41bc705fa9315abd9 Mon Sep 17 00:00:00 2001 From: austinried <4966622+austinried@users.noreply.github.com> Date: Fri, 25 Sep 2026 05:36:19 +0000 Subject: [PATCH] respect the nav bar inset for the tab bar and apply the artwork theme globally --- .../main/kotlin/com/subtracks/ui/AppRoot.kt | 322 +++++++++--------- .../com/subtracks/ui/library/LibraryScreen.kt | 1 + 2 files changed, 164 insertions(+), 159 deletions(-) diff --git a/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt b/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt index fd35c8b6..b35a8f1f 100644 --- a/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt +++ b/app/src/main/kotlin/com/subtracks/ui/AppRoot.kt @@ -61,6 +61,7 @@ import com.subtracks.ui.playback.NowPlayingRoute import com.subtracks.ui.playback.QueueRoute import com.subtracks.ui.settings.AddSourceRoute import com.subtracks.ui.settings.SettingsRoute +import com.subtracks.ui.theme.ArtworkTheme import com.subtracks.ui.theme.rememberArtworkColors import kotlinx.coroutines.Job import kotlinx.coroutines.flow.SharingStarted @@ -156,177 +157,180 @@ private fun MainNavigation() { val keyboardUp = WindowInsets.imeAnimationTarget.getBottom(density) > 0 val showMiniPlayer = playerVisible && !keyboardUp - Box(Modifier.fillMaxSize()) { - Column(Modifier.fillMaxSize().imePadding()) { - NavHost( - navController = navController, - modifier = - Modifier - .weight(1f) - .then( - if (playerVisible) { - Modifier.consumeWindowInsets(WindowInsets.navigationBars) - } else { - Modifier - }, - ), - startDestination = Routes.LIBRARY, - enterTransition = { - slideInHorizontally(initialOffsetX = { it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + - fadeIn(tween(NAVIGATION_DURATION_MS)) - }, - exitTransition = { - slideOutHorizontally(targetOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + - fadeOut(tween(NAVIGATION_DURATION_MS)) - }, - popEnterTransition = { - slideInHorizontally(initialOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + - fadeIn(tween(NAVIGATION_DURATION_MS)) - }, - popExitTransition = { - slideOutHorizontally(targetOffsetX = { it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + - fadeOut(tween(NAVIGATION_DURATION_MS)) - }, - ) { - composable(Routes.LIBRARY) { - LibraryRoute( - onAlbumClick = { album -> navController.navigate(Routes.album(album.id, album.coverArt)) }, - onArtistClick = { artist -> navController.navigate(Routes.artist(artist.id, artist.coverArt)) }, - onPlaylistClick = { playlist -> navController.navigate(Routes.playlist(playlist.id)) }, - onOpenSettings = { navController.navigate(Routes.SETTINGS) }, - bottomInset = if (showMiniPlayer) 0.dp else navBarInset, + val artwork = rememberArtworkColors(playbackController.coverArt(playback.item, thumbnail = true)) + ArtworkTheme(artwork) { + Box(Modifier.fillMaxSize()) { + Column(Modifier.fillMaxSize().imePadding()) { + NavHost( + navController = navController, + modifier = + Modifier + .weight(1f) + .then( + if (playerVisible) { + Modifier.consumeWindowInsets(WindowInsets.navigationBars) + } else { + Modifier + }, + ), + startDestination = Routes.LIBRARY, + enterTransition = { + slideInHorizontally(initialOffsetX = { it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + + fadeIn(tween(NAVIGATION_DURATION_MS)) + }, + exitTransition = { + slideOutHorizontally(targetOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + + fadeOut(tween(NAVIGATION_DURATION_MS)) + }, + popEnterTransition = { + slideInHorizontally(initialOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + + fadeIn(tween(NAVIGATION_DURATION_MS)) + }, + popExitTransition = { + slideOutHorizontally(targetOffsetX = { it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) + + fadeOut(tween(NAVIGATION_DURATION_MS)) + }, + ) { + composable(Routes.LIBRARY) { + LibraryRoute( + onAlbumClick = { album -> navController.navigate(Routes.album(album.id, album.coverArt)) }, + onArtistClick = { artist -> navController.navigate(Routes.artist(artist.id, artist.coverArt)) }, + onPlaylistClick = { playlist -> navController.navigate(Routes.playlist(playlist.id)) }, + onOpenSettings = { navController.navigate(Routes.SETTINGS) }, + bottomInset = if (showMiniPlayer) 0.dp else navBarInset, + ) + } + composable(Routes.SETTINGS) { + SettingsRoute( + onAddServer = { navController.navigate(Routes.ADD_SERVER) }, + onBack = { navController.popBackStack() }, + ) + } + composable( + route = Routes.ALBUM_DETAIL, + arguments = + listOf( + navArgument("albumId") { type = NavType.StringType }, + navArgument("coverArt") { + type = NavType.StringType + defaultValue = "" + }, + ), + ) { entry -> + AlbumDetailRoute( + albumId = entry.arguments?.getString("albumId").orEmpty(), + coverArtId = + entry.arguments + ?.getString("coverArt") + .orEmpty() + .ifEmpty { null }, + onBack = { navController.popBackStack() }, + ) + } + composable( + route = Routes.ARTIST_DETAIL, + arguments = + listOf( + navArgument("artistId") { type = NavType.StringType }, + navArgument("coverArt") { + type = NavType.StringType + defaultValue = "" + }, + ), + ) { entry -> + ArtistDetailRoute( + artistId = entry.arguments?.getString("artistId").orEmpty(), + coverArtId = + entry.arguments + ?.getString("coverArt") + .orEmpty() + .ifEmpty { null }, + onBack = { navController.popBackStack() }, + onAlbumClick = { album -> navController.navigate(Routes.album(album.id, album.coverArt)) }, + ) + } + composable( + route = Routes.PLAYLIST_DETAIL, + arguments = listOf(navArgument("playlistId") { type = NavType.StringType }), + ) { entry -> + PlaylistDetailRoute( + playlistId = entry.arguments?.getString("playlistId").orEmpty(), + onBack = { navController.popBackStack() }, + ) + } + composable(Routes.ADD_SERVER) { + AddSourceRoute( + onSaved = { navController.popBackStack() }, + onBack = { navController.popBackStack() }, + ) + } + } + + AnimatedVisibility( + visible = showMiniPlayer, + enter = expandVertically(tween(MINI_PLAYER_ANIM_MS), expandFrom = Alignment.Bottom), + exit = shrinkVertically(tween(MINI_PLAYER_ANIM_MS), shrinkTowards = Alignment.Bottom), + ) { + val miniArt = playbackController.coverArt(playback.item, thumbnail = true) + MiniPlayer( + state = playback, + coverArt = miniArt, + artwork = rememberArtworkColors(miniArt), + onExpand = { settleNowPlaying(true) }, + onPlayPause = playbackController::togglePlayPause, + onNext = playbackController::next, + onExpandDrag = { dragUpPx -> + nowPlayingOpen = true + settleJob?.cancel() + if (miniPlayerTopPx > 0f) { + nowPlayingProgress = (dragUpPx / miniPlayerTopPx).coerceIn(0f, 1f) + } + }, + onExpandRelease = { velocity -> settleNowPlaying(nowPlayingProgress > 0.05f || velocity < -FLING_VELOCITY) }, + modifier = Modifier.onGloballyPositioned { miniPlayerTopPx = it.positionInRoot().y }, ) } - composable(Routes.SETTINGS) { - SettingsRoute( - onAddServer = { navController.navigate(Routes.ADD_SERVER) }, - onBack = { navController.popBackStack() }, - ) - } - composable( - route = Routes.ALBUM_DETAIL, - arguments = - listOf( - navArgument("albumId") { type = NavType.StringType }, - navArgument("coverArt") { - type = NavType.StringType - defaultValue = "" - }, - ), - ) { entry -> - AlbumDetailRoute( - albumId = entry.arguments?.getString("albumId").orEmpty(), - coverArtId = - entry.arguments - ?.getString("coverArt") - .orEmpty() - .ifEmpty { null }, - onBack = { navController.popBackStack() }, - ) - } - composable( - route = Routes.ARTIST_DETAIL, - arguments = - listOf( - navArgument("artistId") { type = NavType.StringType }, - navArgument("coverArt") { - type = NavType.StringType - defaultValue = "" - }, - ), - ) { entry -> - ArtistDetailRoute( - artistId = entry.arguments?.getString("artistId").orEmpty(), - coverArtId = - entry.arguments - ?.getString("coverArt") - .orEmpty() - .ifEmpty { null }, - onBack = { navController.popBackStack() }, - onAlbumClick = { album -> navController.navigate(Routes.album(album.id, album.coverArt)) }, - ) - } - composable( - route = Routes.PLAYLIST_DETAIL, - arguments = listOf(navArgument("playlistId") { type = NavType.StringType }), - ) { entry -> - PlaylistDetailRoute( - playlistId = entry.arguments?.getString("playlistId").orEmpty(), - onBack = { navController.popBackStack() }, - ) - } - composable(Routes.ADD_SERVER) { - AddSourceRoute( - onSaved = { navController.popBackStack() }, - onBack = { navController.popBackStack() }, + } + + if (nowPlayingOpen) { + Box( + modifier = + Modifier + .fillMaxSize() + .graphicsLayer { + translationY = (1f - nowPlayingProgress) * miniPlayerTopPx + alpha = (nowPlayingProgress / EXPAND_FADE).coerceAtMost(1f) + }.draggable( + orientation = Orientation.Vertical, + state = + rememberDraggableState { delta -> + settleJob?.cancel() + if (miniPlayerTopPx > 0f) { + nowPlayingProgress = (nowPlayingProgress - delta / miniPlayerTopPx).coerceIn(0f, 1f) + } + }, + onDragStopped = { velocity -> settleNowPlaying(nowPlayingProgress > 0.9f && velocity < FLING_VELOCITY) }, + ), + ) { + NowPlayingRoute( + onBack = { settleNowPlaying(false) }, + onQueue = { showingQueue = true }, + modifier = Modifier.fillMaxSize(), ) } } AnimatedVisibility( - visible = showMiniPlayer, - enter = expandVertically(tween(MINI_PLAYER_ANIM_MS), expandFrom = Alignment.Bottom), - exit = shrinkVertically(tween(MINI_PLAYER_ANIM_MS), shrinkTowards = Alignment.Bottom), + visible = showingQueue, + enter = slideInVertically(initialOffsetY = { it }) + fadeIn(tween(OVERLAY_DURATION_MS)), + exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(tween(OVERLAY_DURATION_MS)), ) { - val miniArt = playbackController.coverArt(playback.item, thumbnail = true) - MiniPlayer( - state = playback, - coverArt = miniArt, - artwork = rememberArtworkColors(miniArt), - onExpand = { settleNowPlaying(true) }, - onPlayPause = playbackController::togglePlayPause, - onNext = playbackController::next, - onExpandDrag = { dragUpPx -> - nowPlayingOpen = true - settleJob?.cancel() - if (miniPlayerTopPx > 0f) { - nowPlayingProgress = (dragUpPx / miniPlayerTopPx).coerceIn(0f, 1f) - } - }, - onExpandRelease = { velocity -> settleNowPlaying(nowPlayingProgress > 0.05f || velocity < -FLING_VELOCITY) }, - modifier = Modifier.onGloballyPositioned { miniPlayerTopPx = it.positionInRoot().y }, - ) - } - } - - if (nowPlayingOpen) { - Box( - modifier = - Modifier - .fillMaxSize() - .graphicsLayer { - translationY = (1f - nowPlayingProgress) * miniPlayerTopPx - alpha = (nowPlayingProgress / EXPAND_FADE).coerceAtMost(1f) - }.draggable( - orientation = Orientation.Vertical, - state = - rememberDraggableState { delta -> - settleJob?.cancel() - if (miniPlayerTopPx > 0f) { - nowPlayingProgress = (nowPlayingProgress - delta / miniPlayerTopPx).coerceIn(0f, 1f) - } - }, - onDragStopped = { velocity -> settleNowPlaying(nowPlayingProgress > 0.9f && velocity < FLING_VELOCITY) }, - ), - ) { - NowPlayingRoute( - onBack = { settleNowPlaying(false) }, - onQueue = { showingQueue = true }, + QueueRoute( + onBack = { showingQueue = false }, modifier = Modifier.fillMaxSize(), ) } } - - AnimatedVisibility( - visible = showingQueue, - enter = slideInVertically(initialOffsetY = { it }) + fadeIn(tween(OVERLAY_DURATION_MS)), - exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(tween(OVERLAY_DURATION_MS)), - ) { - QueueRoute( - onBack = { showingQueue = false }, - modifier = Modifier.fillMaxSize(), - ) - } } BackHandler(enabled = showingQueue) { showingQueue = false } diff --git a/app/src/main/kotlin/com/subtracks/ui/library/LibraryScreen.kt b/app/src/main/kotlin/com/subtracks/ui/library/LibraryScreen.kt index c3dc8deb..bec0a282 100644 --- a/app/src/main/kotlin/com/subtracks/ui/library/LibraryScreen.kt +++ b/app/src/main/kotlin/com/subtracks/ui/library/LibraryScreen.kt @@ -407,6 +407,7 @@ fun LibraryScreen( Modifier .fillMaxWidth() .align(Alignment.BottomCenter) + .padding(bottom = bottomInset) .onSizeChanged { tabBarHeightPx = it.height.toFloat() }, ) { LibraryTabs(