diff --git a/apps/mobile/components/media-cards.tsx b/apps/mobile/components/media-cards.tsx
index 473774b..6535b8d 100644
--- a/apps/mobile/components/media-cards.tsx
+++ b/apps/mobile/components/media-cards.tsx
@@ -3,7 +3,9 @@ import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react"
import {
FlatList,
+ Platform,
Pressable,
+ ScrollView,
StyleSheet,
Text,
View,
@@ -33,6 +35,7 @@ import {
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
const GRID_INITIAL_ROWS = 5
+const MAX_NON_VIRTUAL_CAROUSEL_ITEMS = 10
export const AlbumCard = memo(function AlbumCard({
album,
@@ -306,14 +309,30 @@ function ContentCarouselBody({
/>
) : null}
-
+ {Platform.OS === "android" &&
+ content.length <= MAX_NON_VIRTUAL_CAROUSEL_ITEMS ? (
+
+ {content.map((item) => (
+
+
+
+ ))}
+
+ ) : (
+
+ )}
)
}
@@ -343,6 +362,10 @@ const styles = StyleSheet.create({
fontSize: 22,
fontWeight: "700",
},
+ androidCarousel: {
+ // Horizontal lists should measure their cards, not stretch the Home sections.
+ flexGrow: 0,
+ },
carouselContent: {
gap: spacing.md,
},
diff --git a/apps/mobile/components/mini-player.tsx b/apps/mobile/components/mini-player.tsx
index 72df55f..8923c2c 100644
--- a/apps/mobile/components/mini-player.tsx
+++ b/apps/mobile/components/mini-player.tsx
@@ -1,4 +1,7 @@
-import { useAndroidTabPalette } from "@/contexts/android-tab-theme"
+import {
+ useAndroidTabPalette,
+ useAndroidTabHasArtworkPalette,
+} from "@/contexts/android-tab-theme"
import { Ionicons } from "@expo/vector-icons"
import { NativeTabs } from "expo-router/native-tabs"
import { useRouter } from "expo-router"
@@ -163,12 +166,23 @@ function MiniPlayerContent({
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
const palette = useAndroidTabPalette()
+ const hasArtworkPalette = useAndroidTabHasArtworkPalette()
return (
{children}
+ {hasArtworkPalette ? (
+
+ ) : null}
void
+ hasArtworkPalette: boolean
+ setPalette: (palette: CoverPalette | null, owner: string) => void
}
const AndroidTabTheme = createContext(null)
@@ -27,14 +30,35 @@ function useDefaultPalette() {
export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
const defaultPalette = useDefaultPalette()
- const [palette, setPalette] = useState(null)
+ const [screen, setScreen] = useState<{
+ palette: CoverPalette
+ owner: string
+ } | null>(null)
+ const palette = screen?.palette ?? null
+ const setPalette = useCallback(
+ (palette: CoverPalette | null, owner: string) => {
+ setScreen((current) =>
+ palette ? { palette, owner } : current?.owner === owner ? null : current
+ )
+ },
+ []
+ )
+ const artworkPalette =
+ palette &&
+ (palette.background !== defaultPalette.background ||
+ palette.foreground !== defaultPalette.foreground ||
+ palette.secondaryForeground !== defaultPalette.secondaryForeground ||
+ palette.accent !== defaultPalette.accent)
+ ? palette
+ : null
const value = useMemo(
() => ({
- palette: palette ?? defaultPalette,
- selectedColor: palette?.foreground ?? defaultPalette.accentText,
+ palette: artworkPalette ?? defaultPalette,
+ selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText,
+ hasArtworkPalette: artworkPalette !== null,
setPalette,
}),
- [defaultPalette, palette]
+ [defaultPalette, artworkPalette, setPalette]
)
return (
@@ -49,20 +73,25 @@ export function useAndroidTabPalette() {
return theme?.palette ?? defaultPalette
}
+export function useAndroidTabHasArtworkPalette() {
+ return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
+}
+
export function useAndroidTabSelectedColor() {
const theme = useContext(AndroidTabTheme)
const defaultPalette = useDefaultPalette()
return theme?.selectedColor ?? defaultPalette.accentText
}
-/** Only the focused artwork screen colors Android's shared bottom bars. */
+/** Apply the focused screen's colors before paint, including late artwork palettes. */
export function useAndroidScreenPalette(palette: CoverPalette) {
+ const isFocused = useIsFocused()
+ const owner = useId()
const setPalette = useContext(AndroidTabTheme)?.setPalette
- useFocusEffect(
- useCallback(() => {
- if (Platform.OS !== "android" || !setPalette) return
- setPalette(palette)
- return () => setPalette(null)
- }, [palette, setPalette])
- )
+
+ useLayoutEffect(() => {
+ if (Platform.OS !== "android" || !setPalette || !isFocused) return
+ setPalette(palette, owner)
+ return () => setPalette(null, owner)
+ }, [isFocused, owner, palette, setPalette])
}