From c91bf600cbac9ee179b7d5fe9c6e868db0d6768e Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Thu, 5 Nov 2026 21:30:23 -0500 Subject: [PATCH] fix(mobile): fade artwork text colors on the UI thread --- apps/mobile/app/(app)/(tabs)/_layout.tsx | 26 ++- .../app/(app)/(tabs)/home/album/[id].tsx | 84 +++++--- .../app/(app)/(tabs)/home/playlist/[id].tsx | 57 ++++-- apps/mobile/components/audio-format-badge.tsx | 12 +- apps/mobile/components/collection-list.tsx | 10 +- apps/mobile/components/mini-player.tsx | 39 ++-- apps/mobile/components/palette-text.tsx | 49 +++++ apps/mobile/components/player.tsx | 20 +- apps/mobile/components/ui/primitives.tsx | 17 +- apps/mobile/contexts/android-tab-theme.tsx | 189 +++++++++--------- 10 files changed, 337 insertions(+), 166 deletions(-) create mode 100644 apps/mobile/components/palette-text.tsx diff --git a/apps/mobile/app/(app)/(tabs)/_layout.tsx b/apps/mobile/app/(app)/(tabs)/_layout.tsx index 7763f94..261251f 100644 --- a/apps/mobile/app/(app)/(tabs)/_layout.tsx +++ b/apps/mobile/app/(app)/(tabs)/_layout.tsx @@ -4,7 +4,7 @@ import { AndroidTabThemeProvider, useAndroidTabPalette, useAndroidTabBackgroundStyle, - useAndroidTabSelectedColor, + useAndroidNativeTabColors, } from "@/contexts/android-tab-theme" import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router" import { NativeTabs } from "expo-router/native-tabs" @@ -43,10 +43,12 @@ function useRouterTheme() { } function useNativeTabColors() { - const selectedColor = useAndroidTabSelectedColor() + // These props initialize native tabs; the worklet owns subsequent colors. + const selectedColor = colors.dark.primary const themeIsDark = useIsDark() - const androidPalette = useAndroidTabPalette() - const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark + const androidPalette = colors.dark + const artworkPalette = useAndroidTabPalette() + const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark const inactive = appleMusic.tabInactive const iconColor = @@ -56,14 +58,14 @@ function useNativeTabColors() { selected: appleMusic.pink, } : { - default: androidPalette.secondaryForeground, + default: androidPalette.mutedForeground, selected: selectedColor, } const labelColor = Platform.OS === "ios" ? DynamicColorIOS({ dark: inactive, light: "#636366" }) - : androidPalette.secondaryForeground + : androidPalette.mutedForeground return { isDark, @@ -86,6 +88,9 @@ function useNativeTabColors() { } function TabsContent() { + const homeColors = useAndroidNativeTabColors() + const libraryColors = useAndroidNativeTabColors() + const searchColors = useAndroidNativeTabColors() const keyboardVisible = useAndroidKeyboardVisible() const routerTheme = useRouterTheme() const tabColors = useNativeTabColors() @@ -135,6 +140,9 @@ function TabsContent() { @@ -144,6 +152,9 @@ function TabsContent() { @@ -156,6 +167,9 @@ function TabsContent() { diff --git a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx index 4039dea..92fea11 100644 --- a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx +++ b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx @@ -1,3 +1,8 @@ +import { + PaletteText, + PaletteIcon, + renderArtworkBackButton, +} from "@/components/palette-text" import Animated from "react-native-reanimated" import { renderAndroidArtworkBackground, @@ -7,8 +12,7 @@ import { MusicEntityView } from "@/components/music-entity-view" import { Stack, useIsFocused, useLocalSearchParams } from "expo-router" import { StatusBar } from "expo-status-bar" import { memo, useCallback, useEffect, useMemo } from "react" -import { Platform, Pressable, StyleSheet, Text, View } from "react-native" -import { Ionicons } from "@expo/vector-icons" +import { Platform, Pressable, StyleSheet, View } from "react-native" import { CollectionDivider, @@ -137,6 +141,8 @@ export default function AlbumScreen() { ? { headerStyle: { backgroundColor: "transparent" }, headerBackground: renderAndroidArtworkBackground, + headerBackVisible: false, + headerLeft: renderArtworkBackButton, headerTintColor: palette.foreground, } : {}), @@ -163,9 +169,9 @@ export default function AlbumScreen() { }} /> - + Album not found. - + ) @@ -188,6 +194,8 @@ export default function AlbumScreen() { ? { headerStyle: { backgroundColor: "transparent" }, headerBackground: renderAndroidArtworkBackground, + headerBackVisible: false, + headerLeft: renderArtworkBackButton, statusBarStyle: palette.isDark ? ("light" as const) : ("dark" as const), @@ -209,7 +217,8 @@ export default function AlbumScreen() { } > - - + {album.title} - + push(`/artist/${album.artist.id}`)} style={styles.artistPressable} > - + {album.artist.name} - + {metadata ? ( - + {metadata} - + ) : null} {hasLossless ? ( <> {metadata ? ( - + · - + ) : null} {metadata || hasLossless ? ( - + · - + ) : null} - - void onPlay(track.id as Id<"songs">, songIds)} > - {number} - + - {track.title} - + {track.artists ? ( - {track.artists.join(", ")} - + ) : null} - + {formatDuration(track.durationSeconds)} - + diff --git a/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx index 7bc89f9..2cfdfed 100644 --- a/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx +++ b/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx @@ -1,3 +1,8 @@ +import { + PaletteText, + PaletteIcon, + renderArtworkBackButton, +} from "@/components/palette-text" import Animated from "react-native-reanimated" import { PlaylistSearchBar, @@ -21,12 +26,10 @@ import { Platform, Pressable, StyleSheet, - Text, View, type ListRenderItemInfo, } from "react-native" import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable" -import { Ionicons } from "@expo/vector-icons" import { CollectionDivider } from "@/components/collection-list" import { CoverImage } from "@/components/cover-image" @@ -106,6 +109,8 @@ export default function PlaylistScreen() { ? { headerStyle: { backgroundColor: "transparent" }, headerBackground: renderAndroidArtworkBackground, + headerBackVisible: false, + headerLeft: renderArtworkBackButton, headerTintColor: palette.foreground, } : {}), @@ -132,9 +137,9 @@ export default function PlaylistScreen() { }} /> - + Playlist not found. - + ) @@ -269,6 +274,8 @@ function PlaylistContent({ ? { headerStyle: { backgroundColor: "transparent" }, headerBackground: renderAndroidArtworkBackground, + headerBackVisible: false, + headerLeft: renderArtworkBackButton, statusBarStyle: palette.isDark ? ("light" as const) : ("dark" as const), @@ -287,7 +294,8 @@ function PlaylistContent({ onAction={handlePlaylistMenuAction} > - {songs.length ? "No songs found." : "No songs in this playlist."} - + } ListHeaderComponent={ - - + Remove - + )} > @@ -505,10 +518,18 @@ const PlaylistHero = memo(function PlaylistHero({ - + {title} - - {ownerName} + + + {ownerName} + {showSubscribe ? ( - - + diff --git a/apps/mobile/components/audio-format-badge.tsx b/apps/mobile/components/audio-format-badge.tsx index 0a977c9..f2de453 100644 --- a/apps/mobile/components/audio-format-badge.tsx +++ b/apps/mobile/components/audio-format-badge.tsx @@ -1,4 +1,5 @@ -import { StyleSheet, Text, View } from "react-native" +import { PaletteText } from "@/components/palette-text" +import { StyleSheet, View } from "react-native" import Svg, { G, Path } from "react-native-svg" import type { PlaybackFormat } from "@otunes/convex/playback-stream" @@ -74,10 +75,12 @@ function LosslessMark({ /** The Dolby Atmos or Lossless label shown under the progress bar. */ export function AudioFormatBadge({ + artwork = false, format, color, backgroundColor, }: { + artwork?: boolean format: PlaybackFormat color: string backgroundColor: string @@ -90,7 +93,12 @@ export function AudioFormatBadge({ ) : ( )} - {label} + + {label} + ) } diff --git a/apps/mobile/components/collection-list.tsx b/apps/mobile/components/collection-list.tsx index ff04e4c..a11ac37 100644 --- a/apps/mobile/components/collection-list.tsx +++ b/apps/mobile/components/collection-list.tsx @@ -1,5 +1,6 @@ +import { PaletteText } from "@/components/palette-text" import { memo } from "react" -import { StyleSheet, Text, View } from "react-native" +import { StyleSheet, View } from "react-native" import { useThemeColors } from "@/lib/theme" @@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({ }) { const colors = useThemeColors() return ( - + {label} - + ) }) diff --git a/apps/mobile/components/mini-player.tsx b/apps/mobile/components/mini-player.tsx index 7c1adeb..8f936fb 100644 --- a/apps/mobile/components/mini-player.tsx +++ b/apps/mobile/components/mini-player.tsx @@ -1,13 +1,13 @@ +import { PaletteText, PaletteIcon } from "@/components/palette-text" import Animated from "react-native-reanimated" import { useAndroidTabPalette, useAndroidTabBackgroundStyle, useAndroidTabHasArtworkPalette, } from "@/contexts/android-tab-theme" -import { Ionicons } from "@expo/vector-icons" import { NativeTabs } from "expo-router/native-tabs" import { useRouter } from "expo-router" -import { Platform, Pressable, StyleSheet, Text, View } from "react-native" +import { Platform, Pressable, StyleSheet, View } from "react-native" import { useSafeAreaInsets } from "react-native-safe-area-context" @@ -67,7 +67,8 @@ function MiniPlayerContent({ - {currentSong.title} - + - - {currentSong.title} - - + {currentSong.artist.name} - + {Platform.OS === "android" && !isAccessory ? ( @@ -134,7 +138,12 @@ function MiniPlayerContent({ }} hitSlop={6} > - + ) : null} - - + diff --git a/apps/mobile/components/palette-text.tsx b/apps/mobile/components/palette-text.tsx new file mode 100644 index 0000000..0c7934c --- /dev/null +++ b/apps/mobile/components/palette-text.tsx @@ -0,0 +1,49 @@ +import { Ionicons } from "@expo/vector-icons" +import type { ComponentProps } from "react" +import { Pressable, type TextProps } from "react-native" +import { useRouter } from "expo-router" +import Animated from "react-native-reanimated" + +import { + useAnimatedPaletteColor, + type PaletteColor, +} from "@/contexts/android-tab-theme" + +const AnimatedIcon = Animated.createAnimatedComponent(Ionicons) + +/** Keep artwork text colors on the same UI-thread animation as the background. */ +export function PaletteText({ + tone, + style, + ...props +}: TextProps & { tone?: PaletteColor }) { + const colorStyle = useAnimatedPaletteColor(tone) + return +} + +export function PaletteIcon({ + tone, + style, + ...props +}: ComponentProps & { tone?: PaletteColor }) { + const colorStyle = useAnimatedPaletteColor(tone) + return +} + +function ArtworkBackButton() { + const router = useRouter() + return ( + router.back()} + > + + + ) +} + +export function renderArtworkBackButton() { + return +} diff --git a/apps/mobile/components/player.tsx b/apps/mobile/components/player.tsx index 2d074ad..f5e38a1 100644 --- a/apps/mobile/components/player.tsx +++ b/apps/mobile/components/player.tsx @@ -1,3 +1,4 @@ +import { PaletteText } from "@/components/palette-text" import { MusicEntityView } from "@/components/music-entity-view" import { collectionInset } from "@/components/collection-list" import { CoverImage } from "@/components/cover-image" @@ -8,7 +9,7 @@ import { formatDuration } from "@/lib/format" import { albumCoverUrl } from "@/lib/urls" import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme" import { memo, useCallback } from "react" -import { Platform, Pressable, StyleSheet, Text, View } from "react-native" +import { Platform, Pressable, StyleSheet, View } from "react-native" import { MediaContextMenu, @@ -46,22 +47,27 @@ export const SongRow = memo(function SongRow({ const content = ( <> - {song.title} - - + {song.artist.name} · {song.album.title} - + - + {formatDuration(song.durationSeconds)} - + {trailing} ) diff --git a/apps/mobile/components/ui/primitives.tsx b/apps/mobile/components/ui/primitives.tsx index 2ab15f4..3ec1da4 100644 --- a/apps/mobile/components/ui/primitives.tsx +++ b/apps/mobile/components/ui/primitives.tsx @@ -1,3 +1,4 @@ +import { PaletteText, PaletteIcon } from "@/components/palette-text" import { ActivityIndicator, Platform, @@ -73,8 +74,20 @@ export function Button({ ) : ( - {icon ? : null} - {title} + {icon ? ( + + ) : null} + + {title} + )} diff --git a/apps/mobile/contexts/android-tab-theme.tsx b/apps/mobile/contexts/android-tab-theme.tsx index 0435951..fec457d 100644 --- a/apps/mobile/contexts/android-tab-theme.tsx +++ b/apps/mobile/contexts/android-tab-theme.tsx @@ -11,15 +11,16 @@ import { useLayoutEffect, useMemo, useState, - useRef, type PropsWithChildren, } from "react" -import { Animated, Easing, Platform, StyleSheet } from "react-native" +import { Platform, StyleSheet, type HostInstance } from "react-native" import Reanimated, { - interpolateColor, - useReducedMotion, useSharedValue, useAnimatedStyle, + useAnimatedReaction, + useAnimatedRef, + setNativeProps, + processColor, withTiming, type SharedValue, } from "react-native-reanimated" @@ -27,10 +28,14 @@ import Reanimated, { import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette" import { useIsDark, useThemeColors } from "@/lib/theme" +export type PaletteColor = Exclude +type PaletteColors = Pick & { + selectedColor: string +} + type TabTheme = { palette: CoverPalette - background: SharedValue - selectedColor: string + colors: SharedValue hasArtworkPalette: boolean setPalette: (palette: CoverPalette | null, owner: string) => void } @@ -48,14 +53,30 @@ export function AndroidTabThemeProvider({ children }: PropsWithChildren) { palette: CoverPalette owner: string } | null>(null) - const background = useFadingBackground( - screen?.palette.background ?? defaultPalette.background, - defaultPalette.background - ) - const palette = useFadingPalette( - screen?.palette ?? defaultPalette, - defaultPalette - ) + const palette = screen?.palette ?? defaultPalette + const hasArtwork = + palette.background !== defaultPalette.background || + palette.foreground !== defaultPalette.foreground || + palette.secondaryForeground !== defaultPalette.secondaryForeground || + palette.accent !== defaultPalette.accent + const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette + const animatedColors = useSharedValue({ + ...defaultColors, + selectedColor: defaultPalette.accentText, + }) + useLayoutEffect(() => { + if (Platform.OS !== "android") return + const { isDark: _isDark, ...colors } = palette + animatedColors.value = withTiming( + { + ...colors, + selectedColor: hasArtwork + ? palette.foreground + : defaultPalette.accentText, + }, + { duration: PALETTE_FADE_MS } + ) + }, [animatedColors, palette, defaultPalette, hasArtwork]) const setPalette = useCallback( (palette: CoverPalette | null, owner: string) => { setScreen((current) => @@ -64,23 +85,15 @@ export function AndroidTabThemeProvider({ children }: PropsWithChildren) { }, [] ) - const artworkPalette = - palette && - (palette.background !== defaultPalette.background || - palette.foreground !== defaultPalette.foreground || - palette.secondaryForeground !== defaultPalette.secondaryForeground || - palette.accent !== defaultPalette.accent) - ? palette - : null + const artworkPalette = hasArtwork ? palette : null const value = useMemo( () => ({ palette: artworkPalette ?? defaultPalette, - background, - selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText, + colors: animatedColors, hasArtworkPalette: artworkPalette !== null, setPalette, }), - [defaultPalette, artworkPalette, setPalette, background] + [defaultPalette, artworkPalette, setPalette, animatedColors] ) return ( @@ -89,6 +102,50 @@ export function AndroidTabThemeProvider({ children }: PropsWithChildren) { ) } +/** + * NativeTabs forwards raw screen props to its Fabric screen. Bind that host + * directly so appearance updates stay on the UI thread with the page colors. + */ +export function useAndroidNativeTabColors() { + const colors = useContext(AndroidTabTheme)?.colors + const ref = useAnimatedRef() + const mounted = useSharedValue(false) + const attach = useCallback( + (host: HostInstance | null) => { + if (host) ref(host) + mounted.value = host !== null + }, + [ref, mounted] + ) + + useAnimatedReaction( + () => ({ colors: colors?.value, mounted: mounted.value }), + ({ colors: palette, mounted: ready }) => { + if (Platform.OS !== "android" || !ready || !palette) return + const normal = processColor(palette.secondaryForeground) + const selected = processColor(palette.selectedColor) + setNativeProps(ref, { + standardAppearance: { + tabBarBackgroundColor: processColor("transparent"), + tabBarItemRippleColor: selected, + tabBarItemActiveIndicatorEnabled: false, + tabBarItemTitleSmallLabelFontSize: 10, + tabBarItemTitleLargeLabelFontSize: 10, + normal: { + tabBarItemTitleFontColor: normal, + tabBarItemIconColor: normal, + }, + selected: { + tabBarItemTitleFontColor: selected, + tabBarItemIconColor: selected, + }, + }, + }) + } + ) + return { ref: attach, style: { backgroundColor: "transparent" } } +} + export function useAndroidTabPalette() { const theme = useContext(AndroidTabTheme) const defaultPalette = useDefaultPalette() @@ -99,18 +156,23 @@ export function useAndroidTabHasArtworkPalette() { return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false } -export function useAndroidTabSelectedColor() { - const theme = useContext(AndroidTabTheme) - const defaultPalette = useDefaultPalette() - return theme?.selectedColor ?? defaultPalette.accentText -} - export function useAndroidTabBackgroundStyle() { const theme = useContext(AndroidTabTheme) const fallback = useDefaultPalette().background + const colors = theme?.colors return useAnimatedStyle(() => Platform.OS === "android" - ? { backgroundColor: theme?.background.value ?? fallback } + ? { backgroundColor: colors?.value.background ?? fallback } + : {} + ) +} + +/** Color tokens share the background's UI-thread timing. */ +export function useAnimatedPaletteColor(tone: PaletteColor | undefined) { + const colors = useContext(AndroidTabTheme)?.colors + return useAnimatedStyle(() => + Platform.OS === "android" && tone && colors + ? { color: colors.value[tone] } : {} ) } @@ -125,68 +187,8 @@ export function renderAndroidArtworkBackground() { return } -/** Run backgrounds on the UI thread even while React is rendering track rows. */ -function useFadingBackground(target: string, initial: string) { - const background = useSharedValue(initial) - useLayoutEffect(() => { - if (Platform.OS === "android") { - background.value = withTiming(target, { duration: PALETTE_FADE_MS }) - } - }, [background, target]) - return background -} - -// Match the default Android medium animation time used by slide_from_right. -// Continue from displayed colors when artwork arrives late or focus changes. const PALETTE_FADE_MS = 400 -function useFadingPalette(target: CoverPalette, initial: CoverPalette) { - const [displayed, setDisplayed] = useState(initial) - const current = useRef(initial) - const reducedMotion = useReducedMotion() - - useLayoutEffect(() => { - if (Platform.OS !== "android") return - if (reducedMotion || current.current === target) { - current.current = target - setDisplayed(target) - return - } - const from = current.current - const progress = new Animated.Value(0) - const listener = progress.addListener(({ value }) => { - const color = (key: Exclude) => - interpolateColor(value, [0, 1], [from[key], target[key]], "RGB") - const next: CoverPalette = { - background: color("background"), - foreground: color("foreground"), - secondaryForeground: color("secondaryForeground"), - accent: color("accent"), - accentForeground: color("accentForeground"), - accentText: color("accentText"), - surface: color("surface"), - divider: color("divider"), - isDark: value < 0.5 ? from.isDark : target.isDark, - } - current.current = value === 1 ? target : next - setDisplayed(current.current) - }) - const animation = Animated.timing(progress, { - toValue: 1, - duration: PALETTE_FADE_MS, - easing: Easing.out(Easing.cubic), - useNativeDriver: false, - }) - animation.start() - return () => { - animation.stop() - progress.removeListener(listener) - } - }, [target, reducedMotion]) - - return Platform.OS === "android" ? displayed : target -} - /** The focused artwork screen selects the shared background for page and bars. */ export function useAndroidScreenPalette(palette: CoverPalette) { const isFocused = useIsFocused() @@ -207,7 +209,6 @@ export function useAndroidScreenPalette(palette: CoverPalette) { const theme = useContext(AndroidTabTheme) const setPalette = theme?.setPalette const target = isFocused && laidOut && !closing ? palette : defaultPalette - const displayed = useFadingPalette(target, defaultPalette) const backgroundStyle = useAndroidTabBackgroundStyle() useLayoutEffect(() => { @@ -224,7 +225,7 @@ export function useAndroidScreenPalette(palette: CoverPalette) { }, [closing, laidOut, isFocused, owner, palette, setPalette]) return { - palette: displayed, + palette: Platform.OS === "android" ? target : palette, backgroundStyle, onLayout: Platform.OS === "android" ? onLayout : undefined, }