diff --git a/apps/mobile/README.md b/apps/mobile/README.md
index 7fb65bd..9829442 100644
--- a/apps/mobile/README.md
+++ b/apps/mobile/README.md
@@ -42,3 +42,41 @@ Native sharing supplies media titles and artwork through iOS link metadata and A
thumbnail, while sharing the original HTTPS URL. Receiving apps control whether
they display previews. If artwork cannot load, the URL is still shared. Existing
builds without the native sharing module fall back to URL-only sharing.
+
+### iPad sidebar
+
+Expo Router owns navigation through `NativeTabs sidebarAdaptable`.
+`native/TabletSidebar.swift` adds UIKit Library and Playlists groups and the pinned
+account footer, which the current Expo Router API does not expose. The bridge
+reuses the router's tab instances so each destination retains its navigation stack.
+
+The `react-native-screens` patch checks the selected leaf controller rather than
+the group's root controller. It also notifies the sidebar bridge after each native
+tab reconciliation, so startup updates cannot replace the Library and Playlists
+sections with a flat tab list. Keep both behaviors when updating the dependency.
+After changing native modules or dependency patches, run `pod install` in `ios`
+and rebuild the development app.
+
+### Mac Catalyst
+
+On a Mac with Xcode and CocoaPods installed, generate the iOS project with
+Catalyst enabled. Use a separate checkout for Catalyst builds, since prebuild
+changes the generated iOS project and its dependency configuration.
+
+```sh
+MAC_CATALYST=1 APP_VARIANT=development pnpm exec expo prebuild --platform ios --clean
+open ios/*.xcworkspace
+```
+
+In Xcode, select the app scheme and the **My Mac (Mac Catalyst)** destination,
+select your signing team, then build and run. For a Release build, use Xcode's
+Archive action with the Catalyst destination. EAS's existing iOS profiles still
+build iPhone/iPad apps.
+
+The Catalyst plugin enables the Xcode target and React Native's CocoaPods
+patches. It disables precompiled React Native and Expo modules so dependencies
+can compile for Catalyst. The Mac app derives a separate bundle identifier with
+Apple's `maccatalyst.` prefix. System volume stays under macOS control.
+
+To return a checkout to ordinary iOS builds, rerun prebuild without
+`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
diff --git a/apps/mobile/app.config.ts b/apps/mobile/app.config.ts
index 8aa6e7a..009f3d7 100644
--- a/apps/mobile/app.config.ts
+++ b/apps/mobile/app.config.ts
@@ -28,6 +28,12 @@ export default ({ config }: ConfigContext): ExpoConfig => {
return {
...config,
+ plugins: [
+ ...(config.plugins ?? []),
+ ...(process.env.MAC_CATALYST === "1"
+ ? ["./plugins/with-mac-catalyst"]
+ : []),
+ ],
name: `${config.name}${nameSuffix}`,
slug: config.slug!,
scheme: variant === "production" ? "otunes" : `otunes-${variant}`,
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/_layout.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/_layout.tsx
new file mode 100644
index 0000000..9453ea3
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/_layout.tsx
@@ -0,0 +1,25 @@
+import { Stack } from "expo-router"
+
+import { renderTabScreenContent } from "@/components/tab-screen-content"
+import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
+import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
+
+export default function TabletSectionLayout({ segment }: { segment: string }) {
+ const section = tabletSections.find((item) => item.group === segment)
+ const options = useStackScreenOptions()
+
+ return (
+
+ ({
+ ...options,
+ title:
+ route.name === "index"
+ ? section?.title
+ : tabStackScreenTitles[route.name],
+ })}
+ />
+
+ )
+}
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/album/[id].tsx
new file mode 100644
index 0000000..f22686e
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/album/[id].tsx
@@ -0,0 +1 @@
+export { default } from "../../library/album/[id]"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/artist/[id].tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/artist/[id].tsx
new file mode 100644
index 0000000..0953a71
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/artist/[id].tsx
@@ -0,0 +1 @@
+export { default } from "../../library/artist/[id]"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/albums.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/albums.tsx
new file mode 100644
index 0000000..bb0b5fd
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/albums.tsx
@@ -0,0 +1 @@
+export { default } from "../../library/browse/albums"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/artists.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/artists.tsx
new file mode 100644
index 0000000..561a24b
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/artists.tsx
@@ -0,0 +1 @@
+export { default } from "../../library/browse/artists"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/playlists.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/playlists.tsx
new file mode 100644
index 0000000..a5d9b72
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/playlists.tsx
@@ -0,0 +1 @@
+export { default } from "../../library/browse/playlists"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/songs.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/songs.tsx
new file mode 100644
index 0000000..6111e73
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/browse/songs.tsx
@@ -0,0 +1 @@
+export { default } from "../../library/browse/songs"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/index.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/index.tsx
new file mode 100644
index 0000000..688cd25
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/index.tsx
@@ -0,0 +1,23 @@
+import { useContext } from "react"
+import Albums from "../home/browse/albums"
+import Artists from "../home/browse/artists"
+import Songs from "../home/browse/songs"
+import Playlists from "../home/browse/playlists"
+import Favorites from "../home/playlist/favorites"
+import RecentlyPlayed from "../home/recently-played"
+import { TabletSectionContext } from "@/lib/tablet-navigation"
+
+const screens = {
+ albums: Albums,
+ artists: Artists,
+ songs: Songs,
+ playlists: Playlists,
+ favorites: Favorites,
+ recent: RecentlyPlayed,
+}
+
+export default function TabletSectionScreen() {
+ const section = useContext(TabletSectionContext)
+ const Screen = screens[section?.name ?? "albums"]
+ return
+}
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/playlist/[id].tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/playlist/[id].tsx
new file mode 100644
index 0000000..eb057b7
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/playlist/[id].tsx
@@ -0,0 +1 @@
+export { default } from "../../library/playlist/[id]"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/playlist/favorites.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/playlist/favorites.tsx
new file mode 100644
index 0000000..3a58009
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/playlist/favorites.tsx
@@ -0,0 +1 @@
+export { default } from "../../library/playlist/favorites"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/queue.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/queue.tsx
new file mode 100644
index 0000000..4d4acb6
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/queue.tsx
@@ -0,0 +1 @@
+export { default } from "../library/queue"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/recently-added.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/recently-added.tsx
new file mode 100644
index 0000000..01eca97
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/recently-added.tsx
@@ -0,0 +1 @@
+export { default } from "../library/recently-added"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/recently-played.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/recently-played.tsx
new file mode 100644
index 0000000..18d4064
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/recently-played.tsx
@@ -0,0 +1 @@
+export { default } from "../library/recently-played"
diff --git a/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/settings.tsx b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/settings.tsx
new file mode 100644
index 0000000..9ec79d9
--- /dev/null
+++ b/apps/mobile/app/(app)/(tabs)/(albums,artists,songs,playlists,favorites,recent)/settings.tsx
@@ -0,0 +1 @@
+export { default } from "../library/settings"
diff --git a/apps/mobile/app/(app)/(tabs)/_layout.tsx b/apps/mobile/app/(app)/(tabs)/_layout.tsx
index 261251f..512741d 100644
--- a/apps/mobile/app/(app)/(tabs)/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/_layout.tsx
@@ -1,7 +1,10 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
+import { TabletMiniPlayer } from "@/components/tablet-mini-player"
+import { TabletPlayerLayoutProvider } from "@/contexts/tablet-player-layout"
import Animated from "react-native-reanimated"
import { NavigationBar } from "expo-navigation-bar"
import {
- AndroidTabThemeProvider,
+ ScreenPaletteProvider,
useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidNativeTabColors,
@@ -88,6 +91,7 @@ function useNativeTabColors() {
}
function TabsContent() {
+ const tabletLayout = useTabletLayout()
const homeColors = useAndroidNativeTabColors()
const libraryColors = useAndroidNativeTabColors()
const searchColors = useAndroidNativeTabColors()
@@ -109,16 +113,12 @@ function TabsContent() {
return (
-
+
{Platform.OS === "android" ? (
) : null}
- {Platform.OS === "ios" && showBottomAccessory ? (
+ {Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
@@ -162,7 +162,9 @@ function TabsContent() {
sf="music.note.square.stack.fill"
md="library_music"
/>
- Library
+
+ {tabletLayout ? "Recently Added" : "Library"}
+
Search
+
+
+ Albums
+
+
+
+ Artists
+
+
+
+ Songs
+
+
+
+ All Playlists
+
+
+
+ Favorites
+
+
+
+ Recently Played
+
{!keyboardVisible ? : null}
+ {tabletLayout ? : null}
)
}
export default function TabsLayout() {
- if (Platform.OS !== "android") return
return (
-
-
-
+
+
+
+
+
)
}
diff --git a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
index 87b926d..75da6ca 100644
--- a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
@@ -1,3 +1,4 @@
+import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -12,6 +13,7 @@ export default function HomeLayout() {
return (
({
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Home",
diff --git a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
index 834ee31..d4ba20d 100644
--- a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
@@ -1,3 +1,7 @@
+import {
+ CollectionHero,
+ useCollectionHeroLayout,
+} from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
@@ -6,7 +10,7 @@ import {
import Animated from "react-native-reanimated"
import {
renderAndroidArtworkBackground,
- useAndroidScreenPalette,
+ useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
@@ -67,12 +71,13 @@ export default function AlbumScreen() {
const isFocused = useIsFocused()
const coverUri =
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
+ const heroLayout = useCollectionHeroLayout()
const { palette: artworkPalette, settled } = useCoverPalette(
coverUri,
album ? album.cover != null : album === null ? false : undefined
)
const { palette, onLayout, backgroundStyle } =
- useAndroidScreenPalette(artworkPalette)
+ useScreenPalette(artworkPalette)
const songIds = useMemo(
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
[album]
@@ -243,131 +248,161 @@ export default function AlbumScreen() {
indicatorStyle={palette.isDark ? "white" : "black"}
ListHeaderComponent={
-
-
-
-
-
-
-
- {album.title}
-
- push(`/artist/${album.artist.id}`)}
- style={styles.artistPressable}
+
+
+
+
+
+
+ }
+ actions={
+
+ void toggleAlbumFavorite(album.id)}
+ hitSlop={8}
+ style={[
+ styles.iconAction,
+ { backgroundColor: palette.surface },
+ ]}
+ >
+
+
+
+ }
>
- {album.artist.name}
+ {album.title}
-
-
- {metadata ? (
+ push(`/artist/${album.artist.id}`)}
+ style={styles.artistPressable}
+ >
- {metadata}
+ {album.artist.name}
- ) : null}
- {hasLossless ? (
- <>
- {metadata ? (
-
- ·
-
- ) : null}
-
- >
- ) : null}
- {hasAtmos ? (
- <>
- {metadata || hasLossless ? (
-
- ·
-
- ) : null}
-
- >
- ) : null}
-
-
- void toggleAlbumFavorite(album.id)}
- hitSlop={8}
- style={[
- styles.iconAction,
- { backgroundColor: palette.surface },
- ]}
- >
-
-
+ {metadata ? (
+
+ {metadata}
+
+ ) : null}
+ {hasLossless ? (
+ <>
+ {metadata ? (
+
+ ·
+
+ ) : null}
+
+ >
+ ) : null}
+ {hasAtmos ? (
+ <>
+ {metadata || hasLossless ? (
+
+ ·
+
+ ) : null}
+
+ >
+ ) : null}
+
+
@@ -508,17 +543,14 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
const styles = StyleSheet.create({
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
- hero: {
- alignItems: "center",
- padding: spacing.lg,
- gap: spacing.sm,
- },
cover: {
width: 220,
height: 220,
borderRadius: radius.lg,
},
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
+ titleLandscape: { textAlign: "left", fontSize: 22 },
+ artistLandscape: { textAlign: "left", fontSize: 22, fontWeight: "400" },
artistPressable: { alignSelf: "stretch" },
artist: { fontSize: 16, fontWeight: "600", textAlign: "center" },
actions: {
diff --git a/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx
index 4c80192..8cbe59c 100644
--- a/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/playlist/[id].tsx
@@ -1,3 +1,7 @@
+import {
+ CollectionHero,
+ useCollectionHeroLayout,
+} from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
@@ -10,7 +14,7 @@ import {
} from "@/components/playlist-search-bar"
import {
renderAndroidArtworkBackground,
- useAndroidScreenPalette,
+ useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { useMutation } from "convex/react"
@@ -93,7 +97,7 @@ export default function PlaylistScreen() {
playlist ? playlist.cover != null : playlist === null ? false : undefined
)
const { palette, onLayout, backgroundStyle } =
- useAndroidScreenPalette(artworkPalette)
+ useScreenPalette(artworkPalette)
useEffect(() => {
if (songs) rememberSongs(songs)
@@ -168,7 +172,7 @@ function PlaylistContent({
palette,
}: {
onLayout?: () => void
- backgroundStyle: ReturnType["backgroundStyle"]
+ backgroundStyle: ReturnType["backgroundStyle"]
playlist: BrowsePlaylistDetail
songs: BrowseSong[]
coverUri: string
@@ -516,83 +520,109 @@ const PlaylistHero = memo(function PlaylistHero({
onPlay: () => void
onShuffle: () => void
}) {
+ const heroLayout = useCollectionHeroLayout()
return (
-
-
-
-
+
+
+
+
+ }
+ actions={
+
+ {showSubscribe ? (
+
+
+
+ ) : null}
+
+
+
+
-
+ }
+ >
{title}
{ownerName}
-
- {showSubscribe ? (
-
-
-
- ) : null}
-
-
-
-
-
-
+
)
@@ -602,13 +632,13 @@ const styles = StyleSheet.create({
emptyResults: { padding: spacing.lg, textAlign: "center" },
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
listContent: { paddingBottom: contentBottomInset },
- hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
cover: {
width: 200,
height: 200,
borderRadius: radius.lg,
},
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
+ titleLandscape: { textAlign: "left", fontSize: 22 },
actions: {
flexDirection: "row",
alignItems: "center",
diff --git a/apps/mobile/app/(app)/(tabs)/home/settings.tsx b/apps/mobile/app/(app)/(tabs)/home/settings.tsx
index 5d86e35..30a0cfb 100644
--- a/apps/mobile/app/(app)/(tabs)/home/settings.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/settings.tsx
@@ -20,6 +20,11 @@ import { contentBottomInset } from "@/components/player"
import { Button, Input, LoadingView } from "@/components/ui/primitives"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { useServerConfig } from "@/contexts/server-config"
+import {
+ setArtworkColorsEnabled,
+ useArtworkColorsEnabled,
+ useArtworkColorPreferenceLoaded,
+} from "@/lib/artwork-color-preference"
import { initialsFromName } from "@/lib/format"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { changeServer, signOut } from "@/lib/session"
@@ -143,7 +148,12 @@ export default function SettingsScreen() {
})}
- {section === "profile" ? : null}
+ {section === "profile" ? (
+ <>
+
+
+ >
+ ) : null}
{section === "quality" ? : null}
{section === "library" && isAdmin ? : null}
{section === "users" && isAdmin && allUsers ? (
@@ -160,6 +170,33 @@ export default function SettingsScreen() {
)
}
+function AppearanceSection() {
+ const enabled = useArtworkColorsEnabled()
+ const loaded = useArtworkColorPreferenceLoaded()
+ const [saving, setSaving] = useState(false)
+
+ return (
+
+ {
+ setSaving(true)
+ try {
+ await setArtworkColorsEnabled(checked)
+ } catch {
+ showError("Could not save artwork colors preference.")
+ } finally {
+ setSaving(false)
+ }
+ }}
+ />
+
+ )
+}
+
function ProfileSection({ user }: { user: CurrentUser }) {
const colors = useThemeColors()
const updateName = useMutation(api.users.updateProfileName)
diff --git a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
index e3d9b68..50e70aa 100644
--- a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
@@ -1,3 +1,5 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
+import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -8,13 +10,17 @@ export const unstable_settings = {
}
export default function LibraryLayout() {
+ const tabletLayout = useTabletLayout()
const baseOptions = useStackScreenOptions({ title: "Library" })
return (
({
...baseOptions,
- title: tabStackScreenTitles[route.name] ?? "Library",
+ title:
+ tabStackScreenTitles[route.name] ??
+ (tabletLayout ? "Recently Added" : "Library"),
headerRight:
route.name === "index" ? () => : undefined,
unstable_headerRightItems:
diff --git a/apps/mobile/app/(app)/(tabs)/library/index.tsx b/apps/mobile/app/(app)/(tabs)/library/index.tsx
index 44eff2e..7eef065 100644
--- a/apps/mobile/app/(app)/(tabs)/library/index.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/index.tsx
@@ -1,3 +1,4 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { useMemo } from "react"
import { Pressable, StyleSheet, Text, View } from "react-native"
import { SymbolView } from "expo-symbols"
@@ -12,14 +13,22 @@ import { useAppNavigation } from "@/lib/app-navigation"
import { api } from "@otunes/convex/_generated/api"
import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
-const PAGE_SIZE = 16
+const PAGE_SIZE = 24
const links = [
- { title: "Playlists", href: "/browse/playlists", icon: "music.note.list" as const },
+ {
+ title: "Playlists",
+ href: "/browse/playlists",
+ icon: "music.note.list" as const,
+ },
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
- { title: "Recently Played", href: "/recently-played", icon: "clock" as const },
+ {
+ title: "Recently Played",
+ href: "/recently-played",
+ icon: "clock" as const,
+ },
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
]
@@ -43,11 +52,19 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
sparkles: "sparkles",
star: "star",
}
- return
+ return (
+
+ )
}
export default function LibraryScreen() {
+ const tabletLayout = useTabletLayout()
const { push } = useAppNavigation()
+ const isTablet = tabletLayout
const colors = useThemeColors()
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
@@ -58,31 +75,46 @@ export default function LibraryScreen() {
const listHeader = useMemo(
() => (
- {links.map((link) => (
- push(link.href)}
- >
-
-
- {link.title}
-
-
-
- ))}
+ {!isTablet ? (
+ <>
+ {links.map((link) => (
+ push(link.href)}
+ >
+
+
+
+ {link.title}
+
+
+
+
+ ))}
- push("/recently-added")}
- >
-
- Recently Added
-
-
+ push("/recently-added")}
+ >
+
+ Recently Added
+
+
+ >
+ ) : null}
),
- [colors.border, colors.foreground, colors.mutedForeground, push]
+ [colors.border, colors.foreground, colors.mutedForeground, push, isTablet]
)
if (status === "LoadingFirstPage" && !isCached) {
diff --git a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
index 288328a..0b1efce 100644
--- a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
@@ -1,3 +1,4 @@
+import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -12,6 +13,7 @@ export default function SearchLayout() {
return (
({
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
diff --git a/apps/mobile/app/(app)/player.tsx b/apps/mobile/app/(app)/player.tsx
index 1f7f617..eda75e9 100644
--- a/apps/mobile/app/(app)/player.tsx
+++ b/apps/mobile/app/(app)/player.tsx
@@ -1,7 +1,9 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
+import { TabletNowPlaying } from "@/components/tablet-now-playing"
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { NavigationBar } from "expo-navigation-bar"
import { MusicEntityView } from "@/components/music-entity-view"
-import { Stack, useRouter } from "expo-router"
+import { Stack, useRouter, useLocalSearchParams } from "expo-router"
import * as Haptics from "expo-haptics"
import { StatusBar } from "expo-status-bar"
import { useEffect, useRef, useState } from "react"
@@ -72,10 +74,15 @@ const DISMISS_VELOCITY = 900
const DISMISS_CORNER_RADIUS = 48
export default function PlayerScreen() {
+ const tabletLayout = useTabletLayout()
const router = useRouter()
const hadSongRef = useRef(false)
const insets = useSafeAreaInsets()
const { width: windowWidth, height: windowHeight } = useWindowDimensions()
+ // Unfolded iPhones retain the phone idiom but have room for the iPad player.
+ const isTablet =
+ tabletLayout ||
+ (Platform.OS === "ios" && Math.min(windowWidth, windowHeight) >= 600)
const { config } = useServerConfig()
const {
currentSong,
@@ -91,7 +98,8 @@ export default function PlayerScreen() {
skipPrevious,
} = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
- const [showQueue, setShowQueue] = useState(false)
+ const { queue } = useLocalSearchParams<{ queue?: string }>()
+ const [showQueue, setShowQueue] = useState(queue === "1")
const [isDismissing, setIsDismissing] = useState(false)
const [stageHeight, setStageHeight] = useState(0)
const [scrubTime, setScrubTime] = useState(null)
@@ -218,6 +226,22 @@ export default function PlayerScreen() {
setShowQueue((value) => !value)
}
+ if (isTablet) {
+ return (
+
+ }
+ />
+
+ )
+ }
+
return (
diff --git a/apps/mobile/components/collection-hero.tsx b/apps/mobile/components/collection-hero.tsx
new file mode 100644
index 0000000..8a2f1ee
--- /dev/null
+++ b/apps/mobile/components/collection-hero.tsx
@@ -0,0 +1,66 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
+import type { ReactNode } from "react"
+import { Platform, StyleSheet, useWindowDimensions, View } from "react-native"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
+
+export function useCollectionHeroLayout() {
+ const tabletLayout = useTabletLayout()
+ const { width, height } = useWindowDimensions()
+ const insets = useSafeAreaInsets()
+ const paneWidth = width - insets.left - insets.right
+ const isTablet =
+ Platform.OS === "ios" ? tabletLayout : Math.min(width, height) >= 600
+ const landscape = isTablet && width > height && paneWidth >= 640
+ return {
+ landscape,
+ coverSize: landscape
+ ? Math.min(300, Math.max(180, (paneWidth - 100) * 0.4))
+ : undefined,
+ }
+}
+
+/** Tablet artwork and controls share a bottom edge, with metadata above the controls. */
+export function CollectionHero({
+ artwork,
+ actions,
+ children,
+}: {
+ artwork: ReactNode
+ actions: ReactNode
+ children: ReactNode
+}) {
+ const { landscape } = useCollectionHeroLayout()
+ return (
+
+ {artwork}
+
+
+ {children}
+
+ {actions}
+
+
+ )
+}
+
+const styles = StyleSheet.create({
+ hero: { padding: 16, gap: 8, alignItems: "center" },
+ landscape: {
+ flexDirection: "row",
+ alignItems: "stretch",
+ paddingHorizontal: 32,
+ paddingTop: 34,
+ paddingBottom: 40,
+ gap: 34,
+ },
+ details: { alignItems: "center", gap: 8, alignSelf: "stretch" },
+ landscapeDetails: {
+ flex: 1,
+ minWidth: 0,
+ paddingTop: 64,
+ justifyContent: "space-between",
+ alignItems: "flex-start",
+ },
+ metadata: { gap: 8, alignSelf: "stretch", alignItems: "center" },
+ landscapeMetadata: { alignItems: "flex-start", gap: 4 },
+})
diff --git a/apps/mobile/components/keyboard-form.tsx b/apps/mobile/components/keyboard-form.tsx
index 64fa77a..e085e96 100644
--- a/apps/mobile/components/keyboard-form.tsx
+++ b/apps/mobile/components/keyboard-form.tsx
@@ -3,30 +3,40 @@ import {
KeyboardAvoidingView,
Platform,
ScrollView,
+ StyleSheet,
type StyleProp,
type ViewStyle,
} from "react-native"
-/** Android resizes for the IME; scrolling keeps tall forms and actions reachable. */
+/** Center account forms on wide windows; scroll when the keyboard reduces height. */
export function KeyboardForm({
children,
style,
}: PropsWithChildren<{ style?: StyleProp }>) {
- if (Platform.OS === "android") {
- return (
+ return (
+
{children}
- )
- }
- return (
-
- {children}
)
}
+
+const styles = StyleSheet.create({
+ fill: { flex: 1 },
+ content: {
+ flex: undefined,
+ flexGrow: 1,
+ width: "100%",
+ maxWidth: 528,
+ alignSelf: "center",
+ },
+})
diff --git a/apps/mobile/components/media-cards.tsx b/apps/mobile/components/media-cards.tsx
index c5fb7fc..eb7cd5c 100644
--- a/apps/mobile/components/media-cards.tsx
+++ b/apps/mobile/components/media-cards.tsx
@@ -1,3 +1,8 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
+import Animated from "react-native-reanimated"
+import { tabletLayoutTransition } from "@/lib/tablet-motion"
+import { TabletMediaGrid } from "@/components/tablet-media-grid"
+import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { MusicEntityView } from "@/components/music-entity-view"
import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons"
@@ -25,13 +30,7 @@ import type {
PlaylistSummary,
} from "@otunes/convex/types"
import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls"
-import {
- carouselCardWidth,
- radius,
- spacing,
- useThemeColors,
- useTwoColumnCardWidth,
-} from "@/lib/theme"
+import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
@@ -41,11 +40,14 @@ const MAX_NON_VIRTUAL_CAROUSEL_ITEMS = 10
export const AlbumCard = memo(function AlbumCard({
album,
width = carouselCardWidth,
+ fluid = false,
}: {
album: BrowseAlbum
width?: number
+ fluid?: boolean
}) {
const { href } = useAppNavigation()
+ const tabletLayout = useTabletLayout()
const { config } = useServerConfig()
const colors = useThemeColors()
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
@@ -53,20 +55,29 @@ export const AlbumCard = memo(function AlbumCard({
const card = (
-
+
{album.title}
@@ -97,11 +108,14 @@ export const AlbumCard = memo(function AlbumCard({
export const ArtistCard = memo(function ArtistCard({
artist,
width = carouselCardWidth,
+ fluid = false,
}: {
artist: BrowseArtist
width?: number
+ fluid?: boolean
}) {
const { push } = useAppNavigation()
+ const tabletLayout = useTabletLayout()
const { config } = useServerConfig()
const colors = useThemeColors()
const { handleArtistAction, isArtistFavorite } = useMediaMenuActions()
@@ -111,15 +125,22 @@ export const ArtistCard = memo(function ArtistCard({
if (!config) return null
const card = (
-
+
{artist.name}
@@ -142,11 +163,14 @@ export const ArtistCard = memo(function ArtistCard({
export const PlaylistCard = memo(function PlaylistCard({
playlist,
width = carouselCardWidth,
+ fluid = false,
}: {
playlist: PlaylistSummary
width?: number
+ fluid?: boolean
}) {
const { href } = useAppNavigation()
+ const tabletLayout = useTabletLayout()
const { config } = useServerConfig()
const colors = useThemeColors()
const { handlePlaylistAction } = useMediaMenuActions()
@@ -154,20 +178,29 @@ export const PlaylistCard = memo(function PlaylistCard({
const card = (
-
+
{playlist.title}
@@ -200,29 +233,42 @@ export const PlaylistCard = memo(function PlaylistCard({
const CarouselCard = memo(function CarouselCard({
item,
width,
+ fluid = false,
}: {
item: MediaItem
width: number
+ fluid?: boolean
}) {
- if ("owner" in item) return
- if ("artist" in item) return
- return
+ if ("owner" in item)
+ return
+ if ("artist" in item)
+ return
+ return
})
export function MediaGrid({ content }: { content: MediaItem[] }) {
- const cardWidth = useTwoColumnCardWidth()
+ const tabletLayout = useTabletLayout()
+ const { cardWidth, onLayout, ready } = useMediaGridLayout()
return (
-
- {content.map((item) => (
-
-
-
+
+ {(ready ? content : []).map((item) => (
+
+
+
))}
)
}
+function renderTabletCard(item: MediaItem, width: number) {
+ return
+}
+
export function MediaGridList({
content,
paddingBottom,
@@ -236,7 +282,9 @@ export function MediaGridList({
ListHeaderComponent?: ReactElement
contentInset?: boolean
}) {
- const cardWidth = useTwoColumnCardWidth()
+ const tabletLayout = useTabletLayout()
+ const { columns, cardWidth, onLayout, horizontalPadding, gap } =
+ useMediaGridLayout()
const colors = useThemeColors()
const renderItem = useCallback(
({ item }: ListRenderItemInfo) => (
@@ -247,23 +295,43 @@ export function MediaGridList({
[cardWidth]
)
+ if (tabletLayout) {
+ return (
+
+ )
+ }
+
return (
; historyIndex: number }
| { type: "current"; key: string }
- | { type: "controls"; key: string; showTitle: boolean }
+ | { type: "controls"; key: string; showTitle: boolean; tablet?: boolean }
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
| { type: "empty"; key: string; height: number }
@@ -72,7 +72,11 @@ function itemHeight(item: QueueListItem) {
case "current":
return CURRENT_HEIGHT
case "controls":
- return item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT
+ return item.tablet
+ ? 44
+ : item.showTitle
+ ? CONTROLS_HEIGHT
+ : TOGGLES_ONLY_HEIGHT
case "empty":
return item.height
default:
@@ -97,10 +101,14 @@ export function NowPlayingQueue({
colors,
viewportHeight,
currentHeader,
+ tablet = false,
+ fadeColor,
}: {
colors: NowPlayingColors
viewportHeight: number
currentHeader: ReactNode
+ tablet?: boolean
+ fadeColor?: string
}) {
const {
queueSongIds,
@@ -114,6 +122,7 @@ export function NowPlayingQueue({
skipToQueueIndex,
skipToHistoryIndex,
} = usePlayback()
+ const [viewportWidth, setViewportWidth] = useState(0)
const swipeGroup = useSwipeRowGroup()
const [scrollEnabled, setScrollEnabled] = useState(true)
const dragFrom = useSharedValue(-1)
@@ -142,9 +151,14 @@ export function NowPlayingQueue({
})
)
}
- list.push({ type: "current", key: "current" })
+ if (!tablet) list.push({ type: "current", key: "current" })
const hasUpcoming = queueSongIds.length > 1
- list.push({ type: "controls", key: "controls", showTitle: hasUpcoming })
+ list.push({
+ type: "controls",
+ key: "controls",
+ showTitle: hasUpcoming,
+ tablet,
+ })
const occurrences = new Map()
queueSongIds.forEach((songId, queueIndex) => {
const occurrence = occurrences.get(songId) ?? 0
@@ -169,7 +183,7 @@ export function NowPlayingQueue({
})
}
return list
- }, [queueHistorySongIds, queueSongIds, viewportHeight])
+ }, [queueHistorySongIds, queueSongIds, viewportHeight, tablet])
const offsets = useMemo(() => {
const result: number[] = []
@@ -181,8 +195,10 @@ export function NowPlayingQueue({
return result
}, [items])
- const currentIndex = items.findIndex((item) => item.type === "current")
- const controlsIndex = currentIndex + 1
+ const currentIndex = items.findIndex(
+ (item) => item.type === (tablet ? "controls" : "current")
+ )
+ const controlsIndex = tablet ? currentIndex : currentIndex + 1
const belowCurrentHeight = items
.slice(currentIndex)
.reduce((sum, item) => sum + itemHeight(item), 0)
@@ -325,29 +341,31 @@ export function NowPlayingQueue({
style={[
styles.controls,
{
- height: item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT,
- backgroundColor: colors.background,
+ height: itemHeight(item),
+ backgroundColor: tablet ? "transparent" : colors.background,
},
]}
>
-
-
-
-
+ {!tablet ? (
+
+
+
+
+ ) : null}
{item.showTitle ? (
Continue Playing
@@ -361,6 +379,7 @@ export function NowPlayingQueue({
songId={item.songId}
queueIndex={item.queueIndex}
lastIndex={queueSongIds.length - 1}
+ tablet={tablet}
colors={colors}
drag={drag}
swipeGroup={swipeGroup}
@@ -384,7 +403,10 @@ export function NowPlayingQueue({
}
return (
-
+ setViewportWidth(event.nativeEvent.layout.width)}
+ >
}
/>
)
@@ -581,6 +616,7 @@ const UpcomingRow = memo(function UpcomingRow({
songId,
queueIndex,
lastIndex,
+ tablet = false,
colors,
drag,
swipeGroup,
@@ -592,6 +628,7 @@ const UpcomingRow = memo(function UpcomingRow({
songId: Id<"songs">
queueIndex: number
lastIndex: number
+ tablet?: boolean
colors: NowPlayingColors
drag: DragState
swipeGroup: SwipeRowGroup
@@ -685,6 +722,19 @@ const UpcomingRow = memo(function UpcomingRow({
}
/>
+ {tablet ? (
+
+ ) : null}
diff --git a/apps/mobile/components/player.tsx b/apps/mobile/components/player.tsx
index f5e38a1..4450327 100644
--- a/apps/mobile/components/player.tsx
+++ b/apps/mobile/components/player.tsx
@@ -7,7 +7,12 @@ import type { BrowseSong } from "@otunes/convex/types"
import type { CoverPalette } from "@/lib/cover-palette"
import { formatDuration } from "@/lib/format"
import { albumCoverUrl } from "@/lib/urls"
-import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
+import {
+ miniPlayerHeight,
+ tabletMiniPlayerHeight,
+ spacing,
+ useThemeColors,
+} from "@/lib/theme"
import { memo, useCallback } from "react"
import { Platform, Pressable, StyleSheet, View } from "react-native"
@@ -161,9 +166,15 @@ export const SongListRow = memo(function SongListRow({
)
})
-export const tabContentBottomInset = spacing.lg
+const tabletPlayerInset = tabletMiniPlayerHeight + spacing.sm + spacing.lg
+export const tabContentBottomInset =
+ Platform.OS === "ios" && Platform.isPad ? tabletPlayerInset : spacing.lg
export const contentBottomInset =
- Platform.OS === "android" ? spacing.lg : miniPlayerHeight + spacing.lg
+ Platform.OS === "ios" && Platform.isPad
+ ? tabletPlayerInset
+ : Platform.OS === "android"
+ ? spacing.lg
+ : miniPlayerHeight + spacing.lg
const styles = StyleSheet.create({
row: {
diff --git a/apps/mobile/components/profile-header-button.tsx b/apps/mobile/components/profile-header-button.tsx
index 04c9c22..429b38f 100644
--- a/apps/mobile/components/profile-header-button.tsx
+++ b/apps/mobile/components/profile-header-button.tsx
@@ -1,5 +1,6 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
+import { useOpenSettings } from "@/hooks/use-open-settings"
import { Image } from "expo-image"
-import { useRouter } from "expo-router"
import { Pressable, StyleSheet, Text, View } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query"
@@ -8,16 +9,19 @@ import { radius, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
export function ProfileHeaderButton() {
- const router = useRouter()
+ const tabletLayout = useTabletLayout()
+ const openSettings = useOpenSettings()
const colors = useThemeColors()
const user = useCachedQuery(api.auth.currentUser)
+ if (tabletLayout) return null
+
return (
router.push("/(app)/settings")}
+ onPress={openSettings}
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
>
{user?.image ? (
-
+
) : (
{initialsFromName(user?.name ?? "Me")}
diff --git a/apps/mobile/components/skeletons.tsx b/apps/mobile/components/skeletons.tsx
index 147d8dc..591a335 100644
--- a/apps/mobile/components/skeletons.tsx
+++ b/apps/mobile/components/skeletons.tsx
@@ -1,8 +1,14 @@
-import { Link } from "expo-router"
-import Reanimated from "react-native-reanimated"
-import { useEffect, useRef, type ReactNode, type ComponentProps } from "react"
+import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import {
- Animated,
+ CollectionHero,
+ useCollectionHeroLayout,
+} from "@/components/collection-hero"
+import { Link } from "expo-router"
+import { useHeaderHeight } from "expo-router/react-navigation"
+import Reanimated from "react-native-reanimated"
+import { type ReactNode, type ComponentProps } from "react"
+import {
+ Platform,
ScrollView,
StyleSheet,
View,
@@ -12,15 +18,9 @@ import {
} from "react-native"
import { contentBottomInset } from "@/components/player"
-import {
- carouselCardWidth,
- radius,
- spacing,
- useThemeColors,
- useTwoColumnCardWidth,
-} from "@/lib/theme"
+import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
-/** Match the inset-adjusted lists used once screen data is available. */
+/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
function SkeletonContent({
children,
embedded = false,
@@ -29,13 +29,17 @@ function SkeletonContent({
embedded?: boolean
}) {
const colors = useThemeColors()
+ const headerHeight = useHeaderHeight()
if (embedded) return <>{children}>
return (
@@ -46,31 +50,11 @@ function SkeletonContent({
export function Skeleton({ style }: { style?: StyleProp }) {
const colors = useThemeColors()
- const opacity = useRef(new Animated.Value(1)).current
-
- useEffect(() => {
- const pulse = Animated.loop(
- Animated.sequence([
- Animated.timing(opacity, {
- toValue: 0.5,
- duration: 800,
- useNativeDriver: true,
- }),
- Animated.timing(opacity, {
- toValue: 1,
- duration: 800,
- useNativeDriver: true,
- }),
- ])
- )
- pulse.start()
- return () => pulse.stop()
- }, [opacity])
return (
-
@@ -149,20 +133,30 @@ export function MediaGridSkeleton({
contentInset?: boolean
embedded?: boolean
}) {
- const cardWidth = useTwoColumnCardWidth()
+ const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
+ useMediaGridLayout()
return (
- {Array.from({ length: items }, (_, index) => (
-
- ))}
+ {Array.from(
+ { length: ready ? Math.max(items, columns * 3) : 0 },
+ (_, index) => (
+
+ )
+ )}
)
@@ -182,12 +176,16 @@ export function CarouselSkeleton() {
}
export function HomeSkeleton() {
+ const headerHeight = useHeaderHeight()
const colors = useThemeColors()
return (
@@ -212,7 +210,28 @@ export function CollectionDetailSkeleton({
onLayout?: () => void
}) {
const colors = useThemeColors()
- const coverSize = zoomCoverSize ?? (round ? 180 : 210)
+ const headerHeight = useHeaderHeight()
+ const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
+ const coverSize =
+ !round && landscape
+ ? tabletCoverSize!
+ : (zoomCoverSize ?? (round ? 180 : 210))
+ const actions = (
+
+
+
+
+
+ )
+ const artwork = (
+
+ )
return (
-
- {zoomCoverSize ? (
-
-
-
-
-
- ) : (
-
- )}
-
-
-
-
-
-
+ {round ? (
+
+ {zoomCoverSize ? (
+
+ {artwork}
+
+ ) : (
+ artwork
+ )}
+
+
+ {actions}
-
+ ) : (
+
+ {artwork}
+
+ ) : (
+ artwork
+ )
+ }
+ actions={actions}
+ >
+
+
+
+
+ )}
{round ? (
) : (
@@ -302,7 +328,7 @@ const styles = StyleSheet.create({
carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl },
- hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
+ artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: {
flexDirection: "row",
alignItems: "center",
diff --git a/apps/mobile/components/tab-screen-content.tsx b/apps/mobile/components/tab-screen-content.tsx
new file mode 100644
index 0000000..66cb748
--- /dev/null
+++ b/apps/mobile/components/tab-screen-content.tsx
@@ -0,0 +1,27 @@
+import Animated from "react-native-reanimated"
+import { SafeAreaView } from "react-native-safe-area-context"
+import { Platform } from "react-native"
+import type { ReactNode } from "react"
+
+import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
+import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
+import { TabletSidebar } from "@/components/tablet-sidebar"
+
+/** Apply sidebar insets natively, before Yoga measures the content pane. */
+export function TabScreenContent({ children }: { children: ReactNode }) {
+ const backgroundStyle = useAndroidTabBackgroundStyle()
+ if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}>
+ return (
+
+
+ {children}
+
+
+
+
+ )
+}
+
+export function renderTabScreenContent({ children }: { children: ReactNode }) {
+ return {children}
+}
diff --git a/apps/mobile/components/tablet-media-grid.tsx b/apps/mobile/components/tablet-media-grid.tsx
new file mode 100644
index 0000000..c9bf868
--- /dev/null
+++ b/apps/mobile/components/tablet-media-grid.tsx
@@ -0,0 +1,139 @@
+import {
+ useEffect,
+ useCallback,
+ useRef,
+ useState,
+ type ReactElement,
+} from "react"
+import {
+ ScrollView,
+ View,
+ type NativeSyntheticEvent,
+ type NativeScrollEvent,
+} from "react-native"
+import Animated from "react-native-reanimated"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
+
+import type { MediaItem } from "@/components/media-cards"
+import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
+import { tabletLayoutTransition } from "@/lib/tablet-motion"
+import { useThemeColors } from "@/lib/theme"
+
+type GridProps = {
+ content: MediaItem[]
+ paddingBottom: number
+ onEndReached?: () => void
+ ListHeaderComponent?: ReactElement
+ contentInset?: boolean
+ renderCard: (item: MediaItem, width: number) => ReactElement
+}
+
+/**
+ * Keep tiles keyed by media ID across column changes. Only the viewport plus
+ * two rows on either side is mounted, even when a large library is loaded.
+ */
+export function TabletMediaGrid({
+ content,
+ paddingBottom,
+ onEndReached,
+ ListHeaderComponent,
+ contentInset = true,
+ renderCard,
+}: GridProps) {
+ const colors = useThemeColors()
+ const insets = useSafeAreaInsets()
+ const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
+ useMediaGridLayout()
+ const [viewportHeight, setViewportHeight] = useState(900)
+ const [headerHeight, setHeaderHeight] = useState(0)
+ const [scrollY, setScrollY] = useState(0)
+ const lastRequestedLength = useRef(-1)
+ const rowHeight = cardWidth + 48 + gap
+ const firstRow = Math.max(
+ 0,
+ Math.floor((scrollY - headerHeight) / rowHeight) - 2
+ )
+ const visibleRows = Math.ceil(viewportHeight / rowHeight) + 5
+ const start = firstRow * columns
+ const end = Math.min(content.length, (firstRow + visibleRows) * columns)
+ const rows = Math.ceil(content.length / columns)
+ const gridHeight = rows * rowHeight
+
+ const onScroll = useCallback(
+ (event: NativeSyntheticEvent) => {
+ const { contentOffset, layoutMeasurement, contentSize } =
+ event.nativeEvent
+ const nextY = Math.max(0, contentOffset.y)
+ setScrollY((current) =>
+ Math.floor(current / rowHeight) === Math.floor(nextY / rowHeight)
+ ? current
+ : nextY
+ )
+ if (
+ contentOffset.y + layoutMeasurement.height * 1.5 >=
+ contentSize.height &&
+ lastRequestedLength.current !== content.length
+ ) {
+ lastRequestedLength.current = content.length
+ onEndReached?.()
+ }
+ },
+ [content.length, onEndReached, rowHeight]
+ )
+ useEffect(() => {
+ if (
+ content.length > 0 &&
+ gridHeight + headerHeight <= viewportHeight * 1.5 &&
+ lastRequestedLength.current !== content.length
+ ) {
+ lastRequestedLength.current = content.length
+ onEndReached?.()
+ }
+ }, [content.length, gridHeight, headerHeight, viewportHeight, onEndReached])
+
+ return (
+ {
+ onLayout(event)
+ setViewportHeight(event.nativeEvent.layout.height)
+ }}
+ >
+
+ setHeaderHeight(event.nativeEvent.layout.height)}
+ >
+ {ListHeaderComponent}
+
+
+ {(ready ? content.slice(start, end) : []).map((item, offset) => {
+ const index = start + offset
+ return (
+
+ {renderCard(item, cardWidth)}
+
+ )
+ })}
+
+
+
+ )
+}
diff --git a/apps/mobile/components/tablet-mini-player.tsx b/apps/mobile/components/tablet-mini-player.tsx
new file mode 100644
index 0000000..a0fed38
--- /dev/null
+++ b/apps/mobile/components/tablet-mini-player.tsx
@@ -0,0 +1,289 @@
+import { useEffect, type ReactNode } from "react"
+import Animated, {
+ useAnimatedStyle,
+ useSharedValue,
+ withTiming,
+} from "react-native-reanimated"
+import { GlassView, isLiquidGlassAvailable } from "expo-glass-effect"
+import { tabletMotion } from "@/lib/tablet-motion"
+import { BlurView } from "expo-blur"
+import { useIsFocused, useRouter } from "expo-router"
+import {
+ Pressable,
+ StyleSheet,
+ Text,
+ useWindowDimensions,
+ View,
+} from "react-native"
+import { useTabletPlayerInsets } from "@/contexts/tablet-player-layout"
+
+import { CoverImage } from "@/components/cover-image"
+import { MediaActionMenu } from "@/components/media-actions-sheet"
+import { PlayerSymbol } from "@/components/player-symbol"
+import { useFavorites } from "@/contexts/favorites"
+import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
+import { useServerConfig } from "@/contexts/server-config"
+import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
+import { tabletMiniPlayerHeight } from "@/lib/theme"
+import { albumCoverUrl } from "@/lib/urls"
+
+export function TabletMiniPlayer() {
+ const focused = useIsFocused()
+ const router = useRouter()
+ const insets = useTabletPlayerInsets()
+ const { width } = useWindowDimensions()
+ const left = useSharedValue(insets.left)
+ const right = useSharedValue(insets.right)
+ const bottom = useSharedValue(insets.bottom)
+ useEffect(() => {
+ left.value = withTiming(insets.left, tabletMotion)
+ right.value = withTiming(insets.right, tabletMotion)
+ bottom.value = withTiming(insets.bottom, tabletMotion)
+ }, [insets.left, insets.right, insets.bottom, left, right, bottom])
+ const positionStyle = useAnimatedStyle(() => ({
+ left: left.value + 16,
+ right: right.value + 16,
+ bottom: bottom.value + 8,
+ }))
+ const { config } = useServerConfig()
+ const {
+ currentSong,
+ queueSongIds,
+ isPlaying,
+ shuffleEnabled,
+ repeatEnabled,
+ } = usePlaybackQueue()
+ const { setIsPlaying, skipPrevious, skipNext, toggleShuffle, cycleRepeat } =
+ usePlaybackActions()
+ const { handleSongAction } = useMediaMenuActions()
+ const { isSongFavorite } = useFavorites()
+ const roomy = width - insets.left - insets.right >= 650
+
+ if (!focused || !config || !currentSong || queueSongIds.length === 0)
+ return null
+
+ const color = "#fff"
+ const inactive = "rgba(255,255,255,0.4)"
+ const accent = "#FA2D48"
+
+ return (
+
+
+
+ {roomy ? (
+ void toggleShuffle()}
+ size={21}
+ />
+ ) : null}
+ void skipPrevious()}
+ size={27}
+ />
+ setIsPlaying(!isPlaying)}
+ size={34}
+ />
+ void skipNext()}
+ size={27}
+ />
+ {roomy ? (
+ void cycleRepeat()}
+ size={21}
+ />
+ ) : null}
+
+ router.push("/(app)/player")}
+ style={styles.track}
+ accessibilityLabel="Open Now Playing"
+ >
+
+
+
+ {currentSong.title}
+
+
+ {currentSong.artist.name}
+
+
+
+ void handleSongAction(currentSong, action)}
+ >
+
+
+
+
+ {roomy ? (
+
+
+
+ ) : null}
+
+ router.push({ pathname: "/(app)/player", params: { queue: "1" } })
+ }
+ />
+
+
+ )
+}
+
+function TabletPlayerSurface({ children }: { children: ReactNode }) {
+ if (isLiquidGlassAvailable()) {
+ return (
+
+ {children}
+
+ )
+ }
+ return (
+
+ {children}
+
+ )
+}
+
+function Control({
+ label,
+ symbol,
+ fallback,
+ color,
+ size,
+ onPress,
+ selected,
+}: {
+ label: string
+ symbol: React.ComponentProps["name"]
+ fallback: React.ComponentProps["fallback"]
+ color: string
+ size: number
+ onPress: () => void
+ selected?: boolean
+}) {
+ return (
+
+
+
+ )
+}
+
+const styles = StyleSheet.create({
+ position: { position: "absolute", alignItems: "center", zIndex: 100 },
+ bar: {
+ flexDirection: "row",
+ alignItems: "center",
+ width: "100%",
+ maxWidth: 720,
+ height: tabletMiniPlayerHeight,
+ paddingHorizontal: 14,
+ gap: 4,
+ borderRadius: 34,
+ overflow: "hidden",
+ },
+ controls: {
+ flexDirection: "row",
+ alignItems: "center",
+ gap: 1,
+ marginRight: 12,
+ },
+ control: {
+ width: 40,
+ height: 44,
+ alignItems: "center",
+ justifyContent: "center",
+ },
+ track: {
+ flex: 1,
+ minWidth: 0,
+ flexDirection: "row",
+ alignItems: "center",
+ gap: 10,
+ },
+ artwork: { width: 50, height: 50, borderRadius: 5 },
+ meta: { flex: 1, minWidth: 0 },
+ title: { color: "#fff", fontSize: 15, lineHeight: 19, fontWeight: "500" },
+ artist: { color: "rgba(255,255,255,0.7)", fontSize: 14, lineHeight: 18 },
+})
diff --git a/apps/mobile/components/tablet-now-playing.tsx b/apps/mobile/components/tablet-now-playing.tsx
new file mode 100644
index 0000000..64213d3
--- /dev/null
+++ b/apps/mobile/components/tablet-now-playing.tsx
@@ -0,0 +1,418 @@
+import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
+import {
+ Pressable,
+ StyleSheet,
+ Text,
+ View,
+ useWindowDimensions,
+} from "react-native"
+import Animated, {
+ Easing,
+ ReduceMotion,
+ interpolate,
+ useAnimatedStyle,
+ useSharedValue,
+ withTiming,
+} from "react-native-reanimated"
+import { GestureDetector, Gesture } from "react-native-gesture-handler"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
+import { useRouter } from "expo-router"
+import { StatusBar } from "expo-status-bar"
+
+import { AudioOutputButton } from "@/components/audio-output-button"
+import { CoverImage } from "@/components/cover-image"
+import { NowPlayingQueue } from "@/components/now-playing-queue"
+import { PlayerSlider } from "@/components/player-slider"
+import { PlayerSymbol } from "@/components/player-symbol"
+import { usePlayback } from "@/contexts/playback"
+import { useServerConfig } from "@/contexts/server-config"
+import { useSystemVolume } from "@/hooks/use-system-volume"
+import { formatDuration, formatRemainingDuration } from "@/lib/format"
+import type { NowPlayingColors } from "@/lib/now-playing-colors"
+import { albumCoverUrl } from "@/lib/urls"
+
+const queueMotion = {
+ duration: 420,
+ easing: Easing.bezier(0.22, 1, 0.36, 1),
+ reduceMotion: ReduceMotion.System,
+}
+
+/** Tablet player keeps transport controls visible while the queue opens beside them. */
+export function TabletNowPlaying({
+ colors,
+ backgroundStyle,
+ dismissStyle,
+ dismissGesture,
+ showQueue,
+ toggleQueue,
+ metadata,
+}: {
+ colors: NowPlayingColors
+ backgroundStyle: ComponentProps["style"]
+ dismissStyle: ComponentProps["style"]
+ dismissGesture: () => ReturnType
+ showQueue: boolean
+ toggleQueue: () => void
+ metadata: ReactNode
+}) {
+ const router = useRouter()
+ const insets = useSafeAreaInsets()
+ const { width, height } = useWindowDimensions()
+ const { config } = useServerConfig()
+ const {
+ currentSong,
+ currentTime,
+ duration,
+ isPlaying,
+ setIsPlaying,
+ seekTo,
+ skipNext,
+ skipPrevious,
+ shuffleEnabled,
+ repeatEnabled,
+ toggleShuffle,
+ cycleRepeat,
+ } = usePlayback()
+ const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
+ const [scrubTime, setScrubTime] = useState(null)
+ const [queueHeight, setQueueHeight] = useState(0)
+ const wideLayout = width >= 700
+ const sideBySide = showQueue && wideLayout
+ const progress = useSharedValue(sideBySide ? 1 : 0)
+ useEffect(() => {
+ progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
+ }, [sideBySide, progress])
+ const closedCoverSize = Math.max(
+ 160,
+ Math.min(322, width * 0.52, height - 460)
+ )
+ const openCoverSize = Math.max(160, Math.min(322, width * 0.34, height - 460))
+ const mainMotion = useAnimatedStyle(() => ({
+ transform: [{ translateX: -width * 0.2625 * progress.value }],
+ }))
+ const artworkMotion = useAnimatedStyle(() => ({
+ width: interpolate(
+ progress.value,
+ [0, 1],
+ [closedCoverSize, openCoverSize]
+ ),
+ height: interpolate(
+ progress.value,
+ [0, 1],
+ [closedCoverSize, openCoverSize]
+ ),
+ }))
+ const controlsMotion = useAnimatedStyle(() => ({
+ width: interpolate(
+ progress.value,
+ [0, 1],
+ [Math.min(456, width - 80), Math.min(456, width * 0.475 - 80)]
+ ),
+ }))
+ const queueStyle = useAnimatedStyle(() => ({
+ opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
+ transform: [{ translateX: (1 - progress.value) * 48 }],
+ }))
+ const time = scrubTime ?? currentTime
+ if (!currentSong || !config) return null
+ const control = (
+ label: string,
+ symbol: React.ComponentProps["name"],
+ fallback: React.ComponentProps["fallback"],
+ onPress: () => void,
+ size = 32,
+ selected = false,
+ inactive = false
+ ) => (
+
+
+
+ )
+ const queue = (
+
+ )
+ return (
+
+
+
+ router.back()}
+ accessibilityRole="button"
+ accessibilityLabel="Close player"
+ style={[styles.handleRow, { marginTop: insets.top }]}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {metadata}
+ {
+ void seekTo(value)
+ setScrubTime(null)
+ }}
+ />
+
+
+ {formatDuration(time)}
+
+
+ {formatRemainingDuration(time, duration).replace("-", "−")}
+
+
+
+ {control(
+ "Shuffle",
+ "shuffle",
+ "shuffle",
+ () => void toggleShuffle(),
+ 21,
+ shuffleEnabled
+ )}
+ {control(
+ "Previous",
+ "backward.fill",
+ "play-back",
+ () => void skipPrevious(),
+ 38
+ )}
+ {control(
+ isPlaying ? "Pause" : "Play",
+ isPlaying ? "pause.fill" : "play.fill",
+ isPlaying ? "pause" : "play",
+ () => setIsPlaying(!isPlaying),
+ 44
+ )}
+ {control(
+ "Next",
+ "forward.fill",
+ "play-forward",
+ () => void skipNext(),
+ 38
+ )}
+ {control(
+ "Repeat",
+ repeatEnabled === "once" ? "repeat.1" : "repeat",
+ "repeat",
+ () => void cycleRepeat(),
+ 21,
+ repeatEnabled !== "none",
+ repeatEnabled === "none"
+ )}
+
+
+
+
+ }
+ trailing={
+
+ }
+ />
+
+
+
+
+ {wideLayout ? (
+
+ setQueueHeight(event.nativeEvent.layout.height)
+ }
+ >
+ {queueHeight > 0 ? queue : null}
+
+ ) : null}
+ {showQueue && !sideBySide ? (
+
+ setQueueHeight(event.nativeEvent.layout.height)
+ }
+ >
+ {queueHeight > 0 ? queue : null}
+
+ ) : null}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+const styles = StyleSheet.create({
+ root: { flex: 1, overflow: "hidden" },
+ handleRow: { height: 32, alignItems: "center", justifyContent: "center" },
+ handle: { width: 60, height: 4, borderRadius: 2 },
+ body: { flex: 1, flexDirection: "row", minHeight: 0 },
+ main: {
+ flex: 1,
+ minWidth: 0,
+ alignItems: "center",
+ paddingTop: 20,
+ paddingBottom: 0,
+ },
+ artworkArea: {
+ flex: 1,
+ width: "100%",
+ alignItems: "center",
+ justifyContent: "center",
+ paddingBottom: 36,
+ },
+ controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
+ meta: { height: 48 },
+ times: {
+ flexDirection: "row",
+ justifyContent: "space-between",
+ marginTop: -4,
+ },
+ time: { fontSize: 12, fontVariant: ["tabular-nums"] },
+ transport: {
+ flexDirection: "row",
+ alignItems: "center",
+ justifyContent: "space-between",
+ height: 80,
+ paddingHorizontal: 14,
+ },
+ button: {
+ width: 64,
+ minWidth: 36,
+ flexShrink: 1,
+ height: 64,
+ borderRadius: 32,
+ alignItems: "center",
+ justifyContent: "center",
+ },
+ volume: { height: 36, justifyContent: "center" },
+ queue: { position: "absolute", left: "47.5%", right: 20, top: 0, bottom: 0 },
+ portraitQueue: { ...StyleSheet.absoluteFill, bottom: 270 },
+ footer: {
+ flexDirection: "row",
+ justifyContent: "space-between",
+ paddingHorizontal: 44,
+ paddingTop: 12,
+ },
+ footerActions: { flexDirection: "row", gap: 16 },
+ footerButton: {
+ width: 40,
+ height: 40,
+ borderRadius: 20,
+ alignItems: "center",
+ justifyContent: "center",
+ },
+})
diff --git a/apps/mobile/components/tablet-sidebar.tsx b/apps/mobile/components/tablet-sidebar.tsx
new file mode 100644
index 0000000..f2811cb
--- /dev/null
+++ b/apps/mobile/components/tablet-sidebar.tsx
@@ -0,0 +1,39 @@
+import { useOpenSettings } from "@/hooks/use-open-settings"
+import { requireNativeView } from "expo"
+import { useIsFocused } from "expo-router"
+import { Platform, type ViewProps } from "react-native"
+
+import { useCachedQuery } from "@/hooks/use-cached-query"
+import { initialsFromName } from "@/lib/format"
+import { api } from "@otunes/convex/_generated/api"
+
+const NativeSidebar =
+ Platform.OS === "ios"
+ ? requireNativeView<
+ ViewProps & {
+ accountName: string
+ initials: string
+ imageURL?: string
+ active: boolean
+ onProfilePress: () => void
+ }
+ >("TabletSidebar")
+ : null
+
+export function TabletSidebar() {
+ const user = useCachedQuery(api.auth.currentUser)
+ const openSettings = useOpenSettings()
+ const active = useIsFocused()
+
+ if (!NativeSidebar) return null
+ return (
+
+ )
+}
diff --git a/apps/mobile/contexts/android-tab-theme.tsx b/apps/mobile/contexts/android-tab-theme.tsx
index fec457d..efd0cb2 100644
--- a/apps/mobile/contexts/android-tab-theme.tsx
+++ b/apps/mobile/contexts/android-tab-theme.tsx
@@ -10,6 +10,7 @@ import {
useContext,
useLayoutEffect,
useMemo,
+ useRef,
useState,
type PropsWithChildren,
} from "react"
@@ -47,7 +48,7 @@ function useDefaultPalette() {
return useMemo(() => themeCoverPalette(theme, isDark), [theme, isDark])
}
-export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
+export function ScreenPaletteProvider({ children }: PropsWithChildren) {
const defaultPalette = useDefaultPalette()
const [screen, setScreen] = useState<{
palette: CoverPalette
@@ -65,7 +66,6 @@ export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
selectedColor: defaultPalette.accentText,
})
useLayoutEffect(() => {
- if (Platform.OS !== "android") return
const { isDark: _isDark, ...colors } = palette
animatedColors.value = withTiming(
{
@@ -77,13 +77,25 @@ export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
{ duration: PALETTE_FADE_MS }
)
}, [animatedColors, palette, defaultPalette, hasArtwork])
+ const paletteOwner = useRef(null)
const setPalette = useCallback(
(palette: CoverPalette | null, owner: string) => {
- setScreen((current) =>
- palette ? { palette, owner } : current?.owner === owner ? null : current
+ if (!palette && paletteOwner.current !== owner) return
+ paletteOwner.current = palette ? owner : null
+ // Start on the UI thread immediately. React may defer commits while
+ // the native stack is animating, including transitionStart state updates.
+ const target = palette ?? defaultPalette
+ const { isDark: _isDark, ...colors } = target
+ animatedColors.value = withTiming(
+ {
+ ...colors,
+ selectedColor: palette ? target.foreground : target.accentText,
+ },
+ { duration: PALETTE_FADE_MS }
)
+ setScreen(palette ? { palette, owner } : null)
},
- []
+ [animatedColors, defaultPalette]
)
const artworkPalette = hasArtwork ? palette : null
const value = useMemo(
@@ -161,7 +173,7 @@ export function useAndroidTabBackgroundStyle() {
const fallback = useDefaultPalette().background
const colors = theme?.colors
return useAnimatedStyle(() =>
- Platform.OS === "android"
+ Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
? { backgroundColor: colors?.value.background ?? fallback }
: {}
)
@@ -190,43 +202,49 @@ export function renderAndroidArtworkBackground() {
const PALETTE_FADE_MS = 400
/** The focused artwork screen selects the shared background for page and bars. */
-export function useAndroidScreenPalette(palette: CoverPalette) {
+export function useScreenPalette(palette: CoverPalette) {
const isFocused = useIsFocused()
+ const isTablet = Platform.OS === "ios" && Platform.isPad
+ const sharesPalette =
+ Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
const owner = useRoute().key
const navigation =
useNavigation>>()
const [laidOut, setLaidOut] = useState(false)
const [closing, setClosing] = useState(false)
const onLayout = useCallback(() => setLaidOut(true), [])
- useLayoutEffect(() => {
- if (Platform.OS !== "android") return
- const start = navigation.addListener("transitionStart", ({ data }) => {
- setClosing(data.closing)
- })
- return start
- }, [navigation])
- const defaultPalette = useDefaultPalette()
const theme = useContext(AndroidTabTheme)
const setPalette = theme?.setPalette
- const target = isFocused && laidOut && !closing ? palette : defaultPalette
+ useLayoutEffect(() => {
+ if (!sharesPalette) return
+ const start = navigation.addListener("transitionStart", ({ data }) => {
+ if (data.closing) setPalette?.(null, owner)
+ else setPalette?.(palette, owner)
+ setClosing(data.closing)
+ })
+ const cancel = navigation.addListener("gestureCancel", () => {
+ setPalette?.(palette, owner)
+ setClosing(false)
+ })
+ return () => {
+ start()
+ cancel()
+ }
+ }, [navigation, sharesPalette, setPalette, owner, palette])
+ const defaultPalette = useDefaultPalette()
+ const ready = laidOut || isTablet
+ const target = isFocused && ready && !closing ? palette : defaultPalette
const backgroundStyle = useAndroidTabBackgroundStyle()
useLayoutEffect(() => {
- if (
- Platform.OS !== "android" ||
- !setPalette ||
- !isFocused ||
- !laidOut ||
- closing
- )
- return
+ if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
setPalette(palette, owner)
return () => setPalette(null, owner)
- }, [closing, laidOut, isFocused, owner, palette, setPalette])
+ }, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
return {
palette: Platform.OS === "android" ? target : palette,
backgroundStyle,
- onLayout: Platform.OS === "android" ? onLayout : undefined,
+ onLayout: sharesPalette ? onLayout : undefined,
}
}
diff --git a/apps/mobile/contexts/playback.tsx b/apps/mobile/contexts/playback.tsx
index e3b8f31..96241e8 100644
--- a/apps/mobile/contexts/playback.tsx
+++ b/apps/mobile/contexts/playback.tsx
@@ -168,7 +168,12 @@ type PlaybackActionsValue = Pick<
type PlaybackQueueValue = Pick<
PlaybackContextValue,
- "queueSongIds" | "queueHistorySongIds" | "currentSong" | "isPlaying"
+ | "queueSongIds"
+ | "queueHistorySongIds"
+ | "currentSong"
+ | "isPlaying"
+ | "shuffleEnabled"
+ | "repeatEnabled"
>
const PlaybackContext = createContext(null)
@@ -1318,12 +1323,21 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const queueValue = useMemo(
() => ({
+ shuffleEnabled: playback.shuffleEnabled,
+ repeatEnabled,
queueSongIds,
queueHistorySongIds,
currentSong,
isPlaying: isPlaybackActive,
}),
- [currentSong, isPlaybackActive, queueHistorySongIds, queueSongIds]
+ [
+ currentSong,
+ isPlaybackActive,
+ queueHistorySongIds,
+ queueSongIds,
+ playback.shuffleEnabled,
+ repeatEnabled,
+ ]
)
const value = useMemo(
diff --git a/apps/mobile/contexts/tablet-player-layout.tsx b/apps/mobile/contexts/tablet-player-layout.tsx
new file mode 100644
index 0000000..2207670
--- /dev/null
+++ b/apps/mobile/contexts/tablet-player-layout.tsx
@@ -0,0 +1,54 @@
+import {
+ createContext,
+ useCallback,
+ useContext,
+ useLayoutEffect,
+ useMemo,
+ useState,
+ type ReactNode,
+} from "react"
+import { useIsFocused } from "expo-router"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
+
+type PlayerInsets = { left: number; right: number; bottom: number }
+const TabletPlayerLayout = createContext<{
+ insets: PlayerInsets
+ setInsets: (insets: PlayerInsets) => void
+} | null>(null)
+
+/** Keep one player above the navigator, positioned using the focused screen's safe area. */
+export function TabletPlayerLayoutProvider({
+ children,
+}: {
+ children: ReactNode
+}) {
+ const safeArea = useSafeAreaInsets()
+ const [insets, updateInsets] = useState(safeArea)
+ const setInsets = useCallback((next: PlayerInsets) => {
+ updateInsets((current) =>
+ current.left === next.left &&
+ current.right === next.right &&
+ current.bottom === next.bottom
+ ? current
+ : next
+ )
+ }, [])
+ const value = useMemo(() => ({ insets, setInsets }), [insets, setInsets])
+ return {children}
+}
+
+export function TabletPlayerLayoutSync() {
+ const focused = useIsFocused()
+ const { left, right, bottom } = useSafeAreaInsets()
+ const setInsets = useContext(TabletPlayerLayout)?.setInsets
+ useLayoutEffect(() => {
+ if (focused) setInsets?.({ left, right, bottom })
+ }, [focused, left, right, bottom, setInsets])
+ return null
+}
+
+export function useTabletPlayerInsets() {
+ const layout = useContext(TabletPlayerLayout)
+ const safeArea = useSafeAreaInsets()
+ return layout?.insets ?? safeArea
+}
diff --git a/apps/mobile/hooks/use-cover-palette.ts b/apps/mobile/hooks/use-cover-palette.ts
index 2c9d889..7280c45 100644
--- a/apps/mobile/hooks/use-cover-palette.ts
+++ b/apps/mobile/hooks/use-cover-palette.ts
@@ -1,5 +1,10 @@
import { useEffect, useMemo, useState } from "react"
-import { getColors, type ImageColorsResult } from "react-native-image-colors"
+import {
+ artworkColorsEnabled,
+ useArtworkColorsEnabled,
+} from "@/lib/artwork-color-preference"
+import { prefetchLegacyCoverPalette, useLegacyCoverPalette } from "@/hooks/use-legacy-cover-palette"
+import { extractCoverSwatches } from "@/lib/artwork-colors"
import {
deriveCoverPalette,
@@ -15,49 +20,11 @@ import { withCoverImageSize } from "@/lib/urls"
// so rows render once with final colors instead of flashing from the theme.
export const COVER_PALETTE_WAIT_MS = 400
-// image-colors substitutes this for swatches it couldn't find.
-const MISSING = "#010203"
-
const swatchesByKey = new Map()
const pending = new Map>()
function cacheKey(colorSourceUri: string) {
- return `palette:${colorSourceUri}`
-}
-
-function present(colors: (string | undefined)[]) {
- return colors.filter(
- (color): color is string => !!color && color.toLowerCase() !== MISSING
- )
-}
-
-function toSwatches(result: ImageColorsResult): CoverSwatches | null {
- if (result.platform === "ios") {
- const text = present([result.primary, result.secondary, result.detail])
- return result.background.toLowerCase() === MISSING
- ? null
- : { background: result.background, text, accent: text }
- }
-
- const background = present([result.dominant, result.muted])[0]
- if (!background) return null
- return {
- background,
- text: present([
- result.lightVibrant,
- result.lightMuted,
- result.darkVibrant,
- result.darkMuted,
- result.vibrant,
- result.muted,
- ]),
- accent: present([
- result.vibrant,
- result.lightVibrant,
- result.darkVibrant,
- result.muted,
- ]),
- }
+ return `palette:v2:${colorSourceUri}`
}
function sameSwatches(
@@ -76,14 +43,7 @@ function extractSwatches(key: string) {
const inFlight = pending.get(key)
if (inFlight) return inFlight
- const request = getColors(key, {
- fallback: MISSING,
- cache: true,
- key,
- quality: "low",
- pixelSpacing: 4,
- })
- .then(toSwatches)
+ const request = extractCoverSwatches(key)
.catch(() => null)
.then((swatches) => {
swatchesByKey.set(key, swatches)
@@ -97,6 +57,10 @@ function extractSwatches(key: string) {
/** Warm visible artwork colors before a detail page is pushed. */
export function prefetchCoverPalette(uri: string) {
+ if (!artworkColorsEnabled()) {
+ prefetchLegacyCoverPalette(uri)
+ return
+ }
const key = withCoverImageSize(uri, 64)
if (cachedSwatches(key) !== undefined) return
void extractSwatches(key)
@@ -110,7 +74,7 @@ export function prefetchCoverPalette(uri: string) {
* `settled` turns true once the palette is final or after
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
*/
-export function useCoverPalette(
+function useRegionCoverPalette(
uri: string,
hasCover: boolean | undefined
): { palette: CoverPalette; settled: boolean } {
@@ -162,7 +126,7 @@ export function useCoverPalette(
const palette = useMemo(() => {
const fromArt =
hasCover !== false && swatches
- ? deriveCoverPalette(swatches, isDark)
+ ? deriveCoverPalette(swatches)
: null
return fromArt ?? themeCoverPalette(theme, isDark)
}, [hasCover, isDark, swatches, theme])
@@ -173,3 +137,11 @@ export function useCoverPalette(
!key || hasCover === false || swatches !== undefined || waitedKey === key,
}
}
+
+/** Switch both extraction and palette derivation without mixing their caches. */
+export function useCoverPalette(uri: string, hasCover: boolean | undefined) {
+ const enabled = useArtworkColorsEnabled()
+ const region = useRegionCoverPalette(enabled ? uri : "", hasCover)
+ const legacy = useLegacyCoverPalette(enabled ? "" : uri, hasCover)
+ return enabled ? region : legacy
+}
diff --git a/apps/mobile/hooks/use-legacy-cover-palette.ts b/apps/mobile/hooks/use-legacy-cover-palette.ts
new file mode 100644
index 0000000..49a7350
--- /dev/null
+++ b/apps/mobile/hooks/use-legacy-cover-palette.ts
@@ -0,0 +1,178 @@
+import { useEffect, useMemo, useState } from "react"
+import { getColors, type ImageColorsResult } from "react-native-image-colors"
+
+import {
+ themeCoverPalette,
+ type CoverPalette,
+} from "@/lib/cover-palette"
+import { deriveCoverPalette, type LegacyCoverSwatches as CoverSwatches } from "@/lib/legacy-cover-palette"
+import { readCache, writeCache } from "@/lib/persistent-cache"
+import { useIsDark, useThemeColors } from "@/lib/theme"
+import { withCoverImageSize } from "@/lib/urls"
+
+// How long a screen holds its skeleton for the first extraction of a cover,
+// so rows render once with final colors instead of flashing from the theme.
+const COVER_PALETTE_WAIT_MS = 400
+
+// image-colors substitutes this for swatches it couldn't find.
+const MISSING = "#010203"
+
+const swatchesByKey = new Map()
+const pending = new Map>()
+
+function cacheKey(colorSourceUri: string) {
+ return `palette:${colorSourceUri}`
+}
+
+function present(colors: (string | undefined)[]) {
+ return colors.filter(
+ (color): color is string => !!color && color.toLowerCase() !== MISSING
+ )
+}
+
+function toSwatches(result: ImageColorsResult): CoverSwatches | null {
+ if (result.platform === "ios") {
+ const text = present([result.primary, result.secondary, result.detail])
+ return result.background.toLowerCase() === MISSING
+ ? null
+ : { background: result.background, text, accent: text }
+ }
+
+ const background = present([result.dominant, result.muted])[0]
+ if (!background) return null
+ return {
+ background,
+ text: present([
+ result.lightVibrant,
+ result.lightMuted,
+ result.darkVibrant,
+ result.darkMuted,
+ result.vibrant,
+ result.muted,
+ ]),
+ accent: present([
+ result.vibrant,
+ result.lightVibrant,
+ result.darkVibrant,
+ result.muted,
+ ]),
+ }
+}
+
+function sameSwatches(
+ a: CoverSwatches | null | undefined,
+ b: CoverSwatches | null | undefined
+) {
+ return a === b || JSON.stringify(a) === JSON.stringify(b)
+}
+
+function cachedSwatches(key: string): CoverSwatches | null | undefined {
+ if (swatchesByKey.has(key)) return swatchesByKey.get(key)
+ const cached = readCache(cacheKey(key))
+ // Discard the background-only entries written by the tablet palette experiment.
+ return cached && (!Array.isArray(cached.text) || !Array.isArray(cached.accent))
+ ? undefined
+ : cached
+}
+
+function extractSwatches(key: string) {
+ const inFlight = pending.get(key)
+ if (inFlight) return inFlight
+
+ const request = getColors(key, {
+ fallback: MISSING,
+ cache: true,
+ key,
+ quality: "low",
+ pixelSpacing: 4,
+ })
+ .then(toSwatches)
+ .catch(() => null)
+ .then((swatches) => {
+ swatchesByKey.set(key, swatches)
+ if (swatches) writeCache(cacheKey(key), swatches)
+ pending.delete(key)
+ return swatches
+ })
+ pending.set(key, request)
+ return request
+}
+
+/** Warm visible artwork colors before a detail page is pushed. */
+export function prefetchLegacyCoverPalette(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
+ * known yet so extraction can start early.
+ *
+ * `settled` turns true once the palette is final or after
+ * `COVER_PALETTE_WAIT_MS`, whichever comes first.
+ */
+export function useLegacyCoverPalette(
+ uri: string,
+ hasCover: boolean | undefined
+): { palette: CoverPalette; settled: boolean } {
+ const theme = useThemeColors()
+ const isDark = useIsDark()
+ const key = uri ? withCoverImageSize(uri, 64) : ""
+ const [resolved, setResolved] = useState(() => ({
+ key,
+ swatches: key ? cachedSwatches(key) : null,
+ }))
+ const [waitedKey, setWaitedKey] = useState(null)
+
+ const swatches =
+ resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
+
+ useEffect(() => {
+ if (!key || hasCover === false) return
+ let cancelled = false
+ const known = cachedSwatches(key)
+ const show = (next: CoverSwatches | null) =>
+ setResolved((prev) =>
+ prev.key === key && sameSwatches(prev.swatches, next)
+ ? prev
+ : { key, swatches: next }
+ )
+ if (known !== undefined && swatchesByKey.has(key)) {
+ show(known)
+ return
+ }
+
+ // Persisted swatches render immediately; refresh them in the background in
+ // case the cover changed.
+ const timer =
+ known === undefined
+ ? setTimeout(
+ () => !cancelled && setWaitedKey(key),
+ COVER_PALETTE_WAIT_MS
+ )
+ : null
+ void extractSwatches(key).then((next) => {
+ if (!cancelled) show(next ?? known ?? null)
+ })
+ return () => {
+ cancelled = true
+ if (timer) clearTimeout(timer)
+ }
+ }, [hasCover, key])
+
+ const palette = useMemo(() => {
+ const fromArt =
+ hasCover !== false && swatches
+ ? deriveCoverPalette(swatches, isDark)
+ : null
+ return fromArt ?? themeCoverPalette(theme, isDark)
+ }, [hasCover, isDark, swatches, theme])
+
+ return {
+ palette,
+ settled:
+ !key || hasCover === false || swatches !== undefined || waitedKey === key,
+ }
+}
diff --git a/apps/mobile/hooks/use-media-grid-layout.ts b/apps/mobile/hooks/use-media-grid-layout.ts
new file mode 100644
index 0000000..b586d1d
--- /dev/null
+++ b/apps/mobile/hooks/use-media-grid-layout.ts
@@ -0,0 +1,47 @@
+import { useTabletLayout } from "@/hooks/use-tablet-layout"
+import { useCallback, useLayoutEffect, useState } from "react"
+import { useWindowDimensions, type LayoutChangeEvent } from "react-native"
+import { useSafeAreaInsets } from "react-native-safe-area-context"
+import { spacing } from "@/lib/theme"
+
+/** Measure the content pane because native sidebars reduce its available width. */
+export function useMediaGridLayout() {
+ const tabletLayout = useTabletLayout()
+ const { width: windowWidth } = useWindowDimensions()
+ const insets = useSafeAreaInsets()
+ const [measuredWidth, setWidth] = useState(null)
+ const [ready, setReady] = useState(false)
+ useLayoutEffect(() => {
+ if (ready || measuredWidth === null) return
+ let secondFrame = 0
+ const firstFrame = requestAnimationFrame(() => {
+ secondFrame = requestAnimationFrame(() => setReady(true))
+ })
+ return () => {
+ cancelAnimationFrame(firstFrame)
+ cancelAnimationFrame(secondFrame)
+ }
+ }, [measuredWidth, insets.left, insets.right, ready])
+ const width = measuredWidth ?? windowWidth - insets.left - insets.right
+ const onLayout = useCallback((event: LayoutChangeEvent) => {
+ setWidth(event.nativeEvent.layout.width)
+ }, [])
+ const horizontalPadding = tabletLayout ? spacing.xxl : spacing.lg
+ const gap = tabletLayout ? spacing.lg : spacing.md
+ const columns = Math.max(
+ 2,
+ Math.floor((width - horizontalPadding * 2 + gap) / (180 + gap))
+ )
+ const cardWidth = Math.max(
+ 1,
+ Math.floor((width - horizontalPadding * 2 - gap * (columns - 1)) / columns)
+ )
+ return {
+ columns,
+ cardWidth,
+ onLayout,
+ horizontalPadding,
+ gap,
+ ready: ready && measuredWidth !== null,
+ }
+}
diff --git a/apps/mobile/hooks/use-open-settings.ts b/apps/mobile/hooks/use-open-settings.ts
new file mode 100644
index 0000000..d9d58e0
--- /dev/null
+++ b/apps/mobile/hooks/use-open-settings.ts
@@ -0,0 +1,14 @@
+import { useNavigation } from "expo-router"
+import { StackActions } from "expo-router/react-navigation"
+import { useCallback } from "react"
+
+/** Present the app-level modal without resolving an overlapping tab settings route. */
+export function useOpenSettings() {
+ const navigation = useNavigation("/(app)")
+ return useCallback(() => {
+ navigation.dispatch({
+ ...StackActions.push("settings"),
+ target: navigation.getState()?.key,
+ })
+ }, [navigation])
+}
diff --git a/apps/mobile/hooks/use-tablet-layout.ts b/apps/mobile/hooks/use-tablet-layout.ts
new file mode 100644
index 0000000..1e24c72
--- /dev/null
+++ b/apps/mobile/hooks/use-tablet-layout.ts
@@ -0,0 +1,7 @@
+import { Platform, useWindowDimensions } from "react-native"
+
+/** Use the phone layout in compact iPad windows, including Split View. */
+export function useTabletLayout() {
+ const { width } = useWindowDimensions()
+ return Platform.OS === "ios" && Platform.isPad && width >= 600
+}
diff --git a/apps/mobile/lib/app-navigation.ts b/apps/mobile/lib/app-navigation.ts
index 3b0f224..2cbf052 100644
--- a/apps/mobile/lib/app-navigation.ts
+++ b/apps/mobile/lib/app-navigation.ts
@@ -1,7 +1,14 @@
import { useRouter, useSegments, type Href } from "expo-router"
import { useCallback } from "react"
-export const APP_TABS = ["home", "library", "search"] as const
+import { tabletSections } from "@/lib/tablet-navigation"
+
+export const APP_TABS = [
+ "home",
+ "library",
+ "search",
+ ...tabletSections.map((section) => section.group),
+] as const
export type AppTab = (typeof APP_TABS)[number]
const TAB_SET = new Set(APP_TABS)
@@ -37,20 +44,26 @@ export function AppNavigationSync() {
export function useAppNavigation() {
const router = useRouter()
- const push = useCallback((path: string) => {
- if (activeSegmentsRef.current.includes("player")) {
- // Leave the root player modal before navigating into the library stack.
- router.dismiss()
- router.navigate(tabPath("library", path))
- return
- }
+ const push = useCallback(
+ (path: string) => {
+ if (activeSegmentsRef.current.includes("player")) {
+ // Leave the root player modal before navigating into the library stack.
+ router.dismiss()
+ router.navigate(tabPath("library", path))
+ return
+ }
- router.push(tabPath(getActiveTabFromRef(), path))
- }, [router])
+ router.push(tabPath(getActiveTabFromRef(), path))
+ },
+ [router]
+ )
- const replace = useCallback((path: string) => {
- router.replace(tabPath(getActiveTabFromRef(), path))
- }, [router])
+ const replace = useCallback(
+ (path: string) => {
+ router.replace(tabPath(getActiveTabFromRef(), path))
+ },
+ [router]
+ )
const href = useCallback(
(path: string) => tabPath(getActiveTabFromRef(), path),
diff --git a/apps/mobile/lib/artwork-color-preference.ts b/apps/mobile/lib/artwork-color-preference.ts
new file mode 100644
index 0000000..2651ddd
--- /dev/null
+++ b/apps/mobile/lib/artwork-color-preference.ts
@@ -0,0 +1,54 @@
+import AsyncStorage from "@react-native-async-storage/async-storage"
+import { useSyncExternalStore } from "react"
+
+const STORAGE_KEY = "otunes:artwork-colors"
+const listeners = new Set<() => void>()
+let enabled = true
+let loaded = false
+let loading: Promise | undefined
+
+function notify() {
+ for (const listener of listeners) listener()
+}
+
+function load() {
+ return (loading ??= AsyncStorage.getItem(STORAGE_KEY)
+ .then((value) => {
+ enabled = value !== "false"
+ })
+ .catch(() => {
+ // Keep the default when local storage is unavailable.
+ })
+ .finally(() => {
+ loaded = true
+ notify()
+ }))
+}
+
+function subscribe(listener: () => void) {
+ listeners.add(listener)
+ void load()
+ return () => {
+ listeners.delete(listener)
+ }
+}
+
+/** Device preference, kept outside account data and the disposable query cache. */
+export function useArtworkColorsEnabled() {
+ return useSyncExternalStore(subscribe, () => loaded && enabled, () => false)
+}
+
+export function useArtworkColorPreferenceLoaded() {
+ return useSyncExternalStore(subscribe, () => loaded, () => false)
+}
+
+export function artworkColorsEnabled() {
+ return loaded && enabled
+}
+
+export async function setArtworkColorsEnabled(value: boolean) {
+ await load()
+ await AsyncStorage.setItem(STORAGE_KEY, String(value))
+ enabled = value
+ notify()
+}
diff --git a/apps/mobile/lib/artwork-colors.ios.ts b/apps/mobile/lib/artwork-colors.ios.ts
new file mode 100644
index 0000000..1842473
--- /dev/null
+++ b/apps/mobile/lib/artwork-colors.ios.ts
@@ -0,0 +1,11 @@
+import { requireNativeModule } from "expo"
+
+import { swatchesFromHistogram, type ColorBin } from "./color-histogram"
+
+const native = requireNativeModule<{
+ histogram(uri: string): Promise
+}>("ArtworkColors")
+
+export async function extractCoverSwatches(uri: string) {
+ return swatchesFromHistogram(await native.histogram(uri))
+}
diff --git a/apps/mobile/lib/artwork-colors.ts b/apps/mobile/lib/artwork-colors.ts
new file mode 100644
index 0000000..0ee2b3e
--- /dev/null
+++ b/apps/mobile/lib/artwork-colors.ts
@@ -0,0 +1,29 @@
+import { getColors } from "react-native-image-colors"
+import type { CoverSwatches } from "./cover-palette"
+
+const MISSING = "#010203"
+
+/** Android and web retain their platform quantizers; iOS uses the sRGB histogram. */
+export async function extractCoverSwatches(
+ uri: string
+): Promise {
+ const result = await getColors(uri, {
+ fallback: MISSING,
+ cache: true,
+ key: uri,
+ quality: "low",
+ pixelSpacing: 4,
+ })
+ if (result.platform === "ios") return null
+ const background = [result.dominant, result.muted].find(
+ (color) => color && color.toLowerCase() !== MISSING
+ )
+ if (!background) return null
+ return {
+ background,
+ ...(result.platform === "android" &&
+ result.average.toLowerCase() !== MISSING
+ ? { average: result.average }
+ : {}),
+ }
+}
diff --git a/apps/mobile/lib/color-histogram.test.cjs b/apps/mobile/lib/color-histogram.test.cjs
new file mode 100644
index 0000000..99a6206
--- /dev/null
+++ b/apps/mobile/lib/color-histogram.test.cjs
@@ -0,0 +1,55 @@
+const { test } = require("node:test")
+const assert = require("node:assert/strict")
+const fs = require("node:fs")
+const ts = require("typescript")
+
+const compiled = ts.transpileModule(
+ fs.readFileSync(`${__dirname}/color-histogram.ts`, "utf8"),
+ {
+ compilerOptions: {
+ module: ts.ModuleKind.CommonJS,
+ target: ts.ScriptTarget.ES2022,
+ },
+ }
+).outputText
+const loaded = { exports: {} }
+new Function("exports", compiled)(loaded.exports)
+const { swatchesFromHistogram } = loaded.exports
+
+test("a noisy background outranks a smaller flat logo, independent of bin order", () => {
+ const background = Array.from({ length: 30 }, (_, i) => [
+ 30 + i,
+ 110 + i,
+ 30 + i,
+ 100,
+ ])
+ const bins = [...background, [240, 10, 10, 500]]
+ const palette = swatchesFromHistogram(bins)
+ assert.equal(palette.background, "#2d7d2d")
+ assert.ok(palette.dominantFraction > 0.85)
+ assert.deepEqual(palette, swatchesFromHistogram([...bins].reverse()))
+})
+
+test("dominant black stays black beside white and a saturated accent", () => {
+ const palette = swatchesFromHistogram([
+ [0, 0, 0, 60],
+ [255, 255, 255, 30],
+ [140, 200, 50, 10],
+ ])
+ assert.equal(palette.background, "#000000")
+ assert.equal(palette.darkFraction, 0.6)
+ assert.equal(palette.dominantFraction, 0.6)
+})
+
+test("empty and invalid histograms cannot produce NaN colors", () => {
+ assert.equal(swatchesFromHistogram([]), null)
+ assert.equal(
+ swatchesFromHistogram([
+ [NaN, 0, 0, 1],
+ [256, 0, 0, 1],
+ [0, 0, 0, 0],
+ ]),
+ null
+ )
+ assert.equal(swatchesFromHistogram([[80, 100, 120, 4]]).background, "#506478")
+})
diff --git a/apps/mobile/lib/color-histogram.ts b/apps/mobile/lib/color-histogram.ts
new file mode 100644
index 0000000..5136f2a
--- /dev/null
+++ b/apps/mobile/lib/color-histogram.ts
@@ -0,0 +1,162 @@
+import type { CoverSwatches } from "./cover-palette"
+
+type Rgb = [number, number, number]
+export type ColorBin = [red: number, green: number, blue: number, count: number]
+type Cluster = { rgb: Rgb; lab: Rgb; count: number }
+
+function lab([r, g, b]: Rgb): Rgb {
+ const linear = (v: number) =>
+ v <= 0.04045 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4
+ const red = linear(r / 255)
+ const green = linear(g / 255)
+ const blue = linear(b / 255)
+ const l = Math.cbrt(
+ 0.4122214708 * red + 0.5363325363 * green + 0.0514459929 * blue
+ )
+ const m = Math.cbrt(
+ 0.2119034982 * red + 0.6806995451 * green + 0.1073969566 * blue
+ )
+ const s = Math.cbrt(
+ 0.0883024619 * red + 0.2817188376 * green + 0.6299787005 * blue
+ )
+ return [
+ 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s,
+ 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s,
+ 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s,
+ ]
+}
+
+function distance(a: Rgb, b: Rgb) {
+ return (a[0] - b[0]) ** 2 + (a[1] - b[1]) ** 2 + (a[2] - b[2]) ** 2
+}
+
+function hex(rgb: Rgb) {
+ return `#${rgb.map((v) => Math.round(v).toString(16).padStart(2, "0")).join("")}`
+}
+
+/** Group nearby colors by perceived distance, retaining black and white regions. */
+export function swatchesFromHistogram(bins: ColorBin[]): CoverSwatches | null {
+ const samples: Cluster[] = bins
+ .filter(
+ (bin) =>
+ bin.length === 4 &&
+ bin.every(Number.isFinite) &&
+ bin[3] > 0 &&
+ bin.slice(0, 3).every((v) => v >= 0 && v <= 255)
+ )
+ .map(([r, g, b, count]) => ({
+ rgb: [r, g, b],
+ lab: lab([r, g, b]),
+ count,
+ }))
+ .sort(
+ (a, b) =>
+ b.count - a.count ||
+ a.rgb[0] - b.rgb[0] ||
+ a.rgb[1] - b.rgb[1] ||
+ a.rgb[2] - b.rgb[2]
+ )
+ if (!samples.length) return null
+
+ const centers = [samples[0].lab]
+ // Deterministic weighted seeding avoids random palette changes between launches.
+ while (centers.length < Math.min(8, samples.length)) {
+ let candidate = samples[0]
+ let best = 0
+ for (const sample of samples) {
+ const score =
+ Math.min(...centers.map((center) => distance(sample.lab, center))) *
+ sample.count
+ if (score > best) {
+ candidate = sample
+ best = score
+ }
+ }
+ if (best === 0) break
+ centers.push(candidate.lab)
+ }
+
+ let clusters: Cluster[] = []
+ for (let iteration = 0; iteration < 12; iteration++) {
+ clusters = centers.map(() => ({ rgb: [0, 0, 0], lab: [0, 0, 0], count: 0 }))
+ for (const sample of samples) {
+ let nearest = 0
+ for (let index = 1; index < centers.length; index++) {
+ if (
+ distance(sample.lab, centers[index]) <
+ distance(sample.lab, centers[nearest])
+ )
+ nearest = index
+ }
+ const cluster = clusters[nearest]
+ cluster.count += sample.count
+ for (let channel = 0; channel < 3; channel++) {
+ cluster.rgb[channel] += sample.rgb[channel] * sample.count
+ cluster.lab[channel] += sample.lab[channel] * sample.count
+ }
+ }
+ let movement = 0
+ clusters.forEach((cluster, index) => {
+ if (!cluster.count) return
+ for (let channel = 0; channel < 3; channel++) {
+ cluster.rgb[channel] /= cluster.count
+ cluster.lab[channel] /= cluster.count
+ }
+ movement += distance(centers[index], cluster.lab)
+ centers[index] = cluster.lab
+ })
+ if (movement < 0.000001) break
+ }
+
+ // K-means can divide a textured region across several centers. Combine those
+ // centers before ranking coverage so a small flat logo cannot outrank it.
+ clusters = clusters.filter((cluster) => cluster.count > 0)
+ while (clusters.length > 1) {
+ let pair: [number, number] | undefined
+ let closest = 0.06 ** 2
+ for (let a = 0; a < clusters.length; a++) {
+ for (let b = a + 1; b < clusters.length; b++) {
+ const separation = distance(clusters[a].lab, clusters[b].lab)
+ if (separation < closest) {
+ closest = separation
+ pair = [a, b]
+ }
+ }
+ }
+ if (!pair) break
+ const [a, b] = pair
+ const first = clusters[a]
+ const second = clusters[b]
+ const count = first.count + second.count
+ for (let channel = 0; channel < 3; channel++) {
+ first.rgb[channel] =
+ (first.rgb[channel] * first.count +
+ second.rgb[channel] * second.count) /
+ count
+ first.lab[channel] =
+ (first.lab[channel] * first.count +
+ second.lab[channel] * second.count) /
+ count
+ }
+ first.count = count
+ clusters.splice(b, 1)
+ }
+
+ const total = samples.reduce((sum, sample) => sum + sample.count, 0)
+ const average: Rgb = [0, 0, 0]
+ for (const sample of samples) {
+ for (let channel = 0; channel < 3; channel++)
+ average[channel] += (sample.rgb[channel] * sample.count) / total
+ }
+ clusters.sort((a, b) => b.count - a.count)
+ return {
+ background: hex(clusters[0].rgb),
+ average: hex(average),
+ dominantFraction: clusters[0].count / total,
+ darkFraction:
+ samples.reduce(
+ (sum, sample) => sum + (sample.lab[0] < 0.3 ? sample.count : 0),
+ 0
+ ) / total,
+ }
+}
diff --git a/apps/mobile/lib/color-space.ts b/apps/mobile/lib/color-space.ts
new file mode 100644
index 0000000..dd1d96a
--- /dev/null
+++ b/apps/mobile/lib/color-space.ts
@@ -0,0 +1,32 @@
+type Color = [number, number, number]
+
+/** Convert sRGB byte values to Oklab without quantizing intermediate colors. */
+export function toOklab(rgb: Color): Color {
+ const [r, g, b] = rgb.map((byte) => {
+ const v = byte / 255
+ return v <= 0.04045 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4
+ })
+ const l = Math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
+ const m = Math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
+ const s = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
+ return [
+ 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s,
+ 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s,
+ 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s,
+ ]
+}
+
+/** Map an Oklab color back into the display's sRGB gamut. */
+export function fromOklab([L, a, b]: Color): Color {
+ const l = (L + 0.3963377774 * a + 0.2158037573 * b) ** 3
+ const m = (L - 0.1055613458 * a - 0.0638541728 * b) ** 3
+ const s = (L - 0.0894841775 * a - 1.291485548 * b) ** 3
+ return [
+ 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
+ -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
+ -0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s,
+ ].map((v) => {
+ const encoded = v <= 0.0031308 ? 12.92 * v : 1.055 * v ** (1 / 2.4) - 0.055
+ return Math.round(Math.max(0, Math.min(1, encoded)) * 255)
+ }) as Color
+}
diff --git a/apps/mobile/lib/cover-palette.compare.cjs b/apps/mobile/lib/cover-palette.compare.cjs
new file mode 100644
index 0000000..9b0b230
--- /dev/null
+++ b/apps/mobile/lib/cover-palette.compare.cjs
@@ -0,0 +1,50 @@
+// Measurement targets belong here and in the fixture, never in palette derivation.
+const fs = require("node:fs")
+const ts = require("typescript")
+const references = require("./cover-palette.references.json")
+function load(name) {
+ const exports = {}
+ const code = ts.transpileModule(
+ fs.readFileSync(`${__dirname}/${name}.ts`, "utf8"),
+ {
+ compilerOptions: {
+ module: ts.ModuleKind.CommonJS,
+ target: ts.ScriptTarget.ES2022,
+ },
+ }
+ ).outputText
+ new Function("exports", "require", code)(exports, (name) =>
+ load(name.replace("./", ""))
+ )
+ return exports
+}
+const { deriveCoverPalette } = load("cover-palette")
+const rgb = (hex) => [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16))
+const measurements = references.map(
+ ({ label, swatches, expectedBackground }) => {
+ const actual = deriveCoverPalette(swatches).background
+ const errors = rgb(actual).map((v, i) =>
+ Math.abs(v - rgb(expectedBackground)[i])
+ )
+ return {
+ label,
+ expectedBackground,
+ actual,
+ maxChannelError: Math.max(...errors),
+ squaredError: errors.reduce((s, v) => s + v * v, 0),
+ }
+ }
+)
+console.table(measurements.map(({ squaredError, ...row }) => row))
+console.log(
+ "RGB RMSE:",
+ Math.sqrt(
+ measurements.reduce((s, r) => s + r.squaredError, 0) /
+ (measurements.length * 3)
+ )
+)
+if (
+ process.argv.includes("--exact") &&
+ measurements.some((row) => row.maxChannelError !== 0)
+)
+ process.exitCode = 1
diff --git a/apps/mobile/lib/cover-palette.references.json b/apps/mobile/lib/cover-palette.references.json
new file mode 100644
index 0000000..1710d20
--- /dev/null
+++ b/apps/mobile/lib/cover-palette.references.json
@@ -0,0 +1,92 @@
+[
+ {
+ "label": "wicked-soundtrack",
+ "swatches": {
+ "background": "#4f4e33",
+ "average": "#74664d",
+ "dominantFraction": 0.184814453125,
+ "darkFraction": 0.195556640625
+ },
+ "expectedBackground": "#1a1c0e"
+ },
+ {
+ "label": "wicked-broadway",
+ "swatches": {
+ "background": "#030605",
+ "average": "#74786c",
+ "dominantFraction": 0.423828125,
+ "darkFraction": 0.43798828125
+ },
+ "expectedBackground": "#111111"
+ },
+ {
+ "label": "prince-of-egypt",
+ "swatches": {
+ "background": "#16101f",
+ "average": "#584546",
+ "dominantFraction": 0.585693359375,
+ "darkFraction": 0.587158203125
+ },
+ "expectedBackground": "#191718"
+ },
+ {
+ "label": "civilization-vi",
+ "swatches": {
+ "background": "#ccaf90",
+ "average": "#b79e80",
+ "dominantFraction": 0.20703125,
+ "darkFraction": 0.001220703125
+ },
+ "expectedBackground": "#3f280c"
+ },
+ {
+ "label": "ramblin-rover",
+ "swatches": {
+ "background": "#457522",
+ "average": "#548133",
+ "dominantFraction": 0.7802734375,
+ "darkFraction": 0
+ },
+ "expectedBackground": "#0e3900"
+ },
+ {
+ "label": "cavalry",
+ "swatches": {
+ "background": "#0d131f",
+ "average": "#404954",
+ "dominantFraction": 0.317138671875,
+ "darkFraction": 0.38623046875
+ },
+ "expectedBackground": "#151d2f"
+ },
+ {
+ "label": "city-of-angels",
+ "swatches": {
+ "background": "#1895cb",
+ "average": "#6c7c8b",
+ "dominantFraction": 0.241943359375,
+ "darkFraction": 0.075927734375
+ },
+ "expectedBackground": "#003262"
+ },
+ {
+ "label": "we-the-kings",
+ "swatches": {
+ "background": "#ab3a33",
+ "average": "#923b32",
+ "dominantFraction": 0.577880859375,
+ "darkFraction": 0.16552734375
+ },
+ "expectedBackground": "#52170d"
+ },
+ {
+ "label": "counter-strike-2",
+ "swatches": {
+ "background": "#060404",
+ "average": "#786757",
+ "dominantFraction": 0.35693359375,
+ "darkFraction": 0.390625
+ },
+ "expectedBackground": "#251211"
+ }
+]
diff --git a/apps/mobile/lib/cover-palette.test.cjs b/apps/mobile/lib/cover-palette.test.cjs
new file mode 100644
index 0000000..15b9bd5
--- /dev/null
+++ b/apps/mobile/lib/cover-palette.test.cjs
@@ -0,0 +1,54 @@
+const { test } = require("node:test")
+const assert = require("node:assert/strict")
+const fs = require("node:fs")
+const ts = require("typescript")
+function load(name) {
+ const exports = {}
+ new Function(
+ "exports",
+ "require",
+ ts.transpileModule(fs.readFileSync(`${__dirname}/${name}.ts`, "utf8"), {
+ compilerOptions: {
+ module: ts.ModuleKind.CommonJS,
+ target: ts.ScriptTarget.ES2022,
+ },
+ }).outputText
+ )(exports, (name) => load(name.replace("./", "")))
+ return exports
+}
+const { deriveCoverPalette } = load("cover-palette")
+const { toOklab, fromOklab } = load("color-space")
+
+test("sRGB and Oklab conversions round trip across the display gamut", () => {
+ for (const r of [0, 16, 64, 128, 192, 255])
+ for (const g of [0, 16, 64, 128, 192, 255])
+ for (const b of [0, 16, 64, 128, 192, 255])
+ assert.deepEqual(fromOklab(toOklab([r, g, b])), [r, g, b])
+})
+test("near-black neutral artwork does not amplify arbitrary channel noise", () => {
+ for (const background of ["#000000", "#030605", "#050303"]) {
+ const palette = deriveCoverPalette({ background, average: "#747474" })
+ assert.equal(palette.background, "#111111")
+ assert.equal(palette.foreground, "#FFFFFF")
+ }
+})
+test("a conflicting shadow hue is muted while coherent dark blue retains its color", () => {
+ const shadow = deriveCoverPalette({
+ background: "#16101f",
+ average: "#584546",
+ dominantFraction: 0.59,
+ darkFraction: 0.59,
+ })
+ const blue = deriveCoverPalette({
+ background: "#0d131f",
+ average: "#404954",
+ dominantFraction: 0.32,
+ darkFraction: 0.39,
+ })
+ const rgb = (hex) => [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16))
+ const shadowRgb = rgb(shadow.background),
+ blueRgb = rgb(blue.background)
+ assert.ok(Math.max(...shadowRgb) - Math.min(...shadowRgb) <= 4)
+ assert.ok(blueRgb[2] - blueRgb[0] > 15)
+ assert.equal(deriveCoverPalette({ background: "invalid" }), null)
+})
diff --git a/apps/mobile/lib/cover-palette.ts b/apps/mobile/lib/cover-palette.ts
index fa441fb..543376d 100644
--- a/apps/mobile/lib/cover-palette.ts
+++ b/apps/mobile/lib/cover-palette.ts
@@ -1,4 +1,5 @@
import type { ThemeColors } from "@/lib/theme"
+import { toOklab, fromOklab } from "./color-space"
/**
* Colors for a screen tinted by its cover art, modeled on Apple Music's
@@ -17,33 +18,20 @@ export type CoverPalette = {
isDark: boolean
}
-/**
- * Raw colors sampled from the art. `background` is the color the art bleeds
- * into; `text` is ordered by preference and `accent` holds candidates for the
- * Play button.
- */
+/** Artwork measurements, cached before deriving the screen palette. */
export type CoverSwatches = {
background: string
- text: string[]
- accent: string[]
+ average?: string
+ dominantFraction?: number
+ darkFraction?: number
}
-// Best effort: `legibleBackground` only guarantees that white or black reaches
-// 7:1, so on some backgrounds primary text settles for pure white or black.
-const PRIMARY_MIN_CONTRAST = 10
-const SECONDARY_MIN_CONTRAST = 4.5
-const SECONDARY_TO_PRIMARY_CONTRAST = 0.62
-const ACCENT_MIN_CONTRAST = 3
-const ACCENT_MIN_CHROMA = 0.05
-const ACCENT_MAX_LIGHTNESS_SHIFT = 0.25
-// Backgrounds between these luminances can't reach 7:1 with white or black.
-const DARK_BACKGROUND_MAX_LUMINANCE = 0.095
-const LIGHT_BACKGROUND_MIN_LUMINANCE = 0.31
-
type Rgb = [number, number, number]
-type Oklch = { l: number; c: number; h: number }
-export function themeCoverPalette(theme: ThemeColors, isDark: boolean): CoverPalette {
+export function themeCoverPalette(
+ theme: ThemeColors,
+ isDark: boolean
+): CoverPalette {
return {
background: theme.background,
foreground: theme.foreground,
@@ -57,240 +45,89 @@ export function themeCoverPalette(theme: ThemeColors, isDark: boolean): CoverPal
}
}
+/** Dark artwork canvas derived from region coverage and perceptual color. */
export function deriveCoverPalette(
- swatches: CoverSwatches,
- schemeIsDark: boolean
+ swatches: CoverSwatches
): CoverPalette | null {
const source = parseHex(swatches.background)
if (!source) return null
+ const average = swatches.average
+ ? (parseHex(swatches.average) ?? source)
+ : source
+ const [lightness, a, b] = toOklab(source)
+ const [, averageA, averageB] = toOklab(average)
+ const chroma = Math.hypot(a, b)
+ const averageChroma = Math.hypot(averageA, averageB)
+ const shadow = clamp((0.4 - lightness) / 0.3)
+ const coverage = clamp(swatches.dominantFraction ?? 1)
+ const darkCoverage = clamp(swatches.darkFraction ?? 0)
- const background = legibleBackground(source, schemeIsDark)
- const lightText = prefersLightText(background)
- const parsedText = swatches.text
- .map(parseHex)
- .filter((color): color is Rgb => color !== null)
- const backgroundLuminance = luminance(background)
- const sameSideText = parsedText.filter((color) =>
- lightText
- ? luminance(color) > backgroundLuminance
- : luminance(color) < backgroundLuminance
+ // Luminance alone makes bright, muted artwork too light and dark blue art
+ // almost black. Chroma and a bounded shadow lift retain both kinds of cover.
+ let canvasLightness = Math.max(
+ 0.17,
+ Math.min(0.4, 0.11 + 0.21 * lightness + 0.58 * chroma + 0.08 * shadow)
)
- const textCandidates = sameSideText.length > 0 ? sameSideText : parsedText
- const fallbackText: Rgb = lightText ? [255, 255, 255] : [0, 0, 0]
+ let canvasChroma = Math.min(chroma * (1 + shadow), canvasLightness * 0.39)
- const foreground = withMinContrast(
- textCandidates[0] ?? fallbackText,
- background,
- PRIMARY_MIN_CONTRAST
+ // A dark region whose hue conflicts with the whole image is often a shadow,
+ // rather than a reliable saturated background. Do not amplify that tint.
+ const disagreement = Math.max(
+ 0,
+ 1 -
+ (a * averageA + b * averageB) / Math.max(chroma * averageChroma, 1e-8) -
+ 0.3
)
- const primaryContrast = contrastRatio(foreground, background)
- const secondaryTarget = Math.max(
- SECONDARY_MIN_CONTRAST,
- primaryContrast * SECONDARY_TO_PRIMARY_CONTRAST
- )
- const secondaryForeground = softenTo(
- withMinContrast(
- textCandidates[1] ?? foreground,
- background,
- SECONDARY_MIN_CONTRAST
- ),
- background,
- secondaryTarget
+ canvasChroma *= Math.exp(-20 * shadow * disagreement)
+ canvasChroma *= Math.max(
+ 0,
+ 1 - 2.5 * darkCoverage * (1 - coverage) * (1 - shadow)
)
- const accent = pickAccent(swatches.accent, background) ?? foreground
- const accentForeground: Rgb = prefersLightText(accent)
- ? [255, 255, 255]
- : [0, 0, 0]
-
+ // Near-black RGB values carry unstable hue. Use the image's overall chroma
+ // to distinguish neutral artwork from a dark region in a colorful image.
+ const neutral = shadow * clamp((0.02 - chroma) / 0.02)
+ canvasChroma =
+ canvasChroma * (1 - neutral) +
+ Math.max(0, averageChroma - 0.02) * 3.5 * neutral
+ canvasLightness =
+ canvasLightness * (1 - neutral) +
+ (0.177 + Math.max(0, averageChroma - 0.02) * 2) * neutral
+ if (chroma < 0.01 && averageChroma < 0.025) {
+ canvasLightness = toOklab([17, 17, 17])[0]
+ canvasChroma = 0
+ }
+ const direction = chroma > 0 ? canvasChroma / chroma : 0
+ const background = fromOklab([canvasLightness, a * direction, b * direction])
+ const mixWhite = (amount: number) =>
+ toHex(
+ background.map((channel) =>
+ Math.round(channel + (255 - channel) * amount)
+ ) as Rgb
+ )
return {
background: toHex(background),
- foreground: toHex(foreground),
- secondaryForeground: toHex(secondaryForeground),
- accent: toHex(accent),
- accentForeground: toHex(accentForeground),
- accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
- surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
- divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
- isDark: lightText,
+ foreground: "#FFFFFF",
+ secondaryForeground: mixWhite(0.55),
+ accent: "#FFFFFF",
+ accentForeground: toHex(background),
+ accentText: "#FFFFFF",
+ surface: mixWhite(0.08),
+ divider: mixWhite(0.12),
+ isDark: true,
}
}
-function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
- const lch = toOklch(color)
- // Keep the art's hue but avoid a glaring page in dark mode or a murky one in
- // light mode.
- const clamped = schemeIsDark
- ? withLightness(color, Math.min(lch.l, 0.86))
- : withLightness(color, Math.max(lch.l, 0.2))
- const y = luminance(clamped)
- if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
- return clamped
- }
-
- const pivot = schemeIsDark ? 0.28 : 0.14
- return y < pivot
- ? withLuminance(clamped, DARK_BACKGROUND_MAX_LUMINANCE)
- : withLuminance(clamped, LIGHT_BACKGROUND_MIN_LUMINANCE)
+function clamp(value: number) {
+ return Math.max(0, Math.min(1, value))
}
-function pickAccent(candidates: string[], background: Rgb): Rgb | null {
- let best: Rgb | null = null
- let bestChroma = ACCENT_MIN_CHROMA
- for (const hex of candidates) {
- const color = parseHex(hex)
- if (!color) continue
- const adjusted = withMinContrast(color, background, ACCENT_MIN_CONTRAST)
- const before = toOklch(color)
- const after = toOklch(adjusted)
- // A color pushed far from its own lightness (yellow turned olive) no
- // longer reads as coming from the art.
- if (Math.abs(after.l - before.l) > ACCENT_MAX_LIGHTNESS_SHIFT) continue
- if (after.c > bestChroma) {
- best = adjusted
- bestChroma = after.c
- }
- }
- return best
-}
-
-function prefersLightText(background: Rgb) {
- return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
-}
-
-/** Moves `color`'s lightness away from `background` until it reaches `min`. */
-function withMinContrast(color: Rgb, background: Rgb, min: number): Rgb {
- if (contrastRatio(color, background) >= min) return color
-
- const lighten = prefersLightText(background)
- const start = toOklch(color).l
- const extreme = lighten ? 1 : 0
- if (contrastRatio(withLightness(color, extreme), background) < min) {
- return lighten ? [255, 255, 255] : [0, 0, 0]
- }
-
- let near = start
- let far = extreme
- for (let i = 0; i < 16; i++) {
- const mid = (near + far) / 2
- if (contrastRatio(withLightness(color, mid), background) >= min) {
- far = mid
- } else {
- near = mid
- }
- }
- return withLightness(color, far)
-}
-
-/** Blends `color` toward `background` until its contrast drops to `max`. */
-function softenTo(color: Rgb, background: Rgb, max: number): Rgb {
- if (contrastRatio(color, background) <= max) return color
-
- let keep = 0
- let blend = 1
- for (let i = 0; i < 16; i++) {
- const mid = (keep + blend) / 2
- if (contrastRatio(mix(color, background, mid), background) >= max) {
- blend = mid
- } else {
- keep = mid
- }
- }
- return mix(color, background, blend)
-}
-
-function withLuminance(color: Rgb, target: number): Rgb {
- let low = 0
- let high = 1
- for (let i = 0; i < 16; i++) {
- const mid = (low + high) / 2
- if (luminance(withLightness(color, mid)) < target) {
- low = mid
- } else {
- high = mid
- }
- }
- return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
-}
-
-/** `amount` of `color` over `base`. */
-function mix(color: Rgb, base: Rgb, amount: number): Rgb {
- return [0, 1, 2].map((i) =>
- Math.round(base[i] + (color[i] - base[i]) * amount)
- ) as Rgb
-}
-
-function contrastRatio(a: Rgb, b: Rgb) {
- const la = luminance(a)
- const lb = luminance(b)
- return (Math.max(la, lb) + 0.05) / (Math.min(la, lb) + 0.05)
-}
-
-function luminance([r, g, b]: Rgb) {
- return 0.2126 * toLinear(r) + 0.7152 * toLinear(g) + 0.0722 * toLinear(b)
-}
-
-function toLinear(channel: number) {
- const c = channel / 255
- return c <= 0.04045 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4
-}
-
-function fromLinear(value: number) {
- const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
- return c * 255
-}
-
-function toOklch(color: Rgb): Oklch {
- const [r, g, b] = color.map(toLinear)
- const l = Math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
- const m = Math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
- const s = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
- const L = 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s
- const A = 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s
- const B = 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s
- return { l: L, c: Math.hypot(A, B), h: Math.atan2(B, A) }
-}
-
-function oklchToLinear({ l: L, c, h }: Oklch): Rgb {
- const A = c * Math.cos(h)
- const B = c * Math.sin(h)
- const l = (L + 0.3963377774 * A + 0.2158037573 * B) ** 3
- const m = (L - 0.1055613458 * A - 0.0638541728 * B) ** 3
- const s = (L - 0.0894841775 * A - 1.291485548 * B) ** 3
- return [
- 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
- -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
- -0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s,
- ]
-}
-
-/** Sets OKLCH lightness, reducing chroma as needed to stay within sRGB. */
-function withLightness(color: Rgb, lightness: number): Rgb {
- const lch = toOklch(color)
- const l = Math.min(1, Math.max(0, lightness))
- let c = lch.c
- let linear = oklchToLinear({ l, c, h: lch.h })
- for (let i = 0; i < 12 && !inGamut(linear); i++) {
- c *= 0.8
- linear = oklchToLinear({ l, c, h: lch.h })
- }
- return linear.map((value) =>
- Math.round(Math.min(255, Math.max(0, fromLinear(value))))
- ) as Rgb
-}
-
-function inGamut(linear: Rgb) {
- return linear.every((value) => value >= -0.0005 && value <= 1.0005)
-}
-
-function parseHex(hex: string | undefined): Rgb | null {
- if (!hex) return null
- const match = /^#?([0-9a-f]{6})/i.exec(hex.trim())
- if (!match) return null
- const value = parseInt(match[1], 16)
+function parseHex(hex: string): Rgb | null {
+ if (!/^#[0-9a-f]{6}$/i.test(hex)) return null
+ const value = parseInt(hex.slice(1), 16)
return [(value >> 16) & 255, (value >> 8) & 255, value & 255]
}
function toHex(color: Rgb) {
- return `#${color.map((c) => c.toString(16).padStart(2, "0")).join("")}`
+ return `#${color.map((channel) => channel.toString(16).padStart(2, "0")).join("")}`
}
diff --git a/apps/mobile/lib/legacy-cover-palette.ts b/apps/mobile/lib/legacy-cover-palette.ts
new file mode 100644
index 0000000..7bcbd5e
--- /dev/null
+++ b/apps/mobile/lib/legacy-cover-palette.ts
@@ -0,0 +1,266 @@
+// Palette algorithm used before the dominant-region artwork extraction.
+import type { CoverPalette } from "@/lib/cover-palette"
+
+/**
+ * Raw colors sampled from the art. `background` is the color the art bleeds
+ * into; `text` is ordered by preference and `accent` holds candidates for the
+ * Play button.
+ */
+export type LegacyCoverSwatches = {
+ background: string
+ text: string[]
+ accent: string[]
+}
+
+// Best effort: `legibleBackground` only guarantees that white or black reaches
+// 7:1, so on some backgrounds primary text settles for pure white or black.
+const PRIMARY_MIN_CONTRAST = 10
+const SECONDARY_MIN_CONTRAST = 4.5
+const SECONDARY_TO_PRIMARY_CONTRAST = 0.62
+const ACCENT_MIN_CONTRAST = 3
+const ACCENT_MIN_CHROMA = 0.05
+const ACCENT_MAX_LIGHTNESS_SHIFT = 0.25
+// Backgrounds between these luminances can't reach 7:1 with white or black.
+const DARK_BACKGROUND_MAX_LUMINANCE = 0.095
+const LIGHT_BACKGROUND_MIN_LUMINANCE = 0.31
+
+type Rgb = [number, number, number]
+type Oklch = { l: number; c: number; h: number }
+
+export function deriveCoverPalette(
+ swatches: LegacyCoverSwatches,
+ schemeIsDark: boolean
+): CoverPalette | null {
+ const source = parseHex(swatches.background)
+ if (!source) return null
+
+ const background = legibleBackground(source, schemeIsDark)
+ const lightText = prefersLightText(background)
+ const parsedText = swatches.text
+ .map(parseHex)
+ .filter((color): color is Rgb => color !== null)
+ const backgroundLuminance = luminance(background)
+ const sameSideText = parsedText.filter((color) =>
+ lightText
+ ? luminance(color) > backgroundLuminance
+ : luminance(color) < backgroundLuminance
+ )
+ const textCandidates = sameSideText.length > 0 ? sameSideText : parsedText
+ const fallbackText: Rgb = lightText ? [255, 255, 255] : [0, 0, 0]
+
+ const foreground = withMinContrast(
+ textCandidates[0] ?? fallbackText,
+ background,
+ PRIMARY_MIN_CONTRAST
+ )
+ const primaryContrast = contrastRatio(foreground, background)
+ const secondaryTarget = Math.max(
+ SECONDARY_MIN_CONTRAST,
+ primaryContrast * SECONDARY_TO_PRIMARY_CONTRAST
+ )
+ const secondaryForeground = softenTo(
+ withMinContrast(
+ textCandidates[1] ?? foreground,
+ background,
+ SECONDARY_MIN_CONTRAST
+ ),
+ background,
+ secondaryTarget
+ )
+
+ const accent = pickAccent(swatches.accent, background) ?? foreground
+ const accentForeground: Rgb = prefersLightText(accent)
+ ? [255, 255, 255]
+ : [0, 0, 0]
+
+ return {
+ background: toHex(background),
+ foreground: toHex(foreground),
+ secondaryForeground: toHex(secondaryForeground),
+ accent: toHex(accent),
+ accentForeground: toHex(accentForeground),
+ accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
+ surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
+ divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
+ isDark: lightText,
+ }
+}
+
+function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
+ const lch = toOklch(color)
+ // Keep the art's hue but avoid a glaring page in dark mode or a murky one in
+ // light mode.
+ const clamped = schemeIsDark
+ ? withLightness(color, Math.min(lch.l, 0.86))
+ : withLightness(color, Math.max(lch.l, 0.2))
+ const y = luminance(clamped)
+ if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
+ return clamped
+ }
+
+ const pivot = schemeIsDark ? 0.28 : 0.14
+ return y < pivot
+ ? withLuminance(clamped, DARK_BACKGROUND_MAX_LUMINANCE)
+ : withLuminance(clamped, LIGHT_BACKGROUND_MIN_LUMINANCE)
+}
+
+function pickAccent(candidates: string[], background: Rgb): Rgb | null {
+ let best: Rgb | null = null
+ let bestChroma = ACCENT_MIN_CHROMA
+ for (const hex of candidates) {
+ const color = parseHex(hex)
+ if (!color) continue
+ const adjusted = withMinContrast(color, background, ACCENT_MIN_CONTRAST)
+ const before = toOklch(color)
+ const after = toOklch(adjusted)
+ // A color pushed far from its own lightness (yellow turned olive) no
+ // longer reads as coming from the art.
+ if (Math.abs(after.l - before.l) > ACCENT_MAX_LIGHTNESS_SHIFT) continue
+ if (after.c > bestChroma) {
+ best = adjusted
+ bestChroma = after.c
+ }
+ }
+ return best
+}
+
+function prefersLightText(background: Rgb) {
+ return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
+}
+
+/** Moves `color`'s lightness away from `background` until it reaches `min`. */
+function withMinContrast(color: Rgb, background: Rgb, min: number): Rgb {
+ if (contrastRatio(color, background) >= min) return color
+
+ const lighten = prefersLightText(background)
+ const start = toOklch(color).l
+ const extreme = lighten ? 1 : 0
+ if (contrastRatio(withLightness(color, extreme), background) < min) {
+ return lighten ? [255, 255, 255] : [0, 0, 0]
+ }
+
+ let near = start
+ let far = extreme
+ for (let i = 0; i < 16; i++) {
+ const mid = (near + far) / 2
+ if (contrastRatio(withLightness(color, mid), background) >= min) {
+ far = mid
+ } else {
+ near = mid
+ }
+ }
+ return withLightness(color, far)
+}
+
+/** Blends `color` toward `background` until its contrast drops to `max`. */
+function softenTo(color: Rgb, background: Rgb, max: number): Rgb {
+ if (contrastRatio(color, background) <= max) return color
+
+ let keep = 0
+ let blend = 1
+ for (let i = 0; i < 16; i++) {
+ const mid = (keep + blend) / 2
+ if (contrastRatio(mix(color, background, mid), background) >= max) {
+ blend = mid
+ } else {
+ keep = mid
+ }
+ }
+ return mix(color, background, blend)
+}
+
+function withLuminance(color: Rgb, target: number): Rgb {
+ let low = 0
+ let high = 1
+ for (let i = 0; i < 16; i++) {
+ const mid = (low + high) / 2
+ if (luminance(withLightness(color, mid)) < target) {
+ low = mid
+ } else {
+ high = mid
+ }
+ }
+ return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
+}
+
+/** `amount` of `color` over `base`. */
+function mix(color: Rgb, base: Rgb, amount: number): Rgb {
+ return [0, 1, 2].map((i) =>
+ Math.round(base[i] + (color[i] - base[i]) * amount)
+ ) as Rgb
+}
+
+function contrastRatio(a: Rgb, b: Rgb) {
+ const la = luminance(a)
+ const lb = luminance(b)
+ return (Math.max(la, lb) + 0.05) / (Math.min(la, lb) + 0.05)
+}
+
+function luminance([r, g, b]: Rgb) {
+ return 0.2126 * toLinear(r) + 0.7152 * toLinear(g) + 0.0722 * toLinear(b)
+}
+
+function toLinear(channel: number) {
+ const c = channel / 255
+ return c <= 0.04045 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4
+}
+
+function fromLinear(value: number) {
+ const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
+ return c * 255
+}
+
+function toOklch(color: Rgb): Oklch {
+ const [r, g, b] = color.map(toLinear)
+ const l = Math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
+ const m = Math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
+ const s = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
+ const L = 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s
+ const A = 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s
+ const B = 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s
+ return { l: L, c: Math.hypot(A, B), h: Math.atan2(B, A) }
+}
+
+function oklchToLinear({ l: L, c, h }: Oklch): Rgb {
+ const A = c * Math.cos(h)
+ const B = c * Math.sin(h)
+ const l = (L + 0.3963377774 * A + 0.2158037573 * B) ** 3
+ const m = (L - 0.1055613458 * A - 0.0638541728 * B) ** 3
+ const s = (L - 0.0894841775 * A - 1.291485548 * B) ** 3
+ return [
+ 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
+ -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
+ -0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s,
+ ]
+}
+
+/** Sets OKLCH lightness, reducing chroma as needed to stay within sRGB. */
+function withLightness(color: Rgb, lightness: number): Rgb {
+ const lch = toOklch(color)
+ const l = Math.min(1, Math.max(0, lightness))
+ let c = lch.c
+ let linear = oklchToLinear({ l, c, h: lch.h })
+ for (let i = 0; i < 12 && !inGamut(linear); i++) {
+ c *= 0.8
+ linear = oklchToLinear({ l, c, h: lch.h })
+ }
+ return linear.map((value) =>
+ Math.round(Math.min(255, Math.max(0, fromLinear(value))))
+ ) as Rgb
+}
+
+function inGamut(linear: Rgb) {
+ return linear.every((value) => value >= -0.0005 && value <= 1.0005)
+}
+
+function parseHex(hex: string | undefined): Rgb | null {
+ if (!hex) return null
+ const match = /^#?([0-9a-f]{6})/i.exec(hex.trim())
+ if (!match) return null
+ const value = parseInt(match[1], 16)
+ return [(value >> 16) & 255, (value >> 8) & 255, value & 255]
+}
+
+function toHex(color: Rgb) {
+ return `#${color.map((c) => c.toString(16).padStart(2, "0")).join("")}`
+}
diff --git a/apps/mobile/lib/tablet-motion.ts b/apps/mobile/lib/tablet-motion.ts
new file mode 100644
index 0000000..c4e8870
--- /dev/null
+++ b/apps/mobile/lib/tablet-motion.ts
@@ -0,0 +1,13 @@
+import { Easing, LinearTransition, ReduceMotion } from "react-native-reanimated"
+
+/** Short, finite transitions for sidebar resizing and artwork changes. */
+export const tabletMotion = {
+ duration: 360,
+ easing: Easing.bezier(0.2, 0, 0, 1),
+ reduceMotion: ReduceMotion.System,
+}
+export const tabletLayoutTransition = LinearTransition.duration(
+ tabletMotion.duration
+)
+ .easing(tabletMotion.easing)
+ .reduceMotion(ReduceMotion.System)
diff --git a/apps/mobile/lib/tablet-navigation.ts b/apps/mobile/lib/tablet-navigation.ts
new file mode 100644
index 0000000..7cd7d83
--- /dev/null
+++ b/apps/mobile/lib/tablet-navigation.ts
@@ -0,0 +1,14 @@
+import { createContext } from "react"
+
+export const tabletSections = [
+ { name: "albums", group: "(albums)", title: "Albums" },
+ { name: "artists", group: "(artists)", title: "Artists" },
+ { name: "songs", group: "(songs)", title: "Songs" },
+ { name: "playlists", group: "(playlists)", title: "All Playlists" },
+ { name: "favorites", group: "(favorites)", title: "Favorites" },
+ { name: "recent", group: "(recent)", title: "Recently Played" },
+] as const
+
+export const TabletSectionContext = createContext<
+ (typeof tabletSections)[number] | undefined
+>(undefined)
diff --git a/apps/mobile/lib/theme.ts b/apps/mobile/lib/theme.ts
index 4708ada..8d99be2 100644
--- a/apps/mobile/lib/theme.ts
+++ b/apps/mobile/lib/theme.ts
@@ -84,6 +84,7 @@ export const radius = {
} as const
export const miniPlayerHeight = 56
+export const tabletMiniPlayerHeight = 68
export const tabBarHeight = Platform.OS === "ios" ? 49 : 80
export const playerBarHeight = miniPlayerHeight
export const carouselCardWidth = 160
diff --git a/apps/mobile/modules/artwork-colors/expo-module.config.json b/apps/mobile/modules/artwork-colors/expo-module.config.json
new file mode 100644
index 0000000..65eab09
--- /dev/null
+++ b/apps/mobile/modules/artwork-colors/expo-module.config.json
@@ -0,0 +1,4 @@
+{
+ "platforms": ["apple"],
+ "apple": { "modules": ["ArtworkColorsModule"] }
+}
diff --git a/apps/mobile/modules/artwork-colors/ios/ArtworkColors.podspec b/apps/mobile/modules/artwork-colors/ios/ArtworkColors.podspec
new file mode 100644
index 0000000..eaa2cb9
--- /dev/null
+++ b/apps/mobile/modules/artwork-colors/ios/ArtworkColors.podspec
@@ -0,0 +1,17 @@
+Pod::Spec.new do |s|
+ s.name = 'ArtworkColors'
+ s.version = '1.0.0'
+ s.summary = 'Artwork color sampling for oTunes'
+ s.description = s.summary
+ s.license = { :type => 'MIT' }
+ s.author = 'oTunes'
+ s.homepage = 'https://otunes.abunchofknowitalls.com'
+ s.platforms = { :ios => '16.4' }
+ s.swift_version = '5.9'
+ s.source = { :git => '' }
+ s.static_framework = true
+ s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+ s.dependency 'ExpoModulesCore'
+ s.frameworks = 'ImageIO', 'CoreGraphics'
+ s.source_files = '**/*.swift'
+end
diff --git a/apps/mobile/modules/artwork-colors/ios/ArtworkColorsModule.swift b/apps/mobile/modules/artwork-colors/ios/ArtworkColorsModule.swift
new file mode 100644
index 0000000..e0e5898
--- /dev/null
+++ b/apps/mobile/modules/artwork-colors/ios/ArtworkColorsModule.swift
@@ -0,0 +1,65 @@
+import ExpoModulesCore
+import CoreGraphics
+import ImageIO
+
+public final class ArtworkColorsModule: Module {
+ public func definition() -> ModuleDefinition {
+ Name("ArtworkColors")
+
+ AsyncFunction("histogram") { (uri: URL) async throws -> [[Int]] in
+ let (data, response) = try await URLSession.shared.data(from: uri)
+ if let response = response as? HTTPURLResponse, !(200..<300).contains(response.statusCode) {
+ throw ArtworkColorError.invalidImage
+ }
+ return try Self.histogram(data: data)
+ }
+ }
+
+ /// Sample in sRGB so Display P3 artwork and ordinary JPEGs share one color space.
+ static func histogram(data: Data) throws -> [[Int]] {
+ guard let source = CGImageSourceCreateWithData(data as CFData, nil),
+ let image = CGImageSourceCreateThumbnailAtIndex(source, 0, [
+ kCGImageSourceCreateThumbnailFromImageAlways: true,
+ kCGImageSourceCreateThumbnailWithTransform: true,
+ kCGImageSourceThumbnailMaxPixelSize: 64,
+ ] as CFDictionary),
+ let space = CGColorSpace(name: CGColorSpace.sRGB)
+ else { throw ArtworkColorError.invalidImage }
+
+ let width = image.width
+ let height = image.height
+ var pixels = [UInt8](repeating: 0, count: width * height * 4)
+ var bins = [[Int]](repeating: [0, 0, 0, 0], count: 512)
+ try pixels.withUnsafeMutableBytes { buffer in
+ guard let context = CGContext(
+ data: buffer.baseAddress, width: width, height: height,
+ bitsPerComponent: 8, bytesPerRow: width * 4, space: space,
+ bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue | CGBitmapInfo.byteOrder32Big.rawValue
+ ) else { throw ArtworkColorError.invalidImage }
+ context.interpolationQuality = .high
+ context.draw(image, in: CGRect(x: 0, y: 0, width: width, height: height))
+ }
+
+ for offset in stride(from: 0, to: pixels.count, by: 4) {
+ let alpha = Int(pixels[offset + 3])
+ guard alpha >= 128 else { continue }
+ // Ignore transparent pixels and undo premultiplication for the rest.
+ let r = min(255, Int(pixels[offset]) * 255 / alpha)
+ let g = min(255, Int(pixels[offset + 1]) * 255 / alpha)
+ let b = min(255, Int(pixels[offset + 2]) * 255 / alpha)
+ let key = (r >> 5) * 64 + (g >> 5) * 8 + (b >> 5)
+ bins[key][0] += r
+ bins[key][1] += g
+ bins[key][2] += b
+ bins[key][3] += 1
+ }
+ // Keep each bin's actual mean rather than its quantized center.
+ return bins.filter { $0[3] > 0 }.map { bin in
+ [bin[0] / bin[3], bin[1] / bin[3], bin[2] / bin[3], bin[3]]
+ }
+ }
+}
+
+private enum ArtworkColorError: Error {
+ case invalidImage
+}
diff --git a/apps/mobile/native/SystemVolume.swift b/apps/mobile/native/SystemVolume.swift
index 529544b..2c6458c 100644
--- a/apps/mobile/native/SystemVolume.swift
+++ b/apps/mobile/native/SystemVolume.swift
@@ -3,6 +3,7 @@ import MediaPlayer
import UIKit
internal import ExpoModulesCore
+#if !targetEnvironment(macCatalyst)
/// Bridges system volume without changing the playback audio session or player gain.
final class SystemVolume: Module {
private var volumeView: MPVolumeView?
@@ -84,3 +85,18 @@ final class SystemVolume: Module {
return ["volume": AVAudioSession.sharedInstance().outputVolume, "available": available]
}
}
+
+#else
+// macOS owns system volume. Keep the bridge available without MPVolumeView.
+final class SystemVolume: Module {
+ public func definition() -> ExpoModulesCore.ModuleDefinition {
+ Name("SystemVolume")
+ Events("onVolumeChange")
+ AsyncFunction("getState") { () -> [String: Any] in
+ ["volume": 0, "available": false]
+ }
+ AsyncFunction("setPlayerVisible") { (_: Bool) in }
+ AsyncFunction("setVolume") { (_: Double) in }
+ }
+}
+#endif
diff --git a/apps/mobile/native/TabletSidebar.swift b/apps/mobile/native/TabletSidebar.swift
new file mode 100644
index 0000000..bf5e341
--- /dev/null
+++ b/apps/mobile/native/TabletSidebar.swift
@@ -0,0 +1,246 @@
+import UIKit
+internal import ExpoModulesCore
+
+final class TabletSidebar: Module {
+ public func definition() -> ExpoModulesCore.ModuleDefinition {
+ Name("TabletSidebar")
+ View(TabletSidebarView.self) {
+ Events("onProfilePress")
+ Prop("accountName") { (view: TabletSidebarView, value: String) in
+ view.accountName = value
+ view.configure()
+ }
+ Prop("initials") { (view: TabletSidebarView, value: String) in
+ view.initials = value
+ view.configure()
+ }
+ Prop("imageURL") { (view: TabletSidebarView, value: String?) in
+ view.imageURL = value
+ view.configure()
+ }
+ Prop("active") { (view: TabletSidebarView, value: Bool) in
+ view.active = value
+ view.configure()
+ }
+ }
+ }
+}
+
+/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
+final class TabletSidebarView: ExpoView {
+ let onProfilePress = EventDispatcher()
+ var accountName = ""
+ var initials = ""
+ var imageURL: String?
+ var active = false
+ private var tabsObserver: NSObjectProtocol?
+
+ override func didMoveToWindow() {
+ super.didMoveToWindow()
+ if let tabsObserver {
+ NotificationCenter.default.removeObserver(tabsObserver)
+ self.tabsObserver = nil
+ }
+ if window != nil {
+ tabsObserver = NotificationCenter.default.addObserver(
+ forName: Notification.Name("oTunesTabsDidUpdate"), object: nil, queue: .main
+ ) { [weak self] notification in
+ guard let self, self.active, self.window != nil,
+ let controller = notification.object as? UITabBarController,
+ self.owningTabController() === controller else { return }
+ if #available(iOS 18.0, *) { self.configure(controller) }
+ }
+ }
+ configure()
+ }
+
+ override func layoutSubviews() {
+ super.layoutSubviews()
+ configure()
+ }
+
+ func configure() {
+ guard active, window != nil, UIDevice.current.userInterfaceIdiom == .pad else { return }
+ DispatchQueue.main.async { [weak self] in
+ guard let self, self.active else { return }
+ if let tabs = self.owningTabController(), #available(iOS 18.0, *) {
+ self.configure(tabs)
+ }
+ }
+ }
+
+ private func owningTabController() -> UITabBarController? {
+ var responder: UIResponder? = self
+ while let current = responder {
+ if let controller = current as? UIViewController, let tabs = controller.tabBarController {
+ return tabs
+ }
+ responder = current.next
+ }
+ return nil
+ }
+
+ deinit {
+ if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
+ }
+
+ @available(iOS 18.0, *)
+ private func configure(_ controller: UITabBarController) {
+ configureGroups(controller)
+
+ let footer: SidebarAccountButton
+ if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
+ footer = existing
+ } else {
+ footer = SidebarAccountButton()
+ controller.sidebar.bottomBarView = footer
+ }
+ configureTabBar(controller, footer: footer)
+ footer.update(name: accountName, initials: initials, imageURL: imageURL)
+ footer.onPress = { [weak self] in self?.onProfilePress() }
+ }
+
+ @available(iOS 18.0, *)
+ private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
+ let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
+ let selected = destinations.first { $0 === controller.selectedTab }
+ let contextualTab = selected ?? footer.contextualTab ?? destinations.first
+ footer.contextualTab = contextualTab
+ for tab in destinations {
+ let placement: UITab.Placement = tab === contextualTab ? .fixed : .sidebarOnly
+ if tab.preferredPlacement != placement {
+ tab.preferredPlacement = placement
+ }
+ }
+ }
+
+ @available(iOS 18.0, *)
+ private func configureGroups(_ controller: UITabBarController) {
+ // Reuse the router's UITab instances so selection and stack state stay native.
+ if !controller.tabs.contains(where: { $0.identifier == "otunes.library" }) {
+ let tabs = controller.tabs
+ guard tabs.count >= 9 else { return }
+ let selected = controller.selectedTab
+ func tab(_ route: String) -> UITab? {
+ tabs.first { $0.identifier == route }
+ }
+ let library = ["library", "(artists)", "(albums)", "(songs)", "(recent)"].compactMap(tab)
+ let playlists = ["(playlists)", "(favorites)"].compactMap(tab)
+ guard library.count == 5, playlists.count == 2,
+ let home = tab("home"), let search = tab("search") else { return }
+ let libraryGroup = UITabGroup(
+ title: "Library", image: nil, identifier: "otunes.library", children: library,
+ viewControllerProvider: { _ in UIViewController() })
+ let playlistGroup = UITabGroup(
+ title: "Playlists", image: nil, identifier: "otunes.playlists", children: playlists,
+ viewControllerProvider: { _ in UIViewController() })
+ // UIKit requires a managing controller to display the selected child of a group.
+ let libraryNavigation = UINavigationController()
+ libraryNavigation.isNavigationBarHidden = true
+ libraryGroup.managingNavigationController = libraryNavigation
+ let playlistNavigation = UINavigationController()
+ playlistNavigation.isNavigationBarHidden = true
+ playlistGroup.managingNavigationController = playlistNavigation
+ libraryGroup.sidebarAppearance = .rootSection
+ playlistGroup.sidebarAppearance = .rootSection
+ libraryGroup.preferredPlacement = .sidebarOnly
+ playlistGroup.preferredPlacement = .sidebarOnly
+ home.preferredPlacement = .fixed
+ search.preferredPlacement = .pinned
+ let contextualTab = (library + playlists).first { $0 === selected } ?? library.first
+ for tab in library + playlists {
+ tab.preferredPlacement = tab === contextualTab ? .fixed : .sidebarOnly
+ }
+ let delegate = controller.delegate
+ controller.delegate = nil
+ controller.setTabs([home, search, libraryGroup, playlistGroup], animated: false)
+ controller.selectedTab = selected
+ controller.delegate = delegate
+ }
+ }
+}
+
+@available(iOS 18.0, *)
+private final class SidebarAccountButton: UIView {
+ var onPress: (() -> Void)?
+ var contextualTab: UITab?
+ private let button = UIButton(type: .system)
+ private let avatar = UILabel()
+ private let imageView = UIImageView()
+ private var currentURL: String?
+ private var imageTask: URLSessionDataTask?
+
+ override init(frame: CGRect) {
+ super.init(frame: frame)
+ let separator = UIView()
+ separator.backgroundColor = .separator
+ addSubview(separator)
+ addSubview(button)
+ button.addSubview(avatar)
+ avatar.addSubview(imageView)
+ avatar.backgroundColor = .secondarySystemFill
+ avatar.textColor = .white
+ avatar.font = .systemFont(ofSize: 13, weight: .semibold)
+ avatar.textAlignment = .center
+ avatar.layer.cornerRadius = 16
+ avatar.clipsToBounds = true
+ imageView.contentMode = .scaleAspectFill
+ button.contentHorizontalAlignment = .leading
+ button.titleLabel?.font = .systemFont(ofSize: 17, weight: .medium)
+ button.setTitleColor(.white, for: .normal)
+ button.addAction(UIAction { [weak self] _ in self?.onPress?() }, for: .touchUpInside)
+ for view in [separator, button, avatar, imageView] {
+ view.translatesAutoresizingMaskIntoConstraints = false
+ }
+ NSLayoutConstraint.activate([
+ separator.topAnchor.constraint(equalTo: topAnchor),
+ separator.leadingAnchor.constraint(equalTo: leadingAnchor),
+ separator.trailingAnchor.constraint(equalTo: trailingAnchor),
+ separator.heightAnchor.constraint(equalToConstant: 1 / UIScreen.main.scale),
+ button.topAnchor.constraint(equalTo: topAnchor),
+ button.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 20),
+ button.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -16),
+ button.bottomAnchor.constraint(equalTo: bottomAnchor),
+ avatar.leadingAnchor.constraint(equalTo: button.leadingAnchor),
+ avatar.centerYAnchor.constraint(equalTo: button.centerYAnchor),
+ avatar.widthAnchor.constraint(equalToConstant: 32),
+ avatar.heightAnchor.constraint(equalToConstant: 32),
+ imageView.topAnchor.constraint(equalTo: avatar.topAnchor),
+ imageView.bottomAnchor.constraint(equalTo: avatar.bottomAnchor),
+ imageView.leadingAnchor.constraint(equalTo: avatar.leadingAnchor),
+ imageView.trailingAnchor.constraint(equalTo: avatar.trailingAnchor),
+ ])
+ button.titleEdgeInsets = UIEdgeInsets(top: 0, left: 44, bottom: 0, right: 0)
+ }
+
+ required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
+
+ override func systemLayoutSizeFitting(
+ _ targetSize: CGSize,
+ withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority,
+ verticalFittingPriority: UILayoutPriority
+ ) -> CGSize {
+ CGSize(width: targetSize.width, height: 76)
+ }
+
+ func update(name: String, initials: String, imageURL: String?) {
+ button.setTitle(name, for: .normal)
+ button.accessibilityLabel = "Open profile, " + name
+ avatar.text = initials
+ guard imageURL != currentURL else { return }
+ currentURL = imageURL
+ imageTask?.cancel()
+ imageView.image = nil
+ guard let imageURL, let url = URL(string: imageURL) else { return }
+ imageTask = URLSession.shared.dataTask(with: url) { [weak self] data, _, _ in
+ guard let data, let image = UIImage(data: data) else { return }
+ DispatchQueue.main.async {
+ guard let self, self.currentURL == imageURL else { return }
+ self.imageView.image = image
+ }
+ }
+ imageTask?.resume()
+ }
+
+ deinit { imageTask?.cancel() }
+}
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index dc6eeed..9d1371d 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -30,6 +30,7 @@
"expo-constants": "~58.0.13",
"expo-dev-client": "~58.0.14",
"expo-font": "~58.0.9",
+ "expo-glass-effect": "~58.0.5",
"expo-haptics": "~58.0.7",
"expo-image": "~58.0.16",
"expo-image-picker": "~58.0.10",
diff --git a/apps/mobile/plugins/with-mac-catalyst.js b/apps/mobile/plugins/with-mac-catalyst.js
new file mode 100644
index 0000000..efb1325
--- /dev/null
+++ b/apps/mobile/plugins/with-mac-catalyst.js
@@ -0,0 +1,40 @@
+const {
+ withPodfile,
+ withPodfileProperties,
+ withXcodeProject,
+} = require("expo/config-plugins")
+
+// Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
+module.exports = (config) => {
+ config = withPodfileProperties(config, (config) => {
+ config.modResults["ios.buildReactNativeFromSource"] = "true"
+ config.modResults.EXPO_USE_PRECOMPILED_MODULES = "false"
+ return config
+ })
+
+ config = withPodfile(config, (config) => {
+ const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
+ if (!pattern.test(config.modResults.contents)) {
+ throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
+ }
+ config.modResults.contents = config.modResults.contents.replace(
+ pattern,
+ ":mac_catalyst_enabled => true"
+ )
+ return config
+ })
+
+ return withXcodeProject(config, (config) => {
+ const project = config.modResults
+ const target = project.getFirstTarget().firstTarget
+ const lists = project.pbxXCConfigurationList()
+ const configurations = project.pbxXCBuildConfigurationSection()
+ for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
+ const settings = configurations[value].buildSettings
+ settings.SUPPORTS_MACCATALYST = "YES"
+ settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
+ settings.TARGETED_DEVICE_FAMILY = '"1,2"'
+ }
+ return config
+ })
+}
diff --git a/patches/react-native-screens@4.30.0.patch b/patches/react-native-screens@4.30.0.patch
index d2c61da..7e4e20d 100644
--- a/patches/react-native-screens@4.30.0.patch
+++ b/patches/react-native-screens@4.30.0.patch
@@ -31,3 +31,28 @@ index cbe9b978ced6972a51bc5235b47a58dd55836351..b7063502332a7d1da5cb58ea8738670a
}
fun updateFontStyles(
+diff --git a/ios/tabs/host/RNSTabBarController.mm b/ios/tabs/host/RNSTabBarController.mm
+index bc9c64436da76959ecdc22539b94ce459e1e4ed2..8fb814a2a8f9b669419d59620e8082c2e01943fa 100644
+--- a/ios/tabs/host/RNSTabBarController.mm
++++ b/ios/tabs/host/RNSTabBarController.mm
+@@ -354,6 +354,8 @@ static void rns_pushViewController(__unsafe_unretained id self,
+ [self updateTabBarA11yIfNeeded];
+ [self updateProminentIdentifierIfNeeded];
+ [self updateOrientationIfNeeded];
++ // Allow app-owned sidebar groups to be restored after router tab reconciliation.
++ [[NSNotificationCenter defaultCenter] postNotificationName:@"oTunesTabsDidUpdate" object:self];
+ }
+
+ /**
+@@ -415,8 +417,9 @@ static void rns_pushViewController(__unsafe_unretained id self,
+ - (void)userDidSelectViewController:(nonnull UIViewController *)viewController
+ {
+ // At this moment the `UITabBarController` model is already updated.
+- RCTAssert(self.selectedViewController == viewController,
+- @"[RNScreens] Expected UIKit to update selectedViewController");
++ // A tab group exposes its root controller here, while selectedTab is the selected leaf.
++ RCTAssert([self effectiveSelectedViewController] == viewController,
++ @"[RNScreens] Expected UIKit to update the effective selection");
+
+ if (![self usesUITabAPI] && [self isSelectedViewControllerTheMoreNavigationController]) {
+ [self disableNavigationBarInMoreNavigationController];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 047195f..4631b7d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,7 +9,7 @@ patchedDependencies:
hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
path: patches/expo-audio@58.0.10.patch
react-native-screens@4.30.0:
- hash: 4c993bb49116c59c1df018c02687484d61964af674b5ea2d5b68c051e434423a
+ hash: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
path: patches/react-native-screens@4.30.0.patch
importers:
@@ -79,6 +79,9 @@ importers:
expo-font:
specifier: ~58.0.9
version: 58.0.9(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
+ expo-glass-effect:
+ specifier: ~58.0.5
+ version: 58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-haptics:
specifier: ~58.0.7
version: 58.0.7(expo@58.0.17)
@@ -96,7 +99,7 @@ importers:
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-router:
specifier: ~58.0.25
- version: 58.0.25(5c865dc62adb071be8c7946ff2c6115b)
+ version: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
expo-secure-store:
specifier: ~58.0.2
version: 58.0.2(expo@58.0.17)
@@ -138,7 +141,7 @@ importers:
version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-screens:
specifier: 4.30.0
- version: 4.30.0(patch_hash=4c993bb49116c59c1df018c02687484d61964af674b5ea2d5b68c051e434423a)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
+ version: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-svg:
specifier: 15.16.0
version: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
@@ -147,7 +150,7 @@ importers:
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
sonner-native:
specifier: ^0.26.2
- version: 0.26.4(ee6658a01f0566316b5a28dccc2b8480)
+ version: 0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a)
devDependencies:
'@types/node':
specifier: ^20
@@ -1734,12 +1737,15 @@ packages:
'@oslojs/asn1@1.0.0':
resolution: {integrity: sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA==}
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
'@oslojs/binary@1.0.0':
resolution: {integrity: sha512-9RCU6OwXU6p67H4NODbuxv2S3eenuQ4/WFLrsq+K/k682xrznH5EVWA7N4VFk9VYVcbFtKqur5YQQZc0ySGhsQ==}
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
'@oslojs/crypto@1.0.1':
resolution: {integrity: sha512-7n08G8nWjAr/Yu3vu9zzrd0L9XnrJfpMioQcvCMxBIiF5orECHe5/3J0jmXRVvgfqMm/+4oxlQ+Sq39COYLcNQ==}
+ deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
'@oslojs/encoding@1.1.0':
resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
@@ -3911,6 +3917,7 @@ packages:
eslint@9.39.4:
resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
hasBin: true
peerDependencies:
jiti: '*'
@@ -4048,8 +4055,8 @@ packages:
react: '*'
react-native: '*'
- expo-glass-effect@58.0.4:
- resolution: {integrity: sha512-PrxU1FINOpqpnjtZMXHAC/APLq3T3fDforMqQ+JRqRtIrlQ8wntrX8IztLxJBKD9s8cJJ8V9MAoI89aYRK8j9Q==}
+ expo-glass-effect@58.0.5:
+ resolution: {integrity: sha512-PkL1X/r0cTs6NG47Xp3TxRvtqSeRmPYhPOHp3GDmZB2oOxpjXge6qLi/bSSv0asFWqf+MLOlXZ+hq2Imuh0Z1g==}
peerDependencies:
expo: '*'
react: '*'
@@ -7531,7 +7538,7 @@ snapshots:
ws: 8.21.0
zod: 3.25.76
optionalDependencies:
- expo-router: 58.0.25(5c865dc62adb071be8c7946ff2c6115b)
+ expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
transitivePeerDependencies:
- '@expo/dom-webview'
@@ -7832,7 +7839,7 @@ snapshots:
react: 19.3.0
optionalDependencies:
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
- expo-router: 58.0.25(5c865dc62adb071be8c7946ff2c6115b)
+ expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
react-dom: 19.3.0(react@19.3.0)
transitivePeerDependencies:
- supports-color
@@ -11139,7 +11146,7 @@ snapshots:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
- expo-glass-effect@58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
+ expo-glass-effect@58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
dependencies:
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
react: 19.3.0
@@ -11233,7 +11240,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
- expo-router@58.0.25(5c865dc62adb071be8c7946ff2c6115b):
+ expo-router@58.0.25(88877fdcf2b70b064063b5f62591c4ab):
dependencies:
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
@@ -11245,7 +11252,7 @@ snapshots:
client-only: 0.0.1
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
expo-constants: 58.0.13(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(typescript@6.0.3)
- expo-glass-effect: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
+ expo-glass-effect: 58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-linking: 58.0.14(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
expo-server: 58.0.5
nanoid: 3.3.20
@@ -11255,7 +11262,7 @@ snapshots:
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
react-native-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
- react-native-screens: 4.30.0(patch_hash=4c993bb49116c59c1df018c02687484d61964af674b5ea2d5b68c051e434423a)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
+ react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
server-only: 0.0.1
sf-symbols-typescript: 2.2.0
standard-navigation: 0.0.5
@@ -12957,7 +12964,7 @@ snapshots:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
- react-native-screens@4.30.0(patch_hash=4c993bb49116c59c1df018c02687484d61964af674b5ea2d5b68c051e434423a)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
+ react-native-screens@4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
dependencies:
react: 19.3.0
react-freeze: 1.0.4(react@19.3.0)
@@ -13506,14 +13513,14 @@ snapshots:
slugify@1.6.9: {}
- sonner-native@0.26.4(ee6658a01f0566316b5a28dccc2b8480):
+ sonner-native@0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a):
dependencies:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
- react-native-screens: 4.30.0(patch_hash=4c993bb49116c59c1df018c02687484d61964af674b5ea2d5b68c051e434423a)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
+ react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-svg: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-worklets: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)