diff --git a/apps/mobile/app/(app)/(tabs)/_layout.tsx b/apps/mobile/app/(app)/(tabs)/_layout.tsx
index 051a11c..261251f 100644
--- a/apps/mobile/app/(app)/(tabs)/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/_layout.tsx
@@ -1,12 +1,14 @@
+import Animated from "react-native-reanimated"
import { NavigationBar } from "expo-navigation-bar"
import {
AndroidTabThemeProvider,
useAndroidTabPalette,
- useAndroidTabSelectedColor,
+ useAndroidTabBackgroundStyle,
+ useAndroidNativeTabColors,
} from "@/contexts/android-tab-theme"
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
import { NativeTabs } from "expo-router/native-tabs"
-import { DynamicColorIOS, Platform, View } from "react-native"
+import { DynamicColorIOS, Platform } from "react-native"
import { useMemo } from "react"
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
@@ -41,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 =
@@ -54,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,
@@ -78,15 +82,19 @@ function useNativeTabColors() {
blurEffect: isDark
? "systemChromeMaterialDark"
: "systemChromeMaterialLight",
- backgroundColor:
- Platform.OS === "ios" ? undefined : androidPalette.background,
+ // Reveal the shared UI-thread background beneath the native tab bar.
+ backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
}
}
function TabsContent() {
+ const homeColors = useAndroidNativeTabColors()
+ const libraryColors = useAndroidNativeTabColors()
+ const searchColors = useAndroidNativeTabColors()
const keyboardVisible = useAndroidKeyboardVisible()
const routerTheme = useRouterTheme()
const tabColors = useNativeTabColors()
+ const backgroundStyle = useAndroidTabBackgroundStyle()
const { currentSong, queueSongIds } = usePlaybackQueue()
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
@@ -101,7 +109,12 @@ function TabsContent() {
return (
-
+
{Platform.OS === "android" ? (
) : null}
@@ -127,6 +140,9 @@ function TabsContent() {
@@ -136,6 +152,9 @@ function TabsContent() {
@@ -148,6 +167,9 @@ function TabsContent() {
@@ -156,7 +178,7 @@ function TabsContent() {
{!keyboardVisible ? : null}
-
+
)
}
diff --git a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
index 195b95a..87b926d 100644
--- a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
@@ -1,5 +1,4 @@
import { Stack } from "expo-router"
-import { Platform } from "react-native"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
@@ -15,10 +14,6 @@ export default function HomeLayout() {
({
...baseOptions,
- ...(Platform.OS === "android" &&
- (route.name === "album/[id]" || route.name === "playlist/[id]")
- ? { animation: "none" as const }
- : {}),
title: tabStackScreenTitles[route.name] ?? "Home",
headerRight:
route.name === "index" ? () => : undefined,
diff --git a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
index c1de515..92fea11 100644
--- a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
@@ -1,17 +1,18 @@
-import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
+import {
+ PaletteText,
+ PaletteIcon,
+ renderArtworkBackButton,
+} from "@/components/palette-text"
+import Animated from "react-native-reanimated"
+import {
+ renderAndroidArtworkBackground,
+ useAndroidScreenPalette,
+} from "@/contexts/android-tab-theme"
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 {
- FlatList,
- Platform,
- Pressable,
- StyleSheet,
- Text,
- View,
-} from "react-native"
-import { Ionicons } from "@expo/vector-icons"
+import { Platform, Pressable, StyleSheet, View } from "react-native"
import {
CollectionDivider,
@@ -70,7 +71,8 @@ export default function AlbumScreen() {
coverUri,
album ? album.cover != null : album === null ? false : undefined
)
- const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
+ const { palette, onLayout, backgroundStyle } =
+ useAndroidScreenPalette(artworkPalette)
const songIds = useMemo(
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
[album]
@@ -135,9 +137,24 @@ export default function AlbumScreen() {
options={{
title: "",
headerLargeTitle: false,
+ ...(Platform.OS === "android"
+ ? {
+ headerStyle: { backgroundColor: "transparent" },
+ headerBackground: renderAndroidArtworkBackground,
+ headerBackVisible: false,
+ headerLeft: renderArtworkBackButton,
+ headerTintColor: palette.foreground,
+ }
+ : {}),
}}
/>
-
+
>
)
}
@@ -152,9 +169,9 @@ export default function AlbumScreen() {
}}
/>
-
+
Album not found.
-
+
>
)
@@ -175,7 +192,10 @@ export default function AlbumScreen() {
headerTintColor: palette.foreground,
...(Platform.OS === "android"
? {
- headerStyle: { backgroundColor: palette.background },
+ headerStyle: { backgroundColor: "transparent" },
+ headerBackground: renderAndroidArtworkBackground,
+ headerBackVisible: false,
+ headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark
? ("light" as const)
: ("dark" as const),
@@ -197,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 c5214fc..2cfdfed 100644
--- a/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx
@@ -1,8 +1,17 @@
+import {
+ PaletteText,
+ PaletteIcon,
+ renderArtworkBackButton,
+} from "@/components/palette-text"
+import Animated from "react-native-reanimated"
import {
PlaylistSearchBar,
usePlaylistSearch,
} from "@/components/playlist-search-bar"
-import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
+import {
+ renderAndroidArtworkBackground,
+ useAndroidScreenPalette,
+} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { useMutation } from "convex/react"
import { memo, useCallback, useEffect, useMemo } from "react"
@@ -14,16 +23,13 @@ import {
} from "expo-router"
import { StatusBar } from "expo-status-bar"
import {
- FlatList,
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"
@@ -85,7 +91,8 @@ export default function PlaylistScreen() {
coverUri,
playlist ? playlist.cover != null : playlist === null ? false : undefined
)
- const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
+ const { palette, onLayout, backgroundStyle } =
+ useAndroidScreenPalette(artworkPalette)
useEffect(() => {
if (songs) rememberSongs(songs)
@@ -98,9 +105,24 @@ export default function PlaylistScreen() {
options={{
title: "",
headerLargeTitle: false,
+ ...(Platform.OS === "android"
+ ? {
+ headerStyle: { backgroundColor: "transparent" },
+ headerBackground: renderAndroidArtworkBackground,
+ headerBackVisible: false,
+ headerLeft: renderArtworkBackButton,
+ headerTintColor: palette.foreground,
+ }
+ : {}),
}}
/>
-
+
>
)
}
@@ -115,9 +137,9 @@ export default function PlaylistScreen() {
}}
/>
-
+
Playlist not found.
-
+
>
)
@@ -125,6 +147,7 @@ export default function PlaylistScreen() {
return (
void
+ backgroundStyle: ReturnType["backgroundStyle"]
playlist: BrowsePlaylistDetail
songs: BrowseSong[]
coverUri: string
@@ -247,7 +272,10 @@ function PlaylistContent({
headerTintColor: palette.foreground,
...(Platform.OS === "android"
? {
- headerStyle: { backgroundColor: palette.background },
+ headerStyle: { backgroundColor: "transparent" },
+ headerBackground: renderAndroidArtworkBackground,
+ headerBackVisible: false,
+ headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark
? ("light" as const)
: ("dark" as const),
@@ -266,7 +294,8 @@ function PlaylistContent({
onAction={handlePlaylistMenuAction}
>
-
-
{songs.length ? "No songs found." : "No songs in this playlist."}
-
+
}
ListHeaderComponent={
-
-
+
Remove
-
+
)}
>
@@ -481,10 +518,18 @@ const PlaylistHero = memo(function PlaylistHero({
-
+
{title}
-
- {ownerName}
+
+
+ {ownerName}
+
{showSubscribe ? (
-
-
+
diff --git a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
index 1620b26..e3d9b68 100644
--- a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
@@ -1,5 +1,4 @@
import { Stack } from "expo-router"
-import { Platform } from "react-native"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
@@ -15,10 +14,6 @@ export default function LibraryLayout() {
({
...baseOptions,
- ...(Platform.OS === "android" &&
- (route.name === "album/[id]" || route.name === "playlist/[id]")
- ? { animation: "none" as const }
- : {}),
title: tabStackScreenTitles[route.name] ?? "Library",
headerRight:
route.name === "index" ? () => : undefined,
diff --git a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
index dcea4b1..288328a 100644
--- a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
@@ -1,5 +1,4 @@
import { Stack } from "expo-router"
-import { Platform } from "react-native"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
@@ -15,10 +14,6 @@ export default function SearchLayout() {
({
...baseOptions,
- ...(Platform.OS === "android" &&
- (route.name === "album/[id]" || route.name === "playlist/[id]")
- ? { animation: "none" as const }
- : {}),
title: tabStackScreenTitles[route.name] ?? "Search",
headerRight:
route.name === "index" ? () => : undefined,
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/cover-image.tsx b/apps/mobile/components/cover-image.tsx
index d686057..7303894 100644
--- a/apps/mobile/components/cover-image.tsx
+++ b/apps/mobile/components/cover-image.tsx
@@ -2,6 +2,7 @@ import { Ionicons } from "@expo/vector-icons"
import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
import { memo, useMemo } from "react"
import {
+ Platform,
PixelRatio,
StyleProp,
StyleSheet,
@@ -9,6 +10,8 @@ import {
type ViewStyle,
} from "react-native"
+import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
+
import { useThemeColors } from "@/lib/theme"
import {
coverImageSizes,
@@ -106,6 +109,9 @@ export const CoverImage = memo(function CoverImage({
contentFit={contentFit}
transition={150}
blurRadius={blurRadius}
+ onLoad={
+ Platform.OS === "android" ? () => prefetchCoverPalette(uri) : undefined
+ }
cachePolicy="memory-disk"
recyclingKey={sourceUri}
enforceEarlyResizing
diff --git a/apps/mobile/components/mini-player.tsx b/apps/mobile/components/mini-player.tsx
index 8923c2c..8f936fb 100644
--- a/apps/mobile/components/mini-player.tsx
+++ b/apps/mobile/components/mini-player.tsx
@@ -1,11 +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"
@@ -65,7 +67,8 @@ function MiniPlayerContent({
-
{currentSong.title}
-
+
-
-
{currentSong.title}
-
-
+
{currentSong.artist.name}
-
+
{Platform.OS === "android" && !isAccessory ? (
@@ -132,7 +138,12 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
-
+
) : null}
-
-
+
@@ -167,9 +184,10 @@ function MiniPlayerContent({
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
const palette = useAndroidTabPalette()
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
+ const backgroundStyle = useAndroidTabBackgroundStyle()
return (
-
+
{children}
{hasArtworkPalette ? (
-
+
)
}
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/skeletons.tsx b/apps/mobile/components/skeletons.tsx
index 6f32141..cacb8cc 100644
--- a/apps/mobile/components/skeletons.tsx
+++ b/apps/mobile/components/skeletons.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useRef, type ReactNode } from "react"
+import Reanimated from "react-native-reanimated"
+import { useEffect, useRef, type ReactNode, type ComponentProps } from "react"
import {
Animated,
ScrollView,
@@ -197,15 +198,25 @@ export function HomeSkeleton() {
/** Album and playlist pages: cover, title, play buttons, then tracks. */
export function CollectionDetailSkeleton({
+ style,
round = false,
+ backgroundColor,
+ onLayout,
}: {
+ style?: ComponentProps["style"]
round?: boolean
+ backgroundColor?: string
+ onLayout?: () => void
}) {
const colors = useThemeColors()
const coverSize = round ? 180 : 210
return (
-
)}
-
+
)
}
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 791de27..fec457d 100644
--- a/apps/mobile/contexts/android-tab-theme.tsx
+++ b/apps/mobile/contexts/android-tab-theme.tsx
@@ -1,8 +1,7 @@
import {
useIsFocused,
- useNavigation,
- usePreventRemove,
useRoute,
+ useNavigation,
type NativeStackNavigationProp,
} from "expo-router"
import {
@@ -14,14 +13,29 @@ import {
useState,
type PropsWithChildren,
} from "react"
-import { Platform } from "react-native"
+import { Platform, StyleSheet, type HostInstance } from "react-native"
+import Reanimated, {
+ useSharedValue,
+ useAnimatedStyle,
+ useAnimatedReaction,
+ useAnimatedRef,
+ setNativeProps,
+ processColor,
+ withTiming,
+ type SharedValue,
+} from "react-native-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
- selectedColor: string
+ colors: SharedValue
hasArtworkPalette: boolean
setPalette: (palette: CoverPalette | null, owner: string) => void
}
@@ -39,7 +53,30 @@ export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
palette: CoverPalette
owner: string
} | null>(null)
- const palette = screen?.palette ?? null
+ 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) =>
@@ -48,22 +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,
- selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText,
+ colors: animatedColors,
hasArtworkPalette: artworkPalette !== null,
setPalette,
}),
- [defaultPalette, artworkPalette, setPalette]
+ [defaultPalette, artworkPalette, setPalette, animatedColors]
)
return (
@@ -72,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()
@@ -82,39 +156,60 @@ export function useAndroidTabHasArtworkPalette() {
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
}
-export function useAndroidTabSelectedColor() {
+export function useAndroidTabBackgroundStyle() {
const theme = useContext(AndroidTabTheme)
- const defaultPalette = useDefaultPalette()
- return theme?.selectedColor ?? defaultPalette.accentText
+ const fallback = useDefaultPalette().background
+ const colors = theme?.colors
+ return useAnimatedStyle(() =>
+ Platform.OS === "android"
+ ? { backgroundColor: colors?.value.background ?? fallback }
+ : {}
+ )
}
-/** Keep Android artwork screens and shared bars on the same displayed palette. */
+/** 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] }
+ : {}
+ )
+}
+
+/** Native headers draw this same UI-thread background as the page and bars. */
+function AndroidArtworkBackground() {
+ const style = useAndroidTabBackgroundStyle()
+ return
+}
+
+export function renderAndroidArtworkBackground() {
+ return
+}
+
+const PALETTE_FADE_MS = 400
+
+/** The focused artwork screen selects the shared background for page and bars. */
export function useAndroidScreenPalette(palette: CoverPalette) {
const isFocused = useIsFocused()
const owner = useRoute().key
const navigation =
useNavigation>>()
- const [appeared, setAppeared] = useState(false)
- const [leaving, setLeaving] = useState(false)
const [laidOut, setLaidOut] = useState(false)
+ const [closing, setClosing] = useState(false)
const onLayout = useCallback(() => setLaidOut(true), [])
- const theme = useContext(AndroidTabTheme)
- const setPalette = theme?.setPalette
-
useLayoutEffect(() => {
if (Platform.OS !== "android") return
- return navigation.addListener("transitionEnd", ({ data }) => {
- setAppeared(!data.closing)
+ const start = navigation.addListener("transitionStart", ({ data }) => {
+ setClosing(data.closing)
})
+ return start
}, [navigation])
-
- usePreventRemove(Platform.OS === "android" && !leaving, ({ repeat }) => {
- setLeaving(true)
- setPalette?.(null, owner)
- // Let the page and bars paint their shared destination colors before the
- // native stack removes the page. React blur happens too early for this.
- requestAnimationFrame(() => requestAnimationFrame(repeat))
- })
+ const defaultPalette = useDefaultPalette()
+ const theme = useContext(AndroidTabTheme)
+ const setPalette = theme?.setPalette
+ const target = isFocused && laidOut && !closing ? palette : defaultPalette
+ const backgroundStyle = useAndroidTabBackgroundStyle()
useLayoutEffect(() => {
if (
@@ -122,16 +217,16 @@ export function useAndroidScreenPalette(palette: CoverPalette) {
!setPalette ||
!isFocused ||
!laidOut ||
- !appeared ||
- leaving
+ closing
)
return
setPalette(palette, owner)
return () => setPalette(null, owner)
- }, [appeared, isFocused, laidOut, leaving, owner, palette, setPalette])
+ }, [closing, laidOut, isFocused, owner, palette, setPalette])
return {
- palette: Platform.OS === "android" && theme ? theme.palette : palette,
+ palette: Platform.OS === "android" ? target : palette,
+ backgroundStyle,
onLayout: Platform.OS === "android" ? onLayout : undefined,
}
}
diff --git a/apps/mobile/hooks/use-cover-palette.ts b/apps/mobile/hooks/use-cover-palette.ts
index 4fd199b..2c9d889 100644
--- a/apps/mobile/hooks/use-cover-palette.ts
+++ b/apps/mobile/hooks/use-cover-palette.ts
@@ -95,6 +95,13 @@ function extractSwatches(key: string) {
return request
}
+/** Warm visible artwork colors before a detail page is pushed. */
+export function prefetchCoverPalette(uri: string) {
+ const key = withCoverImageSize(uri, 64)
+ if (cachedSwatches(key) !== undefined) return
+ void extractSwatches(key)
+}
+
/**
* Colors for a screen tinted by `uri`'s cover art. Extraction runs once per
* cover and is cached on device. Pass `hasCover` as `undefined` while it isn't
@@ -138,7 +145,10 @@ export function useCoverPalette(
// case the cover changed.
const timer =
known === undefined
- ? setTimeout(() => !cancelled && setWaitedKey(key), COVER_PALETTE_WAIT_MS)
+ ? setTimeout(
+ () => !cancelled && setWaitedKey(key),
+ COVER_PALETTE_WAIT_MS
+ )
: null
void extractSwatches(key).then((next) => {
if (!cancelled) show(next ?? known ?? null)
@@ -151,7 +161,9 @@ export function useCoverPalette(
const palette = useMemo(() => {
const fromArt =
- hasCover !== false && swatches ? deriveCoverPalette(swatches, isDark) : null
+ hasCover !== false && swatches
+ ? deriveCoverPalette(swatches, isDark)
+ : null
return fromArt ?? themeCoverPalette(theme, isDark)
}, [hasCover, isDark, swatches, theme])
diff --git a/apps/mobile/lib/navigation.ts b/apps/mobile/lib/navigation.ts
index 63f6e0c..3340a10 100644
--- a/apps/mobile/lib/navigation.ts
+++ b/apps/mobile/lib/navigation.ts
@@ -28,6 +28,7 @@ export function useStackScreenOptions(
headerBackButtonDisplayMode: "minimal",
...(Platform.OS === "android"
? {
+ animation: "slide_from_right",
headerLargeTitle: false,
headerTransparent: false,
headerStyle: { backgroundColor: theme.background },