Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Merge PR #162: a What's New page behind a bell on Home
kota-zo52c3faa3c2f6
diff --cc base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveHomeScreen.ktindex af8bdf8d,1f0b8afe..1c4e25f0--- a/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveHomeScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/screens/ImmersiveHomeScreen.kt@@@ -204,15 -201,10 +205,16 @@@ fun ImmersiveHomeScreen(navController:}}}- // The greeting and the profile disc on floating glass; the feed scrolls under it.+ // The greeting, the bell and the profile disc on floating glass; the feed scrolls under it.ImmersiveFloatingHeader(title, collapse = rememberTopBarCollapse(listState, 24.dp)) {+ // Friend activity, out of the tab bar: beside the profile, as Spotify has it.+ com.music.spotui.ui.immersive.shell.ImmersiveBarAction(+ androidx.compose.ui.graphics.vector.ImageVector.vectorResource(R.drawable.ic_friends_big),+ contentDescription = stringResource(R.string.friends_title),+ onClick = { navController.navigate(com.music.spotui.ui.navigation.Routes.Friends.route) },+ )val size = LocalBarControlSize.current+ WhatsNewBell(size) { navController.navigate(Routes.WhatsNew.route) }// The tap area is the header's full height and reaches past the disc toward the// title, so the small disc of the minimized bar is still easy to hit.Box(diff --cc base/app/src/main/java/com/music/spotui/ui/navigation/MyNavHost.ktindex b47968c7,f344a8f0..bb12e1a1--- a/base/app/src/main/java/com/music/spotui/ui/navigation/MyNavHost.kt+++ b/base/app/src/main/java/com/music/spotui/ui/navigation/MyNavHost.kt@@@ -143,7 -206,24 +143,16 @@@ fun MyNavHostif (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveRecentlyPlayedScreen(navHostController) else com.music.spotui.ui.screens.RecentlyPlayedScreen(navHostController)}+ // New releases and episodes of what the account follows (the bell on Home).+ page(Routes.WhatsNew.route) {+ LaunchedEffect(playerState) {+ bottomBarState.value = true+ bottomBarPlayerState.value = playerState != ""+ }+ if (isImmersive()) com.music.spotui.ui.immersive.pages.ImmersiveWhatsNewScreen(navHostController) else com.music.spotui.ui.screens.WhatsNewScreen(navHostController)+ }+page(Routes.Liked.route){- LaunchedEffect(playerState) {- bottomBarState.value = true- bottomBarPlayerState.value = playerState != ""- }if (isImmersive()) com.music.spotui.ui.immersive.screens.ImmersiveContextScreen(navHostController, type = "liked", id = "") else ContextScreen(navHostController, type = "liked", id = "")}diff --cc base/app/src/main/java/com/music/spotui/ui/navigation/Routes.ktindex 68bfff04,7619660e..a3c0cc4d--- a/base/app/src/main/java/com/music/spotui/ui/navigation/Routes.kt+++ b/base/app/src/main/java/com/music/spotui/ui/navigation/Routes.kt@@@ -36,7 -34,9 +36,9 @@@ sealed class Routesobject NewEpisodes : Routes(0, "NewEpisodes", "newepisodes")object Recap : Routes(0, "Recap", "recap")object Recent : Routes(0, "Recent", "recent")+ /** The "What's New" feed behind the bell on Home. */+ object WhatsNew : Routes(0, "WhatsNew", "whatsnew")- object Friends : Routes(0, "Friends", "friends")+ object Friends : Routes(icon = R.drawable.ic_friends_big, label = "Amis", route = "friends", labelRes = R.string.friends_tab)object Settings : Routes(0, "Settings", "settings")object Extensions : Routes(0, "Extensions", "extensions")object Extension : Routes(0, "Extension", "extension")diff --cc base/app/src/main/java/com/music/spotui/ui/screens/HomeScreen.ktindex a89a0559,d522fe82..63dcf596--- a/base/app/src/main/java/com/music/spotui/ui/screens/HomeScreen.kt+++ b/base/app/src/main/java/com/music/spotui/ui/screens/HomeScreen.kt@@@ -36,8 -39,12 +36,9 @@@ import androidx.compose.foundation.lazyimport androidx.compose.foundation.lazy.LazyRowimport androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.CircleShape+ import androidx.compose.material.icons.outlined.Notificationsimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScroll-import androidx.compose.material3.Card-import androidx.compose.material3.CardDefaults-import androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Surfaceimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable