Compare commits
2
Commits
No files matched your search
+6
-5
@@ -54,11 +54,12 @@ playwright.config.*
|
||||
*~
|
||||
*.log
|
||||
|
||||
# Environment variables, in any workspace. Next.js inlines NEXT_PUBLIC_* values
|
||||
# into the bundle and the Convex CLI reads .env.local on deploy.
|
||||
**/.env
|
||||
**/.env.*
|
||||
!**/.env.example
|
||||
# Environment variables (only commit template files)
|
||||
.env
|
||||
.env*.local
|
||||
.env.development
|
||||
.env.test
|
||||
.env.production.local
|
||||
|
||||
# Docker configuration files (not needed inside build context)
|
||||
Dockerfile*
|
||||
|
||||
+1
-6
@@ -195,12 +195,7 @@ RUN node --version \
|
||||
&& ldd /convex/generate_key \
|
||||
&& ! ldd /convex/convex-local-backend /convex/generate_key | grep -q 'not found'
|
||||
|
||||
# The backend gets its own user so the web server cannot read the database or
|
||||
# instance secret. It joins the otunes group to clean up the web server's HLS
|
||||
# cache in /tmp/otunes.
|
||||
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes \
|
||||
&& useradd --system --user-group --groups otunes --create-home --home-dir /home/convex \
|
||||
--shell /usr/sbin/nologin convex
|
||||
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes
|
||||
|
||||
COPY --from=convex-functions /app /opt/otunes/convex
|
||||
COPY docker/generate-auth-keys.mjs /opt/otunes/generate-auth-keys.mjs
|
||||
|
||||
@@ -42,41 +42,3 @@ 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.
|
||||
@@ -4,9 +4,7 @@ This integration uses Expo 58 inline modules and `expo-app-intents`. Rebuild the
|
||||
|
||||
Playback and library changes open oTunes because they need its authenticated React runtime. Swift dispatches a request and waits for an app-owned completion acknowledgment. Playback waits for the native audio player to load the requested track; warmup waits for it to load while paused. Errors reach Siri, and requests that have expired are discarded before starting a side effect. Native catalog reads do not open the app.
|
||||
|
||||
The full entity catalog lives in Application Support. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog.
|
||||
|
||||
Sync is incremental. The app subscribes to `intentCatalog.head`, the newest insert, rename or deletion per kind, and fetches a kind only when it moves past the cursor stored in AsyncStorage. `intentCatalog.page` then returns records created after the cursor plus renames and deletions from the `intentCatalogChanges` log. The log keeps 30 days; older cursors, or more than 2,000 changes, rebuild that kind from scratch. Favorites are stamped onto records on device from the favorites subscription, so liking a song costs no catalog queries. Playlists come from the live `intentCatalog.playlists` query. Code lives in `components/app-intents/`: `catalog-sync.ts`, `now-playing.ts`, and `dispatch.ts`.
|
||||
The full entity catalog lives in Application Support. The backend supplies pages of 200 records. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog. Catalogs refresh on launch, foreground entry, favorite changes, and every five minutes while foregrounded.
|
||||
|
||||
Songs, albums, artists, and playlists have Spotlight open intents and on-screen entity associations. Associations require iOS 18.4 and Xcode 27; Spotlight indexing requires iOS 18. Playback donations are made after the player starts, preserve shuffle, and resolve real catalog entities. Removed records trigger donation cleanup. Sign-out clears catalogs, Spotlight entries, donations, and pending invocations. On iOS 27, the query types also handle system requests to rebuild Spotlight indexes.
|
||||
|
||||
@@ -16,7 +14,7 @@ Audio schema intents require Xcode 27 and iOS 27. Custom intents remain availabl
|
||||
|
||||
Deploy the companion Convex changes before installing the new mobile build:
|
||||
|
||||
- `intentCatalog.head`, `intentCatalog.page` and `intentCatalog.playlists` supply the entity catalog. Library mutations record renames and deletions in `intentCatalogChanges`, pruned daily.
|
||||
- `library.intentCatalogPage` supplies authenticated, paginated entity records.
|
||||
- `appIntentPlaylists` records playlist-creation request IDs in the same transaction as creation. Replaying a request returns the original playlist ID.
|
||||
- `playlists.createPlaylist` accepts an optional `invocationId`; existing callers can omit it.
|
||||
|
||||
|
||||
@@ -28,12 +28,6 @@ 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}`,
|
||||
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
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 (
|
||||
<TabletSectionContext value={section}>
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...options,
|
||||
title:
|
||||
route.name === "index"
|
||||
? section?.title
|
||||
: tabStackScreenTitles[route.name],
|
||||
})}
|
||||
/>
|
||||
</TabletSectionContext>
|
||||
)
|
||||
}
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/album/[id]"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/artist/[id]"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/browse/albums"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/browse/artists"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/browse/playlists"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/browse/songs"
|
||||
-23
@@ -1,23 +0,0 @@
|
||||
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 <Screen />
|
||||
}
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/playlist/[id]"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../../library/playlist/favorites"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../library/recently-added"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../library/recently-played"
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../library/settings"
|
||||
@@ -1,17 +1,12 @@
|
||||
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 {
|
||||
ScreenPaletteProvider,
|
||||
AndroidTabThemeProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidNativeTabColors,
|
||||
useAndroidTabSelectedColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { DynamicColorIOS, Platform } from "react-native"
|
||||
import { DynamicColorIOS, Platform, View } from "react-native"
|
||||
import { useMemo } from "react"
|
||||
|
||||
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
|
||||
@@ -46,12 +41,10 @@ function useRouterTheme() {
|
||||
}
|
||||
|
||||
function useNativeTabColors() {
|
||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||
const selectedColor = colors.dark.primary
|
||||
const selectedColor = useAndroidTabSelectedColor()
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = colors.dark
|
||||
const artworkPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -61,14 +54,14 @@ function useNativeTabColors() {
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
: {
|
||||
default: androidPalette.mutedForeground,
|
||||
default: androidPalette.secondaryForeground,
|
||||
selected: selectedColor,
|
||||
}
|
||||
|
||||
const labelColor =
|
||||
Platform.OS === "ios"
|
||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||
: androidPalette.mutedForeground
|
||||
: androidPalette.secondaryForeground
|
||||
|
||||
return {
|
||||
isDark,
|
||||
@@ -85,20 +78,15 @@ function useNativeTabColors() {
|
||||
blurEffect: isDark
|
||||
? "systemChromeMaterialDark"
|
||||
: "systemChromeMaterialLight",
|
||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
||||
backgroundColor:
|
||||
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||
}
|
||||
}
|
||||
|
||||
function TabsContent() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const homeColors = useAndroidNativeTabColors()
|
||||
const libraryColors = useAndroidNativeTabColors()
|
||||
const searchColors = useAndroidNativeTabColors()
|
||||
const keyboardVisible = useAndroidKeyboardVisible()
|
||||
const routerTheme = useRouterTheme()
|
||||
const tabColors = useNativeTabColors()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||
|
||||
@@ -113,12 +101,11 @@ function TabsContent() {
|
||||
|
||||
return (
|
||||
<ThemeProvider value={routerTheme}>
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
<View style={{ flex: 1 }}>
|
||||
{Platform.OS === "android" ? (
|
||||
<NavigationBar style={tabColors.isDark ? "light" : "dark"} />
|
||||
) : null}
|
||||
<NativeTabs
|
||||
sidebarAdaptable
|
||||
blurEffect={
|
||||
tabColors.blurEffect as
|
||||
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
||||
@@ -132,7 +119,7 @@ function TabsContent() {
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||
{Platform.OS === "ios" && showBottomAccessory ? (
|
||||
<NativeTabs.BottomAccessory>
|
||||
<TabBottomAccessory />
|
||||
</NativeTabs.BottomAccessory>
|
||||
@@ -140,9 +127,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? homeColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -152,9 +136,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? libraryColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -162,84 +143,29 @@ function TabsContent() {
|
||||
sf="music.note.square.stack.fill"
|
||||
md="library_music"
|
||||
/>
|
||||
<NativeTabs.Trigger.Label>
|
||||
{tabletLayout ? "Recently Added" : "Library"}
|
||||
</NativeTabs.Trigger.Label>
|
||||
<NativeTabs.Trigger.Label>Library</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? searchColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
||||
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(albums)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="square.stack" />
|
||||
<NativeTabs.Trigger.Label>Albums</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(artists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="mic" />
|
||||
<NativeTabs.Trigger.Label>Artists</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(songs)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="music.note" />
|
||||
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(playlists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="music.note.list" />
|
||||
<NativeTabs.Trigger.Label>All Playlists</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(favorites)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="star" />
|
||||
<NativeTabs.Trigger.Label>Favorites</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(recent)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="clock" />
|
||||
<NativeTabs.Trigger.Label>Recently Played</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
</NativeTabs>
|
||||
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
|
||||
{tabletLayout ? <TabletMiniPlayer /> : null}
|
||||
</Animated.View>
|
||||
</View>
|
||||
</ThemeProvider>
|
||||
)
|
||||
}
|
||||
|
||||
export default function TabsLayout() {
|
||||
if (Platform.OS !== "android") return <TabsContent />
|
||||
return (
|
||||
<ScreenPaletteProvider>
|
||||
<TabletPlayerLayoutProvider>
|
||||
<TabsContent />
|
||||
</TabletPlayerLayoutProvider>
|
||||
</ScreenPaletteProvider>
|
||||
<AndroidTabThemeProvider>
|
||||
<TabsContent />
|
||||
</AndroidTabThemeProvider>
|
||||
)
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -13,9 +13,12 @@ export default function HomeLayout() {
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
|
||||
@@ -1,27 +1,17 @@
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import {
|
||||
useSwipeRowGroup,
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
@@ -35,7 +25,7 @@ import {
|
||||
MediaActionMenu,
|
||||
MediaContextMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
} from "@/components/media-actions-sheet"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
@@ -73,22 +63,33 @@ export default function AlbumScreen() {
|
||||
handleAlbumTrackAction,
|
||||
isAlbumFavorite: isAlbumFav,
|
||||
} = useMediaMenuActions()
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
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 } =
|
||||
useScreenPalette(artworkPalette)
|
||||
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
|
||||
const songIds = useMemo(
|
||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||
[album]
|
||||
)
|
||||
|
||||
// Older servers do not include album format availability yet.
|
||||
const formatTracks = useCachedQuery(
|
||||
api.library.getSongsForPlayback,
|
||||
album && (album.hasLossless === undefined || album.hasAtmos === undefined)
|
||||
? { ids: songIds }
|
||||
: "skip"
|
||||
)
|
||||
const hasLossless =
|
||||
album?.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album?.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
rememberSongs(albumDetailSongs(album))
|
||||
@@ -104,7 +105,6 @@ export default function AlbumScreen() {
|
||||
}
|
||||
return album ? (
|
||||
<AlbumTrackRow
|
||||
swipeGroup={swipeGroup}
|
||||
track={item.track}
|
||||
number={item.number}
|
||||
album={album}
|
||||
@@ -125,7 +125,6 @@ export default function AlbumScreen() {
|
||||
palette,
|
||||
playFromSong,
|
||||
songIds,
|
||||
swipeGroup,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -136,25 +135,9 @@ export default function AlbumScreen() {
|
||||
options={{
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={220}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
Platform.OS === "android" ? palette.background : undefined
|
||||
}
|
||||
/>
|
||||
<CollectionDetailSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -169,9 +152,9 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Album not found.
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -192,10 +175,7 @@ export default function AlbumScreen() {
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -217,8 +197,7 @@ export default function AlbumScreen() {
|
||||
}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
@@ -228,176 +207,119 @@ export default function AlbumScreen() {
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<Animated.FlatList
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
<FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={listItems}
|
||||
keyExtractor={albumListItemKey}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: palette.background },
|
||||
backgroundStyle,
|
||||
]}
|
||||
style={{ flex: 1, backgroundColor: palette.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||
ListHeaderComponent={
|
||||
<View>
|
||||
<MusicEntityView kind="album" id={album.id}>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={album.cover != null}
|
||||
style={[
|
||||
styles.cover,
|
||||
heroLayout.coverSize
|
||||
? {
|
||||
width: heroLayout.coverSize,
|
||||
height: heroLayout.coverSize,
|
||||
}
|
||||
: undefined,
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={
|
||||
<View
|
||||
style={[
|
||||
styles.actions,
|
||||
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||
]}
|
||||
>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
hitSlop={8}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={favorited ? "accent" : "foreground"}
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
}
|
||||
<MusicEntityView kind="album" id={album.id} style={styles.hero}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={album.cover != null}
|
||||
style={styles.cover}
|
||||
/>
|
||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text style={[styles.artist, { color: palette.accentText }]}>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 8,
|
||||
}}
|
||||
>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata}
|
||||
</Text>
|
||||
) : null}
|
||||
{hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{hasAtmos ? (
|
||||
<>
|
||||
{metadata || hasLossless ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
<View style={styles.actions}>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
hitSlop={8}
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
{ color: palette.foreground },
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
{album.title}
|
||||
</PaletteText>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<PaletteText
|
||||
tone="accentText"
|
||||
style={[
|
||||
styles.artist,
|
||||
heroLayout.landscape && styles.artistLandscape,
|
||||
{ color: palette.accentText },
|
||||
]}
|
||||
>
|
||||
{album.artist.name}
|
||||
</PaletteText>
|
||||
<Ionicons
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: heroLayout.landscape
|
||||
? "flex-start"
|
||||
: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 8,
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{metadata}
|
||||
</PaletteText>
|
||||
) : null}
|
||||
{album.hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{album.hasAtmos ? (
|
||||
<>
|
||||
{metadata || album.hasLossless ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
</CollectionHero>
|
||||
<Ionicons
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
</MusicEntityView>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</View>
|
||||
@@ -451,7 +373,6 @@ function albumListItemKey(item: AlbumListItem) {
|
||||
|
||||
const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
track,
|
||||
swipeGroup,
|
||||
number,
|
||||
album,
|
||||
songIds,
|
||||
@@ -461,7 +382,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
onAction,
|
||||
}: {
|
||||
track: BrowseAlbumTrack
|
||||
swipeGroup: SwipeRowGroup
|
||||
number: number
|
||||
album: BrowseAlbumDetail
|
||||
songIds: Id<"songs">[]
|
||||
@@ -474,22 +394,8 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
action: MediaAction
|
||||
) => Promise<void>
|
||||
}) {
|
||||
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={
|
||||
config
|
||||
? {
|
||||
kind: "song",
|
||||
title: track.title,
|
||||
artist: album.artist.name,
|
||||
album: album.title,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
|
||||
hasArtwork: album.cover != null,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
stationArtistId={album.artist.id}
|
||||
favorited={favorited}
|
||||
navigation={{
|
||||
@@ -505,20 +411,15 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
onAction={(action) => void onAction(track, album, action)}
|
||||
>
|
||||
<MusicEntityView kind="song" id={track.id}>
|
||||
<Row
|
||||
group={swipeGroup}
|
||||
backgroundColor={palette.background}
|
||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||
onAddToQueue={() => void onAction(track, album, "play-last")}
|
||||
<Pressable
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||
>
|
||||
{number}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
<View
|
||||
style={[
|
||||
styles.trackContent,
|
||||
@@ -526,31 +427,26 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
]}
|
||||
>
|
||||
<View style={styles.trackMeta}>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{track.artists ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</Row>
|
||||
</Pressable>
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
@@ -558,14 +454,17 @@ 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: {
|
||||
|
||||
@@ -6,7 +6,7 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import { MediaGridList } from "@/components/media-cards"
|
||||
import { MediaActionMenu } from "@/components/media-context-menu"
|
||||
import { MediaActionMenu } from "@/components/media-actions-sheet"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
|
||||
@@ -141,12 +141,6 @@ const ArtistRow = memo(function ArtistRow({
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "artist",
|
||||
title: artist.name,
|
||||
artworkUrl: artistCoverUrl(serverUrl, artist.id),
|
||||
hasArtwork: artist.photo != null,
|
||||
}}
|
||||
favorited={favorited}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
onAction={(action) => void onAction(artist, action)}
|
||||
@@ -166,11 +160,7 @@ const ArtistRow = memo(function ArtistRow({
|
||||
>
|
||||
{artist.name}
|
||||
</Text>
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={16}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
|
||||
</Pressable>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
|
||||
@@ -1,26 +1,12 @@
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import {
|
||||
Link,
|
||||
Stack,
|
||||
useIsFocused,
|
||||
useLocalSearchParams,
|
||||
@@ -28,17 +14,21 @@ import {
|
||||
} from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import {
|
||||
SwipeToRemoveRow,
|
||||
useSwipeRowGroup,
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
@@ -46,7 +36,7 @@ import {
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
} from "@/components/media-actions-sheet"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
@@ -95,8 +85,7 @@ export default function PlaylistScreen() {
|
||||
coverUri,
|
||||
playlist ? playlist.cover != null : playlist === null ? false : undefined
|
||||
)
|
||||
const { palette, onLayout, backgroundStyle } =
|
||||
useScreenPalette(artworkPalette)
|
||||
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
|
||||
|
||||
useEffect(() => {
|
||||
if (songs) rememberSongs(songs)
|
||||
@@ -109,25 +98,9 @@ export default function PlaylistScreen() {
|
||||
options={{
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={200}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
Platform.OS === "android" ? palette.background : undefined
|
||||
}
|
||||
/>
|
||||
<CollectionDetailSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -142,9 +115,9 @@ export default function PlaylistScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Playlist not found.
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -152,7 +125,6 @@ export default function PlaylistScreen() {
|
||||
|
||||
return (
|
||||
<PlaylistContent
|
||||
backgroundStyle={backgroundStyle}
|
||||
onLayout={onLayout}
|
||||
playlist={playlist}
|
||||
songs={playlist.songs}
|
||||
@@ -163,7 +135,6 @@ export default function PlaylistScreen() {
|
||||
}
|
||||
|
||||
function PlaylistContent({
|
||||
backgroundStyle,
|
||||
onLayout,
|
||||
playlist,
|
||||
songs,
|
||||
@@ -171,7 +142,6 @@ function PlaylistContent({
|
||||
palette,
|
||||
}: {
|
||||
onLayout?: () => void
|
||||
backgroundStyle: ReturnType<typeof useScreenPalette>["backgroundStyle"]
|
||||
playlist: BrowsePlaylistDetail
|
||||
songs: BrowseSong[]
|
||||
coverUri: string
|
||||
@@ -277,10 +247,7 @@ function PlaylistContent({
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -299,8 +266,7 @@ function PlaylistContent({
|
||||
onAction={handlePlaylistMenuAction}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
@@ -314,6 +280,7 @@ function PlaylistContent({
|
||||
deletePlaylist,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
playlist?.title,
|
||||
@@ -355,30 +322,26 @@ function PlaylistContent({
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
/>
|
||||
<Animated.FlatList
|
||||
<FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={filteredSongs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: palette.background },
|
||||
backgroundStyle,
|
||||
]}
|
||||
style={{ flex: 1, backgroundColor: palette.background }}
|
||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||
contentContainerStyle={styles.listContent}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListEmptyComponent={
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={[
|
||||
styles.emptyResults,
|
||||
{ color: palette.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<PlaylistHero
|
||||
@@ -432,31 +395,28 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
palette={palette}
|
||||
inset
|
||||
swipe={
|
||||
Platform.OS !== "web"
|
||||
? {
|
||||
group: swipeGroup,
|
||||
backgroundColor: palette.background,
|
||||
onPlayNext: () => onAction(song, "play-next"),
|
||||
onAddToQueue: () => onAction(song, "play-last"),
|
||||
onRemove:
|
||||
Platform.OS === "android" && removable
|
||||
? () => {
|
||||
void onRemove(song.id)
|
||||
}
|
||||
: undefined,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
onPlay={onPlay}
|
||||
onAction={onAction}
|
||||
/>
|
||||
)
|
||||
|
||||
if (Platform.OS !== "web" || !removable) {
|
||||
if (!removable) {
|
||||
return row
|
||||
}
|
||||
|
||||
if (Platform.OS === "ios") {
|
||||
return (
|
||||
<SwipeToRemoveRow
|
||||
group={swipeGroup}
|
||||
backgroundColor={palette.background}
|
||||
actionAccessibilityLabel={`Remove ${song.title} from playlist`}
|
||||
onRemove={handleRemove}
|
||||
>
|
||||
{row}
|
||||
</SwipeToRemoveRow>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<ReanimatedSwipeable
|
||||
friction={2}
|
||||
@@ -475,19 +435,15 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
}}
|
||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||
>
|
||||
<PaletteIcon
|
||||
name="trash"
|
||||
size={22}
|
||||
color={colors.primaryForeground}
|
||||
/>
|
||||
<PaletteText
|
||||
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||
<Text
|
||||
style={[
|
||||
styles.removeActionText,
|
||||
{ color: colors.primaryForeground },
|
||||
]}
|
||||
>
|
||||
Remove
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</Pressable>
|
||||
)}
|
||||
>
|
||||
@@ -521,109 +477,61 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
onPlay: () => void
|
||||
onShuffle: () => void
|
||||
}) {
|
||||
const heroLayout = useCollectionHeroLayout()
|
||||
return (
|
||||
<MusicEntityView kind="playlist" id={entityId}>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={[
|
||||
styles.cover,
|
||||
heroLayout.coverSize
|
||||
? {
|
||||
width: heroLayout.coverSize,
|
||||
height: heroLayout.coverSize,
|
||||
}
|
||||
: undefined,
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={
|
||||
<View
|
||||
style={[
|
||||
styles.actions,
|
||||
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||
]}
|
||||
>
|
||||
{showSubscribe ? (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
||||
accessibilityState={{ selected: isSubscribed }}
|
||||
hitSlop={8}
|
||||
onPress={onSubscribeToggle}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{
|
||||
backgroundColor: isSubscribed
|
||||
? palette.surface
|
||||
: palette.accent,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={
|
||||
isSubscribed ? palette.foreground : palette.accentForeground
|
||||
}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<View style={styles.hero}>
|
||||
<CoverImage uri={coverUri} hasCover={hasCover} style={styles.cover} />
|
||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
||||
{title}
|
||||
</Text>
|
||||
<Text style={{ color: palette.secondaryForeground }}>{ownerName}</Text>
|
||||
<View style={styles.actions}>
|
||||
{showSubscribe ? (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
||||
accessibilityState={{ selected: isSubscribed }}
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
onPress={onSubscribeToggle}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{
|
||||
backgroundColor: isSubscribed
|
||||
? palette.surface
|
||||
: palette.accent,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
<Ionicons
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
color={
|
||||
isSubscribed ? palette.foreground : palette.accentForeground
|
||||
}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
{ color: palette.foreground },
|
||||
]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={{
|
||||
color: palette.foreground,
|
||||
fontSize: heroLayout.landscape ? 22 : 16,
|
||||
}}
|
||||
>
|
||||
{ownerName}
|
||||
</PaletteText>
|
||||
</CollectionHero>
|
||||
) : null}
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
</View>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</MusicEntityView>
|
||||
)
|
||||
@@ -633,13 +541,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",
|
||||
|
||||
@@ -0,0 +1,186 @@
|
||||
import { Stack, useRouter } from "expo-router"
|
||||
import { memo, useCallback, useMemo } from "react"
|
||||
import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongRow } from "@/components/player"
|
||||
import { SongRowSkeleton } from "@/components/skeletons"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { longListProps } from "@/lib/list"
|
||||
import { useSong, useSongs } from "@/lib/song-cache"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** `key` stays stable when earlier songs leave the queue, so rows are not remounted on skip. */
|
||||
type QueueItem = { songId: Id<"songs">; queueIndex: number; key: string }
|
||||
|
||||
function queueItemKey(item: QueueItem) {
|
||||
return item.key
|
||||
}
|
||||
|
||||
const QueueRow = memo(function QueueRow({
|
||||
songId,
|
||||
queueIndex,
|
||||
isLast,
|
||||
isCurrent,
|
||||
onSkipTo,
|
||||
onMove,
|
||||
}: Omit<QueueItem, "key"> & {
|
||||
isLast: boolean
|
||||
isCurrent: boolean
|
||||
onSkipTo: (index: number) => void
|
||||
onMove: (index: number, direction: -1 | 1) => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const song = useSong(songId)
|
||||
|
||||
return (
|
||||
<View>
|
||||
{song ? (
|
||||
<SongRow song={song} onPress={() => onSkipTo(queueIndex)} />
|
||||
) : (
|
||||
<SongRowSkeleton />
|
||||
)}
|
||||
<View style={styles.queueActions}>
|
||||
<Pressable
|
||||
disabled={queueIndex === 0}
|
||||
onPress={() => onMove(queueIndex, -1)}
|
||||
>
|
||||
<Text style={{ color: colors.foreground }}>Move up</Text>
|
||||
</Pressable>
|
||||
<Pressable disabled={isLast} onPress={() => onMove(queueIndex, 1)}>
|
||||
<Text style={{ color: colors.foreground }}>Move down</Text>
|
||||
</Pressable>
|
||||
{isCurrent ? (
|
||||
<Text style={{ color: colors.primary, fontWeight: "700" }}>
|
||||
Now playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
})
|
||||
|
||||
export default function QueueScreen() {
|
||||
const router = useRouter()
|
||||
const colors = useThemeColors()
|
||||
const { queueSongIds, queueHistorySongIds } = usePlaybackQueue()
|
||||
const { skipToQueueIndex, clearQueue, reorderQueue } = usePlaybackActions()
|
||||
const historySongs = useSongs(queueHistorySongIds)
|
||||
|
||||
const items = useMemo<QueueItem[]>(() => {
|
||||
const occurrences = new Map<string, number>()
|
||||
return queueSongIds.map((songId, queueIndex) => {
|
||||
const occurrence = occurrences.get(songId) ?? 0
|
||||
occurrences.set(songId, occurrence + 1)
|
||||
return { songId, queueIndex, key: `${songId}:${occurrence}` }
|
||||
})
|
||||
}, [queueSongIds])
|
||||
|
||||
const moveSong = useCallback(
|
||||
(fromIndex: number, direction: -1 | 1) => {
|
||||
const toIndex = fromIndex + direction
|
||||
if (toIndex < 0 || toIndex >= queueSongIds.length) return
|
||||
const next = [...queueSongIds]
|
||||
const [item] = next.splice(fromIndex, 1)
|
||||
next.splice(toIndex, 0, item)
|
||||
void reorderQueue(next)
|
||||
},
|
||||
[queueSongIds, reorderQueue]
|
||||
)
|
||||
|
||||
function handleClearQueue() {
|
||||
if (router.canGoBack()) {
|
||||
router.back()
|
||||
setTimeout(() => {
|
||||
void clearQueue()
|
||||
}, 0)
|
||||
return
|
||||
}
|
||||
|
||||
void clearQueue()
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
headerRight: () =>
|
||||
queueSongIds.length > 0 ? (
|
||||
<Button
|
||||
title="Clear"
|
||||
variant="ghost"
|
||||
onPress={handleClearQueue}
|
||||
/>
|
||||
) : null,
|
||||
}}
|
||||
/>
|
||||
<FlatList
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
ListHeaderComponent={
|
||||
<View>
|
||||
<Text style={[styles.section, { color: colors.mutedForeground }]}>
|
||||
Up Next
|
||||
</Text>
|
||||
{queueSongIds.length === 0 ? (
|
||||
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
|
||||
Queue is empty
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
}
|
||||
{...longListProps}
|
||||
data={items}
|
||||
keyExtractor={queueItemKey}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
renderItem={({ item }) => (
|
||||
<QueueRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
isLast={item.queueIndex === queueSongIds.length - 1}
|
||||
isCurrent={item.queueIndex === 0}
|
||||
onSkipTo={skipToQueueIndex}
|
||||
onMove={moveSong}
|
||||
/>
|
||||
)}
|
||||
ListFooterComponent={
|
||||
queueHistorySongIds.length > 0 ? (
|
||||
<View style={styles.history}>
|
||||
<Text style={[styles.section, { color: colors.mutedForeground }]}>
|
||||
History
|
||||
</Text>
|
||||
{historySongs.map((song, index) =>
|
||||
song ? (
|
||||
<SongRow key={`${song.id}-${index}`} song={song} />
|
||||
) : (
|
||||
<SongRowSkeleton
|
||||
key={`${queueHistorySongIds[index]}-${index}`}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
) : undefined
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
section: {
|
||||
paddingHorizontal: spacing.lg,
|
||||
paddingTop: spacing.md,
|
||||
fontSize: 12,
|
||||
fontWeight: "700",
|
||||
textTransform: "uppercase",
|
||||
},
|
||||
empty: { padding: spacing.lg },
|
||||
queueActions: {
|
||||
flexDirection: "row",
|
||||
gap: spacing.lg,
|
||||
paddingHorizontal: spacing.lg,
|
||||
paddingBottom: spacing.sm,
|
||||
},
|
||||
history: { marginTop: spacing.lg },
|
||||
})
|
||||
@@ -1,4 +1,4 @@
|
||||
import { atmosEnabled, dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
@@ -20,17 +20,12 @@ 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,
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { changeServer, signOut } from "@/lib/session"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { showError } from "@/lib/toast"
|
||||
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||
import type { PlaybackQuality } from "@/lib/urls"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
@@ -148,12 +143,7 @@ export default function SettingsScreen() {
|
||||
})}
|
||||
</View>
|
||||
|
||||
{section === "profile" ? (
|
||||
<>
|
||||
<AppearanceSection />
|
||||
<ProfileSection user={user} />
|
||||
</>
|
||||
) : null}
|
||||
{section === "profile" ? <ProfileSection user={user} /> : null}
|
||||
{section === "quality" ? <QualitySection user={user} /> : null}
|
||||
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
||||
{section === "users" && isAdmin && allUsers ? (
|
||||
@@ -170,32 +160,6 @@ export default function SettingsScreen() {
|
||||
)
|
||||
}
|
||||
|
||||
function AppearanceSection() {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
return (
|
||||
<SettingsCard title="Appearance">
|
||||
<SwitchRow
|
||||
title="New artwork colors"
|
||||
subtitle="Use the new color algorithm on this device."
|
||||
value={enabled ?? false}
|
||||
disabled={enabled === undefined || saving}
|
||||
onValueChange={async (checked) => {
|
||||
setSaving(true)
|
||||
try {
|
||||
await setArtworkColorsEnabled(checked)
|
||||
} catch {
|
||||
showError("Could not save artwork colors preference.")
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</SettingsCard>
|
||||
)
|
||||
}
|
||||
|
||||
function ProfileSection({ user }: { user: CurrentUser }) {
|
||||
const colors = useThemeColors()
|
||||
const updateName = useMutation(api.users.updateProfileName)
|
||||
@@ -418,7 +382,7 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
: "This device does not support Dolby Atmos playback."
|
||||
}
|
||||
disabled={!dolbyAtmosSupported}
|
||||
value={atmosEnabled(user)}
|
||||
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
|
||||
onValueChange={(checked) =>
|
||||
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
|
||||
showError(error.message)
|
||||
@@ -769,7 +733,6 @@ function ProfileAvatar({
|
||||
style?: StyleProp<ViewStyle>
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const imageUrl = useProfileImageUrl(user.image)
|
||||
const avatarStyle = [
|
||||
styles.avatar,
|
||||
{
|
||||
@@ -781,11 +744,11 @@ function ProfileAvatar({
|
||||
style,
|
||||
]
|
||||
|
||||
if (imageUrl) {
|
||||
if (user.image) {
|
||||
return (
|
||||
<View style={avatarStyle}>
|
||||
<Image
|
||||
source={{ uri: imageUrl }}
|
||||
source={{ uri: user.image }}
|
||||
style={styles.avatarImage}
|
||||
contentFit="cover"
|
||||
/>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -10,17 +9,17 @@ export const unstable_settings = {
|
||||
}
|
||||
|
||||
export default function LibraryLayout() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const baseOptions = useStackScreenOptions({ title: "Library" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Library",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { useMemo } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { SymbolView } from "expo-symbols"
|
||||
@@ -13,22 +12,14 @@ import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
const PAGE_SIZE = 24
|
||||
const PAGE_SIZE = 16
|
||||
|
||||
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 },
|
||||
]
|
||||
|
||||
@@ -52,19 +43,11 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
||||
sparkles: "sparkles",
|
||||
star: "star",
|
||||
}
|
||||
return (
|
||||
<Ionicons
|
||||
name={ionMap[name] ?? "musical-notes"}
|
||||
size={22}
|
||||
color={appleMusic.pink}
|
||||
/>
|
||||
)
|
||||
return <Ionicons name={ionMap[name] ?? "musical-notes"} size={22} color={appleMusic.pink} />
|
||||
}
|
||||
|
||||
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,
|
||||
@@ -75,46 +58,31 @@ export default function LibraryScreen() {
|
||||
const listHeader = useMemo(
|
||||
() => (
|
||||
<View>
|
||||
{!isTablet ? (
|
||||
<>
|
||||
{links.map((link) => (
|
||||
<Pressable
|
||||
key={link.href}
|
||||
style={styles.row}
|
||||
onPress={() => push(link.href)}
|
||||
>
|
||||
<LibraryIcon name={link.icon} />
|
||||
<View
|
||||
style={[
|
||||
styles.rowContent,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.rowTitle, { color: colors.foreground }]}>
|
||||
{link.title}
|
||||
</Text>
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={16}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</View>
|
||||
</Pressable>
|
||||
))}
|
||||
{links.map((link) => (
|
||||
<Pressable
|
||||
key={link.href}
|
||||
style={styles.row}
|
||||
onPress={() => push(link.href)}
|
||||
>
|
||||
<LibraryIcon name={link.icon} />
|
||||
<View style={[styles.rowContent, { borderBottomColor: colors.border }]}>
|
||||
<Text style={[styles.rowTitle, { color: colors.foreground }]}>{link.title}</Text>
|
||||
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
|
||||
</View>
|
||||
</Pressable>
|
||||
))}
|
||||
|
||||
<Pressable
|
||||
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
||||
onPress={() => push("/recently-added")}
|
||||
>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Recently Added
|
||||
</Text>
|
||||
</Pressable>
|
||||
</>
|
||||
) : null}
|
||||
<Pressable
|
||||
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
||||
onPress={() => push("/recently-added")}
|
||||
>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Recently Added
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
),
|
||||
[colors.border, colors.foreground, colors.mutedForeground, push, isTablet]
|
||||
[colors.border, colors.foreground, colors.mutedForeground, push]
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -1,5 +1,5 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -13,9 +13,12 @@ export default function SearchLayout() {
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -73,10 +73,10 @@ export default function AppLayout() {
|
||||
return (
|
||||
<ConvexAuthRecovery onInvalidate={invalidateSession}>
|
||||
<PlaybackProvider>
|
||||
<AppIntentBridge />
|
||||
<AppNavigationSync />
|
||||
<AddToPlaylistProvider>
|
||||
<FavoritesProvider>
|
||||
<AppIntentBridge />
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { TabletNowPlaying } from "@/components/tablet-now-playing"
|
||||
import { atmosEnabled } from "@/lib/playback-capabilities"
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { NavigationBar } from "expo-navigation-bar"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Stack, useRouter, useLocalSearchParams } from "expo-router"
|
||||
import { Stack, useRouter } from "expo-router"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
@@ -39,12 +37,11 @@ import { MarqueeText } from "@/components/marquee-text"
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
} from "@/components/media-actions-sheet"
|
||||
import {
|
||||
NowPlayingQueue,
|
||||
QUEUE_HORIZONTAL_INSET,
|
||||
} from "@/components/now-playing-queue"
|
||||
import { PlayerArtistMenu } from "@/components/player-artist-menu"
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
@@ -75,15 +72,10 @@ 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,
|
||||
@@ -99,8 +91,7 @@ export default function PlayerScreen() {
|
||||
skipPrevious,
|
||||
} = usePlayback()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const { queue } = useLocalSearchParams<{ queue?: string }>()
|
||||
const [showQueue, setShowQueue] = useState(queue === "1")
|
||||
const [showQueue, setShowQueue] = useState(false)
|
||||
const [isDismissing, setIsDismissing] = useState(false)
|
||||
const [stageHeight, setStageHeight] = useState(0)
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
@@ -114,7 +105,7 @@ export default function PlayerScreen() {
|
||||
? playbackFormat(
|
||||
playbackInfo.files,
|
||||
user.playbackQuality,
|
||||
atmosEnabled(user)
|
||||
dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
)
|
||||
: null
|
||||
|
||||
@@ -227,22 +218,6 @@ export default function PlayerScreen() {
|
||||
setShowQueue((value) => !value)
|
||||
}
|
||||
|
||||
if (isTablet) {
|
||||
return (
|
||||
<MusicEntityView kind="song" id={currentSong.id} style={{ flex: 1 }}>
|
||||
<TabletNowPlaying
|
||||
colors={colors}
|
||||
backgroundStyle={backgroundStyle}
|
||||
dismissStyle={dismissStyle}
|
||||
dismissGesture={dismissGesture}
|
||||
showQueue={showQueue}
|
||||
toggleQueue={toggleQueue}
|
||||
metadata={<SongMeta song={currentSong} colors={colors} />}
|
||||
/>
|
||||
</MusicEntityView>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||
@@ -545,15 +520,13 @@ function SongMeta({
|
||||
{ color: colors.foreground },
|
||||
]}
|
||||
/>
|
||||
<PlayerArtistMenu song={song} onAction={handleAction}>
|
||||
<MarqueeText
|
||||
text={song.artist.name}
|
||||
style={[
|
||||
compact ? styles.compactArtist : styles.artist,
|
||||
{ color: colors.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</PlayerArtistMenu>
|
||||
<MarqueeText
|
||||
text={song.artist.name}
|
||||
style={[
|
||||
compact ? styles.compactArtist : styles.artist,
|
||||
{ color: colors.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
<Pressable
|
||||
onPress={() => void toggleSongFavorite(song.id)}
|
||||
@@ -570,12 +543,6 @@ function SongMeta({
|
||||
/>
|
||||
</Pressable>
|
||||
<MediaActionMenu
|
||||
share={{
|
||||
type: "song",
|
||||
songId: song.id,
|
||||
albumId: song.album.id,
|
||||
title: song.title,
|
||||
}}
|
||||
stationArtistId={song.artist.id}
|
||||
favorited={favorited}
|
||||
navigation={{
|
||||
@@ -583,7 +550,6 @@ function SongMeta({
|
||||
album: { id: song.album.id },
|
||||
}}
|
||||
includeActions={[
|
||||
"share",
|
||||
"play-next",
|
||||
"play-last",
|
||||
"shuffle",
|
||||
|
||||
@@ -1,21 +1,147 @@
|
||||
import { useQuery } from "convex/react"
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import { useMemo, useSyncExternalStore } from "react"
|
||||
import type { AppIntentEntity, AppIntentInvocation } from "expo-app-intents"
|
||||
import { useEffect, useMemo, useRef, useSyncExternalStore } from "react"
|
||||
import { AppState } from "react-native"
|
||||
import {
|
||||
completeMusicInvocation,
|
||||
publishMusicCatalog,
|
||||
trackMusicCatalogSync,
|
||||
} from "@/lib/app-intents"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
|
||||
import { useMusicCatalogSync } from "@/components/app-intents/catalog-sync"
|
||||
import { useIntentDispatch } from "@/components/app-intents/dispatch"
|
||||
import { useNowPlayingCatalog } from "@/components/app-intents/now-playing"
|
||||
import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
useCacheScope,
|
||||
} from "@/contexts/persistent-cache"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import {
|
||||
FAVORITES_PLAYLIST_ID,
|
||||
loadHandledIntentIds,
|
||||
rememberHandledIntentId,
|
||||
} from "@/lib/app-intent-handled"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
const warmedAudioIds = new Set<string>()
|
||||
|
||||
class IntentRejected extends Error {}
|
||||
|
||||
const KNOWN_INTENTS = new Set([
|
||||
"playMusic",
|
||||
"warmupAudio",
|
||||
"addToPlaylist",
|
||||
"addToUpNext",
|
||||
"clearUpNext",
|
||||
"createPlaylist",
|
||||
"createStation",
|
||||
"updateAffinity",
|
||||
"transport",
|
||||
"openMusic",
|
||||
])
|
||||
|
||||
type MusicSource = {
|
||||
kind: string
|
||||
id: string
|
||||
}
|
||||
|
||||
function readString(value: unknown) {
|
||||
return typeof value === "string" && value.trim() ? value : null
|
||||
}
|
||||
|
||||
function readSources(value: unknown): MusicSource[] {
|
||||
if (!Array.isArray(value)) {
|
||||
return []
|
||||
}
|
||||
return value.flatMap((entry) => {
|
||||
if (!entry || typeof entry !== "object") {
|
||||
return []
|
||||
}
|
||||
const source = entry as { kind?: unknown; id?: unknown }
|
||||
if (typeof source.kind !== "string" || typeof source.id !== "string") {
|
||||
return []
|
||||
}
|
||||
if (!source.kind || !source.id) {
|
||||
return []
|
||||
}
|
||||
return [{ kind: source.kind, id: source.id }]
|
||||
})
|
||||
}
|
||||
|
||||
function shuffleChoice(value: unknown, fallback: boolean) {
|
||||
if (value === "songs") return true
|
||||
if (value === "off") return false
|
||||
if (value == null) return fallback
|
||||
throw new IntentRejected("Shuffle must be Off or Songs.")
|
||||
}
|
||||
|
||||
function repeatChoice(value: unknown): RepeatMode | null {
|
||||
if (value == null) return null
|
||||
if (value === "none") return "none"
|
||||
if (value === "one") return "once"
|
||||
if (value === "all") return "always"
|
||||
throw new IntentRejected("Repeat must be None, One, or All.")
|
||||
}
|
||||
|
||||
function ensureActive(invocation: AppIntentInvocation) {
|
||||
const deadline = invocation.params.deadline
|
||||
if (typeof deadline === "number" && Date.now() >= deadline) {
|
||||
throw new IntentRejected("This request expired. Please try again.")
|
||||
}
|
||||
}
|
||||
|
||||
function isTransient(error: unknown) {
|
||||
const message = (
|
||||
error instanceof Error ? error.message : String(error)
|
||||
).toLowerCase()
|
||||
return (
|
||||
message.includes("not authenticated") ||
|
||||
message.includes("network") ||
|
||||
message.includes("fetch") ||
|
||||
message.includes("connection") ||
|
||||
message.includes("timed out") ||
|
||||
message.includes("timeout")
|
||||
)
|
||||
}
|
||||
|
||||
function songEntity(song: {
|
||||
id: string
|
||||
title: string
|
||||
artistName: string
|
||||
artistId: string
|
||||
albumTitle: string
|
||||
albumId: string
|
||||
durationSeconds: number
|
||||
genres?: string
|
||||
year?: number
|
||||
track?: number
|
||||
diskNumber?: number | null
|
||||
favorite?: boolean
|
||||
}): AppIntentEntity {
|
||||
return {
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
subtitle: song.artistName,
|
||||
synonyms: song.artistName ? [song.artistName] : undefined,
|
||||
metadata: {
|
||||
artistName: song.artistName,
|
||||
artistId: song.artistId,
|
||||
albumTitle: song.albumTitle,
|
||||
albumId: song.albumId,
|
||||
duration: String(song.durationSeconds),
|
||||
genres: song.genres ?? "",
|
||||
year: song.year == null ? "" : String(song.year),
|
||||
track: song.track == null ? "" : String(song.track),
|
||||
disk: song.diskNumber == null ? "" : String(song.diskNumber),
|
||||
favorite: song.favorite ? "1" : "0",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Siri and Shortcuts integration: the on-device entity catalog, the current
|
||||
* song, and intent dispatch. Must render inside `FavoritesProvider`.
|
||||
*/
|
||||
export function AppIntentBridge() {
|
||||
const scope = useCacheScope()
|
||||
const store = useMemo(
|
||||
@@ -28,8 +154,669 @@ export function AppIntentBridge() {
|
||||
}
|
||||
|
||||
function ReadyAppIntentBridge() {
|
||||
useMusicCatalogSync()
|
||||
useNowPlayingCatalog()
|
||||
useIntentDispatch()
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const playback = usePlayback()
|
||||
const user = useQuery(api.auth.currentUser)
|
||||
const navigation = useAppNavigation()
|
||||
const favorites = useQuery(api.favorites.getUserFavorites)
|
||||
const catalogUserKey = user ? JSON.stringify([user._id, favorites]) : null
|
||||
const store = useMemo(
|
||||
() =>
|
||||
getPlaybackStore(
|
||||
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
|
||||
),
|
||||
[cacheScope]
|
||||
)
|
||||
const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot)
|
||||
const handledIds = useRef<Set<string> | null>(null)
|
||||
const publishChain = useRef(Promise.resolve())
|
||||
const publishGeneration = useRef(0)
|
||||
const playbackRef = useRef(playback)
|
||||
playbackRef.current = playback
|
||||
|
||||
useEffect(() => {
|
||||
if (!AppIntents.isAvailable() || !user) return
|
||||
const generation = ++publishGeneration.current
|
||||
let stopped = false
|
||||
let refreshing = false
|
||||
const refresh = () => {
|
||||
if (refreshing || stopped) return
|
||||
refreshing = true
|
||||
publishChain.current = publishChain.current
|
||||
.catch(() => undefined)
|
||||
.then(async () => {
|
||||
for (const kind of ["artist", "album", "song", "playlist"] as const) {
|
||||
const entities: AppIntentEntity[] = []
|
||||
let cursor: string | null = null
|
||||
do {
|
||||
const result: {
|
||||
page: AppIntentEntity[]
|
||||
isDone: boolean
|
||||
continueCursor: string
|
||||
} = await convex.query(api.library.intentCatalogPage, {
|
||||
kind,
|
||||
paginationOpts: { cursor, numItems: 200 },
|
||||
})
|
||||
if (stopped || generation !== publishGeneration.current) return
|
||||
entities.push(...result.page)
|
||||
cursor = result.isDone ? null : result.continueCursor
|
||||
} while (cursor !== null)
|
||||
await publishMusicCatalog(kind, entities)
|
||||
}
|
||||
})
|
||||
.catch((error) =>
|
||||
console.warn("Could not publish music catalog.", error)
|
||||
)
|
||||
.finally(() => {
|
||||
refreshing = false
|
||||
})
|
||||
trackMusicCatalogSync(publishChain.current)
|
||||
}
|
||||
refresh()
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") refresh()
|
||||
})
|
||||
const timer = setInterval(() => {
|
||||
if (AppState.currentState === "active") refresh()
|
||||
}, 5 * 60_000)
|
||||
return () => {
|
||||
stopped = true
|
||||
++publishGeneration.current
|
||||
subscription.remove()
|
||||
clearInterval(timer)
|
||||
}
|
||||
}, [convex, cacheScope, catalogUserKey])
|
||||
|
||||
const currentSongId = playback.queueSongIds[0] ?? null
|
||||
const currentSong = playback.currentSong
|
||||
|
||||
useEffect(() => {
|
||||
if (!snapshot.hydrated || !AppIntents.isAvailable()) {
|
||||
return
|
||||
}
|
||||
if (!currentSongId) {
|
||||
void publishMusicCatalog("nowPlaying", []).catch((error) => {
|
||||
console.warn("Could not clear the current song.", error)
|
||||
})
|
||||
return
|
||||
}
|
||||
if (!currentSong || currentSong.id !== currentSongId) {
|
||||
return
|
||||
}
|
||||
void publishMusicCatalog("nowPlaying", [
|
||||
songEntity({
|
||||
id: currentSong.id,
|
||||
title: currentSong.title,
|
||||
artistName: currentSong.artist.name,
|
||||
artistId: currentSong.artist.id,
|
||||
albumTitle: currentSong.album.title,
|
||||
albumId: currentSong.album.id,
|
||||
durationSeconds: currentSong.durationSeconds,
|
||||
}),
|
||||
]).catch((error) => {
|
||||
console.warn("Could not publish the current song.", error)
|
||||
})
|
||||
}, [currentSong, currentSongId, snapshot.hydrated])
|
||||
|
||||
AppIntents.useAppIntents(async (pendingIntents) => {
|
||||
if (!handledIds.current) {
|
||||
handledIds.current = await loadHandledIntentIds()
|
||||
}
|
||||
const handled = handledIds.current
|
||||
|
||||
for (const invocation of pendingIntents) {
|
||||
if (handled.has(invocation.id)) {
|
||||
const token = readString(invocation.params.completionToken)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
if (!KNOWN_INTENTS.has(invocation.name)) {
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
const token = readString(invocation.params.completionToken)
|
||||
try {
|
||||
ensureActive(invocation)
|
||||
await performInvocation(invocation)
|
||||
if (
|
||||
["playMusic", "warmupAudio", "transport", "createStation"].includes(
|
||||
invocation.name
|
||||
)
|
||||
) {
|
||||
const id = store.getState().queue[0]
|
||||
const song = playbackRef.current.currentSong
|
||||
if (!id) await publishMusicCatalog("nowPlaying", [])
|
||||
else if (song?.id === id)
|
||||
await publishMusicCatalog("nowPlaying", [
|
||||
songEntity({
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
artistName: song.artist.name,
|
||||
artistId: song.artist.id,
|
||||
albumTitle: song.album.title,
|
||||
albumId: song.album.id,
|
||||
durationSeconds: song.durationSeconds,
|
||||
}),
|
||||
])
|
||||
}
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (error) {
|
||||
if (token) {
|
||||
await completeMusicInvocation(
|
||||
token,
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
)
|
||||
}
|
||||
if (token || error instanceof IntentRejected || !isTransient(error)) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
if (!(error instanceof IntentRejected) || message) {
|
||||
showError(message)
|
||||
}
|
||||
try {
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (removeError) {
|
||||
console.warn(
|
||||
"App Intent remains pending",
|
||||
invocation.id,
|
||||
removeError
|
||||
)
|
||||
}
|
||||
continue
|
||||
}
|
||||
console.warn("App Intent remains pending", invocation.id, error)
|
||||
}
|
||||
}
|
||||
|
||||
async function songIdsFor(kind: string, id: string) {
|
||||
if (kind === "song") {
|
||||
return [id as Id<"songs">]
|
||||
}
|
||||
if (kind === "album") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{
|
||||
albumId: id as Id<"albums">,
|
||||
}
|
||||
)
|
||||
}
|
||||
if (kind === "artist") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: id as Id<"artists"> }
|
||||
)
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
if (id === FAVORITES_PLAYLIST_ID) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs
|
||||
}
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: id as Id<"playlists"> }
|
||||
)
|
||||
}
|
||||
throw new IntentRejected("Choose a song, album, artist, or playlist.")
|
||||
}
|
||||
|
||||
async function uniqueSongIds(sources: MusicSource[]) {
|
||||
const ids: Id<"songs">[] = []
|
||||
for (const source of sources) {
|
||||
ids.push(...(await songIdsFor(source.kind, source.id)))
|
||||
}
|
||||
return [...new Set(ids)]
|
||||
}
|
||||
|
||||
async function performInvocation(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
switch (invocation.name) {
|
||||
case "openMusic": {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id || !kind) throw new IntentRejected("Choose music to open.")
|
||||
if (kind === "song") {
|
||||
const song = await convex.query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
})
|
||||
if (!song)
|
||||
throw new IntentRejected("This song is no longer available.")
|
||||
navigation.push(`/album/${song.album}`)
|
||||
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
|
||||
navigation.push("/playlist/favorites")
|
||||
} else if (["album", "artist", "playlist"].includes(kind)) {
|
||||
navigation.push(`/${kind}/${id}`)
|
||||
} else throw new IntentRejected("Unknown music type.")
|
||||
return
|
||||
}
|
||||
case "playMusic":
|
||||
await playMusic(invocation)
|
||||
if (!["next", "tail"].includes(String(invocation.params.queue))) {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
}
|
||||
return
|
||||
case "warmupAudio":
|
||||
await warmup(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(false)
|
||||
warmedAudioIds.add(invocation.id)
|
||||
return
|
||||
case "addToPlaylist":
|
||||
await addToPlaylist(invocation)
|
||||
return
|
||||
case "addToUpNext":
|
||||
await addToUpNext(invocation)
|
||||
return
|
||||
case "clearUpNext":
|
||||
ensureActive(invocation)
|
||||
await actions.clearUpNext()
|
||||
return
|
||||
case "createPlaylist":
|
||||
await createPlaylist(invocation)
|
||||
return
|
||||
case "createStation":
|
||||
await createStation(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
return
|
||||
case "updateAffinity":
|
||||
await updateAffinity(invocation)
|
||||
return
|
||||
case "transport":
|
||||
await transport(invocation)
|
||||
if (store.getState().queue.length > 0) {
|
||||
const command = invocation.params.command
|
||||
await playbackRef.current.waitForPlaybackReady(
|
||||
command === "resume"
|
||||
? true
|
||||
: command === "pause"
|
||||
? false
|
||||
: undefined
|
||||
)
|
||||
}
|
||||
return
|
||||
default:
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
async function playMusic(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const queue = readString(invocation.params.queue) ?? "now"
|
||||
const warmupId = readString(invocation.params.warmupId)
|
||||
const repeat = repeatChoice(invocation.params.repeat)
|
||||
if (repeat) {
|
||||
ensureActive(invocation)
|
||||
await actions.setRepeatMode(repeat)
|
||||
}
|
||||
|
||||
if (queue === "next" || queue === "tail") {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
if (queue === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueNext(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueLast(ids)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (warmupId && warmedAudioIds.has(warmupId)) {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const kind = readString(invocation.params.kind) ?? "resume"
|
||||
if (kind === "resume") {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
if (favorites.favoriteSongs.length === 0) {
|
||||
throw new IntentRejected(
|
||||
"Nothing is queued, and your favorites are empty."
|
||||
)
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(favorites.favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(favorites.favoriteSongs)
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id) {
|
||||
throw new IntentRejected("Choose music to play.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await actions.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
true
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to play.")
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function warmup(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to get ready.")
|
||||
}
|
||||
const shuffled = shuffleChoice(invocation.params.shuffle, false)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
false
|
||||
)
|
||||
} else {
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to get ready.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.prepareQueue(ids, shuffled)
|
||||
}
|
||||
}
|
||||
|
||||
async function addToPlaylist(invocation: AppIntentInvocation) {
|
||||
const playlistId = readString(invocation.params.playlistId)
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (!playlistId || sources.length === 0) {
|
||||
throw new IntentRejected("Choose music and a playlist.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(sources)
|
||||
if (songIds.length === 0) {
|
||||
throw new IntentRejected("Those items have no songs to add.")
|
||||
}
|
||||
if (playlistId === FAVORITES_PLAYLIST_ID) {
|
||||
for (const source of sources) {
|
||||
if (source.kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSong, {
|
||||
songId: source.id as Id<"songs">,
|
||||
})
|
||||
} else if (source.kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteAlbum, {
|
||||
albumId: source.id as Id<"albums">,
|
||||
})
|
||||
} else if (source.kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteArtist, {
|
||||
artistId: source.id as Id<"artists">,
|
||||
})
|
||||
} else if (source.kind === "playlist") {
|
||||
const ids = await songIdsFor(source.kind, source.id)
|
||||
if (ids.length > 0) {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSongs, {
|
||||
songIds: ids,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"Choose a song, album, artist, or playlist."
|
||||
)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.addSongsToPlaylist, {
|
||||
playlistId: playlistId as Id<"playlists">,
|
||||
songIds,
|
||||
})
|
||||
}
|
||||
|
||||
async function addToUpNext(invocation: AppIntentInvocation) {
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (sources.length === 0) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const ids = await uniqueSongIds(sources)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
const position =
|
||||
readString(invocation.params.position) === "last" ? "last" : "next"
|
||||
if (position === "last") {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueLast(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueNext(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function createPlaylist(invocation: AppIntentInvocation) {
|
||||
const name = readString(invocation.params.name)
|
||||
if (!name) {
|
||||
throw new IntentRejected("A playlist needs a name.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(
|
||||
readSources(invocation.params.sources)
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.createPlaylist, {
|
||||
name,
|
||||
songIds,
|
||||
invocationId: invocation.id,
|
||||
})
|
||||
}
|
||||
|
||||
async function createStation(invocation: AppIntentInvocation) {
|
||||
const artistId = readString(invocation.params.artistId)
|
||||
if (!artistId) {
|
||||
throw new IntentRejected("Nothing is playing in oTunes.")
|
||||
}
|
||||
const ids = await songIdsFor("artist", artistId)
|
||||
if (ids.length === 0)
|
||||
throw new IntentRejected("This artist has no songs to play.")
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.playShuffled(ids)
|
||||
}
|
||||
|
||||
async function updateAffinity(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
const state = readString(invocation.params.state)
|
||||
if (!kind || !id || (state !== "like" && state !== "unset")) {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love or unlike a song, album, or artist."
|
||||
)
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
if (state === "like") {
|
||||
if (kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSong, {
|
||||
songId: id as Id<"songs">,
|
||||
})
|
||||
} else if (kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteAlbum, {
|
||||
albumId: id as Id<"albums">,
|
||||
})
|
||||
} else if (kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteArtist, {
|
||||
artistId: id as Id<"artists">,
|
||||
})
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love songs, albums, and artists."
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
if (kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteSong, {
|
||||
songId: id as Id<"songs">,
|
||||
})
|
||||
} else if (kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteAlbum, {
|
||||
albumId: id as Id<"albums">,
|
||||
})
|
||||
} else if (kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteArtist, {
|
||||
artistId: id as Id<"artists">,
|
||||
})
|
||||
} else {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
}
|
||||
|
||||
async function transport(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const command = readString(invocation.params.command)
|
||||
if (command === "pause") {
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(false)
|
||||
return
|
||||
}
|
||||
if (command === "resume") {
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
throw new IntentRejected("Nothing is queued in oTunes.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
if (command === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipNext()
|
||||
return
|
||||
}
|
||||
if (command === "previous") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipPrevious()
|
||||
return
|
||||
}
|
||||
throw new IntentRejected("oTunes doesn't know that playback control.")
|
||||
}
|
||||
})
|
||||
|
||||
return null
|
||||
}
|
||||
@@ -1,198 +0,0 @@
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentEntity } from "expo-app-intents"
|
||||
import { useEffect, useRef } from "react"
|
||||
import { AppState } from "react-native"
|
||||
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import {
|
||||
loadCatalogCursors,
|
||||
saveCatalogCursors,
|
||||
type CatalogCursors,
|
||||
} from "@/lib/app-intent-handled"
|
||||
import {
|
||||
publishMusicCatalog,
|
||||
readMusicCatalog,
|
||||
trackMusicCatalogSync,
|
||||
} from "@/lib/app-intents"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { FunctionReturnType } from "convex/server"
|
||||
|
||||
const LIBRARY_KINDS = ["artist", "album", "song"] as const
|
||||
type LibraryKind = (typeof LIBRARY_KINDS)[number]
|
||||
const PAGE_SIZE = 500
|
||||
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
|
||||
|
||||
type Favorites = {
|
||||
favoriteSongs: string[]
|
||||
favoriteAlbums: string[]
|
||||
favoriteArtists: string[]
|
||||
}
|
||||
|
||||
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
|
||||
return new Set<string>(
|
||||
kind === "song"
|
||||
? favorites.favoriteSongs
|
||||
: kind === "album"
|
||||
? favorites.favoriteAlbums
|
||||
: favorites.favoriteArtists
|
||||
)
|
||||
}
|
||||
|
||||
/** Stamps `metadata.favorite`, which Siri uses to rank suggestions. */
|
||||
function withFavorite(entity: AppIntentEntity, favorite: boolean) {
|
||||
const flag = favorite ? "1" : "0"
|
||||
return entity.metadata?.favorite === flag
|
||||
? entity
|
||||
: { ...entity, metadata: { ...entity.metadata, favorite: flag } }
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps the on-device Siri catalog in step with the server. `intentCatalog.head`
|
||||
* is a live subscription, so the library is fetched only when it changes, and
|
||||
* then only the records changed since the stored cursor. Favorites are applied
|
||||
* locally from the existing favorites subscription.
|
||||
*/
|
||||
export function useMusicCatalogSync() {
|
||||
const convex = useConvex()
|
||||
const scope = useCacheScope()
|
||||
const head = useQuery(api.intentCatalog.head)
|
||||
const favorites = useQuery(api.favorites.getUserFavorites)
|
||||
const playlists = useQuery(api.intentCatalog.playlists)
|
||||
const latest = useRef({ head, favorites, playlists })
|
||||
latest.current = { head, favorites, playlists }
|
||||
const schedule = useRef<() => void>(() => undefined)
|
||||
|
||||
useEffect(() => {
|
||||
if (!AppIntents.isAvailable()) return
|
||||
let stopped = false
|
||||
let running = false
|
||||
let dirty = false
|
||||
let cursors: CatalogCursors | null = null
|
||||
// What the disk catalog reflects, to skip no-op republishes.
|
||||
const appliedFavorites = new Map<LibraryKind, Set<string>>()
|
||||
let publishedPlaylists: string | null = null
|
||||
|
||||
async function fetchChanges(kind: LibraryKind, since: number | undefined) {
|
||||
const upserts: AppIntentEntity[] = []
|
||||
let removed: string[] = []
|
||||
let head = 0
|
||||
let cursor: string | null = null
|
||||
do {
|
||||
const result: CatalogPage = await convex.query(api.intentCatalog.page, {
|
||||
kind,
|
||||
since,
|
||||
paginationOpts: { cursor, numItems: PAGE_SIZE },
|
||||
})
|
||||
if (stopped) return null
|
||||
if (cursor === null) {
|
||||
if (result.reset) return fetchChanges(kind, undefined)
|
||||
head = result.head ?? 0
|
||||
removed = result.removed
|
||||
}
|
||||
upserts.push(...result.page)
|
||||
cursor = result.isDone ? null : result.continueCursor
|
||||
} while (cursor !== null)
|
||||
return { upserts, removed, head, full: since === undefined }
|
||||
}
|
||||
|
||||
async function syncKind(
|
||||
kind: LibraryKind,
|
||||
serverHead: number,
|
||||
favorites: Favorites
|
||||
) {
|
||||
if (!cursors) return
|
||||
const since = cursors[kind]
|
||||
const stale = since === undefined || serverHead > since
|
||||
const liked = favoriteIds(favorites, kind)
|
||||
const previousLiked = appliedFavorites.get(kind)
|
||||
const likesChanged =
|
||||
!previousLiked ||
|
||||
previousLiked.size !== liked.size ||
|
||||
[...liked].some((id) => !previousLiked.has(id))
|
||||
if (!stale && !likesChanged) return
|
||||
|
||||
const changes = stale ? await fetchChanges(kind, since) : null
|
||||
if (stopped) return
|
||||
const records = new Map<string, AppIntentEntity>()
|
||||
if (!changes?.full) {
|
||||
for (const entity of await readMusicCatalog(kind)) {
|
||||
records.set(entity.id, entity)
|
||||
}
|
||||
}
|
||||
for (const id of changes?.removed ?? []) records.delete(id)
|
||||
for (const entity of changes?.upserts ?? [])
|
||||
records.set(entity.id, entity)
|
||||
|
||||
let modified = changes !== null
|
||||
for (const [id, entity] of records) {
|
||||
const next = withFavorite(entity, liked.has(id))
|
||||
if (next !== entity) {
|
||||
records.set(id, next)
|
||||
modified = true
|
||||
}
|
||||
}
|
||||
if (stopped) return
|
||||
if (modified) await publishMusicCatalog(kind, [...records.values()])
|
||||
appliedFavorites.set(kind, liked)
|
||||
if (changes && !stopped) {
|
||||
cursors = { ...cursors, [kind]: changes.head }
|
||||
await saveCatalogCursors(scope, cursors)
|
||||
}
|
||||
}
|
||||
|
||||
async function syncOnce() {
|
||||
const { head, favorites, playlists } = latest.current
|
||||
cursors ??= await loadCatalogCursors(scope)
|
||||
if (head && favorites) {
|
||||
for (const kind of LIBRARY_KINDS) {
|
||||
if (stopped) return
|
||||
await syncKind(kind, head[kind], favorites)
|
||||
}
|
||||
}
|
||||
if (playlists && !stopped) {
|
||||
const json = JSON.stringify(playlists)
|
||||
if (json !== publishedPlaylists) {
|
||||
await publishMusicCatalog("playlist", playlists)
|
||||
publishedPlaylists = json
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
schedule.current = () => {
|
||||
if (stopped) return
|
||||
if (running) {
|
||||
dirty = true
|
||||
return
|
||||
}
|
||||
running = true
|
||||
const sync = (async () => {
|
||||
do {
|
||||
dirty = false
|
||||
await syncOnce()
|
||||
} while (dirty && !stopped)
|
||||
})()
|
||||
.catch((error) =>
|
||||
console.warn("Could not publish music catalog.", error)
|
||||
)
|
||||
.finally(() => {
|
||||
running = false
|
||||
})
|
||||
trackMusicCatalogSync(sync)
|
||||
}
|
||||
schedule.current()
|
||||
// Retries a failed sync; a no-op without server queries when current.
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") schedule.current()
|
||||
})
|
||||
return () => {
|
||||
stopped = true
|
||||
schedule.current = () => undefined
|
||||
subscription.remove()
|
||||
}
|
||||
}, [convex, scope])
|
||||
|
||||
useEffect(() => {
|
||||
schedule.current()
|
||||
}, [head, favorites, playlists])
|
||||
}
|
||||
@@ -1,631 +0,0 @@
|
||||
import { useConvex } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentInvocation } from "expo-app-intents"
|
||||
import { useMemo, useRef } from "react"
|
||||
|
||||
import { useFavorites, type FavoriteKind } from "@/contexts/favorites"
|
||||
import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
useCacheScope,
|
||||
} from "@/contexts/persistent-cache"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import {
|
||||
FAVORITES_PLAYLIST_ID,
|
||||
loadHandledIntentIds,
|
||||
rememberHandledIntentId,
|
||||
} from "@/lib/app-intent-handled"
|
||||
import { completeMusicInvocation } from "@/lib/app-intents"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { publishNowPlaying } from "./now-playing"
|
||||
|
||||
const warmedAudioIds = new Set<string>()
|
||||
|
||||
class IntentRejected extends Error {}
|
||||
|
||||
const KNOWN_INTENTS = new Set([
|
||||
"playMusic",
|
||||
"warmupAudio",
|
||||
"addToPlaylist",
|
||||
"addToUpNext",
|
||||
"clearUpNext",
|
||||
"createPlaylist",
|
||||
"createStation",
|
||||
"updateAffinity",
|
||||
"transport",
|
||||
"openMusic",
|
||||
])
|
||||
|
||||
type MusicSource = {
|
||||
kind: string
|
||||
id: string
|
||||
}
|
||||
|
||||
function readString(value: unknown) {
|
||||
return typeof value === "string" && value.trim() ? value : null
|
||||
}
|
||||
|
||||
function readSources(value: unknown): MusicSource[] {
|
||||
if (!Array.isArray(value)) {
|
||||
return []
|
||||
}
|
||||
return value.flatMap((entry) => {
|
||||
if (!entry || typeof entry !== "object") {
|
||||
return []
|
||||
}
|
||||
const source = entry as { kind?: unknown; id?: unknown }
|
||||
if (typeof source.kind !== "string" || typeof source.id !== "string") {
|
||||
return []
|
||||
}
|
||||
if (!source.kind || !source.id) {
|
||||
return []
|
||||
}
|
||||
return [{ kind: source.kind, id: source.id }]
|
||||
})
|
||||
}
|
||||
|
||||
function isFavoriteKind(kind: string): kind is FavoriteKind {
|
||||
return kind === "song" || kind === "album" || kind === "artist"
|
||||
}
|
||||
|
||||
function shuffleChoice(value: unknown, fallback: boolean) {
|
||||
if (value === "songs") return true
|
||||
if (value === "off") return false
|
||||
if (value == null) return fallback
|
||||
throw new IntentRejected("Shuffle must be Off or Songs.")
|
||||
}
|
||||
|
||||
function repeatChoice(value: unknown): RepeatMode | null {
|
||||
if (value == null) return null
|
||||
if (value === "none") return "none"
|
||||
if (value === "one") return "once"
|
||||
if (value === "all") return "always"
|
||||
throw new IntentRejected("Repeat must be None, One, or All.")
|
||||
}
|
||||
|
||||
function ensureActive(invocation: AppIntentInvocation) {
|
||||
const deadline = invocation.params.deadline
|
||||
if (typeof deadline === "number" && Date.now() >= deadline) {
|
||||
throw new IntentRejected("This request expired. Please try again.")
|
||||
}
|
||||
}
|
||||
|
||||
function isTransient(error: unknown) {
|
||||
const message = (
|
||||
error instanceof Error ? error.message : String(error)
|
||||
).toLowerCase()
|
||||
return (
|
||||
message.includes("not authenticated") ||
|
||||
message.includes("network") ||
|
||||
message.includes("fetch") ||
|
||||
message.includes("connection") ||
|
||||
message.includes("timed out") ||
|
||||
message.includes("timeout")
|
||||
)
|
||||
}
|
||||
|
||||
/** Runs Siri and Shortcuts invocations queued by the native intents. */
|
||||
export function useIntentDispatch() {
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const playback = usePlayback()
|
||||
const favorites = useFavorites()
|
||||
const navigation = useAppNavigation()
|
||||
const store = useMemo(
|
||||
() =>
|
||||
getPlaybackStore(
|
||||
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
|
||||
),
|
||||
[cacheScope]
|
||||
)
|
||||
const handledIds = useRef<Set<string> | null>(null)
|
||||
const playbackRef = useRef(playback)
|
||||
playbackRef.current = playback
|
||||
|
||||
/** Intent ids arrive as strings; the server validates them. */
|
||||
function setFavorite(kind: FavoriteKind, id: string, favorite: boolean) {
|
||||
return kind === "song"
|
||||
? favorites.setFavorite(kind, id as Id<"songs">, favorite)
|
||||
: kind === "album"
|
||||
? favorites.setFavorite(kind, id as Id<"albums">, favorite)
|
||||
: favorites.setFavorite(kind, id as Id<"artists">, favorite)
|
||||
}
|
||||
|
||||
AppIntents.useAppIntents(async (pendingIntents) => {
|
||||
if (!handledIds.current) {
|
||||
handledIds.current = await loadHandledIntentIds()
|
||||
}
|
||||
const handled = handledIds.current
|
||||
|
||||
for (const invocation of pendingIntents) {
|
||||
if (handled.has(invocation.id)) {
|
||||
const token = readString(invocation.params.completionToken)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
if (!KNOWN_INTENTS.has(invocation.name)) {
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
const token = readString(invocation.params.completionToken)
|
||||
try {
|
||||
ensureActive(invocation)
|
||||
await performInvocation(invocation)
|
||||
if (
|
||||
["playMusic", "warmupAudio", "transport", "createStation"].includes(
|
||||
invocation.name
|
||||
)
|
||||
) {
|
||||
await publishNowPlaying(
|
||||
store.getState().queue[0] ?? null,
|
||||
playbackRef.current.currentSong
|
||||
)
|
||||
}
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (error) {
|
||||
if (token) {
|
||||
await completeMusicInvocation(
|
||||
token,
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
)
|
||||
}
|
||||
if (token || error instanceof IntentRejected || !isTransient(error)) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
if (!(error instanceof IntentRejected) || message) {
|
||||
showError(message)
|
||||
}
|
||||
try {
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (removeError) {
|
||||
console.warn(
|
||||
"App Intent remains pending",
|
||||
invocation.id,
|
||||
removeError
|
||||
)
|
||||
}
|
||||
continue
|
||||
}
|
||||
console.warn("App Intent remains pending", invocation.id, error)
|
||||
}
|
||||
}
|
||||
|
||||
async function songIdsFor(kind: string, id: string) {
|
||||
if (kind === "song") {
|
||||
return [id as Id<"songs">]
|
||||
}
|
||||
if (kind === "album") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{
|
||||
albumId: id as Id<"albums">,
|
||||
}
|
||||
)
|
||||
}
|
||||
if (kind === "artist") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: id as Id<"artists"> }
|
||||
)
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
if (id === FAVORITES_PLAYLIST_ID) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs
|
||||
}
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: id as Id<"playlists"> }
|
||||
)
|
||||
}
|
||||
throw new IntentRejected("Choose a song, album, artist, or playlist.")
|
||||
}
|
||||
|
||||
async function uniqueSongIds(sources: MusicSource[]) {
|
||||
const ids: Id<"songs">[] = []
|
||||
for (const source of sources) {
|
||||
ids.push(...(await songIdsFor(source.kind, source.id)))
|
||||
}
|
||||
return [...new Set(ids)]
|
||||
}
|
||||
|
||||
async function performInvocation(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
switch (invocation.name) {
|
||||
case "openMusic": {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id || !kind) throw new IntentRejected("Choose music to open.")
|
||||
if (kind === "song") {
|
||||
const song = await convex.query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
})
|
||||
if (!song)
|
||||
throw new IntentRejected("This song is no longer available.")
|
||||
navigation.push(`/album/${song.album}`)
|
||||
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
|
||||
navigation.push("/playlist/favorites")
|
||||
} else if (["album", "artist", "playlist"].includes(kind)) {
|
||||
navigation.push(`/${kind}/${id}`)
|
||||
} else throw new IntentRejected("Unknown music type.")
|
||||
return
|
||||
}
|
||||
case "playMusic":
|
||||
await playMusic(invocation)
|
||||
if (!["next", "tail"].includes(String(invocation.params.queue))) {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
}
|
||||
return
|
||||
case "warmupAudio":
|
||||
await warmup(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(false)
|
||||
warmedAudioIds.add(invocation.id)
|
||||
return
|
||||
case "addToPlaylist":
|
||||
await addToPlaylist(invocation)
|
||||
return
|
||||
case "addToUpNext":
|
||||
await addToUpNext(invocation)
|
||||
return
|
||||
case "clearUpNext":
|
||||
ensureActive(invocation)
|
||||
await actions.clearUpNext()
|
||||
return
|
||||
case "createPlaylist":
|
||||
await createPlaylist(invocation)
|
||||
return
|
||||
case "createStation":
|
||||
await createStation(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
return
|
||||
case "updateAffinity":
|
||||
await updateAffinity(invocation)
|
||||
return
|
||||
case "transport":
|
||||
await transport(invocation)
|
||||
if (store.getState().queue.length > 0) {
|
||||
const command = invocation.params.command
|
||||
await playbackRef.current.waitForPlaybackReady(
|
||||
command === "resume"
|
||||
? true
|
||||
: command === "pause"
|
||||
? false
|
||||
: undefined
|
||||
)
|
||||
}
|
||||
return
|
||||
default:
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
async function playMusic(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const queue = readString(invocation.params.queue) ?? "now"
|
||||
const warmupId = readString(invocation.params.warmupId)
|
||||
const repeat = repeatChoice(invocation.params.repeat)
|
||||
if (repeat) {
|
||||
ensureActive(invocation)
|
||||
await actions.setRepeatMode(repeat)
|
||||
}
|
||||
|
||||
if (queue === "next" || queue === "tail") {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
if (queue === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueNext(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueLast(ids)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (warmupId && warmedAudioIds.has(warmupId)) {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const kind = readString(invocation.params.kind) ?? "resume"
|
||||
if (kind === "resume") {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
if (favorites.favoriteSongs.length === 0) {
|
||||
throw new IntentRejected(
|
||||
"Nothing is queued, and your favorites are empty."
|
||||
)
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(favorites.favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(favorites.favoriteSongs)
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id) {
|
||||
throw new IntentRejected("Choose music to play.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await actions.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
true
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to play.")
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function warmup(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to get ready.")
|
||||
}
|
||||
const shuffled = shuffleChoice(invocation.params.shuffle, false)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
false
|
||||
)
|
||||
} else {
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to get ready.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.prepareQueue(ids, shuffled)
|
||||
}
|
||||
}
|
||||
|
||||
async function addToPlaylist(invocation: AppIntentInvocation) {
|
||||
const playlistId = readString(invocation.params.playlistId)
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (!playlistId || sources.length === 0) {
|
||||
throw new IntentRejected("Choose music and a playlist.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(sources)
|
||||
if (songIds.length === 0) {
|
||||
throw new IntentRejected("Those items have no songs to add.")
|
||||
}
|
||||
if (playlistId === FAVORITES_PLAYLIST_ID) {
|
||||
for (const source of sources) {
|
||||
if (isFavoriteKind(source.kind)) {
|
||||
ensureActive(invocation)
|
||||
await setFavorite(source.kind, source.id, true)
|
||||
} else if (source.kind === "playlist") {
|
||||
const ids = await songIdsFor(source.kind, source.id)
|
||||
ensureActive(invocation)
|
||||
await favorites.addFavoriteSongs(ids)
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"Choose a song, album, artist, or playlist."
|
||||
)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.addSongsToPlaylist, {
|
||||
playlistId: playlistId as Id<"playlists">,
|
||||
songIds,
|
||||
})
|
||||
}
|
||||
|
||||
async function addToUpNext(invocation: AppIntentInvocation) {
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (sources.length === 0) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const ids = await uniqueSongIds(sources)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
const position =
|
||||
readString(invocation.params.position) === "last" ? "last" : "next"
|
||||
if (position === "last") {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueLast(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueNext(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function createPlaylist(invocation: AppIntentInvocation) {
|
||||
const name = readString(invocation.params.name)
|
||||
if (!name) {
|
||||
throw new IntentRejected("A playlist needs a name.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(
|
||||
readSources(invocation.params.sources)
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.createPlaylist, {
|
||||
name,
|
||||
songIds,
|
||||
invocationId: invocation.id,
|
||||
})
|
||||
}
|
||||
|
||||
async function createStation(invocation: AppIntentInvocation) {
|
||||
const artistId = readString(invocation.params.artistId)
|
||||
if (!artistId) {
|
||||
throw new IntentRejected("Nothing is playing in oTunes.")
|
||||
}
|
||||
const ids = await songIdsFor("artist", artistId)
|
||||
if (ids.length === 0)
|
||||
throw new IntentRejected("This artist has no songs to play.")
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.playShuffled(ids)
|
||||
}
|
||||
|
||||
async function updateAffinity(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
const state = readString(invocation.params.state)
|
||||
if (!kind || !id || (state !== "like" && state !== "unset")) {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love or unlike a song, album, or artist."
|
||||
)
|
||||
}
|
||||
if (!isFavoriteKind(kind)) {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await setFavorite(kind, id, state === "like")
|
||||
}
|
||||
|
||||
async function transport(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const command = readString(invocation.params.command)
|
||||
if (command === "pause") {
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(false)
|
||||
return
|
||||
}
|
||||
if (command === "resume") {
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
throw new IntentRejected("Nothing is queued in oTunes.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
if (command === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipNext()
|
||||
return
|
||||
}
|
||||
if (command === "previous") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipPrevious()
|
||||
return
|
||||
}
|
||||
throw new IntentRejected("oTunes doesn't know that playback control.")
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentEntity } from "expo-app-intents"
|
||||
import { useEffect } from "react"
|
||||
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { publishMusicCatalog } from "@/lib/app-intents"
|
||||
|
||||
type CurrentSong = NonNullable<ReturnType<typeof usePlayback>["currentSong"]>
|
||||
|
||||
function nowPlayingEntity(song: CurrentSong): AppIntentEntity {
|
||||
const artistName = song.artist.name
|
||||
return {
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
subtitle: artistName,
|
||||
synonyms: artistName ? [artistName] : undefined,
|
||||
metadata: {
|
||||
artistName,
|
||||
artistId: song.artist.id,
|
||||
albumTitle: song.album.title,
|
||||
albumId: song.album.id,
|
||||
duration: String(song.durationSeconds),
|
||||
genres: "",
|
||||
year: "",
|
||||
track: "",
|
||||
disk: "",
|
||||
favorite: "0",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Publishes the "nowPlaying" catalog Siri reads for the current song. With an
|
||||
* id but no matching `song` it leaves the catalog alone until the song loads.
|
||||
*/
|
||||
export async function publishNowPlaying(
|
||||
queueHeadId: string | null,
|
||||
song: CurrentSong | null
|
||||
) {
|
||||
if (!queueHeadId) await publishMusicCatalog("nowPlaying", [])
|
||||
else if (song?.id === queueHeadId)
|
||||
await publishMusicCatalog("nowPlaying", [nowPlayingEntity(song)])
|
||||
}
|
||||
|
||||
/** Keeps the "nowPlaying" catalog in step with the playback queue. */
|
||||
export function useNowPlayingCatalog() {
|
||||
const playback = usePlayback()
|
||||
const queueHeadId = playback.queueSongIds[0] ?? null
|
||||
const song = playback.currentSong
|
||||
|
||||
useEffect(() => {
|
||||
if (!AppIntents.isAvailable()) return
|
||||
void publishNowPlaying(queueHeadId, song).catch((error) => {
|
||||
console.warn("Could not publish the current song.", error)
|
||||
})
|
||||
}, [queueHeadId, song])
|
||||
}
|
||||
@@ -1,34 +1,39 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import Svg, { G, Path } from "react-native-svg"
|
||||
|
||||
import {
|
||||
DOLBY_PATHS,
|
||||
DOLBY_VIEW_BOX,
|
||||
DOLBY_WIDTH,
|
||||
LOSSLESS_FALL,
|
||||
LOSSLESS_FALL_GAP,
|
||||
LOSSLESS_PEAKS,
|
||||
LOSSLESS_STROKES,
|
||||
LOSSLESS_THIN_WIDTH,
|
||||
LOSSLESS_VIEW_BOX,
|
||||
LOSSLESS_WIDTH,
|
||||
MARK_HEIGHT,
|
||||
} from "@otunes/convex/client/audio-format-marks"
|
||||
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
|
||||
|
||||
const LABEL_SIZE = 13
|
||||
const MARK_HEIGHT = 11
|
||||
|
||||
function DolbyMark({ color }: { color: string }) {
|
||||
return (
|
||||
<Svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}>
|
||||
{DOLBY_PATHS.map((d) => (
|
||||
<Path key={d} d={d} fill={color} />
|
||||
))}
|
||||
<Svg
|
||||
width={(MARK_HEIGHT * 23) / 16}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="0 0 23 16"
|
||||
>
|
||||
<Path d="M0 0H2.5A8 8 0 0 1 2.5 16H0Z" fill={color} />
|
||||
<Path d="M23 0H20.5A8 8 0 0 0 20.5 16H23Z" fill={color} />
|
||||
</Svg>
|
||||
)
|
||||
}
|
||||
|
||||
const LOSSLESS_PEAKS = [110, 215, 320]
|
||||
const LOSSLESS_THIN_WIDTH = 24
|
||||
const LOSSLESS_STROKES: [peak: number, d: string][] = [
|
||||
[110, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[215, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[320, "M-30 185C-22 173 -11 166 0 166"],
|
||||
[110, "M166 413C176 413 186 406 194 395"],
|
||||
[215, "M166 413C200 413 226 340 240 275"],
|
||||
[320, "M166 413C200 413 226 340 240 275"],
|
||||
]
|
||||
const LOSSLESS_FALL =
|
||||
"M0 178L4 179L8 181L12 184L16 189L20 196L23 204L27 213L30 223L34 233L39 243L43 254L48 266L53 278L58 289L62 301L66 313L71 325L75 336L79 347L83 357L86 364L89 370L93 377L97 382L101 387L105 392L109 397L113 401L117 405L121 408L126 412L130 415L134 417L139 419L143 421L148 423L152 424L157 424L161 425L166 425L166 401L163 401L161 400L159 400L157 399L154 397L152 396L151 394L149 392L147 389L145 386L143 383L142 380L140 376L138 371L137 367L135 362L134 357L132 351L130 345L127 339L124 330L120 319L116 308L111 297L107 285L102 272L98 260L93 248L88 235L82 223L76 212L69 201L61 192L53 183L45 175L37 168L28 163L19 158L10 155L0 154Z"
|
||||
const LOSSLESS_FALL_GAP =
|
||||
"M0 178L4 180L6 184L8 190L9 197L11 203L14 210L17 219L21 228L24 238L29 248L33 259L38 270L43 282L47 293L52 305L56 317L60 328L64 340L68 351L73 361L76 368L79 375L83 381L87 387L91 393L95 398L100 403L104 408L109 412L113 416L118 419L124 422L130 424L135 425L141 426L147 426L152 426L157 425L161 425L166 425L166 401L163 401L161 399L159 398L158 395L157 393L156 390L155 387L155 384L154 381L153 379L152 376L150 373L149 369L148 366L146 361L145 357L143 352L142 347L140 341L137 335L134 326L130 315L126 304L122 293L117 281L113 268L108 256L103 243L98 231L92 219L86 207L79 196L71 186L62 177L53 168L44 161L32 157L21 155L10 154L0 154Z"
|
||||
|
||||
/**
|
||||
* Three overlapping waves. Each thick downstroke is outlined in the
|
||||
* background color so it reads as passing over the strokes behind it.
|
||||
@@ -42,9 +47,9 @@ function LosslessMark({
|
||||
}) {
|
||||
return (
|
||||
<Svg
|
||||
width={LOSSLESS_WIDTH}
|
||||
width={(MARK_HEIGHT * 544) / 271}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox={LOSSLESS_VIEW_BOX}
|
||||
viewBox="28 154 544 271"
|
||||
>
|
||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||
<Path
|
||||
@@ -69,12 +74,10 @@ function LosslessMark({
|
||||
|
||||
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
||||
export function AudioFormatBadge({
|
||||
artwork = false,
|
||||
format,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
artwork?: boolean
|
||||
format: PlaybackFormat
|
||||
color: string
|
||||
backgroundColor: string
|
||||
@@ -87,12 +90,7 @@ export function AudioFormatBadge({
|
||||
) : (
|
||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||
)}
|
||||
<PaletteText
|
||||
tone={artwork ? "secondaryForeground" : undefined}
|
||||
style={[styles.label, { color }]}
|
||||
>
|
||||
{label}
|
||||
</PaletteText>
|
||||
<Text style={[styles.label, { color }]}>{label}</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
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 (
|
||||
<View style={[styles.hero, landscape && styles.landscape]}>
|
||||
{artwork}
|
||||
<View style={[styles.details, landscape && styles.landscapeDetails]}>
|
||||
<View style={[styles.metadata, landscape && styles.landscapeMetadata]}>
|
||||
{children}
|
||||
</View>
|
||||
{actions}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
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 },
|
||||
})
|
||||
@@ -1,6 +1,5 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { memo } from "react"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
@@ -26,12 +25,9 @@ export const DiscHeader = memo(function DiscHeader({
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<PaletteText
|
||||
tone={color ? "foreground" : undefined}
|
||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
||||
>
|
||||
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||
{label}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
|
||||
import { memo, useMemo } from "react"
|
||||
import {
|
||||
Platform,
|
||||
PixelRatio,
|
||||
StyleProp,
|
||||
StyleSheet,
|
||||
@@ -10,8 +9,6 @@ import {
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
coverImageSizes,
|
||||
@@ -109,9 +106,6 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit={contentFit}
|
||||
transition={150}
|
||||
blurRadius={blurRadius}
|
||||
onLoad={
|
||||
Platform.OS === "android" ? () => prefetchCoverPalette(uri) : undefined
|
||||
}
|
||||
cachePolicy="memory-disk"
|
||||
recyclingKey={sourceUri}
|
||||
enforceEarlyResizing
|
||||
|
||||
@@ -3,40 +3,30 @@ import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
/** Center account forms on wide windows; scroll when the keyboard reduces height. */
|
||||
/** Android resizes for the IME; scrolling keeps tall forms and actions reachable. */
|
||||
export function KeyboardForm({
|
||||
children,
|
||||
style,
|
||||
}: PropsWithChildren<{ style?: StyleProp<ViewStyle> }>) {
|
||||
return (
|
||||
<KeyboardAvoidingView
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
style={styles.fill}
|
||||
>
|
||||
if (Platform.OS === "android") {
|
||||
return (
|
||||
<ScrollView
|
||||
style={styles.fill}
|
||||
contentContainerStyle={[style, styles.content]}
|
||||
style={{ flex: 1 }}
|
||||
contentContainerStyle={[style, { flex: undefined, flexGrow: 1 }]}
|
||||
keyboardShouldPersistTaps="handled"
|
||||
keyboardDismissMode={Platform.OS === "ios" ? "interactive" : "on-drag"}
|
||||
keyboardDismissMode="on-drag"
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<KeyboardAvoidingView behavior="padding" style={style}>
|
||||
{children}
|
||||
</KeyboardAvoidingView>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
fill: { flex: 1 },
|
||||
content: {
|
||||
flex: undefined,
|
||||
flexGrow: 1,
|
||||
width: "100%",
|
||||
maxWidth: 528,
|
||||
alignSelf: "center",
|
||||
},
|
||||
})
|
||||
@@ -0,0 +1,7 @@
|
||||
export type { MediaAction, MediaMenuConfig, MediaNavigation } from "@/components/media-context-menu"
|
||||
export type { MediaShareContext } from "@/lib/media-links"
|
||||
export {
|
||||
buildMediaMenuActions,
|
||||
MediaActionMenu,
|
||||
MediaContextMenu,
|
||||
} from "@/components/media-context-menu"
|
||||
@@ -1,10 +1,4 @@
|
||||
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"
|
||||
import { memo, useCallback, type ReactElement } from "react"
|
||||
import {
|
||||
@@ -30,7 +24,13 @@ import type {
|
||||
PlaylistSummary,
|
||||
} from "@otunes/convex/types"
|
||||
import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
carouselCardWidth,
|
||||
radius,
|
||||
spacing,
|
||||
useThemeColors,
|
||||
useTwoColumnCardWidth,
|
||||
} from "@/lib/theme"
|
||||
|
||||
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
|
||||
|
||||
@@ -40,74 +40,52 @@ 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 { push } = useAppNavigation()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||
const onPress = useCallback(() => {
|
||||
push(`/album/${album.id}`)
|
||||
}, [push, album.id])
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Link href={href(`/album/${album.id}`)} push asChild>
|
||||
<Pressable
|
||||
style={StyleSheet.flatten([
|
||||
styles.card,
|
||||
{ width: fluid ? "100%" : width },
|
||||
])}
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, album.id)}
|
||||
hasCover={album.cover != null}
|
||||
style={{ width, height: width, borderRadius: radius.md }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={2}
|
||||
>
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, album.id)}
|
||||
hasCover={album.cover != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||
: { width, height: width, borderRadius: radius.md }
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoom>
|
||||
<MusicEntityView kind="album" id={album.id} style={styles.card}>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</MusicEntityView>
|
||||
</Pressable>
|
||||
</Link>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "album",
|
||||
title: album.title,
|
||||
artist: album.artist.name,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
|
||||
hasArtwork: album.cover != null,
|
||||
}}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
stationArtistId={album.artist.id}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
onAction={(action) => void handleAlbumAction(album, action)}
|
||||
>
|
||||
{card}
|
||||
<MusicEntityView kind="album" id={album.id}>
|
||||
{card}
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
})
|
||||
@@ -115,14 +93,11 @@ 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()
|
||||
@@ -132,22 +107,15 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Pressable
|
||||
style={[styles.card, { width: fluid ? "100%" : width }]}
|
||||
onPress={onPress}
|
||||
>
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={artistCoverUrl(config.serverUrl, artist.id)}
|
||||
hasCover={artist.photo != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: 9999 }
|
||||
: { width, height: width, borderRadius: width / 2 }
|
||||
}
|
||||
style={{ width, height: width, borderRadius: width / 2 }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
numberOfLines={2}
|
||||
>
|
||||
{artist.name}
|
||||
</Text>
|
||||
@@ -156,12 +124,6 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "artist",
|
||||
title: artist.name,
|
||||
artworkUrl: artistCoverUrl(config.serverUrl, artist.id),
|
||||
hasArtwork: artist.photo != null,
|
||||
}}
|
||||
favorited={isArtistFavorite(artist.id)}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
onAction={(action) => void handleArtistAction(artist, action)}
|
||||
@@ -176,56 +138,39 @@ 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 { push } = useAppNavigation()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handlePlaylistAction } = useMediaMenuActions()
|
||||
const onPress = useCallback(() => {
|
||||
push(`/playlist/${playlist.id}`)
|
||||
}, [push, playlist.id])
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Link href={href(`/playlist/${playlist.id}`)} push asChild>
|
||||
<Pressable
|
||||
style={StyleSheet.flatten([
|
||||
styles.card,
|
||||
{ width: fluid ? "100%" : width },
|
||||
])}
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={{ width, height: width, borderRadius: radius.md }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={2}
|
||||
>
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||
: { width, height: width, borderRadius: radius.md }
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoom>
|
||||
<MusicEntityView kind="playlist" id={playlist.id} style={styles.card}>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{playlist.owner}
|
||||
</Text>
|
||||
</MusicEntityView>
|
||||
</Pressable>
|
||||
</Link>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{playlist.owner}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
|
||||
return (
|
||||
@@ -238,7 +183,9 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
}}
|
||||
onAction={(action) => void handlePlaylistAction(playlist, action)}
|
||||
>
|
||||
{card}
|
||||
<MusicEntityView kind="playlist" id={playlist.id}>
|
||||
{card}
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
})
|
||||
@@ -246,42 +193,29 @@ 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 <PlaylistCard playlist={item} width={width} fluid={fluid} />
|
||||
if ("artist" in item)
|
||||
return <AlbumCard album={item} width={width} fluid={fluid} />
|
||||
return <ArtistCard artist={item} width={width} fluid={fluid} />
|
||||
if ("owner" in item) return <PlaylistCard playlist={item} width={width} />
|
||||
if ("artist" in item) return <AlbumCard album={item} width={width} />
|
||||
return <ArtistCard artist={item} width={width} />
|
||||
})
|
||||
|
||||
export function MediaGrid({ content }: { content: MediaItem[] }) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { cardWidth, onLayout, ready } = useMediaGridLayout()
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
|
||||
return (
|
||||
<View style={styles.grid} onLayout={onLayout}>
|
||||
{(ready ? content : []).map((item) => (
|
||||
<Animated.View
|
||||
key={item.id}
|
||||
layout={tabletLayout ? tabletLayoutTransition : undefined}
|
||||
style={{ width: cardWidth }}
|
||||
>
|
||||
<CarouselCard item={item} width={cardWidth} fluid={tabletLayout} />
|
||||
</Animated.View>
|
||||
<View style={styles.grid}>
|
||||
{content.map((item) => (
|
||||
<View key={item.id} style={{ width: cardWidth }}>
|
||||
<CarouselCard item={item} width={cardWidth} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function renderTabletCard(item: MediaItem, width: number) {
|
||||
return <CarouselCard item={item} width={width} fluid />
|
||||
}
|
||||
|
||||
export function MediaGridList({
|
||||
content,
|
||||
paddingBottom,
|
||||
@@ -295,9 +229,7 @@ export function MediaGridList({
|
||||
ListHeaderComponent?: ReactElement
|
||||
contentInset?: boolean
|
||||
}) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
|
||||
useMediaGridLayout()
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
const colors = useThemeColors()
|
||||
const renderItem = useCallback(
|
||||
({ item }: ListRenderItemInfo<MediaItem>) => (
|
||||
@@ -308,43 +240,23 @@ export function MediaGridList({
|
||||
[cardWidth]
|
||||
)
|
||||
|
||||
if (tabletLayout) {
|
||||
return (
|
||||
<TabletMediaGrid
|
||||
content={content}
|
||||
paddingBottom={paddingBottom}
|
||||
onEndReached={onEndReached}
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
contentInset={contentInset}
|
||||
renderCard={renderTabletCard}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<FlatList
|
||||
key={columns}
|
||||
onLayout={onLayout}
|
||||
data={content}
|
||||
keyExtractor={mediaItemKey}
|
||||
renderItem={renderItem}
|
||||
numColumns={columns}
|
||||
numColumns={2}
|
||||
initialNumToRender={GRID_INITIAL_ROWS}
|
||||
maxToRenderPerBatch={GRID_INITIAL_ROWS}
|
||||
windowSize={longListProps.windowSize}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
contentInset ? styles.gridListContent : styles.gridListContentInset,
|
||||
{
|
||||
paddingBottom,
|
||||
gap,
|
||||
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
|
||||
},
|
||||
{ paddingBottom },
|
||||
]}
|
||||
columnWrapperStyle={[
|
||||
styles.gridListRow,
|
||||
!contentInset && { paddingHorizontal: horizontalPadding },
|
||||
{ gap },
|
||||
!contentInset && styles.gridListRowInset,
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
|
||||
@@ -4,19 +4,12 @@ import { requireNativeView } from "expo"
|
||||
import type { ComponentType, ReactNode } from "react"
|
||||
import {
|
||||
Platform,
|
||||
Text,
|
||||
useWindowDimensions,
|
||||
View,
|
||||
type StyleProp,
|
||||
type ViewProps,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { MediaShareContext } from "@/lib/media-links"
|
||||
import { shouldShowShare } from "@/lib/media-links"
|
||||
@@ -39,17 +32,7 @@ export type MediaNavigation = {
|
||||
album?: { id: string }
|
||||
}
|
||||
|
||||
export type MediaMenuPreview = {
|
||||
title: string
|
||||
artist?: string
|
||||
album?: string
|
||||
artworkUrl: string
|
||||
hasArtwork: boolean
|
||||
kind: "album" | "artist" | "song"
|
||||
}
|
||||
|
||||
export type MediaMenuConfig = {
|
||||
preview?: MediaMenuPreview
|
||||
selectedCount?: number
|
||||
playlistLabel?: string
|
||||
favorited?: boolean
|
||||
@@ -106,12 +89,12 @@ const MEDIA_ACTION_ITEMS: {
|
||||
{
|
||||
action: "go-artist",
|
||||
label: () => "Go to Artist",
|
||||
image: "music.mic",
|
||||
image: "person",
|
||||
},
|
||||
{
|
||||
action: "go-album",
|
||||
label: () => "Go to Album",
|
||||
image: "square.stack",
|
||||
image: "opticaldisc",
|
||||
},
|
||||
{
|
||||
action: "favorite",
|
||||
@@ -231,95 +214,10 @@ function MediaMenuBase({
|
||||
const NativeContextMenuView =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
ViewProps & {
|
||||
disableForceFlatten?: boolean
|
||||
children: ReactNode
|
||||
onPreviewTappedAnimationCompleted?: () => void
|
||||
}
|
||||
ViewProps & { disableForceFlatten?: boolean; children: ReactNode }
|
||||
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewView")
|
||||
: null
|
||||
|
||||
const NativeContextMenuPreview =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
ViewProps & {
|
||||
preferredContentSize: { width: number; height: number }
|
||||
children: ReactNode
|
||||
}
|
||||
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewContentView")
|
||||
: null
|
||||
|
||||
function MediaPreview({ preview }: { preview: MediaMenuPreview }) {
|
||||
const colors = useThemeColors()
|
||||
const { width: windowWidth, fontScale } = useWindowDimensions()
|
||||
if (!NativeContextMenuPreview) return null
|
||||
|
||||
const width = Math.min(360, windowWidth - 32)
|
||||
const height = Math.max(124, 32 + 76 * fontScale)
|
||||
const isArtist = preview.kind === "artist"
|
||||
return (
|
||||
// Match Expo Router's preview wrapper: UIKit mounts this separately, but
|
||||
// Yoga must also keep it out of the trigger's normal layout.
|
||||
<NativeContextMenuPreview
|
||||
preferredContentSize={{ width, height }}
|
||||
style={{ position: "absolute", top: 0, left: 0 }}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
width,
|
||||
height,
|
||||
padding: 16,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 16,
|
||||
backgroundColor: colors.card,
|
||||
}}
|
||||
>
|
||||
<CoverImage
|
||||
uri={preview.artworkUrl}
|
||||
hasCover={preview.hasArtwork}
|
||||
style={{ width: 88, height: 88, borderRadius: isArtist ? 44 : 12 }}
|
||||
/>
|
||||
<View style={{ flex: 1, gap: 2 }}>
|
||||
<Text
|
||||
numberOfLines={2}
|
||||
style={{
|
||||
color: colors.foreground,
|
||||
fontSize: 17,
|
||||
fontWeight: "600",
|
||||
}}
|
||||
>
|
||||
{preview.title}
|
||||
</Text>
|
||||
{preview.artist ? (
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
style={{ color: colors.mutedForeground, fontSize: 15 }}
|
||||
>
|
||||
{preview.artist}
|
||||
</Text>
|
||||
) : null}
|
||||
{preview.album ? (
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
style={{ color: colors.mutedForeground, fontSize: 14 }}
|
||||
>
|
||||
{preview.album}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
{preview.kind !== "song" ? (
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
</NativeContextMenuPreview>
|
||||
)
|
||||
}
|
||||
|
||||
const NativeContextMenuAction: ComponentType<{
|
||||
identifier: string
|
||||
title: string
|
||||
@@ -335,13 +233,11 @@ const NativeContextMenuAction: ComponentType<{
|
||||
|
||||
function NativeMediaContextMenu({
|
||||
children,
|
||||
preview,
|
||||
onAction,
|
||||
share,
|
||||
...actionConfig
|
||||
}: MediaMenuWrapperProps) {
|
||||
const { config } = useServerConfig()
|
||||
const { push } = useAppNavigation()
|
||||
|
||||
if (!NativeContextMenuView || !NativeContextMenuAction) {
|
||||
return children
|
||||
@@ -356,21 +252,10 @@ function NativeMediaContextMenu({
|
||||
}
|
||||
|
||||
return (
|
||||
<NativeContextMenuView
|
||||
style={{ display: "contents" }}
|
||||
disableForceFlatten
|
||||
onPreviewTappedAnimationCompleted={() => {
|
||||
if (share?.type === "artist") push(`/artist/${share.artistId}`)
|
||||
else if (share?.type === "album" || share?.type === "song")
|
||||
push(`/album/${share.albumId}`)
|
||||
}}
|
||||
>
|
||||
<NativeContextMenuView style={{ display: "contents" }} disableForceFlatten>
|
||||
{/* The native menu retains its first trigger. Keep that view mounted when
|
||||
focus changes replace the Siri entity wrapper inside it. */}
|
||||
<View collapsable={false}>{children}</View>
|
||||
{preview && (actionConfig.selectedCount ?? 1) === 1 ? (
|
||||
<MediaPreview preview={preview} />
|
||||
) : null}
|
||||
{buildMediaMenuActions({ ...actionConfig, share }).map((action) => (
|
||||
<NativeContextMenuAction
|
||||
key={action.id}
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
import type { MenuComponentProps } from "@expo/ui/community/menu"
|
||||
import { Button, Host, Menu, RNHostView } from "@expo/ui/swift-ui"
|
||||
import { disabled, menuOrder } from "@expo/ui/swift-ui/modifiers"
|
||||
|
||||
// SwiftUI's automatic order reverses menus that open upward in the player.
|
||||
// Keep the same top-to-bottom order as the UIKit long-press menus.
|
||||
export function MenuView({
|
||||
actions,
|
||||
children,
|
||||
style,
|
||||
testID,
|
||||
onPressAction,
|
||||
}: MenuComponentProps) {
|
||||
return (
|
||||
<Host matchContents style={style} testID={testID} ignoreSafeArea="all">
|
||||
<Menu
|
||||
modifiers={[menuOrder("fixed")]}
|
||||
label={
|
||||
<RNHostView matchContents>
|
||||
<>{children}</>
|
||||
</RNHostView>
|
||||
}
|
||||
>
|
||||
{actions
|
||||
.filter((action) => !action.attributes?.hidden)
|
||||
.map((action) => (
|
||||
<Button
|
||||
key={action.id ?? action.title}
|
||||
label={action.title}
|
||||
systemImage={
|
||||
typeof action.image === "string" ? action.image : undefined
|
||||
}
|
||||
role={action.attributes?.destructive ? "destructive" : undefined}
|
||||
modifiers={[disabled(action.attributes?.disabled ?? false)]}
|
||||
onPress={() =>
|
||||
onPressAction?.({
|
||||
nativeEvent: { event: action.id ?? action.title },
|
||||
})
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</Menu>
|
||||
</Host>
|
||||
)
|
||||
}
|
||||
@@ -1,13 +1,11 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { useRouter } from "expo-router"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
@@ -67,8 +65,7 @@ function MiniPlayerContent({
|
||||
<View
|
||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -76,7 +73,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
@@ -86,8 +83,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={20}
|
||||
color={colors.foreground}
|
||||
@@ -105,8 +101,7 @@ function MiniPlayerContent({
|
||||
style={artworkStyle}
|
||||
/>
|
||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -114,9 +109,8 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||
{ color: colors.mutedForeground },
|
||||
@@ -124,7 +118,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
@@ -138,12 +132,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-back"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
@@ -154,8 +143,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
@@ -169,12 +157,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-forward"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
</Pressable>
|
||||
@@ -184,10 +167,9 @@ function MiniPlayerContent({
|
||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
const palette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
return (
|
||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||
{children}
|
||||
{hasArtworkPalette ? (
|
||||
<View
|
||||
@@ -205,7 +187,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ type QueueListItem =
|
||||
| { type: "history-header"; key: string }
|
||||
| { type: "history"; key: string; songId: Id<"songs">; historyIndex: number }
|
||||
| { type: "current"; key: string }
|
||||
| { type: "controls"; key: string; showTitle: boolean; tablet?: boolean }
|
||||
| { type: "controls"; key: string; showTitle: boolean }
|
||||
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
|
||||
| { type: "empty"; key: string; height: number }
|
||||
|
||||
@@ -72,11 +72,7 @@ function itemHeight(item: QueueListItem) {
|
||||
case "current":
|
||||
return CURRENT_HEIGHT
|
||||
case "controls":
|
||||
return item.tablet
|
||||
? 44
|
||||
: item.showTitle
|
||||
? CONTROLS_HEIGHT
|
||||
: TOGGLES_ONLY_HEIGHT
|
||||
return item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT
|
||||
case "empty":
|
||||
return item.height
|
||||
default:
|
||||
@@ -101,14 +97,10 @@ export function NowPlayingQueue({
|
||||
colors,
|
||||
viewportHeight,
|
||||
currentHeader,
|
||||
tablet = false,
|
||||
fadeColor,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
viewportHeight: number
|
||||
currentHeader: ReactNode
|
||||
tablet?: boolean
|
||||
fadeColor?: string
|
||||
}) {
|
||||
const {
|
||||
queueSongIds,
|
||||
@@ -122,7 +114,6 @@ export function NowPlayingQueue({
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
} = usePlayback()
|
||||
const [viewportWidth, setViewportWidth] = useState(0)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const [scrollEnabled, setScrollEnabled] = useState(true)
|
||||
const dragFrom = useSharedValue(-1)
|
||||
@@ -151,14 +142,9 @@ export function NowPlayingQueue({
|
||||
})
|
||||
)
|
||||
}
|
||||
if (!tablet) list.push({ type: "current", key: "current" })
|
||||
list.push({ type: "current", key: "current" })
|
||||
const hasUpcoming = queueSongIds.length > 1
|
||||
list.push({
|
||||
type: "controls",
|
||||
key: "controls",
|
||||
showTitle: hasUpcoming,
|
||||
tablet,
|
||||
})
|
||||
list.push({ type: "controls", key: "controls", showTitle: hasUpcoming })
|
||||
const occurrences = new Map<string, number>()
|
||||
queueSongIds.forEach((songId, queueIndex) => {
|
||||
const occurrence = occurrences.get(songId) ?? 0
|
||||
@@ -183,7 +169,7 @@ export function NowPlayingQueue({
|
||||
})
|
||||
}
|
||||
return list
|
||||
}, [queueHistorySongIds, queueSongIds, viewportHeight, tablet])
|
||||
}, [queueHistorySongIds, queueSongIds, viewportHeight])
|
||||
|
||||
const offsets = useMemo(() => {
|
||||
const result: number[] = []
|
||||
@@ -195,10 +181,8 @@ export function NowPlayingQueue({
|
||||
return result
|
||||
}, [items])
|
||||
|
||||
const currentIndex = items.findIndex(
|
||||
(item) => item.type === (tablet ? "controls" : "current")
|
||||
)
|
||||
const controlsIndex = tablet ? currentIndex : currentIndex + 1
|
||||
const currentIndex = items.findIndex((item) => item.type === "current")
|
||||
const controlsIndex = currentIndex + 1
|
||||
const belowCurrentHeight = items
|
||||
.slice(currentIndex)
|
||||
.reduce((sum, item) => sum + itemHeight(item), 0)
|
||||
@@ -341,31 +325,29 @@ export function NowPlayingQueue({
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
height: item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT,
|
||||
backgroundColor: colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{!tablet ? (
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
{item.showTitle ? (
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Continue Playing
|
||||
@@ -379,7 +361,6 @@ export function NowPlayingQueue({
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={queueSongIds.length - 1}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
@@ -403,10 +384,7 @@ export function NowPlayingQueue({
|
||||
}
|
||||
|
||||
return (
|
||||
<View
|
||||
style={styles.root}
|
||||
onLayout={(event) => setViewportWidth(event.nativeEvent.layout.width)}
|
||||
>
|
||||
<View style={styles.root}>
|
||||
<FlatList
|
||||
ref={listRef}
|
||||
data={items}
|
||||
@@ -425,31 +403,18 @@ export function NowPlayingQueue({
|
||||
ListFooterComponent={<View style={{ height: footerHeight }} />}
|
||||
/>
|
||||
<Svg
|
||||
key={viewportWidth}
|
||||
pointerEvents="none"
|
||||
style={styles.bottomFade}
|
||||
width={viewportWidth}
|
||||
width="100%"
|
||||
height={BOTTOM_FADE_HEIGHT}
|
||||
>
|
||||
<Defs>
|
||||
<LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1">
|
||||
<Stop
|
||||
offset="0"
|
||||
stopColor={fadeColor ?? colors.background}
|
||||
stopOpacity={0}
|
||||
/>
|
||||
<Stop
|
||||
offset="1"
|
||||
stopColor={fadeColor ?? colors.background}
|
||||
stopOpacity={1}
|
||||
/>
|
||||
<Stop offset="0" stopColor={colors.background} stopOpacity={0} />
|
||||
<Stop offset="1" stopColor={colors.background} stopOpacity={1} />
|
||||
</LinearGradient>
|
||||
</Defs>
|
||||
<Rect
|
||||
width={viewportWidth}
|
||||
height={BOTTOM_FADE_HEIGHT}
|
||||
fill="url(#queue-fade)"
|
||||
/>
|
||||
<Rect width="100%" height="100%" fill="url(#queue-fade)" />
|
||||
</Svg>
|
||||
</View>
|
||||
)
|
||||
@@ -616,7 +581,6 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
songId,
|
||||
queueIndex,
|
||||
lastIndex,
|
||||
tablet = false,
|
||||
colors,
|
||||
drag,
|
||||
swipeGroup,
|
||||
@@ -628,7 +592,6 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
songId: Id<"songs">
|
||||
queueIndex: number
|
||||
lastIndex: number
|
||||
tablet?: boolean
|
||||
colors: NowPlayingColors
|
||||
drag: DragState
|
||||
swipeGroup: SwipeRowGroup
|
||||
@@ -722,19 +685,6 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
</GestureDetector>
|
||||
}
|
||||
/>
|
||||
{tablet ? (
|
||||
<View
|
||||
pointerEvents="none"
|
||||
style={{
|
||||
position: "absolute",
|
||||
left: 88,
|
||||
right: 26,
|
||||
bottom: 0,
|
||||
height: StyleSheet.hairlineWidth,
|
||||
backgroundColor: colors.sliderTrack,
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<Animated.View
|
||||
pointerEvents="none"
|
||||
style={[
|
||||
@@ -751,7 +701,7 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
{Platform.OS === "ios" ? (
|
||||
<SwipeToRemoveRow
|
||||
group={swipeGroup}
|
||||
backgroundColor={tablet ? "transparent" : colors.background}
|
||||
backgroundColor={colors.background}
|
||||
actionAccessibilityLabel="Remove from queue"
|
||||
onRemove={handleRemove}
|
||||
>
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import type { ComponentProps } from "react"
|
||||
import { Pressable, type TextProps } from "react-native"
|
||||
import { useRouter } from "expo-router"
|
||||
import Animated from "react-native-reanimated"
|
||||
|
||||
import {
|
||||
useAnimatedPaletteColor,
|
||||
type PaletteColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
|
||||
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
|
||||
|
||||
/** Keep artwork text colors on the same UI-thread animation as the background. */
|
||||
export function PaletteText({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: TextProps & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <Animated.Text {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
export function PaletteIcon({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <AnimatedIcon {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
function ArtworkBackButton() {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Navigate up"
|
||||
hitSlop={8}
|
||||
onPress={() => router.back()}
|
||||
>
|
||||
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
export function renderArtworkBackButton() {
|
||||
return <ArtworkBackButton />
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
import { useState, type ReactNode } from "react"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
export function PlayerArtistMenu({
|
||||
song,
|
||||
onAction,
|
||||
children,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
onAction: (action: MediaAction) => void
|
||||
children: ReactNode
|
||||
}) {
|
||||
const [size, setSize] = useState({ width: 0, height: 0 })
|
||||
|
||||
return (
|
||||
<View
|
||||
style={styles.container}
|
||||
onLayout={({ nativeEvent: { layout } }) =>
|
||||
setSize({ width: layout.width, height: layout.height })
|
||||
}
|
||||
>
|
||||
<View
|
||||
pointerEvents="none"
|
||||
accessibilityElementsHidden
|
||||
importantForAccessibility="no-hide-descendants"
|
||||
>
|
||||
{children}
|
||||
</View>
|
||||
{size.width > 0 ? (
|
||||
<MediaActionMenu
|
||||
style={StyleSheet.absoluteFill}
|
||||
includeActions={["go-album", "go-artist"]}
|
||||
onAction={onAction}
|
||||
>
|
||||
<View
|
||||
style={size}
|
||||
accessible
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={song.artist.name}
|
||||
accessibilityHint="Opens album and artist options"
|
||||
/>
|
||||
</MediaActionMenu>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: { overflow: "hidden" },
|
||||
})
|
||||
@@ -1,6 +1,3 @@
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { collectionInset } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
@@ -9,14 +6,9 @@ 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,
|
||||
tabletMiniPlayerHeight,
|
||||
spacing,
|
||||
useThemeColors,
|
||||
} from "@/lib/theme"
|
||||
import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { memo, useCallback } from "react"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -24,8 +16,6 @@ import {
|
||||
type MediaMenuConfig,
|
||||
} from "@/components/media-context-menu"
|
||||
|
||||
function consumeLongPress() {}
|
||||
|
||||
export const SongRow = memo(function SongRow({
|
||||
song,
|
||||
onPress,
|
||||
@@ -33,7 +23,6 @@ export const SongRow = memo(function SongRow({
|
||||
trailing,
|
||||
palette,
|
||||
inset = false,
|
||||
swipe,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
onPress?: () => void
|
||||
@@ -42,13 +31,6 @@ export const SongRow = memo(function SongRow({
|
||||
}
|
||||
trailing?: React.ReactNode
|
||||
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
||||
inset?: boolean
|
||||
}) {
|
||||
@@ -64,33 +46,33 @@ export const SongRow = memo(function SongRow({
|
||||
const content = (
|
||||
<>
|
||||
<View style={styles.rowMeta}>
|
||||
<PaletteText
|
||||
tone={palette ? "foreground" : undefined}
|
||||
<Text
|
||||
style={[styles.rowTitle, { color: foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.artist.name} · {song.album.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.duration, { color: secondaryForeground }]}
|
||||
>
|
||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{trailing}
|
||||
</>
|
||||
)
|
||||
|
||||
const rowContent = (
|
||||
<>
|
||||
const row = (
|
||||
<Pressable
|
||||
style={
|
||||
inset ? styles.insetRow : [styles.row, { borderBottomColor: divider }]
|
||||
}
|
||||
onPress={onPress}
|
||||
>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, song.album.id)}
|
||||
hasCover={song.album.cover != null}
|
||||
@@ -103,33 +85,8 @@ export const SongRow = memo(function SongRow({
|
||||
) : (
|
||||
content
|
||||
)}
|
||||
</>
|
||||
</Pressable>
|
||||
)
|
||||
const rowStyle = inset
|
||||
? styles.insetRow
|
||||
: [styles.row, { borderBottomColor: divider }]
|
||||
const row =
|
||||
swipe && Platform.OS !== "web" ? (
|
||||
<SongSwipeRow
|
||||
group={swipe.group}
|
||||
onPlayNext={swipe.onPlayNext}
|
||||
onAddToQueue={swipe.onAddToQueue}
|
||||
onRemove={swipe.onRemove}
|
||||
backgroundColor={swipe.backgroundColor}
|
||||
onPress={onPress}
|
||||
style={rowStyle}
|
||||
>
|
||||
{rowContent}
|
||||
</SongSwipeRow>
|
||||
) : (
|
||||
<Pressable
|
||||
style={rowStyle}
|
||||
onPress={onPress}
|
||||
onLongPress={contextMenu ? consumeLongPress : undefined}
|
||||
>
|
||||
{rowContent}
|
||||
</Pressable>
|
||||
)
|
||||
|
||||
if (!contextMenu) {
|
||||
return (
|
||||
@@ -159,7 +116,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
playlistLabel,
|
||||
palette,
|
||||
inset,
|
||||
swipe,
|
||||
onPlay,
|
||||
onAction,
|
||||
}: {
|
||||
@@ -168,17 +124,9 @@ export const SongListRow = memo(function SongListRow({
|
||||
playlistLabel?: string
|
||||
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
||||
inset?: boolean
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
||||
|
||||
return (
|
||||
@@ -186,19 +134,8 @@ export const SongListRow = memo(function SongListRow({
|
||||
song={song}
|
||||
palette={palette}
|
||||
inset={inset}
|
||||
swipe={swipe}
|
||||
onPress={handlePress}
|
||||
contextMenu={{
|
||||
preview: config
|
||||
? {
|
||||
kind: "song",
|
||||
title: song.title,
|
||||
artist: song.artist.name,
|
||||
album: song.album.title,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, song.album.id),
|
||||
hasArtwork: song.album.cover != null,
|
||||
}
|
||||
: undefined,
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
playlistLabel,
|
||||
@@ -218,15 +155,9 @@ export const SongListRow = memo(function SongListRow({
|
||||
)
|
||||
})
|
||||
|
||||
const tabletPlayerInset = tabletMiniPlayerHeight + spacing.sm + spacing.lg
|
||||
export const tabContentBottomInset =
|
||||
Platform.OS === "ios" && Platform.isPad ? tabletPlayerInset : spacing.lg
|
||||
export const tabContentBottomInset = spacing.lg
|
||||
export const contentBottomInset =
|
||||
Platform.OS === "ios" && Platform.isPad
|
||||
? tabletPlayerInset
|
||||
: Platform.OS === "android"
|
||||
? spacing.lg
|
||||
: miniPlayerHeight + spacing.lg
|
||||
Platform.OS === "android" ? spacing.lg : miniPlayerHeight + spacing.lg
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
|
||||
@@ -4,15 +4,19 @@ import { Stack } from "expo-router"
|
||||
|
||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { filterSongs } from "@otunes/convex/client/song-search"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
export function usePlaylistSearch(songs: BrowseSong[]) {
|
||||
const search = useDebouncedSearch()
|
||||
const filteredSongs = useMemo(
|
||||
() => filterSongs(songs, search.searchQuery),
|
||||
[songs, search.searchQuery]
|
||||
)
|
||||
const filteredSongs = useMemo(() => {
|
||||
const query = search.searchQuery.toLowerCase()
|
||||
if (!query) return songs
|
||||
return songs.filter((song) =>
|
||||
[song.title, song.artist.name, song.album.title].some((value) =>
|
||||
value.toLowerCase().includes(query)
|
||||
)
|
||||
)
|
||||
}, [songs, search.searchQuery])
|
||||
|
||||
return { ...search, filteredSongs }
|
||||
}
|
||||
|
||||
@@ -1,29 +1,23 @@
|
||||
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"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { radius, useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
export function ProfileHeaderButton() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const openSettings = useOpenSettings()
|
||||
const router = useRouter()
|
||||
const colors = useThemeColors()
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const imageUrl = useProfileImageUrl(user?.image)
|
||||
|
||||
if (tabletLayout) return null
|
||||
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityLabel="Open profile"
|
||||
accessibilityRole="button"
|
||||
hitSlop={8}
|
||||
onPress={openSettings}
|
||||
onPress={() => router.push("/(app)/settings")}
|
||||
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
|
||||
>
|
||||
<View
|
||||
@@ -35,12 +29,8 @@ export function ProfileHeaderButton() {
|
||||
},
|
||||
]}
|
||||
>
|
||||
{imageUrl ? (
|
||||
<Image
|
||||
source={{ uri: imageUrl }}
|
||||
style={styles.image}
|
||||
contentFit="cover"
|
||||
/>
|
||||
{user?.image ? (
|
||||
<Image source={{ uri: user.image }} style={styles.image} contentFit="cover" />
|
||||
) : (
|
||||
<Text style={[styles.initials, { color: colors.foreground }]}>
|
||||
{initialsFromName(user?.name ?? "Me")}
|
||||
|
||||
@@ -1,14 +1,6 @@
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useEffect, useRef, type ReactNode } from "react"
|
||||
import {
|
||||
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,
|
||||
Animated,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
View,
|
||||
@@ -18,9 +10,15 @@ import {
|
||||
} from "react-native"
|
||||
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
carouselCardWidth,
|
||||
radius,
|
||||
spacing,
|
||||
useThemeColors,
|
||||
useTwoColumnCardWidth,
|
||||
} from "@/lib/theme"
|
||||
|
||||
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
||||
/** Match the inset-adjusted lists used once screen data is available. */
|
||||
function SkeletonContent({
|
||||
children,
|
||||
embedded = false,
|
||||
@@ -29,17 +27,13 @@ function SkeletonContent({
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
if (embedded) return <>{children}</>
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
@@ -50,11 +44,31 @@ function SkeletonContent({
|
||||
|
||||
export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
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 (
|
||||
<View
|
||||
<Animated.View
|
||||
style={[
|
||||
{ backgroundColor: colors.muted, borderRadius: radius.sm },
|
||||
{ backgroundColor: colors.muted, borderRadius: radius.sm, opacity },
|
||||
style,
|
||||
]}
|
||||
/>
|
||||
@@ -133,30 +147,20 @@ export function MediaGridSkeleton({
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||
useMediaGridLayout()
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
{
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
gap,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{Array.from(
|
||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||
(_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
)
|
||||
)}
|
||||
{Array.from({ length: items }, (_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
)
|
||||
@@ -176,16 +180,12 @@ export function CarouselSkeleton() {
|
||||
}
|
||||
|
||||
export function HomeSkeleton() {
|
||||
const headerHeight = useHeaderHeight()
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.home,
|
||||
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
contentContainerStyle={styles.home}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
@@ -197,96 +197,42 @@ export function HomeSkeleton() {
|
||||
|
||||
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
||||
export function CollectionDetailSkeleton({
|
||||
zoomCoverSize,
|
||||
style,
|
||||
round = false,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
zoomCoverSize?: number
|
||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
||||
round?: boolean
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
||||
const coverSize =
|
||||
!round && landscape
|
||||
? tabletCoverSize!
|
||||
: (zoomCoverSize ?? (round ? 180 : 210))
|
||||
const actions = (
|
||||
<View style={styles.actions}>
|
||||
<Skeleton style={styles.iconAction} />
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
)
|
||||
const artwork = (
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
)
|
||||
const coverSize = round ? 180 : 210
|
||||
return (
|
||||
<Reanimated.ScrollView
|
||||
onLayout={onLayout}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
|
||||
style,
|
||||
]}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
{round ? (
|
||||
<View style={styles.artistHero}>
|
||||
{zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)}
|
||||
<TextLine width={200} height={24} />
|
||||
<TextLine width={120} height={16} />
|
||||
{actions}
|
||||
<View style={styles.hero}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
<TextLine width={200} height={24} />
|
||||
<TextLine width={120} height={16} />
|
||||
<View style={styles.actions}>
|
||||
<Skeleton style={styles.iconAction} />
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
) : (
|
||||
<CollectionHero
|
||||
artwork={
|
||||
zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)
|
||||
}
|
||||
actions={actions}
|
||||
>
|
||||
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
|
||||
<TextLine
|
||||
width={landscape && !round ? "60%" : 120}
|
||||
height={landscape && !round ? 22 : 16}
|
||||
/>
|
||||
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
|
||||
</CollectionHero>
|
||||
)}
|
||||
</View>
|
||||
{round ? (
|
||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||
) : (
|
||||
<SongListSkeleton rows={8} embedded />
|
||||
)}
|
||||
</Reanimated.ScrollView>
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -328,7 +274,7 @@ const styles = StyleSheet.create({
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,461 +0,0 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { SymbolView } from "expo-symbols"
|
||||
import {
|
||||
useCallback,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useState,
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
import Animated, {
|
||||
type SharedValue,
|
||||
cancelAnimation,
|
||||
Extrapolation,
|
||||
interpolate,
|
||||
useAnimatedStyle,
|
||||
useSharedValue,
|
||||
withSpring,
|
||||
} from "react-native-reanimated"
|
||||
import { scheduleOnRN } from "react-native-worklets"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
|
||||
const IS_ANDROID = Platform.OS === "android"
|
||||
|
||||
const ACTION_WIDTH = 82
|
||||
const LEADING_ACTION_WIDTH = 72
|
||||
const SPRING = { duration: 450, dampingRatio: 1 }
|
||||
|
||||
function impact() {
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium)
|
||||
}
|
||||
|
||||
/** A tap competes with the swipe so dragging a moving row never starts playback. */
|
||||
export function SongSwipeRow({
|
||||
children,
|
||||
style,
|
||||
backgroundColor,
|
||||
group,
|
||||
onPress,
|
||||
onPlayNext,
|
||||
onAddToQueue,
|
||||
onRemove,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
backgroundColor: string
|
||||
group: SwipeRowGroup
|
||||
onPress?: () => void
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
}) {
|
||||
const hasRemove = IS_ANDROID && !!onRemove
|
||||
const x = useSharedValue(0)
|
||||
const startX = useSharedValue(0)
|
||||
const width = useSharedValue(0)
|
||||
const height = useSharedValue(0)
|
||||
const committed = useSharedValue(false)
|
||||
const commitProgress = useSharedValue(0)
|
||||
const [open, setOpen] = useState<-1 | 0 | 1>(0)
|
||||
|
||||
const close = useCallback(() => {
|
||||
x.value = withSpring(0, SPRING)
|
||||
committed.value = false
|
||||
commitProgress.value = withSpring(0, SPRING)
|
||||
setOpen(0)
|
||||
group.clear(close)
|
||||
}, [commitProgress, committed, group, x])
|
||||
|
||||
useEffect(() => () => group.clear(close), [close, group])
|
||||
|
||||
const begin = useCallback(() => group.setOpen(close), [close, group])
|
||||
const settle = useCallback(
|
||||
(side: -1 | 0 | 1) => {
|
||||
setOpen(side)
|
||||
if (!side) group.clear(close)
|
||||
},
|
||||
[close, group]
|
||||
)
|
||||
const activate = useCallback(
|
||||
(side: number) => {
|
||||
close()
|
||||
if (side > 0) onAddToQueue()
|
||||
// Download is intentionally a placeholder.
|
||||
},
|
||||
[close, onAddToQueue]
|
||||
)
|
||||
const tapRow = useCallback(() => {
|
||||
if (open) close()
|
||||
else onPress?.()
|
||||
}, [close, onPress, open])
|
||||
|
||||
const gesture = useMemo(() => {
|
||||
const pan = Gesture.Pan()
|
||||
// Leave the screen's leading edge available for native back navigation.
|
||||
.hitSlop({ left: -24 })
|
||||
.activeOffsetX([-10, 10])
|
||||
.failOffsetY([-10, 10])
|
||||
.onStart(() => {
|
||||
cancelAnimation(x)
|
||||
startX.value = x.value
|
||||
scheduleOnRN(begin)
|
||||
})
|
||||
.onUpdate((event) => {
|
||||
x.value = Math.max(
|
||||
-width.value,
|
||||
Math.min(width.value, startX.value + event.translationX)
|
||||
)
|
||||
const commit =
|
||||
Math.abs(x.value) >
|
||||
Math.max(
|
||||
x.value > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1),
|
||||
width.value * 0.55
|
||||
)
|
||||
if (commit !== committed.value) {
|
||||
committed.value = commit
|
||||
commitProgress.value = withSpring(commit ? 1 : 0, SPRING)
|
||||
scheduleOnRN(impact)
|
||||
}
|
||||
})
|
||||
.onEnd((event) => {
|
||||
const side = x.value > 0 ? 1 : -1
|
||||
if (committed.value) {
|
||||
x.value = withSpring(0, SPRING)
|
||||
scheduleOnRN(activate, side)
|
||||
return
|
||||
}
|
||||
const projected = x.value + event.velocityX * 0.12
|
||||
const target =
|
||||
Math.abs(x.value) > 10 && projected * side > ACTION_WIDTH / 2
|
||||
? side
|
||||
: 0
|
||||
x.value = withSpring(
|
||||
target *
|
||||
(target > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
|
||||
{
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
}
|
||||
)
|
||||
scheduleOnRN(settle, target)
|
||||
})
|
||||
.onFinalize((_event, success) => {
|
||||
if (!success) {
|
||||
x.value = withSpring(0, SPRING)
|
||||
scheduleOnRN(close)
|
||||
}
|
||||
})
|
||||
const tap = Gesture.Tap()
|
||||
.maxDistance(10)
|
||||
.maxDuration(500)
|
||||
.onEnd((_event, success) => {
|
||||
if (success) scheduleOnRN(tapRow)
|
||||
})
|
||||
return Gesture.Exclusive(pan, tap)
|
||||
}, [
|
||||
activate,
|
||||
hasRemove,
|
||||
begin,
|
||||
close,
|
||||
commitProgress,
|
||||
committed,
|
||||
settle,
|
||||
startX,
|
||||
tapRow,
|
||||
width,
|
||||
x,
|
||||
])
|
||||
|
||||
const rowStyle = useAnimatedStyle(() => ({
|
||||
transform: [{ translateX: x.value }],
|
||||
borderRadius: IS_ANDROID
|
||||
? 0
|
||||
: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, height.value / 2],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
}))
|
||||
const fillStyle = useAnimatedStyle(() => ({
|
||||
opacity: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, 1],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
}))
|
||||
|
||||
return (
|
||||
<Animated.View
|
||||
style={styles.container}
|
||||
onLayout={(event) => {
|
||||
width.value = event.nativeEvent.layout.width
|
||||
height.value = event.nativeEvent.layout.height
|
||||
}}
|
||||
>
|
||||
<SwipeAction
|
||||
side={1}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === 1}
|
||||
onPress={() => activate(1)}
|
||||
/>
|
||||
<SwipeAction
|
||||
side={1}
|
||||
secondary
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === 1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onPlayNext()
|
||||
}}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
remove
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onRemove?.()
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
paired={hasRemove}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => activate(-1)}
|
||||
/>
|
||||
<GestureDetector gesture={gesture}>
|
||||
<Animated.View
|
||||
accessible
|
||||
accessibilityRole="button"
|
||||
onAccessibilityTap={tapRow}
|
||||
accessibilityActions={[
|
||||
{ name: "addToQueue", label: "Add to Queue" },
|
||||
{ name: "playNext", label: "Play Next" },
|
||||
{ name: "download", label: "Download" },
|
||||
...(hasRemove
|
||||
? [{ name: "remove", label: "Remove from Playlist" }]
|
||||
: []),
|
||||
]}
|
||||
onAccessibilityAction={(event) => {
|
||||
if (event.nativeEvent.actionName === "remove" && hasRemove) {
|
||||
close()
|
||||
onRemove?.()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||
if (event.nativeEvent.actionName === "playNext") {
|
||||
close()
|
||||
onPlayNext()
|
||||
}
|
||||
}}
|
||||
style={[styles.row, { backgroundColor }, rowStyle]}
|
||||
>
|
||||
<Animated.View
|
||||
pointerEvents="none"
|
||||
style={[StyleSheet.absoluteFill, styles.fill, fillStyle]}
|
||||
/>
|
||||
<Animated.View style={style}>{children}</Animated.View>
|
||||
</Animated.View>
|
||||
</GestureDetector>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
function SwipeAction({
|
||||
side,
|
||||
secondary = false,
|
||||
paired = side > 0,
|
||||
remove = false,
|
||||
x,
|
||||
height,
|
||||
progress,
|
||||
open,
|
||||
onPress,
|
||||
}: {
|
||||
side: 1 | -1
|
||||
secondary?: boolean
|
||||
paired?: boolean
|
||||
remove?: boolean
|
||||
x: SharedValue<number>
|
||||
height: SharedValue<number>
|
||||
progress: SharedValue<number>
|
||||
open: boolean
|
||||
onPress: () => void
|
||||
}) {
|
||||
const actionStyle = useAnimatedStyle(() => {
|
||||
const revealed = Math.max(0, x.value * side)
|
||||
const primaryWidth = (revealed * (1 + progress.value)) / 2
|
||||
return {
|
||||
width: !paired
|
||||
? revealed
|
||||
: secondary
|
||||
? revealed - primaryWidth
|
||||
: primaryWidth,
|
||||
...(secondary
|
||||
? side > 0
|
||||
? { left: primaryWidth }
|
||||
: { right: primaryWidth }
|
||||
: {}),
|
||||
}
|
||||
})
|
||||
const pillStyle = useAnimatedStyle(() => {
|
||||
const total = Math.max(0, x.value * side)
|
||||
const revealed = !paired
|
||||
? total
|
||||
: (total * (secondary ? 1 - progress.value : 1 + progress.value)) / 2
|
||||
if (IS_ANDROID) {
|
||||
return { width: revealed, height: height.value, borderRadius: 0 }
|
||||
}
|
||||
const resting = Math.max(
|
||||
0,
|
||||
Math.min(
|
||||
revealed - (side > 0 ? 10 : 20),
|
||||
interpolate(
|
||||
revealed,
|
||||
[24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[0, 62, 200]
|
||||
)
|
||||
)
|
||||
)
|
||||
const pillWidth =
|
||||
resting + (Math.max(0, revealed - 12) - resting) * progress.value
|
||||
const restingHeight = interpolate(
|
||||
pillWidth,
|
||||
[0, 24, 62, 140, 200],
|
||||
[0, 0.3, 0.77, 0.82, 0.86].map((ratio) => ratio * height.value),
|
||||
Extrapolation.CLAMP
|
||||
)
|
||||
const pillHeight =
|
||||
restingHeight +
|
||||
(Math.max(0, height.value - 12) - restingHeight) * progress.value
|
||||
return {
|
||||
width: pillWidth,
|
||||
height: pillHeight,
|
||||
borderRadius: pillHeight / 2,
|
||||
}
|
||||
})
|
||||
const iconStyle = useAnimatedStyle(() => ({
|
||||
transform: [
|
||||
{
|
||||
scale: interpolate(
|
||||
x.value * side,
|
||||
[24, 64],
|
||||
[0, 1],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
},
|
||||
],
|
||||
}))
|
||||
return (
|
||||
<Animated.View
|
||||
pointerEvents={open ? "auto" : "none"}
|
||||
accessibilityElementsHidden={!open}
|
||||
importantForAccessibility={open ? "auto" : "no-hide-descendants"}
|
||||
style={[
|
||||
styles.action,
|
||||
side > 0 ? styles.leading : styles.trailing,
|
||||
actionStyle,
|
||||
]}
|
||||
>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={
|
||||
remove
|
||||
? "Remove from Playlist"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
}
|
||||
onPress={onPress}
|
||||
style={styles.actionButton}
|
||||
>
|
||||
<Animated.View
|
||||
style={[
|
||||
styles.pill,
|
||||
{
|
||||
backgroundColor: remove
|
||||
? "#d32f2f"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "#6b5bff"
|
||||
: "#f29943"
|
||||
: "#008dff",
|
||||
},
|
||||
pillStyle,
|
||||
]}
|
||||
>
|
||||
<Animated.View style={iconStyle}>
|
||||
{IS_ANDROID ? (
|
||||
<Ionicons
|
||||
name={
|
||||
remove
|
||||
? "trash-outline"
|
||||
: side < 0
|
||||
? "arrow-down"
|
||||
: secondary
|
||||
? "play-forward"
|
||||
: "list"
|
||||
}
|
||||
size={22}
|
||||
color="white"
|
||||
/>
|
||||
) : (
|
||||
<SymbolView
|
||||
name={
|
||||
side > 0
|
||||
? secondary
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "text.line.last.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
/>
|
||||
)}
|
||||
</Animated.View>
|
||||
</Animated.View>
|
||||
</Pressable>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: { overflow: "hidden" },
|
||||
row: { overflow: "hidden" },
|
||||
fill: { backgroundColor: "rgba(128,128,128,0.16)" },
|
||||
action: { position: "absolute", top: 0, bottom: 0 },
|
||||
leading: { left: 0 },
|
||||
trailing: { right: 0 },
|
||||
actionButton: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
pill: { alignItems: "center", justifyContent: "center", overflow: "hidden" },
|
||||
})
|
||||
@@ -1,27 +0,0 @@
|
||||
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 (
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
|
||||
{children}
|
||||
</SafeAreaView>
|
||||
<TabletSidebar />
|
||||
<TabletPlayerLayoutSync />
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
export function renderTabScreenContent({ children }: { children: ReactNode }) {
|
||||
return <TabScreenContent>{children}</TabScreenContent>
|
||||
}
|
||||
@@ -1,139 +0,0 @@
|
||||
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<NativeScrollEvent>) => {
|
||||
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 (
|
||||
<Animated.View
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
onLayout={(event) => {
|
||||
onLayout(event)
|
||||
setViewportHeight(event.nativeEvent.layout.height)
|
||||
}}
|
||||
>
|
||||
<ScrollView
|
||||
onScroll={onScroll}
|
||||
scrollEventThrottle={32}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
contentContainerStyle={{
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
paddingBottom: paddingBottom + insets.bottom,
|
||||
}}
|
||||
>
|
||||
<View
|
||||
onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)}
|
||||
>
|
||||
{ListHeaderComponent}
|
||||
</View>
|
||||
<View style={{ height: gridHeight }}>
|
||||
{(ready ? content.slice(start, end) : []).map((item, offset) => {
|
||||
const index = start + offset
|
||||
return (
|
||||
<Animated.View
|
||||
key={item.id}
|
||||
layout={tabletLayoutTransition}
|
||||
style={{
|
||||
position: "absolute",
|
||||
left:
|
||||
horizontalPadding + (index % columns) * (cardWidth + gap),
|
||||
top: Math.floor(index / columns) * rowHeight,
|
||||
width: cardWidth,
|
||||
}}
|
||||
>
|
||||
{renderCard(item, cardWidth)}
|
||||
</Animated.View>
|
||||
)
|
||||
})}
|
||||
</View>
|
||||
</ScrollView>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
@@ -1,289 +0,0 @@
|
||||
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-context-menu"
|
||||
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 (
|
||||
<Animated.View
|
||||
pointerEvents="box-none"
|
||||
style={[styles.position, positionStyle]}
|
||||
>
|
||||
<TabletPlayerSurface>
|
||||
<View style={styles.controls}>
|
||||
{roomy ? (
|
||||
<Control
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
color={shuffleEnabled ? accent : inactive}
|
||||
selected={shuffleEnabled}
|
||||
onPress={() => void toggleShuffle()}
|
||||
size={21}
|
||||
/>
|
||||
) : null}
|
||||
<Control
|
||||
label="Previous track"
|
||||
symbol="backward.fill"
|
||||
fallback="play-back"
|
||||
color={color}
|
||||
onPress={() => void skipPrevious()}
|
||||
size={27}
|
||||
/>
|
||||
<Control
|
||||
label={isPlaying ? "Pause" : "Play"}
|
||||
symbol={isPlaying ? "pause.fill" : "play.fill"}
|
||||
fallback={isPlaying ? "pause" : "play"}
|
||||
color={color}
|
||||
onPress={() => setIsPlaying(!isPlaying)}
|
||||
size={34}
|
||||
/>
|
||||
<Control
|
||||
label="Next track"
|
||||
symbol="forward.fill"
|
||||
fallback="play-forward"
|
||||
color={color}
|
||||
onPress={() => void skipNext()}
|
||||
size={27}
|
||||
/>
|
||||
{roomy ? (
|
||||
<Control
|
||||
label="Repeat"
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
color={repeatEnabled !== "none" ? accent : inactive}
|
||||
selected={repeatEnabled !== "none"}
|
||||
onPress={() => void cycleRepeat()}
|
||||
size={21}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
<Pressable
|
||||
onPress={() => router.push("/(app)/player")}
|
||||
style={styles.track}
|
||||
accessibilityLabel="Open Now Playing"
|
||||
>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, currentSong.album.id)}
|
||||
hasCover={currentSong.album.cover != null}
|
||||
style={styles.artwork}
|
||||
/>
|
||||
<View style={styles.meta}>
|
||||
<Text numberOfLines={1} style={styles.title}>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
<Text numberOfLines={1} style={styles.artist}>
|
||||
{currentSong.artist.name}
|
||||
</Text>
|
||||
</View>
|
||||
</Pressable>
|
||||
<MediaActionMenu
|
||||
style={{ alignSelf: "center" }}
|
||||
favorited={isSongFavorite(currentSong.id)}
|
||||
stationArtistId={currentSong.artist.id}
|
||||
navigation={{
|
||||
artist: { id: currentSong.artist.id },
|
||||
album: { id: currentSong.album.id },
|
||||
}}
|
||||
includeActions={["playlist", "favorite", "go-artist", "go-album"]}
|
||||
onAction={(action) => void handleSongAction(currentSong, action)}
|
||||
>
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="More"
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="ellipsis"
|
||||
fallback="ellipsis-horizontal"
|
||||
size={23}
|
||||
color={color}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
{roomy ? (
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
disabled
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback="chatbox-outline"
|
||||
size={23}
|
||||
color={inactive}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Control
|
||||
label="Show queue"
|
||||
symbol="list.bullet"
|
||||
fallback="list"
|
||||
color={color}
|
||||
size={25}
|
||||
onPress={() =>
|
||||
router.push({ pathname: "/(app)/player", params: { queue: "1" } })
|
||||
}
|
||||
/>
|
||||
</TabletPlayerSurface>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
function TabletPlayerSurface({ children }: { children: ReactNode }) {
|
||||
if (isLiquidGlassAvailable()) {
|
||||
return (
|
||||
<GlassView
|
||||
glassEffectStyle="regular"
|
||||
colorScheme="dark"
|
||||
isInteractive
|
||||
style={styles.bar}
|
||||
>
|
||||
{children}
|
||||
</GlassView>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<BlurView intensity={70} tint="dark" style={styles.bar}>
|
||||
{children}
|
||||
</BlurView>
|
||||
)
|
||||
}
|
||||
|
||||
function Control({
|
||||
label,
|
||||
symbol,
|
||||
fallback,
|
||||
color,
|
||||
size,
|
||||
onPress,
|
||||
selected,
|
||||
}: {
|
||||
label: string
|
||||
symbol: React.ComponentProps<typeof PlayerSymbol>["name"]
|
||||
fallback: React.ComponentProps<typeof PlayerSymbol>["fallback"]
|
||||
color: string
|
||||
size: number
|
||||
onPress: () => void
|
||||
selected?: boolean
|
||||
}) {
|
||||
return (
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
onPress={onPress}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={label}
|
||||
accessibilityState={{ selected }}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name={symbol}
|
||||
fallback={fallback}
|
||||
color={color}
|
||||
size={size}
|
||||
weight="semibold"
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
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 },
|
||||
})
|
||||
@@ -1,418 +0,0 @@
|
||||
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<typeof Animated.View>["style"]
|
||||
dismissStyle: ComponentProps<typeof Animated.View>["style"]
|
||||
dismissGesture: () => ReturnType<typeof Gesture.Pan>
|
||||
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<number | null>(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<typeof PlayerSymbol>["name"],
|
||||
fallback: React.ComponentProps<typeof PlayerSymbol>["fallback"],
|
||||
onPress: () => void,
|
||||
size = 32,
|
||||
selected = false,
|
||||
inactive = false
|
||||
) => (
|
||||
<Pressable
|
||||
onPress={onPress}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={label}
|
||||
accessibilityState={{ selected }}
|
||||
style={[styles.button, selected && { backgroundColor: colors.control }]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name={symbol}
|
||||
fallback={fallback}
|
||||
size={size}
|
||||
color={inactive ? colors.secondaryForeground : colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
const queue = (
|
||||
<NowPlayingQueue
|
||||
tablet
|
||||
colors={colors}
|
||||
viewportHeight={queueHeight}
|
||||
currentHeader={null}
|
||||
/>
|
||||
)
|
||||
return (
|
||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Close player"
|
||||
style={[styles.handleRow, { marginTop: insets.top }]}
|
||||
>
|
||||
<View
|
||||
style={[styles.handle, { backgroundColor: colors.sliderFill }]}
|
||||
/>
|
||||
</Pressable>
|
||||
</GestureDetector>
|
||||
<View style={styles.body}>
|
||||
<Animated.View style={[styles.main, mainMotion]}>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<View style={styles.artworkArea}>
|
||||
<Animated.View style={artworkMotion}>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, currentSong.album.id)}
|
||||
hasCover={currentSong.album.cover != null}
|
||||
style={{ width: "100%", height: "100%", borderRadius: 10 }}
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
</GestureDetector>
|
||||
<Animated.View style={[styles.controls, controlsMotion]}>
|
||||
<View style={styles.meta}>{metadata}</View>
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={time}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.times}>
|
||||
<Text
|
||||
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
{formatDuration(time)}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
{formatRemainingDuration(time, duration).replace("-", "−")}
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.transport}>
|
||||
{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"
|
||||
)}
|
||||
</View>
|
||||
<View style={styles.volume}>
|
||||
<View
|
||||
pointerEvents={volumeAvailable ? "auto" : "none"}
|
||||
accessibilityState={{ disabled: !volumeAvailable }}
|
||||
>
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
commitHoldMs={0}
|
||||
animateValueChanges
|
||||
value={volume}
|
||||
maximumValue={1}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={volumeAvailable ? setVolume : undefined}
|
||||
leading={
|
||||
<PlayerSymbol
|
||||
name="speaker.fill"
|
||||
fallback="volume-low"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
trailing={
|
||||
<PlayerSymbol
|
||||
name="speaker.wave.3.fill"
|
||||
fallback="volume-high"
|
||||
size={18}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
</Animated.View>
|
||||
</Animated.View>
|
||||
{wideLayout ? (
|
||||
<Animated.View
|
||||
pointerEvents={showQueue ? "auto" : "none"}
|
||||
accessibilityElementsHidden={!showQueue}
|
||||
importantForAccessibility={
|
||||
showQueue ? "auto" : "no-hide-descendants"
|
||||
}
|
||||
style={[styles.queue, queueStyle]}
|
||||
onLayout={(event) =>
|
||||
setQueueHeight(event.nativeEvent.layout.height)
|
||||
}
|
||||
>
|
||||
{queueHeight > 0 ? queue : null}
|
||||
</Animated.View>
|
||||
) : null}
|
||||
{showQueue && !sideBySide ? (
|
||||
<View
|
||||
style={[
|
||||
styles.portraitQueue,
|
||||
{ backgroundColor: colors.background },
|
||||
]}
|
||||
onLayout={(event) =>
|
||||
setQueueHeight(event.nativeEvent.layout.height)
|
||||
}
|
||||
>
|
||||
{queueHeight > 0 ? queue : null}
|
||||
</View>
|
||||
) : null}
|
||||
</View>
|
||||
<View
|
||||
style={[
|
||||
styles.footer,
|
||||
{ paddingBottom: Math.max(insets.bottom, 24) + 12 },
|
||||
]}
|
||||
>
|
||||
<AudioOutputButton
|
||||
color={colors.foreground}
|
||||
style={styles.footerButton}
|
||||
/>
|
||||
<View style={styles.footerActions}>
|
||||
<Pressable
|
||||
disabled
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
style={[styles.footerButton, { opacity: 0.4 }]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback="chatbox-outline"
|
||||
size={25}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Pressable
|
||||
onPress={toggleQueue}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||
accessibilityState={{ selected: showQueue }}
|
||||
style={[
|
||||
styles.footerButton,
|
||||
showQueue && { backgroundColor: colors.selected },
|
||||
]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="list.bullet"
|
||||
fallback="list"
|
||||
size={25}
|
||||
color={showQueue ? colors.selectedForeground : colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
</View>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
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",
|
||||
},
|
||||
})
|
||||
@@ -1,41 +0,0 @@
|
||||
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 { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
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 imageUrl = useProfileImageUrl(user?.image)
|
||||
const openSettings = useOpenSettings()
|
||||
const active = useIsFocused()
|
||||
|
||||
if (!NativeSidebar) return null
|
||||
return (
|
||||
<NativeSidebar
|
||||
style={{ position: "absolute", width: 0, height: 0 }}
|
||||
accountName={user?.name ?? "Account"}
|
||||
initials={initialsFromName(user?.name ?? "Me")}
|
||||
imageURL={imageUrl}
|
||||
active={active}
|
||||
onProfilePress={openSettings}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Platform,
|
||||
@@ -74,20 +73,8 @@ export function Button({
|
||||
<ActivityIndicator color={textColor} />
|
||||
) : (
|
||||
<View style={styles.buttonContent}>
|
||||
{icon ? (
|
||||
<PaletteIcon
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
name={icon}
|
||||
size={18}
|
||||
color={textColor}
|
||||
/>
|
||||
) : null}
|
||||
<PaletteText
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
style={[styles.buttonText, { color: textColor }]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
||||
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
||||
</View>
|
||||
)}
|
||||
</Pressable>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import {
|
||||
useIsFocused,
|
||||
useRoute,
|
||||
useNavigation,
|
||||
usePreventRemove,
|
||||
useRoute,
|
||||
type NativeStackNavigationProp,
|
||||
} from "expo-router"
|
||||
import {
|
||||
@@ -10,33 +11,17 @@ import {
|
||||
useContext,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
type PropsWithChildren,
|
||||
} from "react"
|
||||
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
||||
import Reanimated, {
|
||||
useSharedValue,
|
||||
useAnimatedStyle,
|
||||
useAnimatedReaction,
|
||||
useAnimatedRef,
|
||||
setNativeProps,
|
||||
processColor,
|
||||
withTiming,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
|
||||
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
|
||||
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
|
||||
selectedColor: string
|
||||
}
|
||||
|
||||
type TabTheme = {
|
||||
palette: CoverPalette
|
||||
colors: SharedValue<PaletteColors>
|
||||
selectedColor: string
|
||||
hasArtworkPalette: boolean
|
||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||
}
|
||||
@@ -48,64 +33,37 @@ function useDefaultPalette() {
|
||||
return useMemo(() => themeCoverPalette(theme, isDark), [theme, isDark])
|
||||
}
|
||||
|
||||
export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
|
||||
const defaultPalette = useDefaultPalette()
|
||||
const [screen, setScreen] = useState<{
|
||||
palette: CoverPalette
|
||||
owner: string
|
||||
} | null>(null)
|
||||
const palette = screen?.palette ?? defaultPalette
|
||||
const hasArtwork =
|
||||
palette.background !== defaultPalette.background ||
|
||||
palette.foreground !== defaultPalette.foreground ||
|
||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||
palette.accent !== defaultPalette.accent
|
||||
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
|
||||
const animatedColors = useSharedValue<PaletteColors>({
|
||||
...defaultColors,
|
||||
selectedColor: defaultPalette.accentText,
|
||||
})
|
||||
useLayoutEffect(() => {
|
||||
const { isDark: _isDark, ...colors } = palette
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: hasArtwork
|
||||
? palette.foreground
|
||||
: defaultPalette.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
}, [animatedColors, palette, defaultPalette, hasArtwork])
|
||||
const paletteOwner = useRef<string | null>(null)
|
||||
const palette = screen?.palette ?? null
|
||||
const setPalette = useCallback(
|
||||
(palette: CoverPalette | null, owner: string) => {
|
||||
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((current) =>
|
||||
palette ? { palette, owner } : current?.owner === owner ? null : current
|
||||
)
|
||||
setScreen(palette ? { palette, owner } : null)
|
||||
},
|
||||
[animatedColors, defaultPalette]
|
||||
[]
|
||||
)
|
||||
const artworkPalette = hasArtwork ? palette : null
|
||||
const artworkPalette =
|
||||
palette &&
|
||||
(palette.background !== defaultPalette.background ||
|
||||
palette.foreground !== defaultPalette.foreground ||
|
||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||
palette.accent !== defaultPalette.accent)
|
||||
? palette
|
||||
: null
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
palette: artworkPalette ?? defaultPalette,
|
||||
colors: animatedColors,
|
||||
selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText,
|
||||
hasArtworkPalette: artworkPalette !== null,
|
||||
setPalette,
|
||||
}),
|
||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
||||
[defaultPalette, artworkPalette, setPalette]
|
||||
)
|
||||
return (
|
||||
<AndroidTabTheme.Provider value={value}>
|
||||
@@ -114,50 +72,6 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
|
||||
* directly so appearance updates stay on the UI thread with the page colors.
|
||||
*/
|
||||
export function useAndroidNativeTabColors() {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
const ref = useAnimatedRef<HostInstance>()
|
||||
const mounted = useSharedValue(false)
|
||||
const attach = useCallback(
|
||||
(host: HostInstance | null) => {
|
||||
if (host) ref(host)
|
||||
mounted.value = host !== null
|
||||
},
|
||||
[ref, mounted]
|
||||
)
|
||||
|
||||
useAnimatedReaction(
|
||||
() => ({ colors: colors?.value, mounted: mounted.value }),
|
||||
({ colors: palette, mounted: ready }) => {
|
||||
if (Platform.OS !== "android" || !ready || !palette) return
|
||||
const normal = processColor(palette.secondaryForeground)
|
||||
const selected = processColor(palette.selectedColor)
|
||||
setNativeProps(ref, {
|
||||
standardAppearance: {
|
||||
tabBarBackgroundColor: processColor("transparent"),
|
||||
tabBarItemRippleColor: selected,
|
||||
tabBarItemActiveIndicatorEnabled: false,
|
||||
tabBarItemTitleSmallLabelFontSize: 10,
|
||||
tabBarItemTitleLargeLabelFontSize: 10,
|
||||
normal: {
|
||||
tabBarItemTitleFontColor: normal,
|
||||
tabBarItemIconColor: normal,
|
||||
},
|
||||
selected: {
|
||||
tabBarItemTitleFontColor: selected,
|
||||
tabBarItemIconColor: selected,
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
)
|
||||
return { ref: attach, style: { backgroundColor: "transparent" } }
|
||||
}
|
||||
|
||||
export function useAndroidTabPalette() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
@@ -168,83 +82,56 @@ export function useAndroidTabHasArtworkPalette() {
|
||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||
}
|
||||
|
||||
export function useAndroidTabBackgroundStyle() {
|
||||
export function useAndroidTabSelectedColor() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const fallback = useDefaultPalette().background
|
||||
const colors = theme?.colors
|
||||
return useAnimatedStyle(() =>
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
? { backgroundColor: colors?.value.background ?? fallback }
|
||||
: {}
|
||||
)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
return theme?.selectedColor ?? defaultPalette.accentText
|
||||
}
|
||||
|
||||
/** Color tokens share the background's UI-thread timing. */
|
||||
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
return useAnimatedStyle(() =>
|
||||
Platform.OS === "android" && tone && colors
|
||||
? { color: colors.value[tone] }
|
||||
: {}
|
||||
)
|
||||
}
|
||||
|
||||
/** Native headers draw this same UI-thread background as the page and bars. */
|
||||
function AndroidArtworkBackground() {
|
||||
const style = useAndroidTabBackgroundStyle()
|
||||
return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
|
||||
}
|
||||
|
||||
export function renderAndroidArtworkBackground() {
|
||||
return <AndroidArtworkBackground />
|
||||
}
|
||||
|
||||
const PALETTE_FADE_MS = 400
|
||||
|
||||
/** The focused artwork screen selects the shared background for page and bars. */
|
||||
export function useScreenPalette(palette: CoverPalette) {
|
||||
/** Keep Android artwork screens and shared bars on the same displayed palette. */
|
||||
export function useAndroidScreenPalette(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<NativeStackNavigationProp<Record<string, undefined>>>()
|
||||
const [appeared, setAppeared] = useState(false)
|
||||
const [leaving, setLeaving] = useState(false)
|
||||
const [laidOut, setLaidOut] = useState(false)
|
||||
const [closing, setClosing] = useState(false)
|
||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const setPalette = theme?.setPalette
|
||||
useLayoutEffect(() => {
|
||||
if (!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 (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
||||
if (Platform.OS !== "android") return
|
||||
return navigation.addListener("transitionEnd", ({ data }) => {
|
||||
setAppeared(!data.closing)
|
||||
})
|
||||
}, [navigation])
|
||||
|
||||
usePreventRemove(Platform.OS === "android" && !leaving, ({ repeat }) => {
|
||||
setLeaving(true)
|
||||
setPalette?.(null, owner)
|
||||
// Let the page and bars paint their shared destination colors before the
|
||||
// native stack removes the page. React blur happens too early for this.
|
||||
requestAnimationFrame(() => requestAnimationFrame(repeat))
|
||||
})
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (
|
||||
Platform.OS !== "android" ||
|
||||
!setPalette ||
|
||||
!isFocused ||
|
||||
!laidOut ||
|
||||
!appeared ||
|
||||
leaving
|
||||
)
|
||||
return
|
||||
setPalette(palette, owner)
|
||||
return () => setPalette(null, owner)
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
||||
}, [appeared, isFocused, laidOut, leaving, owner, palette, setPalette])
|
||||
|
||||
return {
|
||||
palette: Platform.OS === "android" ? target : palette,
|
||||
backgroundStyle,
|
||||
onLayout: sharesPalette ? onLayout : undefined,
|
||||
palette: Platform.OS === "android" && theme ? theme.palette : palette,
|
||||
onLayout: Platform.OS === "android" ? onLayout : undefined,
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
import { createContext, useContext, useMemo, type ReactNode } from "react"
|
||||
import { createContext, useContext, type ReactNode } from "react"
|
||||
|
||||
type ConvexAuthSessionContextValue = {
|
||||
invalidateSession: () => Promise<void>
|
||||
}
|
||||
|
||||
const ConvexAuthSessionContext =
|
||||
createContext<ConvexAuthSessionContextValue | null>(null)
|
||||
const ConvexAuthSessionContext = createContext<ConvexAuthSessionContextValue | null>(
|
||||
null
|
||||
)
|
||||
|
||||
export function ConvexAuthSessionProvider({
|
||||
children,
|
||||
@@ -14,9 +15,8 @@ export function ConvexAuthSessionProvider({
|
||||
children: ReactNode
|
||||
invalidateSession: () => Promise<void>
|
||||
}) {
|
||||
const value = useMemo(() => ({ invalidateSession }), [invalidateSession])
|
||||
return (
|
||||
<ConvexAuthSessionContext.Provider value={value}>
|
||||
<ConvexAuthSessionContext.Provider value={{ invalidateSession }}>
|
||||
{children}
|
||||
</ConvexAuthSessionContext.Provider>
|
||||
)
|
||||
@@ -25,9 +25,7 @@ export function ConvexAuthSessionProvider({
|
||||
export function useInvalidateAuthSession() {
|
||||
const context = useContext(ConvexAuthSessionContext)
|
||||
if (!context) {
|
||||
throw new Error(
|
||||
"useInvalidateAuthSession must be used within ConvexAuthSessionProvider"
|
||||
)
|
||||
throw new Error("useInvalidateAuthSession must be used within ConvexAppProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -12,28 +12,22 @@ import {
|
||||
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { favoriteOptimisticUpdates } from "@otunes/convex/client/favorites"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
/**
|
||||
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a
|
||||
* module-level update so it does not change between renders.
|
||||
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. The
|
||||
* update is captured on first render, so it must not close over render state.
|
||||
*/
|
||||
function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>(
|
||||
mutation: Mutation,
|
||||
optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>>
|
||||
): ReactMutation<Mutation> {
|
||||
const base = useMutation(mutation)
|
||||
return useMemo(
|
||||
() => base.withOptimisticUpdate(optimisticUpdate),
|
||||
[base, optimisticUpdate]
|
||||
)
|
||||
const updateRef = useRef(optimisticUpdate)
|
||||
return useMemo(() => base.withOptimisticUpdate(updateRef.current), [base])
|
||||
}
|
||||
|
||||
type FavoriteTables = { song: "songs"; album: "albums"; artist: "artists" }
|
||||
export type FavoriteKind = keyof FavoriteTables
|
||||
|
||||
type FavoritesContextValue = {
|
||||
isSongFavorite: (songId: string) => boolean
|
||||
isAlbumFavorite: (albumId: string) => boolean
|
||||
@@ -42,20 +36,6 @@ type FavoritesContextValue = {
|
||||
toggleAlbumFavorite: (albumId: Id<"albums">) => Promise<void>
|
||||
toggleArtistFavorite: (artistId: Id<"artists">) => Promise<void>
|
||||
favoriteSongs: (songIds: Id<"songs">[]) => Promise<void>
|
||||
/** Idempotent; throws so callers like Siri can report failures. */
|
||||
setFavorite: <Kind extends FavoriteKind>(
|
||||
kind: Kind,
|
||||
id: Id<FavoriteTables[Kind]>,
|
||||
favorite: boolean
|
||||
) => Promise<void>
|
||||
/** Throws so callers like Siri can report failures. */
|
||||
addFavoriteSongs: (songIds: Id<"songs">[]) => Promise<void>
|
||||
}
|
||||
|
||||
function showFavoritesError(error: unknown) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
|
||||
const FavoritesContext = createContext<FavoritesContextValue | null>(null)
|
||||
@@ -72,31 +52,110 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
const favorites = useCachedQuery(api.favorites.getUserFavorites)
|
||||
const favoriteSong = useOptimisticMutation(
|
||||
api.favorites.favoriteSong,
|
||||
favoriteOptimisticUpdates.favoriteSong
|
||||
(store, { songId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current || current.favoriteSongs.includes(songId)) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteSongs: [...current.favoriteSongs, songId],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const unfavoriteSong = useOptimisticMutation(
|
||||
api.favorites.unfavoriteSong,
|
||||
favoriteOptimisticUpdates.unfavoriteSong
|
||||
(store, { songId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteSongs: current.favoriteSongs.filter((id) => id !== songId),
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const favoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.favoriteAlbum,
|
||||
favoriteOptimisticUpdates.favoriteAlbum
|
||||
(store, { albumId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current || current.favoriteAlbums.includes(albumId)) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteAlbums: [...current.favoriteAlbums, albumId],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const unfavoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.unfavoriteAlbum,
|
||||
favoriteOptimisticUpdates.unfavoriteAlbum
|
||||
(store, { albumId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteAlbums: current.favoriteAlbums.filter((id) => id !== albumId),
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const favoriteArtist = useOptimisticMutation(
|
||||
api.favorites.favoriteArtist,
|
||||
favoriteOptimisticUpdates.favoriteArtist
|
||||
(store, { artistId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current || current.favoriteArtists.includes(artistId)) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteArtists: [...current.favoriteArtists, artistId],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const unfavoriteArtist = useOptimisticMutation(
|
||||
api.favorites.unfavoriteArtist,
|
||||
favoriteOptimisticUpdates.unfavoriteArtist
|
||||
(store, { artistId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteArtists: current.favoriteArtists.filter(
|
||||
(id) => id !== artistId
|
||||
),
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const favoriteSongsMutation = useOptimisticMutation(
|
||||
api.favorites.favoriteSongs,
|
||||
favoriteOptimisticUpdates.favoriteSongs
|
||||
(store, { songIds }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteSongs: [...new Set([...current.favoriteSongs, ...songIds])],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
const songIds = useMemo(
|
||||
@@ -114,72 +173,70 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
const idsRef = useRef({ songIds, albumIds, artistIds })
|
||||
idsRef.current = { songIds, albumIds, artistIds }
|
||||
|
||||
const setFavorite = useCallback(
|
||||
async <Kind extends FavoriteKind>(
|
||||
kind: Kind,
|
||||
id: Id<FavoriteTables[Kind]>,
|
||||
favorite: boolean
|
||||
) => {
|
||||
if (kind === "song") {
|
||||
const songId = id as Id<"songs">
|
||||
await (favorite ? favoriteSong : unfavoriteSong)({ songId })
|
||||
} else if (kind === "album") {
|
||||
const albumId = id as Id<"albums">
|
||||
await (favorite ? favoriteAlbum : unfavoriteAlbum)({ albumId })
|
||||
} else {
|
||||
const artistId = id as Id<"artists">
|
||||
await (favorite ? favoriteArtist : unfavoriteArtist)({ artistId })
|
||||
const toggleSongFavorite = useCallback(
|
||||
async (songId: Id<"songs">) => {
|
||||
try {
|
||||
if (idsRef.current.songIds.has(songId)) {
|
||||
await unfavoriteSong({ songId })
|
||||
} else {
|
||||
await favoriteSong({ songId })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[
|
||||
favoriteSong,
|
||||
unfavoriteSong,
|
||||
favoriteAlbum,
|
||||
unfavoriteAlbum,
|
||||
favoriteArtist,
|
||||
unfavoriteArtist,
|
||||
]
|
||||
)
|
||||
|
||||
const toggleSongFavorite = useCallback(
|
||||
(songId: Id<"songs">) =>
|
||||
setFavorite("song", songId, !idsRef.current.songIds.has(songId)).catch(
|
||||
showFavoritesError
|
||||
),
|
||||
[setFavorite]
|
||||
[favoriteSong, unfavoriteSong]
|
||||
)
|
||||
|
||||
const toggleAlbumFavorite = useCallback(
|
||||
(albumId: Id<"albums">) =>
|
||||
setFavorite(
|
||||
"album",
|
||||
albumId,
|
||||
!idsRef.current.albumIds.has(albumId)
|
||||
).catch(showFavoritesError),
|
||||
[setFavorite]
|
||||
async (albumId: Id<"albums">) => {
|
||||
try {
|
||||
if (idsRef.current.albumIds.has(albumId)) {
|
||||
await unfavoriteAlbum({ albumId })
|
||||
} else {
|
||||
await favoriteAlbum({ albumId })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[favoriteAlbum, unfavoriteAlbum]
|
||||
)
|
||||
|
||||
const toggleArtistFavorite = useCallback(
|
||||
(artistId: Id<"artists">) =>
|
||||
setFavorite(
|
||||
"artist",
|
||||
artistId,
|
||||
!idsRef.current.artistIds.has(artistId)
|
||||
).catch(showFavoritesError),
|
||||
[setFavorite]
|
||||
)
|
||||
|
||||
const addFavoriteSongs = useCallback(
|
||||
async (ids: Id<"songs">[]) => {
|
||||
const unique = [...new Set(ids)]
|
||||
if (unique.length > 0) await favoriteSongsMutation({ songIds: unique })
|
||||
async (artistId: Id<"artists">) => {
|
||||
try {
|
||||
if (idsRef.current.artistIds.has(artistId)) {
|
||||
await unfavoriteArtist({ artistId })
|
||||
} else {
|
||||
await favoriteArtist({ artistId })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[favoriteSongsMutation]
|
||||
[favoriteArtist, unfavoriteArtist]
|
||||
)
|
||||
|
||||
const favoriteSongs = useCallback(
|
||||
(ids: Id<"songs">[]) => addFavoriteSongs(ids).catch(showFavoritesError),
|
||||
[addFavoriteSongs]
|
||||
async (ids: Id<"songs">[]) => {
|
||||
const unique = [...new Set(ids)]
|
||||
if (unique.length === 0) return
|
||||
try {
|
||||
await favoriteSongsMutation({ songIds: unique })
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[favoriteSongsMutation]
|
||||
)
|
||||
|
||||
const value = useMemo(
|
||||
@@ -191,8 +248,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
toggleAlbumFavorite,
|
||||
toggleArtistFavorite,
|
||||
favoriteSongs,
|
||||
setFavorite,
|
||||
addFavoriteSongs,
|
||||
}),
|
||||
[
|
||||
songIds,
|
||||
@@ -202,8 +257,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
toggleAlbumFavorite,
|
||||
toggleArtistFavorite,
|
||||
favoriteSongs,
|
||||
setFavorite,
|
||||
addFavoriteSongs,
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { useAuthToken } from "@convex-dev/auth/react"
|
||||
import { userIdFromToken } from "@otunes/convex/client/auth-token"
|
||||
import { createContext, useContext, useMemo, type ReactNode } from "react"
|
||||
|
||||
import { loadPersistentCache } from "@/lib/persistent-cache"
|
||||
@@ -10,6 +9,21 @@ const CacheScopeContext = createContext(ANONYMOUS_CACHE_SCOPE)
|
||||
|
||||
void loadPersistentCache()
|
||||
|
||||
function userIdFromToken(token: string | null) {
|
||||
const payload = token?.split(".")[1]
|
||||
if (!payload) {
|
||||
return null
|
||||
}
|
||||
|
||||
try {
|
||||
const json = atob(payload.replace(/-/g, "+").replace(/_/g, "/"))
|
||||
const subject = (JSON.parse(json) as { sub?: unknown }).sub
|
||||
return typeof subject === "string" ? (subject.split("|")[0] ?? null) : null
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
/** Namespaces persisted client data by server and signed-in user. */
|
||||
export function PersistentCacheProvider({
|
||||
serverUrl,
|
||||
|
||||
+794
-170
File diff suppressed because it is too large.
Load diff
@@ -1,54 +0,0 @@
|
||||
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<PlayerInsets>(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 <TabletPlayerLayout value={value}>{children}</TabletPlayerLayout>
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
@@ -1,142 +0,0 @@
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
|
||||
import { themeCoverPalette, type CoverPalette } from "@/lib/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.
|
||||
export const COVER_PALETTE_WAIT_MS = 400
|
||||
|
||||
export type CoverPaletteResult = { palette: CoverPalette; settled: boolean }
|
||||
|
||||
type CoverPaletteSourceOptions<Swatches> = {
|
||||
/** Persistent cache key for a 64px cover URI. */
|
||||
cacheKey: (colorSourceUri: string) => string
|
||||
extract: (colorSourceUri: string) => Promise<Swatches | null>
|
||||
derive: (swatches: Swatches, isDark: boolean) => CoverPalette | null
|
||||
/** Reject persisted entries written in an older shape. */
|
||||
isValidCache?: (swatches: Swatches) => boolean
|
||||
}
|
||||
|
||||
/**
|
||||
* One artwork color pipeline: an extractor and palette derivation with their
|
||||
* own memory cache, persistent cache and in-flight requests.
|
||||
*/
|
||||
export function createCoverPaletteSource<Swatches>({
|
||||
cacheKey,
|
||||
extract,
|
||||
derive,
|
||||
isValidCache,
|
||||
}: CoverPaletteSourceOptions<Swatches>) {
|
||||
const swatchesByKey = new Map<string, Swatches | null>()
|
||||
const pending = new Map<string, Promise<Swatches | null>>()
|
||||
|
||||
function cachedSwatches(key: string): Swatches | null | undefined {
|
||||
if (swatchesByKey.has(key)) return swatchesByKey.get(key)
|
||||
const cached = readCache<Swatches>(cacheKey(key))
|
||||
return cached && isValidCache && !isValidCache(cached) ? undefined : cached
|
||||
}
|
||||
|
||||
function extractSwatches(key: string) {
|
||||
const inFlight = pending.get(key)
|
||||
if (inFlight) return inFlight
|
||||
|
||||
const request = extract(key)
|
||||
.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
|
||||
}
|
||||
|
||||
function prefetch(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. Pass `uri` as "" to skip
|
||||
* extraction. 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.
|
||||
*/
|
||||
function usePalette(
|
||||
uri: string,
|
||||
hasCover: boolean | undefined
|
||||
): CoverPaletteResult {
|
||||
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<string | null>(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: Swatches | 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 ? derive(swatches, isDark) : null
|
||||
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||
}, [hasCover, isDark, swatches, theme])
|
||||
|
||||
return {
|
||||
palette,
|
||||
settled:
|
||||
!key ||
|
||||
hasCover === false ||
|
||||
swatches !== undefined ||
|
||||
waitedKey === key,
|
||||
}
|
||||
}
|
||||
|
||||
return { prefetch, usePalette }
|
||||
}
|
||||
|
||||
function sameSwatches(a: unknown, b: unknown) {
|
||||
return a === b || JSON.stringify(a) === JSON.stringify(b)
|
||||
}
|
||||
@@ -1,47 +1,163 @@
|
||||
import {
|
||||
createCoverPaletteSource,
|
||||
type CoverPaletteResult,
|
||||
} from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
prefetchLegacyCoverPalette,
|
||||
useLegacyCoverPalette,
|
||||
} from "@/hooks/use-legacy-cover-palette"
|
||||
import {
|
||||
loadArtworkColorsEnabled,
|
||||
useArtworkColorsEnabled,
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
||||
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import { getColors, type ImageColorsResult } from "react-native-image-colors"
|
||||
|
||||
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
deriveCoverPalette,
|
||||
themeCoverPalette,
|
||||
type CoverPalette,
|
||||
type CoverSwatches,
|
||||
} from "@/lib/cover-palette"
|
||||
import { readCache, writeCache } from "@/lib/persistent-cache"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
import { withCoverImageSize } from "@/lib/urls"
|
||||
|
||||
const region = createCoverPaletteSource<CoverSwatches>({
|
||||
cacheKey: (colorSourceUri) => `palette:v2:${colorSourceUri}`,
|
||||
extract: extractCoverSwatches,
|
||||
derive: (swatches) => deriveCoverPalette(swatches),
|
||||
})
|
||||
// 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.
|
||||
export const COVER_PALETTE_WAIT_MS = 400
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export function prefetchCoverPalette(uri: string) {
|
||||
void loadArtworkColorsEnabled().then((enabled) =>
|
||||
enabled ? region.prefetch(uri) : prefetchLegacyCoverPalette(uri)
|
||||
// image-colors substitutes this for swatches it couldn't find.
|
||||
const MISSING = "#010203"
|
||||
|
||||
const swatchesByKey = new Map<string, CoverSwatches | null>()
|
||||
const pending = new Map<string, Promise<CoverSwatches | null>>()
|
||||
|
||||
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)
|
||||
return readCache<CoverSwatches>(cacheKey(key))
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
/**
|
||||
* Colors for a screen tinted by `uri`'s cover art, from whichever pipeline the
|
||||
* device preference selects. Nothing is extracted until the preference loads,
|
||||
* and the screen stays unsettled meanwhile so it doesn't flash theme colors.
|
||||
* 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 useCoverPalette(
|
||||
uri: string,
|
||||
hasCover: boolean | undefined
|
||||
): CoverPaletteResult {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const current = region.usePalette(enabled === true ? uri : "", hasCover)
|
||||
const legacy = useLegacyCoverPalette(enabled === false ? uri : "", hasCover)
|
||||
if (enabled === undefined) {
|
||||
return { palette: current.palette, settled: !uri || hasCover === false }
|
||||
): { 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<string | null>(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,
|
||||
}
|
||||
return enabled ? current : legacy
|
||||
}
|
||||
@@ -1,67 +0,0 @@
|
||||
import { getColors, type ImageColorsResult } from "react-native-image-colors"
|
||||
|
||||
import { createCoverPaletteSource } from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
deriveCoverPalette,
|
||||
type LegacyCoverSwatches as CoverSwatches,
|
||||
} from "@/lib/legacy-cover-palette"
|
||||
|
||||
// image-colors substitutes this for swatches it couldn't find.
|
||||
const MISSING = "#010203"
|
||||
|
||||
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,
|
||||
]),
|
||||
}
|
||||
}
|
||||
|
||||
const legacy = createCoverPaletteSource<CoverSwatches>({
|
||||
cacheKey: (colorSourceUri) => `palette:${colorSourceUri}`,
|
||||
extract: (key) =>
|
||||
getColors(key, {
|
||||
fallback: MISSING,
|
||||
cache: true,
|
||||
key,
|
||||
quality: "low",
|
||||
pixelSpacing: 4,
|
||||
}).then(toSwatches),
|
||||
derive: deriveCoverPalette,
|
||||
// Discard the background-only entries written by the tablet palette experiment.
|
||||
isValidCache: (cached) =>
|
||||
Array.isArray(cached.text) && Array.isArray(cached.accent),
|
||||
})
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export const prefetchLegacyCoverPalette = legacy.prefetch
|
||||
|
||||
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
|
||||
export const useLegacyCoverPalette = legacy.usePalette
|
||||
@@ -1,47 +0,0 @@
|
||||
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<number | null>(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,
|
||||
}
|
||||
}
|
||||
@@ -1,724 +0,0 @@
|
||||
import { atmosEnabled } from "@/lib/playback-capabilities"
|
||||
import {
|
||||
createAudioPlaylist,
|
||||
setAudioModeAsync,
|
||||
setIsAudioActiveAsync,
|
||||
type AudioMetadata,
|
||||
type AudioPlaylist,
|
||||
type AudioPlaylistStatus,
|
||||
type AudioSource,
|
||||
} from "expo-audio"
|
||||
import { useConvex } from "convex/react"
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react"
|
||||
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
|
||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { albumCoverUrl, songAudioSource } from "@/lib/urls"
|
||||
import {
|
||||
activatePlaylistLockScreen,
|
||||
releaseAudioPlaylist,
|
||||
updatePlaylistLockScreenMetadata,
|
||||
} from "@/lib/audio-playlist-lock-screen"
|
||||
import {
|
||||
nativePlaylistEdits,
|
||||
nativePlaylistNeedsRebuild,
|
||||
nativePlaylistSongIds,
|
||||
repeatToPlaylistLoop,
|
||||
} from "@/lib/native-playlist-window"
|
||||
|
||||
const PLAYBACK_READY_TIMEOUT_MS = 20_000
|
||||
|
||||
function lockScreenMetadata(
|
||||
song: BrowseSong,
|
||||
serverUrl: string
|
||||
): AudioMetadata {
|
||||
return {
|
||||
title: song.title,
|
||||
artist: song.artist.name,
|
||||
albumTitle: song.album.title,
|
||||
artworkUrl: albumCoverUrl(serverUrl, song.album.id, 512),
|
||||
}
|
||||
}
|
||||
|
||||
type PlaybackWaiter = { playing?: boolean; resolve: () => void }
|
||||
|
||||
/** Where the last sync left the native player, and the queue it reflects. */
|
||||
type SyncedPosition = {
|
||||
index: number
|
||||
songId: Id<"songs"> | undefined
|
||||
historyLength: number
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps the native `AudioPlaylist` in step with the playback queue, and
|
||||
* feeds its status (position, playing, track changes) back into the queue.
|
||||
*/
|
||||
export function useNativePlaylistSync({
|
||||
store,
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
repeatEnabled,
|
||||
currentSong,
|
||||
queueStartVersion,
|
||||
}: {
|
||||
store: PlaybackStore
|
||||
queueSongIds: Id<"songs">[]
|
||||
queueHistorySongIds: Id<"songs">[]
|
||||
repeatEnabled: RepeatMode
|
||||
currentSong: BrowseSong | null
|
||||
queueStartVersion: number
|
||||
}) {
|
||||
const convex = useConvex()
|
||||
const { config } = useServerConfig()
|
||||
const cacheScope = useCacheScope()
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const storeRef = useRef(store)
|
||||
storeRef.current = store
|
||||
|
||||
const playlistRef = useRef<AudioPlaylist | null>(null)
|
||||
const statusSubscriptionRef = useRef<{ remove: () => void } | null>(null)
|
||||
const trackChangedSubscriptionRef = useRef<{ remove: () => void } | null>(
|
||||
null
|
||||
)
|
||||
const loadedSongIdsRef = useRef<Id<"songs">[]>([])
|
||||
const loadedLoadKeyRef = useRef<string | null>(null)
|
||||
const syncedPositionRef = useRef<SyncedPosition | null>(null)
|
||||
const waitersRef = useRef(new Map<Id<"songs">, Set<PlaybackWaiter>>())
|
||||
const autoPlayNextRef = useRef(false)
|
||||
const isPlayingRef = useRef(false)
|
||||
const currentTimeRef = useRef(0)
|
||||
const pendingSeekRef = useRef<number | null>(null)
|
||||
const seekInFlightRef = useRef(false)
|
||||
// Set while `play()` waits for a pending seek to land.
|
||||
const deferredPlayRef = useRef(false)
|
||||
const loadRequestIdRef = useRef(0)
|
||||
|
||||
const [isPlaying, setIsPlayingState] = useState(false)
|
||||
const [currentTime, setCurrentTime] = useState(0)
|
||||
const [measuredDuration, setDuration] = useState(0)
|
||||
|
||||
const currentSongId = queueSongIds[0] ?? null
|
||||
const duration =
|
||||
measuredDuration > 0
|
||||
? measuredDuration
|
||||
: (currentSong?.durationSeconds ?? 0)
|
||||
const queueSyncKey = useMemo(
|
||||
() => JSON.stringify(queueSongIds),
|
||||
[queueSongIds]
|
||||
)
|
||||
const historySyncKey = useMemo(
|
||||
() => JSON.stringify(queueHistorySongIds),
|
||||
[queueHistorySongIds]
|
||||
)
|
||||
const currentSongSyncKey = currentSong
|
||||
? JSON.stringify([
|
||||
currentSong.id,
|
||||
currentSong.title,
|
||||
currentSong.artist.name,
|
||||
currentSong.album.id,
|
||||
currentSong.album.title,
|
||||
currentSong.album.cover ?? "",
|
||||
])
|
||||
: ""
|
||||
const userPlaybackKey = user
|
||||
? JSON.stringify([user._id, user.playbackQuality, atmosEnabled(user)])
|
||||
: ""
|
||||
|
||||
const settleWaiters = useCallback(() => {
|
||||
const player = playlistRef.current
|
||||
if (waitersRef.current.size === 0 || !player) return
|
||||
const songId = loadedSongIdsRef.current[player.currentIndex]
|
||||
const waiters = songId && waitersRef.current.get(songId)
|
||||
if (!waiters || !player.isLoaded) return
|
||||
for (const waiter of waiters) {
|
||||
if (waiter.playing === undefined || player.playing === waiter.playing) {
|
||||
waiter.resolve()
|
||||
}
|
||||
}
|
||||
}, [])
|
||||
|
||||
const markSynced = useCallback(
|
||||
(playlist: AudioPlaylist, songId: Id<"songs">, historyLength: number) => {
|
||||
syncedPositionRef.current = {
|
||||
index: playlist.currentIndex,
|
||||
songId,
|
||||
historyLength,
|
||||
}
|
||||
settleWaiters()
|
||||
},
|
||||
[settleWaiters]
|
||||
)
|
||||
|
||||
const destroyPlaylist = useCallback(() => {
|
||||
statusSubscriptionRef.current?.remove()
|
||||
statusSubscriptionRef.current = null
|
||||
trackChangedSubscriptionRef.current?.remove()
|
||||
trackChangedSubscriptionRef.current = null
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
playlist.pause()
|
||||
releaseAudioPlaylist(playlist)
|
||||
}
|
||||
playlistRef.current = null
|
||||
loadedSongIdsRef.current = []
|
||||
loadedLoadKeyRef.current = null
|
||||
syncedPositionRef.current = null
|
||||
}, [])
|
||||
|
||||
const resetPosition = useCallback(() => {
|
||||
pendingSeekRef.current = null
|
||||
deferredPlayRef.current = false
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
setDuration(0)
|
||||
}, [])
|
||||
|
||||
// A new queue must not inherit the native player's position or a pending seek.
|
||||
const resetForNewQueue = useCallback(() => {
|
||||
loadRequestIdRef.current += 1
|
||||
destroyPlaylist()
|
||||
seekInFlightRef.current = false
|
||||
resetPosition()
|
||||
}, [destroyPlaylist, resetPosition])
|
||||
|
||||
/**
|
||||
* Starts the player, unless a seek (a restored position) is still pending.
|
||||
* Then the status handler starts it once the seek lands, so playback never
|
||||
* starts at 0:00 and jumps.
|
||||
*/
|
||||
const startPlayer = useCallback((playlist: AudioPlaylist) => {
|
||||
if (pendingSeekRef.current !== null && pendingSeekRef.current > 0) {
|
||||
deferredPlayRef.current = true
|
||||
return
|
||||
}
|
||||
playlist.play()
|
||||
}, [])
|
||||
|
||||
const handlePlaylistStatusUpdate = useCallback(
|
||||
(status: AudioPlaylistStatus) => {
|
||||
settleWaiters()
|
||||
// iOS may remove the finished item before delivering its final status.
|
||||
if (!status.isLoaded && !status.didJustFinish) return
|
||||
const state = storeRef.current.getState()
|
||||
if (loadedSongIdsRef.current[status.currentIndex] !== state.queue[0]) {
|
||||
return
|
||||
}
|
||||
|
||||
if (status.duration > 0) {
|
||||
setDuration(status.duration)
|
||||
}
|
||||
|
||||
if (pendingSeekRef.current !== null && pendingSeekRef.current > 0) {
|
||||
const seekSeconds =
|
||||
status.duration > 0
|
||||
? Math.min(pendingSeekRef.current, status.duration)
|
||||
: pendingSeekRef.current
|
||||
pendingSeekRef.current = null
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
// Statuses report the old position until the seek lands.
|
||||
seekInFlightRef.current = true
|
||||
void playlist.seekTo(seekSeconds).finally(() => {
|
||||
seekInFlightRef.current = false
|
||||
if (deferredPlayRef.current && playlistRef.current === playlist) {
|
||||
deferredPlayRef.current = false
|
||||
playlist.play()
|
||||
}
|
||||
})
|
||||
}
|
||||
currentTimeRef.current = seekSeconds
|
||||
setCurrentTime(seekSeconds)
|
||||
} else if (!seekInFlightRef.current) {
|
||||
currentTimeRef.current = status.currentTime
|
||||
setCurrentTime(status.currentTime)
|
||||
}
|
||||
|
||||
if (status.playing) {
|
||||
autoPlayNextRef.current = false
|
||||
if (!isPlayingRef.current) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
}
|
||||
} else if (
|
||||
isPlayingRef.current &&
|
||||
!status.didJustFinish &&
|
||||
!deferredPlayRef.current
|
||||
) {
|
||||
autoPlayNextRef.current = false
|
||||
isPlayingRef.current = false
|
||||
setIsPlayingState(false)
|
||||
}
|
||||
|
||||
if (!status.didJustFinish) return
|
||||
if (state.repeatEnabled === "once") return
|
||||
if (status.currentIndex < status.trackCount - 1) return
|
||||
|
||||
const shouldContinue =
|
||||
state.repeatEnabled !== "none" || state.queue.length > 1
|
||||
if (!shouldContinue) {
|
||||
autoPlayNextRef.current = false
|
||||
isPlayingRef.current = false
|
||||
setIsPlayingState(false)
|
||||
storeRef.current.update(playbackQueue.skipNext)
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
playlist.pause()
|
||||
// Reload the final item, which iOS removes when playback ends. The
|
||||
// index doesn't move, so handleTrackChanged treats it as ours.
|
||||
playlist.skipTo(status.currentIndex)
|
||||
}
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
return
|
||||
}
|
||||
|
||||
autoPlayNextRef.current = true
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
storeRef.current.update(playbackQueue.skipNext)
|
||||
if (storeRef.current.getState().queue[0] === state.queue[0]) {
|
||||
const playlist = playlistRef.current
|
||||
void playlist?.seekTo(0)
|
||||
playlist?.play()
|
||||
}
|
||||
},
|
||||
[settleWaiters]
|
||||
)
|
||||
|
||||
const handleTrackChanged = useCallback(() => {
|
||||
const playlist = playlistRef.current
|
||||
const synced = syncedPositionRef.current
|
||||
if (!playlist || !synced) return
|
||||
// Queue edits run synchronously, so an event can describe an index from
|
||||
// before them (Android's `previousIndex` also goes stale). The player's
|
||||
// live index is the one that matters; if it is where the last sync left
|
||||
// it, this change was ours.
|
||||
const index = playlist.currentIndex
|
||||
if (index === synced.index) return
|
||||
const state = storeRef.current.getState()
|
||||
// A queue change is still being applied and will move the player itself.
|
||||
if (
|
||||
state.queue[0] !== synced.songId ||
|
||||
state.history.length !== synced.historyLength
|
||||
) {
|
||||
return
|
||||
}
|
||||
// The window is history then queue, so the current track sits at
|
||||
// `history.length`.
|
||||
const steps = index - state.history.length
|
||||
if (steps === 0) return
|
||||
|
||||
autoPlayNextRef.current = true
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
|
||||
storeRef.current.update((state) => {
|
||||
if (steps === 1) return playbackQueue.skipNext(state)
|
||||
if (steps > 1) return playbackQueue.skipToQueueIndex(state, steps)
|
||||
let next = state
|
||||
for (let i = 0; i < -steps; i++) {
|
||||
next = playbackQueue.skipPrevious(next)
|
||||
}
|
||||
return next
|
||||
})
|
||||
const next = storeRef.current.getState()
|
||||
syncedPositionRef.current = {
|
||||
index,
|
||||
songId: next.queue[0],
|
||||
historyLength: next.history.length,
|
||||
}
|
||||
settleWaiters()
|
||||
}, [settleWaiters])
|
||||
|
||||
const ensurePlaylist = useCallback(
|
||||
(sources: AudioSource[]) => {
|
||||
if (playlistRef.current) {
|
||||
return playlistRef.current
|
||||
}
|
||||
|
||||
const playlist = createAudioPlaylist({
|
||||
sources,
|
||||
updateInterval: 500,
|
||||
loop: repeatToPlaylistLoop(storeRef.current.getState().repeatEnabled),
|
||||
})
|
||||
// System volume controls loudness; keep the player gain at full scale.
|
||||
playlist.volume = 1
|
||||
statusSubscriptionRef.current = playlist.addListener(
|
||||
"playlistStatusUpdate",
|
||||
handlePlaylistStatusUpdate
|
||||
)
|
||||
trackChangedSubscriptionRef.current = playlist.addListener(
|
||||
"trackChanged",
|
||||
handleTrackChanged
|
||||
)
|
||||
playlistRef.current = playlist
|
||||
return playlist
|
||||
},
|
||||
[handlePlaylistStatusUpdate, handleTrackChanged]
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false
|
||||
void setAudioModeAsync({
|
||||
playsInSilentMode: true,
|
||||
shouldPlayInBackground: true,
|
||||
interruptionMode: "doNotMix",
|
||||
}).catch(() => {
|
||||
if (!cancelled) {
|
||||
showError("Audio playback could not be initialized.")
|
||||
}
|
||||
})
|
||||
|
||||
return () => {
|
||||
cancelled = true
|
||||
destroyPlaylist()
|
||||
}
|
||||
}, [destroyPlaylist])
|
||||
|
||||
useEffect(() => {
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
}
|
||||
}, [repeatEnabled])
|
||||
|
||||
const setIsPlaying = useCallback(
|
||||
(playing: boolean) => {
|
||||
isPlayingRef.current = playing
|
||||
setIsPlayingState(playing)
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
if (playing) {
|
||||
startPlayer(playlist)
|
||||
} else {
|
||||
deferredPlayRef.current = false
|
||||
playlist.pause()
|
||||
}
|
||||
},
|
||||
[startPlayer]
|
||||
)
|
||||
|
||||
const seekTo = useCallback(
|
||||
async (seconds: number) => {
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
const maxDuration = playlist.duration || duration || 0
|
||||
const clamped = Math.max(0, Math.min(seconds, maxDuration))
|
||||
await playlist.seekTo(clamped)
|
||||
currentTimeRef.current = clamped
|
||||
setCurrentTime(clamped)
|
||||
},
|
||||
[duration]
|
||||
)
|
||||
|
||||
const handlePlaybackLoadFailure = useCallback(() => {
|
||||
autoPlayNextRef.current = false
|
||||
isPlayingRef.current = false
|
||||
destroyPlaylist()
|
||||
setIsPlayingState(false)
|
||||
showError("Could not play this track. The queue has been cleared.")
|
||||
storeRef.current.update(playbackQueue.clearQueue)
|
||||
}, [destroyPlaylist])
|
||||
|
||||
useEffect(() => {
|
||||
const loadRequestId = ++loadRequestIdRef.current
|
||||
const isCurrentLoad = () => loadRequestIdRef.current === loadRequestId
|
||||
|
||||
async function syncPlaylist() {
|
||||
if (!config || !currentSongId || !user) {
|
||||
if (!currentSongId) {
|
||||
destroyPlaylist()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const windowSongIds = nativePlaylistSongIds(
|
||||
queueHistorySongIds,
|
||||
queueSongIds
|
||||
)
|
||||
const currentIndex = queueHistorySongIds.length
|
||||
const cookieHeader = await getAuthCookieHeader(
|
||||
config.serverUrl,
|
||||
config.convexUrl
|
||||
)
|
||||
if (!cookieHeader) {
|
||||
showError("Your session has expired. Please sign in again.")
|
||||
return
|
||||
}
|
||||
if (!isCurrentLoad()) return
|
||||
|
||||
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
|
||||
const needsRebuild =
|
||||
loadedLoadKeyRef.current !== loadKey ||
|
||||
nativePlaylistNeedsRebuild(
|
||||
loadedSongIdsRef.current,
|
||||
queueHistorySongIds,
|
||||
queueSongIds
|
||||
)
|
||||
|
||||
const metadata = currentSong
|
||||
? lockScreenMetadata(currentSong, config.serverUrl)
|
||||
: null
|
||||
const shouldPlay = isPlayingRef.current || autoPlayNextRef.current
|
||||
|
||||
if (!needsRebuild) {
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
if (playlist.currentIndex !== currentIndex) {
|
||||
playlist.skipTo(currentIndex)
|
||||
}
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
if (metadata) {
|
||||
updatePlaylistLockScreenMetadata(playlist, metadata)
|
||||
}
|
||||
markSynced(playlist, currentSongId, currentIndex)
|
||||
if (shouldPlay) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
startPlayer(playlist)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const buildSources = async (songIds: Id<"songs">[]) => {
|
||||
const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
|
||||
const sources = new Map<Id<"songs">, AudioSource>()
|
||||
for (const song of songs) {
|
||||
if (!song) return null
|
||||
const plan = playbackStreamPlan(
|
||||
song.files,
|
||||
user.playbackQuality,
|
||||
atmosEnabled(user)
|
||||
)
|
||||
sources.set(
|
||||
song.id,
|
||||
songAudioSource(
|
||||
config.serverUrl,
|
||||
song.id,
|
||||
plan.playbackQuality,
|
||||
plan.preferAtmos,
|
||||
plan.useHls,
|
||||
{ cookieHeader, songTitle: song.title }
|
||||
)
|
||||
)
|
||||
}
|
||||
return sources
|
||||
}
|
||||
|
||||
// Queue and history edits around the playing track are applied in place
|
||||
// so playback isn't interrupted.
|
||||
const loadedPlaylist = playlistRef.current
|
||||
const edits =
|
||||
loadedPlaylist && loadedLoadKeyRef.current === loadKey
|
||||
? nativePlaylistEdits(
|
||||
loadedSongIdsRef.current,
|
||||
loadedPlaylist.currentIndex,
|
||||
windowSongIds,
|
||||
currentIndex
|
||||
)
|
||||
: null
|
||||
if (loadedPlaylist && edits) {
|
||||
const addedSongIds = edits.flatMap((edit) =>
|
||||
edit.type === "remove" ? [] : [edit.songId]
|
||||
)
|
||||
const sources = await buildSources([...new Set(addedSongIds)])
|
||||
if (!isCurrentLoad()) return
|
||||
if (!sources) {
|
||||
handlePlaybackLoadFailure()
|
||||
return
|
||||
}
|
||||
for (const edit of edits) {
|
||||
if (edit.type === "remove") {
|
||||
loadedPlaylist.remove(edit.index)
|
||||
} else if (edit.type === "insert") {
|
||||
loadedPlaylist.insert(sources.get(edit.songId)!, edit.index)
|
||||
} else {
|
||||
loadedPlaylist.add(sources.get(edit.songId)!)
|
||||
}
|
||||
}
|
||||
loadedSongIdsRef.current = windowSongIds
|
||||
loadedPlaylist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
markSynced(loadedPlaylist, currentSongId, currentIndex)
|
||||
if (shouldPlay && !loadedPlaylist.playing) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
startPlayer(loadedPlaylist)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const sourcesById = await buildSources(windowSongIds)
|
||||
if (!isCurrentLoad()) return
|
||||
if (!sourcesById) {
|
||||
handlePlaybackLoadFailure()
|
||||
return
|
||||
}
|
||||
const sources = windowSongIds.map((songId) => sourcesById.get(songId)!)
|
||||
|
||||
// Keep the position when only the stream settings changed.
|
||||
const resumeSeconds =
|
||||
loadedPlaylist &&
|
||||
loadedSongIdsRef.current[loadedPlaylist.currentIndex] === currentSongId
|
||||
? currentTimeRef.current
|
||||
: null
|
||||
|
||||
destroyPlaylist()
|
||||
|
||||
if (resumeSeconds !== null && resumeSeconds > 0) {
|
||||
pendingSeekRef.current = resumeSeconds
|
||||
}
|
||||
// Start at the current track and put history in front of it, so an
|
||||
// earlier song is never loaded first.
|
||||
const playlist = ensurePlaylist(sources.slice(currentIndex))
|
||||
for (let index = 0; index < currentIndex; index++) {
|
||||
playlist.insert(sources[index], index)
|
||||
}
|
||||
loadedSongIdsRef.current = windowSongIds
|
||||
loadedLoadKeyRef.current = loadKey
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
activatePlaylistLockScreen(
|
||||
playlist,
|
||||
metadata ?? { title: currentSong?.title }
|
||||
)
|
||||
markSynced(playlist, currentSongId, currentIndex)
|
||||
|
||||
if (shouldPlay) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
startPlayer(playlist)
|
||||
} else {
|
||||
playlist.pause()
|
||||
// Enable audio for the restored queue without starting playback.
|
||||
try {
|
||||
await setIsAudioActiveAsync(true)
|
||||
} catch {
|
||||
if (isCurrentLoad()) {
|
||||
showError("Audio playback could not be initialized.")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void syncPlaylist().catch(() => {
|
||||
if (!isCurrentLoad()) return
|
||||
handlePlaybackLoadFailure()
|
||||
})
|
||||
|
||||
return () => {
|
||||
if (loadRequestIdRef.current === loadRequestId) {
|
||||
loadRequestIdRef.current += 1
|
||||
}
|
||||
}
|
||||
}, [
|
||||
cacheScope,
|
||||
config,
|
||||
convex,
|
||||
currentSongId,
|
||||
currentSongSyncKey,
|
||||
destroyPlaylist,
|
||||
ensurePlaylist,
|
||||
handlePlaybackLoadFailure,
|
||||
historySyncKey,
|
||||
markSynced,
|
||||
queueSyncKey,
|
||||
queueStartVersion,
|
||||
repeatEnabled,
|
||||
startPlayer,
|
||||
userPlaybackKey,
|
||||
])
|
||||
|
||||
/**
|
||||
* Resolves once the native player has `songId` loaded (and playing or
|
||||
* paused, if given). Rejects if the queue moves to another song first.
|
||||
*/
|
||||
const waitForSong = useCallback(
|
||||
(songId: Id<"songs">, playing?: boolean) =>
|
||||
new Promise<void>((resolve, reject) => {
|
||||
const store = storeRef.current
|
||||
const waiters = waitersRef.current
|
||||
let songWaiters = waiters.get(songId)
|
||||
if (!songWaiters) {
|
||||
songWaiters = new Set()
|
||||
waiters.set(songId, songWaiters)
|
||||
}
|
||||
const finish = (error?: Error) => {
|
||||
clearTimeout(timeout)
|
||||
unsubscribe()
|
||||
songWaiters.delete(waiter)
|
||||
if (songWaiters.size === 0 && waiters.get(songId) === songWaiters) {
|
||||
waiters.delete(songId)
|
||||
}
|
||||
if (error) reject(error)
|
||||
else resolve()
|
||||
}
|
||||
const waiter: PlaybackWaiter = { playing, resolve: () => finish() }
|
||||
const timeout = setTimeout(
|
||||
() =>
|
||||
finish(
|
||||
new Error(
|
||||
"The audio did not become ready. Check your connection and try again."
|
||||
)
|
||||
),
|
||||
PLAYBACK_READY_TIMEOUT_MS
|
||||
)
|
||||
// Starting a queue clears it and fills it in one go; only the
|
||||
// settled queue counts.
|
||||
const unsubscribe = store.subscribe(() => {
|
||||
queueMicrotask(() => {
|
||||
if (store.getState().queue[0] !== songId) {
|
||||
finish(
|
||||
new Error(
|
||||
"The playback queue changed before the request finished."
|
||||
)
|
||||
)
|
||||
}
|
||||
})
|
||||
})
|
||||
songWaiters.add(waiter)
|
||||
settleWaiters()
|
||||
}),
|
||||
[settleWaiters]
|
||||
)
|
||||
|
||||
/**
|
||||
* Starts the current song at `seconds` once it loads, and shows that
|
||||
* position right away. Playback waits for the seek (see `startPlayer`).
|
||||
*/
|
||||
const queueSeek = useCallback((seconds: number) => {
|
||||
pendingSeekRef.current = seconds
|
||||
currentTimeRef.current = seconds
|
||||
setCurrentTime(seconds)
|
||||
}, [])
|
||||
|
||||
const hasPlayer = useCallback(() => playlistRef.current !== null, [])
|
||||
|
||||
const requestAutoPlay = useCallback(() => {
|
||||
autoPlayNextRef.current = true
|
||||
}, [])
|
||||
|
||||
return {
|
||||
isPlaying,
|
||||
setIsPlaying,
|
||||
currentTime,
|
||||
currentTimeRef,
|
||||
duration,
|
||||
seekTo,
|
||||
queueSeek,
|
||||
hasPlayer,
|
||||
requestAutoPlay,
|
||||
resetPosition,
|
||||
resetForNewQueue,
|
||||
waitForSong,
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
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])
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
|
||||
/**
|
||||
* Resolves `currentUser.image` to a loadable URI. Stored avatars come back as
|
||||
* paths on the oTunes web server; legacy ones are data URLs.
|
||||
*/
|
||||
export function useProfileImageUrl(image: string | undefined) {
|
||||
const { config } = useServerConfig()
|
||||
if (!image?.startsWith("/")) {
|
||||
return image
|
||||
}
|
||||
return config ? `${config.serverUrl.replace(/\/+$/, "")}${image}` : undefined
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
import { useMutation } from "convex/react"
|
||||
import { useCallback, useEffect, useRef, type RefObject } from "react"
|
||||
import { AppState } from "react-native"
|
||||
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { flushPersistentCache } from "@/lib/persistent-cache"
|
||||
|
||||
const PROGRESS_SAVE_INTERVAL_MS = 5000
|
||||
|
||||
/**
|
||||
* Restores the saved position when a song becomes current, and saves the
|
||||
* position while it plays, on pause, and when the app leaves the foreground.
|
||||
*/
|
||||
export function useProgressPersistence({
|
||||
store,
|
||||
currentSongId,
|
||||
isPlaying,
|
||||
queueStartVersion,
|
||||
currentTimeRef,
|
||||
hasPlayer,
|
||||
queueSeek,
|
||||
resetPosition,
|
||||
}: {
|
||||
store: PlaybackStore
|
||||
currentSongId: Id<"songs"> | null
|
||||
isPlaying: boolean
|
||||
queueStartVersion: number
|
||||
currentTimeRef: RefObject<number>
|
||||
hasPlayer: () => boolean
|
||||
queueSeek: (seconds: number) => void
|
||||
resetPosition: () => void
|
||||
}) {
|
||||
const updateSongProgressMutation = useMutation(
|
||||
api.playback.updateSongProgress
|
||||
)
|
||||
const storeRef = useRef(store)
|
||||
storeRef.current = store
|
||||
|
||||
const progressRestoredForSongRef = useRef<Id<"songs"> | null>(null)
|
||||
const lastSavedProgressRef = useRef(-1)
|
||||
const prevIsPlayingRef = useRef(false)
|
||||
|
||||
const saveProgress = useCallback(
|
||||
(seconds: number) => {
|
||||
const songId = storeRef.current.getState().queue[0]
|
||||
if (!songId) return
|
||||
const progressSeconds = Math.max(0, Math.floor(seconds))
|
||||
if (progressSeconds === lastSavedProgressRef.current) return
|
||||
lastSavedProgressRef.current = progressSeconds
|
||||
storeRef.current.setProgress(songId, progressSeconds)
|
||||
void updateSongProgressMutation({
|
||||
songId,
|
||||
progressSeconds,
|
||||
}).catch(() => {})
|
||||
},
|
||||
[updateSongProgressMutation]
|
||||
)
|
||||
|
||||
const resetProgress = useCallback(() => {
|
||||
progressRestoredForSongRef.current = null
|
||||
lastSavedProgressRef.current = -1
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
if (!currentSongId) {
|
||||
progressRestoredForSongRef.current = null
|
||||
return
|
||||
}
|
||||
|
||||
if (progressRestoredForSongRef.current === currentSongId) return
|
||||
progressRestoredForSongRef.current = currentSongId
|
||||
lastSavedProgressRef.current = -1
|
||||
resetPosition()
|
||||
// Queue the seek before the song loads, so playback starts there.
|
||||
const progressSeconds = store.getState().progressSeconds
|
||||
if (progressSeconds > 0) {
|
||||
queueSeek(progressSeconds)
|
||||
}
|
||||
}, [currentSongId, queueStartVersion, queueSeek, resetPosition, store])
|
||||
|
||||
useEffect(() => {
|
||||
if (!currentSongId) return
|
||||
if (prevIsPlayingRef.current === isPlaying) return
|
||||
prevIsPlayingRef.current = isPlaying
|
||||
saveProgress(currentTimeRef.current)
|
||||
}, [isPlaying, currentSongId, currentTimeRef, saveProgress])
|
||||
|
||||
useEffect(() => {
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") return
|
||||
if (currentSongId && hasPlayer()) {
|
||||
saveProgress(currentTimeRef.current)
|
||||
}
|
||||
flushPersistentCache()
|
||||
})
|
||||
return () => subscription.remove()
|
||||
}, [currentSongId, currentTimeRef, hasPlayer, saveProgress])
|
||||
|
||||
useEffect(() => {
|
||||
if (!isPlaying || !currentSongId) return
|
||||
const interval = setInterval(() => {
|
||||
saveProgress(currentTimeRef.current)
|
||||
}, PROGRESS_SAVE_INTERVAL_MS)
|
||||
return () => clearInterval(interval)
|
||||
}, [isPlaying, currentSongId, currentTimeRef, saveProgress])
|
||||
|
||||
return { resetProgress }
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
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
|
||||
}
|
||||
@@ -5,7 +5,6 @@ import { publishMusicCatalog } from "@/lib/app-intents"
|
||||
export const FAVORITES_PLAYLIST_ID = "otunes:favorites"
|
||||
|
||||
const HANDLED_KEY = "otunes:handled-app-intents"
|
||||
const CATALOG_CURSORS_KEY = "otunes:app-intent-catalog-cursors"
|
||||
const MAX_HANDLED = 200
|
||||
|
||||
const CATALOG_KINDS = [
|
||||
@@ -21,7 +20,6 @@ export async function clearAppIntentCatalogs() {
|
||||
return
|
||||
}
|
||||
const results = await Promise.allSettled([
|
||||
AsyncStorage.removeItem(CATALOG_CURSORS_KEY),
|
||||
AppIntents.deleteDonationsAsync({ intent: "playMusic" }),
|
||||
AppIntents.clearPendingInvocationsAsync(),
|
||||
...CATALOG_KINDS.map((kind) => publishMusicCatalog(kind, [])),
|
||||
@@ -30,39 +28,6 @@ export async function clearAppIntentCatalogs() {
|
||||
if (failed?.status === "rejected") throw failed.reason
|
||||
}
|
||||
|
||||
/**
|
||||
* Server `head` values the disk catalog is synced to, per library kind. A
|
||||
* missing kind means it has never synced and needs a full download.
|
||||
*/
|
||||
export type CatalogCursors = Partial<
|
||||
Record<"song" | "album" | "artist", number>
|
||||
>
|
||||
|
||||
/** Cursors for `scope`; another server or user's cursors read as empty. */
|
||||
export async function loadCatalogCursors(
|
||||
scope: string
|
||||
): Promise<CatalogCursors> {
|
||||
try {
|
||||
const raw = await AsyncStorage.getItem(CATALOG_CURSORS_KEY)
|
||||
const parsed = raw
|
||||
? (JSON.parse(raw) as { scope?: unknown; cursors?: CatalogCursors })
|
||||
: null
|
||||
return parsed?.scope === scope ? (parsed.cursors ?? {}) : {}
|
||||
} catch {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
|
||||
export async function saveCatalogCursors(
|
||||
scope: string,
|
||||
cursors: CatalogCursors
|
||||
) {
|
||||
await AsyncStorage.setItem(
|
||||
CATALOG_CURSORS_KEY,
|
||||
JSON.stringify({ scope, cursors })
|
||||
)
|
||||
}
|
||||
|
||||
export async function loadHandledIntentIds() {
|
||||
const raw = await AsyncStorage.getItem(HANDLED_KEY)
|
||||
if (!raw) {
|
||||
|
||||
@@ -50,13 +50,6 @@ export function publishMusicCatalog(kind: string, entities: AppIntentEntity[]) {
|
||||
return write
|
||||
}
|
||||
|
||||
/** The full disk catalog for `kind`, as last published. */
|
||||
export async function readMusicCatalog(kind: string) {
|
||||
await publishing.catch(() => undefined)
|
||||
if (!native || !AppIntents.isAvailable()) return []
|
||||
return JSON.parse(await native.catalogJSON(kind)) as AppIntentEntity[]
|
||||
}
|
||||
|
||||
export async function completeMusicInvocation(
|
||||
token: string,
|
||||
error: string | null
|
||||
|
||||
@@ -1,14 +1,7 @@
|
||||
import { useRouter, useSegments, type Href } from "expo-router"
|
||||
import { useCallback } from "react"
|
||||
|
||||
import { tabletSections } from "@/lib/tablet-navigation"
|
||||
|
||||
export const APP_TABS = [
|
||||
"home",
|
||||
"library",
|
||||
"search",
|
||||
...tabletSections.map((section) => section.group),
|
||||
] as const
|
||||
export const APP_TABS = ["home", "library", "search"] as const
|
||||
export type AppTab = (typeof APP_TABS)[number]
|
||||
|
||||
const TAB_SET = new Set<string>(APP_TABS)
|
||||
@@ -44,26 +37,20 @@ 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),
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage"
|
||||
import { useSyncExternalStore } from "react"
|
||||
|
||||
const STORAGE_KEY = "otunes:artwork-colors"
|
||||
const listeners = new Set<() => void>()
|
||||
// Undefined until storage has been read, so callers never act on a guess.
|
||||
let enabled: boolean | undefined
|
||||
let loading: Promise<void> | undefined
|
||||
|
||||
function notify() {
|
||||
for (const listener of listeners) listener()
|
||||
}
|
||||
|
||||
function load() {
|
||||
return (loading ??= AsyncStorage.getItem(STORAGE_KEY)
|
||||
.then((value) => value !== "false")
|
||||
// Keep the default when local storage is unavailable.
|
||||
.catch(() => true)
|
||||
.then((value) => {
|
||||
enabled = value
|
||||
notify()
|
||||
}))
|
||||
}
|
||||
|
||||
void load()
|
||||
|
||||
function subscribe(listener: () => void) {
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Device preference, kept outside account data and the disposable query cache.
|
||||
* `undefined` until it has loaded.
|
||||
*/
|
||||
export function useArtworkColorsEnabled() {
|
||||
return useSyncExternalStore(
|
||||
subscribe,
|
||||
() => enabled,
|
||||
() => undefined
|
||||
)
|
||||
}
|
||||
|
||||
/** Resolves with the preference once it has loaded. */
|
||||
export async function loadArtworkColorsEnabled() {
|
||||
await load()
|
||||
return enabled ?? true
|
||||
}
|
||||
|
||||
export async function setArtworkColorsEnabled(value: boolean) {
|
||||
await load()
|
||||
await AsyncStorage.setItem(STORAGE_KEY, String(value))
|
||||
enabled = value
|
||||
notify()
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
import { requireNativeModule } from "expo"
|
||||
|
||||
import { swatchesFromHistogram, type ColorBin } from "./color-histogram"
|
||||
|
||||
const native = requireNativeModule<{
|
||||
histogram(uri: string): Promise<ColorBin[]>
|
||||
}>("ArtworkColors")
|
||||
|
||||
export async function extractCoverSwatches(uri: string) {
|
||||
return swatchesFromHistogram(await native.histogram(uri))
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
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<CoverSwatches | null> {
|
||||
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 }
|
||||
: {}),
|
||||
}
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
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")
|
||||
})
|
||||
@@ -1,162 +0,0 @@
|
||||
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<Cluster>(([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,
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
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
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
// 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
|
||||
@@ -1,92 +0,0 @@
|
||||
[
|
||||
{
|
||||
"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"
|
||||
}
|
||||
]
|
||||
@@ -1,54 +0,0 @@
|
||||
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)
|
||||
})
|
||||
@@ -1,5 +1,4 @@
|
||||
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
|
||||
@@ -18,20 +17,33 @@ export type CoverPalette = {
|
||||
isDark: boolean
|
||||
}
|
||||
|
||||
/** Artwork measurements, cached before deriving the screen 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 CoverSwatches = {
|
||||
background: string
|
||||
average?: string
|
||||
dominantFraction?: number
|
||||
darkFraction?: number
|
||||
text: string[]
|
||||
accent: string[]
|
||||
}
|
||||
|
||||
type Rgb = [number, number, 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
|
||||
|
||||
export function themeCoverPalette(
|
||||
theme: ThemeColors,
|
||||
isDark: boolean
|
||||
): CoverPalette {
|
||||
type Rgb = [number, number, number]
|
||||
type Oklch = { l: number; c: number; h: number }
|
||||
|
||||
export function themeCoverPalette(theme: ThemeColors, isDark: boolean): CoverPalette {
|
||||
return {
|
||||
background: theme.background,
|
||||
foreground: theme.foreground,
|
||||
@@ -45,89 +57,240 @@ export function themeCoverPalette(
|
||||
}
|
||||
}
|
||||
|
||||
/** Dark artwork canvas derived from region coverage and perceptual color. */
|
||||
export function deriveCoverPalette(
|
||||
swatches: CoverSwatches
|
||||
swatches: CoverSwatches,
|
||||
schemeIsDark: boolean
|
||||
): 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)
|
||||
|
||||
// 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 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
|
||||
)
|
||||
let canvasChroma = Math.min(chroma * (1 + shadow), canvasLightness * 0.39)
|
||||
const textCandidates = sameSideText.length > 0 ? sameSideText : parsedText
|
||||
const fallbackText: Rgb = lightText ? [255, 255, 255] : [0, 0, 0]
|
||||
|
||||
// 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 foreground = withMinContrast(
|
||||
textCandidates[0] ?? fallbackText,
|
||||
background,
|
||||
PRIMARY_MIN_CONTRAST
|
||||
)
|
||||
canvasChroma *= Math.exp(-20 * shadow * disagreement)
|
||||
canvasChroma *= Math.max(
|
||||
0,
|
||||
1 - 2.5 * darkCoverage * (1 - coverage) * (1 - shadow)
|
||||
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
|
||||
)
|
||||
|
||||
// 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
|
||||
)
|
||||
const accent = pickAccent(swatches.accent, background) ?? foreground
|
||||
const accentForeground: Rgb = prefersLightText(accent)
|
||||
? [255, 255, 255]
|
||||
: [0, 0, 0]
|
||||
|
||||
return {
|
||||
background: toHex(background),
|
||||
foreground: "#FFFFFF",
|
||||
secondaryForeground: mixWhite(0.55),
|
||||
accent: "#FFFFFF",
|
||||
accentForeground: toHex(background),
|
||||
accentText: "#FFFFFF",
|
||||
surface: mixWhite(0.08),
|
||||
divider: mixWhite(0.12),
|
||||
isDark: true,
|
||||
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 clamp(value: number) {
|
||||
return Math.max(0, Math.min(1, value))
|
||||
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 parseHex(hex: string): Rgb | null {
|
||||
if (!/^#[0-9a-f]{6}$/i.test(hex)) return null
|
||||
const value = parseInt(hex.slice(1), 16)
|
||||
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((channel) => channel.toString(16).padStart(2, "0")).join("")}`
|
||||
return `#${color.map((c) => c.toString(16).padStart(2, "0")).join("")}`
|
||||
}
|
||||
@@ -1,266 +0,0 @@
|
||||
// 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("")}`
|
||||
}
|
||||
@@ -1,9 +1,40 @@
|
||||
import type { MediaShareTarget } from "@otunes/convex/client/media-links"
|
||||
export type MediaShareContext = (
|
||||
| { type: "album"; albumId: string }
|
||||
| { type: "song"; albumId: string; songId: string }
|
||||
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
|
||||
| { type: "artist"; artistId: string }
|
||||
) & { title: string }
|
||||
|
||||
export {
|
||||
mediaShareUrl,
|
||||
shouldShowShare,
|
||||
} from "@otunes/convex/client/media-links"
|
||||
export function shouldShowShare(
|
||||
share: MediaShareContext | undefined,
|
||||
selectedCount: number
|
||||
) {
|
||||
if (!share) {
|
||||
return false
|
||||
}
|
||||
if (share.type === "song") {
|
||||
return selectedCount === 1
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
/** A share target plus the title shown in the native share sheet. */
|
||||
export type MediaShareContext = MediaShareTarget & { title: string }
|
||||
export function mediaShareUrl(
|
||||
serverUrl: string,
|
||||
share: MediaShareContext
|
||||
): string {
|
||||
const origin = serverUrl.replace(/\/+$/, "")
|
||||
|
||||
switch (share.type) {
|
||||
case "album":
|
||||
return `${origin}/album/${share.albumId}`
|
||||
case "song":
|
||||
return `${origin}/album/${share.albumId}?s=${share.songId}`
|
||||
case "playlist":
|
||||
if (share.isFavorites) {
|
||||
return `${origin}/playlist/favorites`
|
||||
}
|
||||
return `${origin}/playlist/${share.playlistId}`
|
||||
case "artist":
|
||||
return `${origin}/artist/${share.artistId}`
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,6 @@ export function useStackScreenOptions(
|
||||
headerBackButtonDisplayMode: "minimal",
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
animation: "slide_from_right",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: theme.background },
|
||||
|
||||
@@ -2,8 +2,3 @@ import { Platform } from "react-native"
|
||||
|
||||
// Android Dolby decoder reports do not reliably indicate working Atmos playback.
|
||||
export const dolbyAtmosSupported = Platform.OS === "ios"
|
||||
|
||||
/** Whether to stream Atmos for this user: they opted in and the device can play it. */
|
||||
export function atmosEnabled(user: { preferAtmos?: boolean }) {
|
||||
return dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
}
|
||||
@@ -5,10 +5,8 @@ import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import {
|
||||
getCachedSong,
|
||||
getSongSnapshot,
|
||||
getSongsVersion,
|
||||
requestSongs,
|
||||
songFromSnapshot,
|
||||
subscribeSongs,
|
||||
} from "@otunes/convex/client/song-cache"
|
||||
import { isPersistentCacheLoaded } from "@/lib/persistent-cache"
|
||||
@@ -52,10 +50,12 @@ export function useSongs(songIds: readonly Id<"songs">[]) {
|
||||
*/
|
||||
export function useSong(songId: Id<"songs"> | null): BrowseSong | null {
|
||||
const convex = useConvex()
|
||||
// While the song is missing the snapshot is the cache version, so every
|
||||
// cache change re-renders and retries the fetch below.
|
||||
const snapshot = useSyncExternalStore(subscribeSongs, () =>
|
||||
getSongSnapshot(songId)
|
||||
songId ? (getCachedSong(songId) ?? getSongsVersion()) : null
|
||||
)
|
||||
const song = songFromSnapshot(snapshot)
|
||||
const song = typeof snapshot === "object" ? snapshot : null
|
||||
|
||||
useEffect(() => {
|
||||
if (songId && !song && isPersistentCacheLoaded()) {
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
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)
|
||||
@@ -1,14 +0,0 @@
|
||||
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)
|
||||
@@ -84,7 +84,6 @@ 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
|
||||
|
||||
+33
-11
@@ -1,11 +1,9 @@
|
||||
import {
|
||||
type PlaybackQuality,
|
||||
songHlsPlaylistPath,
|
||||
songPlayPath,
|
||||
} from "@otunes/convex/playback-stream"
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { Platform } from "react-native"
|
||||
import type { AudioSource } from "expo-audio"
|
||||
|
||||
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
|
||||
|
||||
export const coverImageSizes = [64, 128, 192, 256, 384, 512, 768, 1024] as const
|
||||
|
||||
export type CoverImageSize = (typeof coverImageSizes)[number]
|
||||
@@ -47,6 +45,33 @@ export function playlistCoverUrl(
|
||||
return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
|
||||
}
|
||||
|
||||
export function songPlayUrl(
|
||||
serverUrl: string,
|
||||
songId: string,
|
||||
quality: PlaybackQuality | undefined,
|
||||
preferAtmos: boolean | undefined
|
||||
) {
|
||||
const params = new URLSearchParams()
|
||||
if (Platform.OS === "ios") params.set("losslessFormat", "alac")
|
||||
if (quality) params.set("quality", quality)
|
||||
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
|
||||
const query = params.toString()
|
||||
return `${serverUrl}/api/song/${songId}/play${query ? `?${query}` : ""}`
|
||||
}
|
||||
|
||||
export function songHlsPlaylistUrl(
|
||||
serverUrl: string,
|
||||
songId: string,
|
||||
quality: PlaybackQuality | undefined,
|
||||
preferAtmos: boolean | undefined
|
||||
) {
|
||||
const params = new URLSearchParams()
|
||||
if (quality) params.set("quality", quality)
|
||||
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
|
||||
const query = params.toString()
|
||||
return `${serverUrl}/api/song/${songId}/play/hls${query ? `?${query}` : ""}`
|
||||
}
|
||||
|
||||
export function songAudioSource(
|
||||
serverUrl: string,
|
||||
songId: string,
|
||||
@@ -55,12 +80,9 @@ export function songAudioSource(
|
||||
useHls: boolean,
|
||||
options?: { cookieHeader?: string | null; songTitle?: string }
|
||||
): AudioSource {
|
||||
const path = useHls
|
||||
? songHlsPlaylistPath(songId, quality, preferAtmos)
|
||||
: songPlayPath(songId, quality, preferAtmos, {
|
||||
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
|
||||
})
|
||||
const uri = `${serverUrl}${path}`
|
||||
const uri = useHls
|
||||
? songHlsPlaylistUrl(serverUrl, songId, quality, preferAtmos)
|
||||
: songPlayUrl(serverUrl, songId, quality, preferAtmos)
|
||||
|
||||
const headers = options?.cookieHeader
|
||||
? { Cookie: options.cookieHeader }
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"platforms": ["apple"],
|
||||
"apple": { "modules": ["ArtworkColorsModule"] }
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
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
|
||||
Loaded 100 of 184 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user