mirror of
https://github.com/austinried/subtracks.git
synced 2026-11-11 07:29:14 +01:00
respect the nav bar inset for the tab bar and apply the artwork theme globally
This commit is contained in:
austinried
@@ -61,6 +61,7 @@ import com.subtracks.ui.playback.NowPlayingRoute
|
|||||||
import com.subtracks.ui.playback.QueueRoute
|
import com.subtracks.ui.playback.QueueRoute
|
||||||
import com.subtracks.ui.settings.AddSourceRoute
|
import com.subtracks.ui.settings.AddSourceRoute
|
||||||
import com.subtracks.ui.settings.SettingsRoute
|
import com.subtracks.ui.settings.SettingsRoute
|
||||||
|
import com.subtracks.ui.theme.ArtworkTheme
|
||||||
import com.subtracks.ui.theme.rememberArtworkColors
|
import com.subtracks.ui.theme.rememberArtworkColors
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.flow.SharingStarted
|
import kotlinx.coroutines.flow.SharingStarted
|
||||||
@@ -156,177 +157,180 @@ private fun MainNavigation() {
|
|||||||
val keyboardUp = WindowInsets.imeAnimationTarget.getBottom(density) > 0
|
val keyboardUp = WindowInsets.imeAnimationTarget.getBottom(density) > 0
|
||||||
val showMiniPlayer = playerVisible && !keyboardUp
|
val showMiniPlayer = playerVisible && !keyboardUp
|
||||||
|
|
||||||
Box(Modifier.fillMaxSize()) {
|
val artwork = rememberArtworkColors(playbackController.coverArt(playback.item, thumbnail = true))
|
||||||
Column(Modifier.fillMaxSize().imePadding()) {
|
ArtworkTheme(artwork) {
|
||||||
NavHost(
|
Box(Modifier.fillMaxSize()) {
|
||||||
navController = navController,
|
Column(Modifier.fillMaxSize().imePadding()) {
|
||||||
modifier =
|
NavHost(
|
||||||
Modifier
|
navController = navController,
|
||||||
.weight(1f)
|
modifier =
|
||||||
.then(
|
Modifier
|
||||||
if (playerVisible) {
|
.weight(1f)
|
||||||
Modifier.consumeWindowInsets(WindowInsets.navigationBars)
|
.then(
|
||||||
} else {
|
if (playerVisible) {
|
||||||
Modifier
|
Modifier.consumeWindowInsets(WindowInsets.navigationBars)
|
||||||
},
|
} else {
|
||||||
),
|
Modifier
|
||||||
startDestination = Routes.LIBRARY,
|
},
|
||||||
enterTransition = {
|
),
|
||||||
slideInHorizontally(initialOffsetX = { it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) +
|
startDestination = Routes.LIBRARY,
|
||||||
fadeIn(tween(NAVIGATION_DURATION_MS))
|
enterTransition = {
|
||||||
},
|
slideInHorizontally(initialOffsetX = { it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) +
|
||||||
exitTransition = {
|
fadeIn(tween(NAVIGATION_DURATION_MS))
|
||||||
slideOutHorizontally(targetOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) +
|
},
|
||||||
fadeOut(tween(NAVIGATION_DURATION_MS))
|
exitTransition = {
|
||||||
},
|
slideOutHorizontally(targetOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) +
|
||||||
popEnterTransition = {
|
fadeOut(tween(NAVIGATION_DURATION_MS))
|
||||||
slideInHorizontally(initialOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) +
|
},
|
||||||
fadeIn(tween(NAVIGATION_DURATION_MS))
|
popEnterTransition = {
|
||||||
},
|
slideInHorizontally(initialOffsetX = { -it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) +
|
||||||
popExitTransition = {
|
fadeIn(tween(NAVIGATION_DURATION_MS))
|
||||||
slideOutHorizontally(targetOffsetX = { it / 4 }, animationSpec = tween(NAVIGATION_DURATION_MS)) +
|
},
|
||||||
fadeOut(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)) },
|
composable(Routes.LIBRARY) {
|
||||||
onArtistClick = { artist -> navController.navigate(Routes.artist(artist.id, artist.coverArt)) },
|
LibraryRoute(
|
||||||
onPlaylistClick = { playlist -> navController.navigate(Routes.playlist(playlist.id)) },
|
onAlbumClick = { album -> navController.navigate(Routes.album(album.id, album.coverArt)) },
|
||||||
onOpenSettings = { navController.navigate(Routes.SETTINGS) },
|
onArtistClick = { artist -> navController.navigate(Routes.artist(artist.id, artist.coverArt)) },
|
||||||
bottomInset = if (showMiniPlayer) 0.dp else navBarInset,
|
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) },
|
if (nowPlayingOpen) {
|
||||||
onBack = { navController.popBackStack() },
|
Box(
|
||||||
)
|
modifier =
|
||||||
}
|
Modifier
|
||||||
composable(
|
.fillMaxSize()
|
||||||
route = Routes.ALBUM_DETAIL,
|
.graphicsLayer {
|
||||||
arguments =
|
translationY = (1f - nowPlayingProgress) * miniPlayerTopPx
|
||||||
listOf(
|
alpha = (nowPlayingProgress / EXPAND_FADE).coerceAtMost(1f)
|
||||||
navArgument("albumId") { type = NavType.StringType },
|
}.draggable(
|
||||||
navArgument("coverArt") {
|
orientation = Orientation.Vertical,
|
||||||
type = NavType.StringType
|
state =
|
||||||
defaultValue = ""
|
rememberDraggableState { delta ->
|
||||||
},
|
settleJob?.cancel()
|
||||||
),
|
if (miniPlayerTopPx > 0f) {
|
||||||
) { entry ->
|
nowPlayingProgress = (nowPlayingProgress - delta / miniPlayerTopPx).coerceIn(0f, 1f)
|
||||||
AlbumDetailRoute(
|
}
|
||||||
albumId = entry.arguments?.getString("albumId").orEmpty(),
|
},
|
||||||
coverArtId =
|
onDragStopped = { velocity -> settleNowPlaying(nowPlayingProgress > 0.9f && velocity < FLING_VELOCITY) },
|
||||||
entry.arguments
|
),
|
||||||
?.getString("coverArt")
|
) {
|
||||||
.orEmpty()
|
NowPlayingRoute(
|
||||||
.ifEmpty { null },
|
onBack = { settleNowPlaying(false) },
|
||||||
onBack = { navController.popBackStack() },
|
onQueue = { showingQueue = true },
|
||||||
)
|
modifier = Modifier.fillMaxSize(),
|
||||||
}
|
|
||||||
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(
|
AnimatedVisibility(
|
||||||
visible = showMiniPlayer,
|
visible = showingQueue,
|
||||||
enter = expandVertically(tween(MINI_PLAYER_ANIM_MS), expandFrom = Alignment.Bottom),
|
enter = slideInVertically(initialOffsetY = { it }) + fadeIn(tween(OVERLAY_DURATION_MS)),
|
||||||
exit = shrinkVertically(tween(MINI_PLAYER_ANIM_MS), shrinkTowards = Alignment.Bottom),
|
exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(tween(OVERLAY_DURATION_MS)),
|
||||||
) {
|
) {
|
||||||
val miniArt = playbackController.coverArt(playback.item, thumbnail = true)
|
QueueRoute(
|
||||||
MiniPlayer(
|
onBack = { showingQueue = false },
|
||||||
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 },
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
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 }
|
BackHandler(enabled = showingQueue) { showingQueue = false }
|
||||||
|
|||||||
@@ -407,6 +407,7 @@ fun LibraryScreen(
|
|||||||
Modifier
|
Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.align(Alignment.BottomCenter)
|
.align(Alignment.BottomCenter)
|
||||||
|
.padding(bottom = bottomInset)
|
||||||
.onSizeChanged { tabBarHeightPx = it.height.toFloat() },
|
.onSizeChanged { tabBarHeightPx = it.height.toFloat() },
|
||||||
) {
|
) {
|
||||||
LibraryTabs(
|
LibraryTabs(
|
||||||
|
|||||||
Reference in New Issue
Block a user