From df0aa7f84d1bd72501058b4b6c5ec6bb27c9fb64 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Sat, 17 Oct 2026 14:48:08 -0400 Subject: [PATCH] fix(mobile): derive legible Apple Music-style colors from cover art Co-authored-by: Cursor --- .../app/(app)/(tabs)/home/album/[id].tsx | 121 ++++--- .../app/(app)/(tabs)/home/playlist/[id].tsx | 69 ++-- apps/mobile/components/player.tsx | 21 +- apps/mobile/components/ui/primitives.tsx | 13 +- .../hooks/use-cover-background-color.ts | 58 ---- apps/mobile/hooks/use-cover-palette.ts | 163 ++++++++++ apps/mobile/lib/cover-palette.ts | 297 ++++++++++++++++++ apps/mobile/lib/persistent-cache.ts | 2 +- 8 files changed, 601 insertions(+), 143 deletions(-) delete mode 100644 apps/mobile/hooks/use-cover-background-color.ts create mode 100644 apps/mobile/hooks/use-cover-palette.ts create mode 100644 apps/mobile/lib/cover-palette.ts diff --git a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx index 8ec6b43..c0a2a28 100644 --- a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx +++ b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx @@ -1,5 +1,6 @@ -import { Stack, useLocalSearchParams } from "expo-router" -import { memo, useEffect, useMemo } from "react" +import { Stack, useIsFocused, useLocalSearchParams } from "expo-router" +import { StatusBar } from "expo-status-bar" +import { memo, useCallback, useEffect, useMemo } from "react" import { FlatList, Pressable, StyleSheet, Text, View } from "react-native" import { Ionicons } from "@expo/vector-icons" @@ -17,11 +18,12 @@ import { useFavorites } from "@/contexts/favorites" import { usePlaybackActions } from "@/contexts/playback" import { useServerConfig } from "@/contexts/server-config" import { useCachedQuery } from "@/hooks/use-cached-query" -import { useCoverBackgroundColor } from "@/hooks/use-cover-background-color" +import { useCoverPalette } from "@/hooks/use-cover-palette" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { api } from "@otunes/convex/_generated/api" import type { Id } from "@otunes/convex/_generated/dataModel" import type { BrowseAlbumDetail, BrowseAlbumTrack } from "@otunes/convex/types" +import type { CoverPalette } from "@/lib/cover-palette" import { formatDuration, formatMetadata } from "@/lib/format" import { useAppNavigation } from "@/lib/app-navigation" import { longListProps } from "@/lib/list" @@ -46,12 +48,16 @@ export default function AlbumScreen() { handleAlbumTrackAction, isAlbumFavorite: isAlbumFav, } = useMediaMenuActions() + const isFocused = useIsFocused() const coverUri = - config && album ? albumCoverUrl(config.serverUrl, album.id) : "" - const backgroundColor = useCoverBackgroundColor( + config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : "" + const { palette, settled } = useCoverPalette( coverUri, - album?.cover != null, - colors.background + album ? album.cover != null : album === null ? false : undefined + ) + const songIds = useMemo( + () => album?.tracks.map((track) => track.id as Id<"songs">) ?? [], + [album] ) useEffect(() => { @@ -60,12 +66,24 @@ export default function AlbumScreen() { } }, [album]) - const songIds = useMemo( - () => album?.tracks.map((track) => track.id) ?? [], - [album?.tracks] + const renderTrack = useCallback( + ({ item, index }: { item: BrowseAlbumTrack; index: number }) => + album ? ( + + ) : null, + [album, handleAlbumTrackAction, isSongFavorite, palette, playFromSong, songIds] ) - if (album === undefined || !config) { + if (album === undefined || !config || !settled) { return ( <> + {isFocused ? ( + + ) : null} ( @@ -133,9 +156,10 @@ export default function AlbumScreen() { {...longListProps} data={album.tracks} keyExtractor={(track) => track.id} - style={{ flex: 1, backgroundColor }} + style={{ flex: 1, backgroundColor: palette.background }} contentContainerStyle={{ paddingBottom: contentBottomInset }} contentInsetAdjustmentBehavior="automatic" + indicatorStyle={palette.isDark ? "white" : "black"} ListHeaderComponent={ - + {album.title} push(`/artist/${album.artist.id}`)}> - + {album.artist.name} {metadata ? ( - {metadata} + + {metadata} + ) : null} void toggleAlbumFavorite(album.id)} hitSlop={8} - style={[styles.iconAction, { backgroundColor: colors.muted }]} + style={[styles.iconAction, { backgroundColor: palette.surface }]} >