Compare commits
62
Commits
No files matched your search
+5
-6
@@ -54,12 +54,11 @@ playwright.config.*
|
||||
*~
|
||||
*.log
|
||||
|
||||
# Environment variables (only commit template files)
|
||||
.env
|
||||
.env*.local
|
||||
.env.development
|
||||
.env.test
|
||||
.env.production.local
|
||||
# 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
|
||||
|
||||
# Docker configuration files (not needed inside build context)
|
||||
Dockerfile*
|
||||
|
||||
+6
-1
@@ -41,4 +41,9 @@ apps/web/next-env.d.ts
|
||||
/.convex
|
||||
/.cursor
|
||||
/database
|
||||
docker-compose.yml
|
||||
docker-compose.yml
|
||||
|
||||
**/credentials.json
|
||||
**/credentials/
|
||||
**/*.ipa
|
||||
**/*.apk
|
||||
+15
-18
@@ -25,20 +25,16 @@ FROM node:${NODE_VERSION} AS dependencies
|
||||
WORKDIR /app
|
||||
|
||||
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
|
||||
# Mobile is intentionally omitted so its deps are never installed.
|
||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
||||
# Mobile's manifest is never copied, so the workspace globs cannot discover it.
|
||||
# The workspace file must be the real one: its overrides and patches are
|
||||
# checked against the lockfile.
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
|
||||
# pnpm validates patches even when their packages are outside the install filter.
|
||||
COPY patches ./patches
|
||||
COPY apps/web/package.json ./apps/web/
|
||||
COPY packages/convex/package.json ./packages/convex/
|
||||
|
||||
# Explicit workspace — do not use apps/* so mobile cannot be discovered.
|
||||
RUN printf '%s\n' \
|
||||
'packages:' \
|
||||
' - "apps/web"' \
|
||||
' - "packages/convex"' \
|
||||
>> pnpm-workspace.yaml \
|
||||
&& printf '\n%s\n' \
|
||||
RUN printf '\n%s\n' \
|
||||
'supportedArchitectures.os=current' \
|
||||
'supportedArchitectures.cpu=current' \
|
||||
'supportedArchitectures.libc=current' \
|
||||
@@ -82,15 +78,11 @@ FROM node:${NODE_VERSION} AS convex-functions
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
|
||||
COPY patches ./patches
|
||||
COPY packages/convex/package.json ./packages/convex/
|
||||
|
||||
RUN printf '%s\n' \
|
||||
'packages:' \
|
||||
' - "packages/convex"' \
|
||||
> pnpm-workspace.yaml \
|
||||
&& printf '\n%s\n' \
|
||||
RUN printf '\n%s\n' \
|
||||
'supportedArchitectures.os=current' \
|
||||
'supportedArchitectures.cpu=current' \
|
||||
'supportedArchitectures.libc=current' \
|
||||
@@ -129,7 +121,7 @@ RUN curl -fsSL -o ffmpeg.tar.xz "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VER
|
||||
|
||||
# Decoders cover the library formats (FLAC, ALAC/AAC in m4a, MP3, Opus,
|
||||
# Vorbis, WavPack, WMA, E-AC-3/TrueHD for Atmos). Encoders are only the two
|
||||
# the app writes: AAC (HLS and ADTS) and FLAC.
|
||||
# the app writes: AAC (HLS, ADTS and .m4a downloads) and FLAC.
|
||||
RUN ./configure \
|
||||
--prefix=/opt/ffmpeg \
|
||||
--disable-shared \
|
||||
@@ -146,7 +138,7 @@ RUN ./configure \
|
||||
--enable-demuxer=aac,ac3,aiff,ape,asf,au,caf,dsf,flac,matroska,mov,mp3,ogg,wav,wv \
|
||||
--enable-decoder=aac,aac_latm,ac3,alac,ape,dsd_lsbf,dsd_msbf,eac3,flac,mlp,mp3,opus,pcm_f32le,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32be,pcm_s32le,pcm_u8,truehd,vorbis,wavpack,wmav1,wmav2 \
|
||||
--enable-encoder=aac,flac \
|
||||
--enable-muxer=adts,flac,hls,mpegts \
|
||||
--enable-muxer=adts,flac,hls,ipod,mpegts \
|
||||
--enable-parser=aac,aac_latm,ac3,flac,mpegaudio,opus,vorbis \
|
||||
--enable-bsf=aac_adtstoasc \
|
||||
--enable-filter=aresample,aformat \
|
||||
@@ -195,7 +187,12 @@ RUN node --version \
|
||||
&& ldd /convex/generate_key \
|
||||
&& ! ldd /convex/convex-local-backend /convex/generate_key | grep -q 'not found'
|
||||
|
||||
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes
|
||||
# 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
|
||||
|
||||
COPY --from=convex-functions /app /opt/otunes/convex
|
||||
COPY docker/generate-auth-keys.mjs /opt/otunes/generate-auth-keys.mjs
|
||||
|
||||
@@ -73,10 +73,15 @@ 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.
|
||||
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
|
||||
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
|
||||
raises pod deployment targets to the app's, and disables precompiled React
|
||||
Native and Expo modules so dependencies can compile for Catalyst. System volume
|
||||
stays under macOS control.
|
||||
|
||||
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
|
||||
same team. Handoff only pairs apps with a matching team and activity type, which
|
||||
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
|
||||
|
||||
To return a checkout to ordinary iOS builds, rerun prebuild without
|
||||
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
|
||||
@@ -4,7 +4,9 @@ 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. 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.
|
||||
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`.
|
||||
|
||||
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.
|
||||
|
||||
@@ -14,7 +16,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:
|
||||
|
||||
- `library.intentCatalogPage` supplies authenticated, paginated entity records.
|
||||
- `intentCatalog.head`, `intentCatalog.page` and `intentCatalog.playlists` supply the entity catalog. Library mutations record renames and deletions in `intentCatalogChanges`, pruned daily.
|
||||
- `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.
|
||||
|
||||
|
||||
@@ -26,10 +26,19 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
production: "oTunes",
|
||||
}[variant]
|
||||
|
||||
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
|
||||
|
||||
return {
|
||||
...config,
|
||||
plugins: [
|
||||
...(config.plugins ?? []),
|
||||
[
|
||||
"react-native-continued-task",
|
||||
{
|
||||
// Matches TASK_PREFIX in hooks/use-background-downloads.ts.
|
||||
identifierPrefixes: [`${bundleIdentifier}.downloads`],
|
||||
},
|
||||
],
|
||||
...(process.env.MAC_CATALYST === "1"
|
||||
? ["./plugins/with-mac-catalyst"]
|
||||
: []),
|
||||
@@ -40,11 +49,12 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
icon: `./assets/icon${iconSuffix}.png`,
|
||||
ios: {
|
||||
...config.ios,
|
||||
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
||||
bundleIdentifier,
|
||||
icon: `./assets/${composer}.icon`,
|
||||
infoPlist: {
|
||||
...config.ios?.infoPlist,
|
||||
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
|
||||
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
|
||||
NSUserActivityTypes: [`${bundleIdentifier}.media`],
|
||||
},
|
||||
},
|
||||
android: {
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
"expo-status-bar",
|
||||
"expo-app-intents",
|
||||
"./plugins/with-android-colors",
|
||||
"./plugins/with-android-fast-fade",
|
||||
[
|
||||
"expo-navigation-bar",
|
||||
{
|
||||
|
||||
-1
@@ -1 +0,0 @@
|
||||
export { default } from "../library/queue"
|
||||
+13
-10
@@ -1,5 +1,6 @@
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
|
||||
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
@@ -10,16 +11,18 @@ export default function TabletSectionLayout({ segment }: { segment: string }) {
|
||||
|
||||
return (
|
||||
<TabletSectionContext value={section}>
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...options,
|
||||
title:
|
||||
route.name === "index"
|
||||
? section?.title
|
||||
: tabStackScreenTitles[route.name],
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value={section?.group}>
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...options,
|
||||
title:
|
||||
route.name === "index"
|
||||
? section?.title
|
||||
: tabStackScreenTitles[route.name],
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
</TabletSectionContext>
|
||||
)
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads"
|
||||
+1
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
+2
@@ -5,6 +5,7 @@ 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 Downloads from "../home/downloads"
|
||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
|
||||
const screens = {
|
||||
@@ -14,6 +15,7 @@ const screens = {
|
||||
playlists: Playlists,
|
||||
favorites: Favorites,
|
||||
recent: RecentlyPlayed,
|
||||
downloads: Downloads,
|
||||
}
|
||||
|
||||
export default function TabletSectionScreen() {
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
|
||||
import {
|
||||
ScreenPaletteProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidNativeTabColors,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
useTabletBackgroundStyle,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
@@ -46,12 +46,13 @@ function useRouterTheme() {
|
||||
}
|
||||
|
||||
function useNativeTabColors() {
|
||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||
const selectedColor = colors.dark.primary
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = colors.dark
|
||||
const artworkPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const selectedColor = hasArtworkPalette
|
||||
? androidPalette.foreground
|
||||
: androidPalette.accentText
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -61,14 +62,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 +86,17 @@ 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 backgroundStyle = useTabletBackgroundStyle()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||
|
||||
@@ -129,7 +127,9 @@ function TabsContent() {
|
||||
tintColor={tabColors.tintColor}
|
||||
minimizeBehavior="onScrollDown"
|
||||
{...(Platform.OS === "android"
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
? // A new ripple color rebuilds Material's item backgrounds and
|
||||
// cuts off the in-flight ripple, so it must not follow the palette.
|
||||
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||
@@ -140,9 +140,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? homeColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -152,9 +149,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? libraryColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -169,9 +163,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? searchColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -202,6 +193,14 @@ function TabsContent() {
|
||||
<NativeTabs.Trigger.Icon sf="music.note" />
|
||||
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(downloads)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="arrow.down.circle" />
|
||||
<NativeTabs.Trigger.Label>Downloads</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(playlists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
@@ -12,24 +13,26 @@ export default function HomeLayout() {
|
||||
const baseOptions = useStackScreenOptions({ title: "Home" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value="home">
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
)
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import {
|
||||
useSwipeRowGroup,
|
||||
@@ -7,21 +8,13 @@ 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 { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link, 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 { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
@@ -29,13 +22,25 @@ import {
|
||||
DiscHeader,
|
||||
} from "@/components/collection-list"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import {
|
||||
CollectionDownloadButton,
|
||||
DownloadedQuality,
|
||||
} from "@/components/collection-download-button"
|
||||
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import {
|
||||
useDownloads,
|
||||
useIsCollectionDownloaded,
|
||||
useSongDownloadState,
|
||||
useToggleSongDownload,
|
||||
} from "@/contexts/downloads"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import {
|
||||
MediaActionMenu,
|
||||
MediaContextMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-actions-sheet"
|
||||
} from "@/components/media-context-menu"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
@@ -65,9 +70,18 @@ export default function AlbumScreen() {
|
||||
api.library.browseAlbumDetail,
|
||||
typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
|
||||
)
|
||||
const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
|
||||
useFavorites()
|
||||
const {
|
||||
playAlbum,
|
||||
playAlbumShuffled,
|
||||
playFromSong,
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
} = usePlaybackActions()
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`album:${id}`)
|
||||
: `album:${id}`
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const {
|
||||
handleAlbumDetailAction,
|
||||
handleAlbumTrackAction,
|
||||
@@ -88,20 +102,17 @@ export default function AlbumScreen() {
|
||||
() => 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 { requestDownload, removeDownload } = useDownloads()
|
||||
const downloadTarget = useMemo(
|
||||
() => ({
|
||||
kind: "album" as const,
|
||||
id: typeof id === "string" ? id : "",
|
||||
title: album?.title ?? "",
|
||||
songIds,
|
||||
}),
|
||||
[album?.title, id, songIds]
|
||||
)
|
||||
const hasLossless =
|
||||
album?.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album?.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
const albumDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
@@ -111,6 +122,12 @@ export default function AlbumScreen() {
|
||||
|
||||
const listItems = useMemo(() => albumListItems(album?.tracks ?? []), [album])
|
||||
|
||||
const playTrack = useCallback(
|
||||
(songId: Id<"songs">, ids: Id<"songs">[]) =>
|
||||
playFromSong(songId, ids, playOrigin),
|
||||
[playOrigin, playFromSong]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
({ item }: { item: AlbumListItem }) => {
|
||||
if (item.type === "disc") {
|
||||
@@ -125,9 +142,7 @@ export default function AlbumScreen() {
|
||||
songIds={songIds}
|
||||
palette={palette}
|
||||
favorited={isSongFavorite(item.track.id)}
|
||||
onPlay={(songId, ids) =>
|
||||
playFromSong(songId, ids, `album:${album.id}`)
|
||||
}
|
||||
onPlay={playTrack}
|
||||
onAction={handleAlbumTrackAction}
|
||||
/>
|
||||
) : null
|
||||
@@ -137,7 +152,7 @@ export default function AlbumScreen() {
|
||||
handleAlbumTrackAction,
|
||||
isSongFavorite,
|
||||
palette,
|
||||
playFromSong,
|
||||
playTrack,
|
||||
songIds,
|
||||
swipeGroup,
|
||||
]
|
||||
@@ -152,17 +167,14 @@ export default function AlbumScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={220}
|
||||
variant="album"
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -183,16 +195,15 @@ 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>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const metadata = formatMetadata(album.genre, album.year)
|
||||
const favorited = isAlbumFavorite(album.id)
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -206,10 +217,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),
|
||||
@@ -220,22 +228,28 @@ export default function AlbumScreen() {
|
||||
stationArtistId={album.artist.id}
|
||||
selectedCount={album.tracks.length}
|
||||
favorited={isAlbumFav(album.id)}
|
||||
downloaded={albumDownloaded}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
onAction={(action) =>
|
||||
void handleAlbumDetailAction(
|
||||
album.id as Id<"albums">,
|
||||
songIds,
|
||||
action,
|
||||
album.artist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
onAction={(action) => {
|
||||
if (action === "download") {
|
||||
void requestDownload(downloadTarget)
|
||||
} else if (action === "remove-download") {
|
||||
void removeDownload(downloadTarget)
|
||||
} else {
|
||||
void handleAlbumDetailAction(
|
||||
album.id as Id<"albums">,
|
||||
songIds,
|
||||
action,
|
||||
album.artist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -286,52 +300,51 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() =>
|
||||
void (fromDownloads
|
||||
? playShuffled(songIds, playOrigin)
|
||||
: playAlbumShuffled(album.id, songIds))
|
||||
}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={favorited ? "accent" : "foreground"}
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
<Ionicons
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
onPress={() =>
|
||||
void (fromDownloads
|
||||
? playInOrder(songIds, playOrigin)
|
||||
: 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)}
|
||||
<CollectionDownloadButton
|
||||
target={downloadTarget}
|
||||
color={palette.foreground}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
/>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -339,13 +352,12 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<PaletteText
|
||||
tone="accentText"
|
||||
<Text
|
||||
style={[
|
||||
styles.artist,
|
||||
heroLayout.landscape && styles.artistLandscape,
|
||||
@@ -353,7 +365,7 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.artist.name}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
@@ -367,43 +379,32 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
{hasLossless ? (
|
||||
{album.hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{hasAtmos ? (
|
||||
{album.hasAtmos ? (
|
||||
<>
|
||||
{metadata || hasLossless ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{metadata || album.hasLossless ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
@@ -411,6 +412,11 @@ export default function AlbumScreen() {
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
<DownloadedQuality
|
||||
collection={downloadTarget}
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</CollectionHero>
|
||||
</MusicEntityView>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
@@ -488,8 +494,15 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
action: MediaAction
|
||||
) => Promise<void>
|
||||
}) {
|
||||
const Row = Platform.OS === "ios" ? SongSwipeRow : Pressable
|
||||
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
const downloadRef = useMemo(
|
||||
() => ({ kind: "album" as const, id: album.id }),
|
||||
[album.id]
|
||||
)
|
||||
const downloadState = useSongDownloadState(track.id, downloadRef)
|
||||
const downloaded = downloadState === "here"
|
||||
const toggleDownload = useToggleSongDownload()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={
|
||||
@@ -506,6 +519,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
}
|
||||
stationArtistId={album.artist.id}
|
||||
favorited={favorited}
|
||||
downloaded={downloaded}
|
||||
navigation={{
|
||||
artist: { id: album.artist.id },
|
||||
album: { id: album.id },
|
||||
@@ -523,15 +537,17 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
group={swipeGroup}
|
||||
backgroundColor={palette.background}
|
||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||
onAddToQueue={() => void onAction(track, album, "play-last")}
|
||||
downloaded={downloaded}
|
||||
onDownload={() => toggleDownload(track, downloaded, downloadRef)}
|
||||
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,
|
||||
@@ -539,29 +555,32 @@ 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 }}
|
||||
>
|
||||
{downloaded || downloadState === "device" ? (
|
||||
<Ionicons
|
||||
name="arrow-down-circle"
|
||||
size={14}
|
||||
color={palette.secondaryForeground}
|
||||
accessibilityLabel="Downloaded"
|
||||
/>
|
||||
) : null}
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</Row>
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -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-actions-sheet"
|
||||
import { MediaActionMenu } from "@/components/media-context-menu"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
|
||||
headerLargeTitle: false,
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton round />
|
||||
<CollectionDetailSkeleton variant="artist" />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,176 @@
|
||||
import { useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { tabContentBottomInset } from "@/components/player"
|
||||
import {
|
||||
FAVORITES_DOWNLOAD_ID,
|
||||
useDownloads,
|
||||
useDownloadsVersion,
|
||||
} from "@/contexts/downloads"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import {
|
||||
FROM_DOWNLOADS_PARAM,
|
||||
OTHER_DOWNLOADS_TITLE,
|
||||
} from "@/lib/downloads-navigation"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||
import type { DownloadedCollection } from "@otunes/convex/client/download-queue"
|
||||
import { formatBytes } from "@otunes/convex/download-quality"
|
||||
|
||||
type Card =
|
||||
| { kind: "other"; songCount: number; bytes: number }
|
||||
| { kind: "collection"; collection: DownloadedCollection; bytes: number }
|
||||
|
||||
function songCount(count: number) {
|
||||
return count === 1 ? "1 song" : `${count} songs`
|
||||
}
|
||||
|
||||
function collectionPath({ kind, id }: DownloadedCollection) {
|
||||
if (kind === "album") return `/album/${id}?${FROM_DOWNLOADS_PARAM}`
|
||||
if (id === FAVORITES_DOWNLOAD_ID) {
|
||||
return `/playlist/favorites?${FROM_DOWNLOADS_PARAM}`
|
||||
}
|
||||
return `/playlist/${id}?${FROM_DOWNLOADS_PARAM}`
|
||||
}
|
||||
|
||||
/** Downloaded albums and playlists, newest first, after Other Downloaded Songs. */
|
||||
export default function DownloadsScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const { queue } = useDownloads()
|
||||
const version = useDownloadsVersion()
|
||||
const { push } = useAppNavigation()
|
||||
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
|
||||
useMediaGridLayout()
|
||||
|
||||
const cards = useMemo<Card[]>(() => {
|
||||
if (!queue) return []
|
||||
const breakdown = queue.breakdown()
|
||||
const bytesByCollection = new Map(
|
||||
breakdown.collections.map((row) => [row.collection, row.bytes])
|
||||
)
|
||||
const other: Card[] =
|
||||
breakdown.otherSongs.songIds.length > 0
|
||||
? [
|
||||
{
|
||||
kind: "other",
|
||||
songCount: breakdown.otherSongs.songIds.length,
|
||||
bytes: breakdown.otherSongs.bytes,
|
||||
},
|
||||
]
|
||||
: []
|
||||
return [
|
||||
...other,
|
||||
...queue
|
||||
.collections()
|
||||
.reverse()
|
||||
.map((collection): Card => ({
|
||||
kind: "collection",
|
||||
collection,
|
||||
bytes: bytesByCollection.get(collection) ?? 0,
|
||||
})),
|
||||
]
|
||||
// version invalidates the lookup when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [queue, version])
|
||||
|
||||
function renderItem({ item }: ListRenderItemInfo<Card>) {
|
||||
if (!config) return null
|
||||
const isOther = item.kind === "other"
|
||||
const collection = isOther ? null : item.collection
|
||||
const isFavorites = collection?.id === FAVORITES_DOWNLOAD_ID
|
||||
const title = collection?.title ?? OTHER_DOWNLOADS_TITLE
|
||||
const subtitle = isOther
|
||||
? `${songCount(item.songCount)} · ${formatBytes(item.bytes)}`
|
||||
: `${collection!.kind === "album" ? "Album" : "Playlist"} · ${formatBytes(item.bytes)}`
|
||||
const coverUri = !collection
|
||||
? ""
|
||||
: collection.kind === "album"
|
||||
? albumCoverUrl(config.serverUrl, collection.id)
|
||||
: playlistCoverUrl(config.serverUrl, collection.id, null)
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
style={[styles.card, { width: cardWidth }]}
|
||||
onPress={() =>
|
||||
push(collection ? collectionPath(collection) : "/downloads/other")
|
||||
}
|
||||
>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={collection !== null && !isFavorites}
|
||||
placeholderIcon={isOther ? "arrow-down" : "star"}
|
||||
style={{
|
||||
width: cardWidth,
|
||||
height: cardWidth,
|
||||
borderRadius: radius.md,
|
||||
}}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{subtitle}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={{ title: "Downloads", headerLargeTitle: true }} />
|
||||
<FlatList
|
||||
key={columns}
|
||||
onLayout={onLayout}
|
||||
data={cards}
|
||||
keyExtractor={(card) =>
|
||||
card.kind === "other"
|
||||
? "other"
|
||||
: `${card.collection.kind}:${card.collection.id}`
|
||||
}
|
||||
renderItem={renderItem}
|
||||
numColumns={columns}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: spacing.lg,
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingBottom: tabContentBottomInset,
|
||||
gap,
|
||||
}}
|
||||
columnWrapperStyle={columns > 1 ? { gap } : undefined}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListEmptyComponent={
|
||||
<View style={styles.empty}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Nothing downloaded on this device.
|
||||
</Text>
|
||||
</View>
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
card: { gap: spacing.xs },
|
||||
title: { fontSize: 14, fontWeight: "600" },
|
||||
subtitle: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||
empty: { alignItems: "center", paddingTop: spacing.xl },
|
||||
})
|
||||
@@ -0,0 +1,153 @@
|
||||
import { useCallback, useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { useSwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
import type { MediaAction } from "@/components/media-context-menu"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { OTHER_DOWNLOADS_TITLE } from "@/lib/downloads-navigation"
|
||||
import { longListProps } from "@/lib/list"
|
||||
import { useSongs } from "@/lib/song-cache"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
const PLAY_ORIGIN = downloadsQueueOrigin("other")
|
||||
|
||||
/** Songs downloaded on their own. Playback here always uses the downloads. */
|
||||
export default function OtherDownloadsScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { queue } = useDownloads()
|
||||
const version = useDownloadsVersion()
|
||||
const songIds = useMemo(
|
||||
() =>
|
||||
(queue?.otherSongIds() ?? [])
|
||||
.filter((songId) => queue?.getDownloaded(songId))
|
||||
.reverse() as Id<"songs">[],
|
||||
// version invalidates the lookup when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[queue, version]
|
||||
)
|
||||
const cachedSongs = useSongs(songIds)
|
||||
const songs = useMemo(
|
||||
() => cachedSongs.filter((song): song is BrowseSong => song != null),
|
||||
[cachedSongs]
|
||||
)
|
||||
const playableIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { playFromSong, playInOrder, playShuffled } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, playableIds, PLAY_ORIGIN),
|
||||
[playFromSong, playableIds]
|
||||
)
|
||||
const handleAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action, "other"),
|
||||
[handleSongAction]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
({ item: song }: ListRenderItemInfo<BrowseSong>) => (
|
||||
<SongListRow
|
||||
song={song}
|
||||
favorited={isSongFavorite(song.id)}
|
||||
downloadFrom="other"
|
||||
swipe={{
|
||||
group: swipeGroup,
|
||||
backgroundColor: colors.background,
|
||||
onPlayNext: () => handleAction(song, "play-next"),
|
||||
onAddToQueue: () => handleAction(song, "play-last"),
|
||||
}}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleAction}
|
||||
/>
|
||||
),
|
||||
[
|
||||
colors.background,
|
||||
handleAction,
|
||||
handlePlaySong,
|
||||
isSongFavorite,
|
||||
swipeGroup,
|
||||
]
|
||||
)
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{ title: OTHER_DOWNLOADS_TITLE, headerLargeTitle: false }}
|
||||
/>
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
data={songs}
|
||||
keyExtractor={(song) => song.id}
|
||||
renderItem={renderItem}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListHeaderComponent={
|
||||
songs.length > 0 ? (
|
||||
<View style={styles.actions}>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
|
||||
style={[styles.iconAction, { backgroundColor: colors.muted }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
|
||||
style={styles.playButton}
|
||||
/>
|
||||
</View>
|
||||
) : undefined
|
||||
}
|
||||
ListEmptyComponent={
|
||||
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
|
||||
Songs you download on their own appear here.
|
||||
</Text>
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
playButton: { borderRadius: 999, minWidth: 160 },
|
||||
iconAction: {
|
||||
width: 44,
|
||||
height: 44,
|
||||
borderRadius: 22,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
empty: { padding: spacing.lg, textAlign: "center" },
|
||||
})
|
||||
@@ -62,7 +62,10 @@ export default function HomeScreen() {
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
|
||||
contentContainerStyle={[
|
||||
styles.content,
|
||||
{ paddingBottom: tabContentBottomInset },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
>
|
||||
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
|
||||
|
||||
@@ -1,21 +1,14 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
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 { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
@@ -31,6 +24,7 @@ import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
@@ -46,10 +40,23 @@ import {
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-actions-sheet"
|
||||
} from "@/components/media-context-menu"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import {
|
||||
CollectionDownloadButton,
|
||||
type CollectionDownloadTarget,
|
||||
DownloadedQuality,
|
||||
} from "@/components/collection-download-button"
|
||||
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import type { CollectionRef } from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
FAVORITES_DOWNLOAD_ID,
|
||||
useDownloads,
|
||||
useIsCollectionDownloaded,
|
||||
} from "@/contexts/downloads"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
@@ -74,6 +81,7 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
|
||||
"play-last",
|
||||
"shuffle",
|
||||
"favorite",
|
||||
"change-cover",
|
||||
"delete-playlist",
|
||||
]
|
||||
|
||||
@@ -89,7 +97,11 @@ export default function PlaylistScreen() {
|
||||
const songs = playlist?.songs
|
||||
const coverUri =
|
||||
config && playlistId
|
||||
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
|
||||
? playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist?.id ?? playlistId,
|
||||
playlist?.cover ?? null
|
||||
)
|
||||
: ""
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
@@ -111,17 +123,14 @@ export default function PlaylistScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={200}
|
||||
variant="playlist"
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -142,9 +151,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>
|
||||
</>
|
||||
)
|
||||
@@ -179,10 +188,18 @@ function PlaylistContent({
|
||||
}) {
|
||||
const router = useRouter()
|
||||
const isFocused = useIsFocused()
|
||||
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
||||
usePlaybackActions()
|
||||
const colors = useThemeColors()
|
||||
const {
|
||||
playPlaylist,
|
||||
playPlaylistShuffled,
|
||||
playFromSong,
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
} = usePlaybackActions()
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const subscribe = useMutation(api.playlists.subscribeToPlaylist)
|
||||
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
|
||||
const deletePlaylist = useMutation(api.playlists.deletePlaylist)
|
||||
@@ -195,17 +212,25 @@ function PlaylistContent({
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const downloadRef = useMemo(
|
||||
() => ({
|
||||
kind: "playlist" as const,
|
||||
id: playlistId ?? FAVORITES_DOWNLOAD_ID,
|
||||
}),
|
||||
[playlistId]
|
||||
)
|
||||
const downloadTarget = useMemo(
|
||||
() => ({ ...downloadRef, title: playlist.title, songIds }),
|
||||
[downloadRef, playlist.title, songIds]
|
||||
)
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
|
||||
: `playlist:${playlistId}`
|
||||
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) =>
|
||||
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
|
||||
[playFromSong, songIds, playlistId]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action),
|
||||
[handleSongAction]
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||
[playFromSong, songIds, playOrigin]
|
||||
)
|
||||
|
||||
const handleRemoveSong = useCallback(
|
||||
@@ -226,13 +251,37 @@ function PlaylistContent({
|
||||
[playlistId, removeSongs]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) => {
|
||||
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
|
||||
else void handleSongAction(song, action, downloadRef)
|
||||
},
|
||||
[downloadRef, handleRemoveSong, handleSongAction]
|
||||
)
|
||||
|
||||
const handlePlay = useCallback(() => {
|
||||
if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [playPlaylist, playlistId, songIds])
|
||||
if (fromDownloads) void playInOrder(songIds, playOrigin)
|
||||
else if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [
|
||||
fromDownloads,
|
||||
playInOrder,
|
||||
playOrigin,
|
||||
playPlaylist,
|
||||
playlistId,
|
||||
songIds,
|
||||
])
|
||||
|
||||
const handleShuffle = useCallback(() => {
|
||||
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||
}, [playPlaylistShuffled, playlistId, songIds])
|
||||
if (fromDownloads) void playShuffled(songIds, playOrigin)
|
||||
else if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||
}, [
|
||||
fromDownloads,
|
||||
playShuffled,
|
||||
playOrigin,
|
||||
playPlaylistShuffled,
|
||||
playlistId,
|
||||
songIds,
|
||||
])
|
||||
|
||||
const handleSubscribeToggle = useCallback(async () => {
|
||||
if (!playlistId) return
|
||||
@@ -267,6 +316,23 @@ function PlaylistContent({
|
||||
void handleDelete()
|
||||
return
|
||||
}
|
||||
if (action === "change-cover") {
|
||||
if (playlistId) {
|
||||
router.push({
|
||||
pathname: "/playlist-cover",
|
||||
params: { id: playlistId },
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
if (action === "download") {
|
||||
void requestDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
if (action === "remove-download") {
|
||||
void removeDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
|
||||
void handlePlaylistDetailAction(songIds, action)
|
||||
}
|
||||
@@ -277,10 +343,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),
|
||||
@@ -290,6 +353,7 @@ function PlaylistContent({
|
||||
<MediaActionMenu
|
||||
selectedCount={songIds.length}
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
downloaded={playlistDownloaded}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlistId ?? "favorites",
|
||||
@@ -299,11 +363,10 @@ function PlaylistContent({
|
||||
onAction={handlePlaylistMenuAction}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -311,10 +374,14 @@ function PlaylistContent({
|
||||
}
|
||||
}, [
|
||||
canEdit,
|
||||
colors.foreground,
|
||||
deletePlaylist,
|
||||
downloadTarget,
|
||||
playlistDownloaded,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
playlist?.title,
|
||||
@@ -330,6 +397,7 @@ function PlaylistContent({
|
||||
removable={canEdit}
|
||||
palette={palette}
|
||||
swipeGroup={swipeGroup}
|
||||
downloadRef={downloadRef}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleSongMenuAction}
|
||||
onRemove={handleRemoveSong}
|
||||
@@ -337,6 +405,7 @@ function PlaylistContent({
|
||||
),
|
||||
[
|
||||
canEdit,
|
||||
downloadRef,
|
||||
handlePlaySong,
|
||||
handleRemoveSong,
|
||||
handleSongMenuAction,
|
||||
@@ -371,15 +440,14 @@ function PlaylistContent({
|
||||
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
|
||||
@@ -392,6 +460,7 @@ function PlaylistContent({
|
||||
isSubscribed={isSubscribed}
|
||||
showSubscribe={!playlist.isOwner && playlistId !== null}
|
||||
onSubscribeToggle={handleSubscribeToggle}
|
||||
downloadTarget={downloadTarget}
|
||||
onPlay={handlePlay}
|
||||
onShuffle={handleShuffle}
|
||||
/>
|
||||
@@ -411,6 +480,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
removable,
|
||||
palette,
|
||||
swipeGroup,
|
||||
downloadRef,
|
||||
onPlay,
|
||||
onAction,
|
||||
onRemove,
|
||||
@@ -420,6 +490,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
removable: boolean
|
||||
palette: CoverPalette
|
||||
swipeGroup: SwipeRowGroup
|
||||
downloadRef: CollectionRef
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
onRemove: (songId: Id<"songs">) => Promise<boolean>
|
||||
@@ -433,12 +504,16 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
palette={palette}
|
||||
inset
|
||||
removable={removable}
|
||||
downloadFrom={downloadRef}
|
||||
swipe={
|
||||
Platform.OS === "ios"
|
||||
Platform.OS !== "web"
|
||||
? {
|
||||
group: swipeGroup,
|
||||
backgroundColor: palette.background,
|
||||
onPlayNext: () => onAction(song, "play-next"),
|
||||
onAddToQueue: () => onAction(song, "play-last"),
|
||||
onRemove: removable ? () => void handleRemove() : undefined,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
@@ -447,7 +522,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
/>
|
||||
)
|
||||
|
||||
if (Platform.OS === "ios" || !removable) {
|
||||
if (Platform.OS !== "web" || !removable) {
|
||||
return row
|
||||
}
|
||||
|
||||
@@ -469,19 +544,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>
|
||||
)}
|
||||
>
|
||||
@@ -500,9 +571,11 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
isSubscribed,
|
||||
showSubscribe = false,
|
||||
onSubscribeToggle,
|
||||
downloadTarget,
|
||||
onPlay,
|
||||
onShuffle,
|
||||
}: {
|
||||
downloadTarget: CollectionDownloadTarget
|
||||
entityId: string
|
||||
coverUri: string
|
||||
hasCover: boolean
|
||||
@@ -561,8 +634,7 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||
<Ionicons
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={
|
||||
@@ -571,6 +643,15 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
@@ -581,25 +662,15 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
<CollectionDownloadButton
|
||||
target={downloadTarget}
|
||||
color={palette.foreground}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
/>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -607,16 +678,20 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
</Text>
|
||||
<Text
|
||||
style={{
|
||||
color: palette.foreground,
|
||||
fontSize: heroLayout.landscape ? 22 : 16,
|
||||
}}
|
||||
>
|
||||
{ownerName}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
<DownloadedQuality
|
||||
collection={downloadTarget}
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</CollectionHero>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -16,6 +16,14 @@ import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import {
|
||||
CollectionDownloadButton,
|
||||
type CollectionDownloadTarget,
|
||||
DownloadedQuality,
|
||||
} from "@/components/collection-download-button"
|
||||
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import { FAVORITES_DOWNLOAD_ID } from "@/contexts/downloads"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
@@ -31,39 +39,52 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
|
||||
const DOWNLOAD_REF = { kind: "playlist", id: FAVORITES_DOWNLOAD_ID } as const
|
||||
|
||||
export default function FavoritesScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
|
||||
const songs = favorites?.songs ?? []
|
||||
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
|
||||
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin("playlist:favorites")
|
||||
: undefined
|
||||
const downloadTarget = useMemo(
|
||||
() => ({
|
||||
...DOWNLOAD_REF,
|
||||
title: favorites?.title ?? "Favorites",
|
||||
songIds,
|
||||
}),
|
||||
[favorites?.title, songIds]
|
||||
)
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
|
||||
useEffect(() => {
|
||||
if (favorites) rememberSongs(favorites.songs)
|
||||
}, [favorites])
|
||||
rememberSongs(songs)
|
||||
}, [songs])
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
[playFromSong, songIds]
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||
[playFromSong, playOrigin, songIds]
|
||||
)
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action),
|
||||
void handleSongAction(song, action, DOWNLOAD_REF),
|
||||
[handleSongAction]
|
||||
)
|
||||
const handlePlay = useCallback(
|
||||
() => void playInOrder(songIds),
|
||||
[playInOrder, songIds]
|
||||
() => void playInOrder(songIds, playOrigin),
|
||||
[playInOrder, playOrigin, songIds]
|
||||
)
|
||||
const handleShuffle = useCallback(
|
||||
() => void playShuffled(songIds),
|
||||
[playShuffled, songIds]
|
||||
() => void playShuffled(songIds, playOrigin),
|
||||
[playShuffled, playOrigin, songIds]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
@@ -73,6 +94,7 @@ export default function FavoritesScreen() {
|
||||
favorited={isSongFavorite(song.id)}
|
||||
playlistLabel="Add to Another Playlist"
|
||||
inset
|
||||
downloadFrom={DOWNLOAD_REF}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleSongMenuAction}
|
||||
/>
|
||||
@@ -84,7 +106,7 @@ export default function FavoritesScreen() {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<CollectionDetailSkeleton />
|
||||
<CollectionDetailSkeleton variant="favorites" />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -127,6 +149,7 @@ export default function FavoritesScreen() {
|
||||
ListHeaderComponent={
|
||||
<FavoritesHero
|
||||
title={favorites.title}
|
||||
downloadTarget={downloadTarget}
|
||||
onPlay={handlePlay}
|
||||
onShuffle={handleShuffle}
|
||||
/>
|
||||
@@ -142,10 +165,12 @@ function songKey(song: BrowseSong) {
|
||||
|
||||
const FavoritesHero = memo(function FavoritesHero({
|
||||
title,
|
||||
downloadTarget,
|
||||
onPlay,
|
||||
onShuffle,
|
||||
}: {
|
||||
title: string
|
||||
downloadTarget: CollectionDownloadTarget
|
||||
onPlay: () => void
|
||||
onShuffle: () => void
|
||||
}) {
|
||||
@@ -166,13 +191,12 @@ const FavoritesHero = memo(function FavoritesHero({
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
{title}
|
||||
</Text>
|
||||
<DownloadedQuality
|
||||
collection={DOWNLOAD_REF}
|
||||
color={colors.mutedForeground}
|
||||
backgroundColor={colors.background}
|
||||
/>
|
||||
<View style={styles.actions}>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
@@ -182,6 +206,17 @@ const FavoritesHero = memo(function FavoritesHero({
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
/>
|
||||
<CollectionDownloadButton
|
||||
target={downloadTarget}
|
||||
color={colors.foreground}
|
||||
style={[styles.iconAction, { backgroundColor: colors.muted }]}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
<CollectionDivider />
|
||||
|
||||
@@ -1,186 +0,0 @@
|
||||
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,11 +1,16 @@
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import {
|
||||
atmosEnabled,
|
||||
deviceDownloadQualities,
|
||||
dolbyAtmosSupported,
|
||||
} from "@/lib/playback-capabilities"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { useState } from "react"
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import { router } from "expo-router"
|
||||
import {
|
||||
Alert,
|
||||
Platform,
|
||||
Pressable,
|
||||
ScrollView,
|
||||
@@ -16,25 +21,38 @@ import {
|
||||
} from "react-native"
|
||||
import type { StyleProp, ViewStyle } from "react-native"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
|
||||
import {
|
||||
readRememberedDownloadQuality,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import {
|
||||
DOWNLOAD_QUALITY_DETAILS,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
setArtworkColorsEnabled,
|
||||
useArtworkColorsEnabled,
|
||||
useArtworkColorPreferenceLoaded,
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
|
||||
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 "@/lib/urls"
|
||||
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
type Section = "profile" | "quality" | "library" | "users"
|
||||
type Section = "profile" | "quality" | "downloads" | "library" | "users"
|
||||
|
||||
type CurrentUser = {
|
||||
_id: Id<"users">
|
||||
@@ -74,6 +92,7 @@ const QUALITY_OPTIONS: {
|
||||
const SECTIONS: SectionConfig[] = [
|
||||
{ id: "profile", label: "Profile", icon: "person-circle-outline" },
|
||||
{ id: "quality", label: "Playback", icon: "volume-high-outline" },
|
||||
{ id: "downloads", label: "Downloads", icon: "arrow-down-circle-outline" },
|
||||
{ id: "library", label: "Library", icon: "library-outline", admin: true },
|
||||
{ id: "users", label: "Users", icon: "people-outline", admin: true },
|
||||
]
|
||||
@@ -155,6 +174,7 @@ export default function SettingsScreen() {
|
||||
</>
|
||||
) : null}
|
||||
{section === "quality" ? <QualitySection user={user} /> : null}
|
||||
{section === "downloads" ? <DownloadsSection /> : null}
|
||||
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
||||
{section === "users" && isAdmin && allUsers ? (
|
||||
<UsersSection users={allUsers} currentUserId={user._id} />
|
||||
@@ -172,7 +192,6 @@ export default function SettingsScreen() {
|
||||
|
||||
function AppearanceSection() {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const loaded = useArtworkColorPreferenceLoaded()
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
return (
|
||||
@@ -180,12 +199,13 @@ function AppearanceSection() {
|
||||
<SwitchRow
|
||||
title="New artwork colors"
|
||||
subtitle="Use the new color algorithm on this device."
|
||||
value={enabled}
|
||||
disabled={!loaded || saving}
|
||||
value={enabled ?? false}
|
||||
disabled={enabled === undefined || saving}
|
||||
onValueChange={async (checked) => {
|
||||
setSaving(true)
|
||||
try {
|
||||
await setArtworkColorsEnabled(checked)
|
||||
clearCoverPaletteCache()
|
||||
} catch {
|
||||
showError("Could not save artwork colors preference.")
|
||||
} finally {
|
||||
@@ -419,7 +439,7 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
: "This device does not support Dolby Atmos playback."
|
||||
}
|
||||
disabled={!dolbyAtmosSupported}
|
||||
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
|
||||
value={atmosEnabled(user)}
|
||||
onValueChange={(checked) =>
|
||||
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
|
||||
showError(error.message)
|
||||
@@ -431,6 +451,299 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Shades of the text color, faintest for the smallest files. */
|
||||
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
|
||||
low: 0.2,
|
||||
medium: 0.35,
|
||||
high: 0.5,
|
||||
lossless: 0.75,
|
||||
atmos: 1,
|
||||
}
|
||||
|
||||
function songCount(count: number) {
|
||||
return count === 1 ? "1 song" : `${count} songs`
|
||||
}
|
||||
|
||||
function QualityName({
|
||||
quality,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
quality: DownloadQuality
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
if (quality === "lossless" || quality === "atmos") {
|
||||
return (
|
||||
<AudioFormatBadge
|
||||
format={quality}
|
||||
color={color}
|
||||
backgroundColor={backgroundColor}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<Text style={{ color, fontSize: 13, fontWeight: "500" }}>
|
||||
{DOWNLOAD_QUALITY_LABELS[quality]}
|
||||
</Text>
|
||||
)
|
||||
}
|
||||
|
||||
function confirm(title: string, onConfirm: () => void) {
|
||||
Alert.alert(title, undefined, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{ text: "Remove", style: "destructive", onPress: onConfirm },
|
||||
])
|
||||
}
|
||||
|
||||
function RememberedQualityCard() {
|
||||
const colors = useThemeColors()
|
||||
// undefined until read; null means ask every time.
|
||||
const [remembered, setRemembered] = useState<DownloadQuality | null>()
|
||||
useEffect(() => {
|
||||
void readRememberedDownloadQuality().then((quality) =>
|
||||
setRemembered(quality ?? null)
|
||||
)
|
||||
}, [])
|
||||
const options: {
|
||||
value: DownloadQuality | null
|
||||
label: string
|
||||
detail: string
|
||||
}[] = [
|
||||
{ value: null, label: "Ask every time", detail: "Choose when downloading" },
|
||||
...deviceDownloadQualities.map((quality) => ({
|
||||
value: quality,
|
||||
label: DOWNLOAD_QUALITY_LABELS[quality],
|
||||
detail: DOWNLOAD_QUALITY_DETAILS[quality],
|
||||
})),
|
||||
]
|
||||
|
||||
return (
|
||||
<SettingsCard title="Download Quality">
|
||||
{options.map((option) => {
|
||||
const selected = remembered === option.value
|
||||
return (
|
||||
<Pressable
|
||||
key={option.value ?? "ask"}
|
||||
accessibilityRole="button"
|
||||
accessibilityState={{ selected }}
|
||||
onPress={() => {
|
||||
setRemembered(option.value)
|
||||
void writeRememberedDownloadQuality(option.value ?? undefined)
|
||||
}}
|
||||
style={[
|
||||
styles.optionRow,
|
||||
{
|
||||
borderColor: selected ? colors.primary : colors.border,
|
||||
backgroundColor: selected ? colors.muted : colors.card,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text style={[styles.optionTitle, { color: colors.foreground }]}>
|
||||
{option.label}
|
||||
</Text>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
{option.detail}
|
||||
</Text>
|
||||
</View>
|
||||
{selected ? (
|
||||
<Ionicons
|
||||
name="checkmark-circle"
|
||||
size={22}
|
||||
color={colors.primary}
|
||||
/>
|
||||
) : null}
|
||||
</Pressable>
|
||||
)
|
||||
})}
|
||||
</SettingsCard>
|
||||
)
|
||||
}
|
||||
|
||||
function DownloadsSection() {
|
||||
const colors = useThemeColors()
|
||||
const { queue } = useDownloads()
|
||||
const version = useDownloadsVersion()
|
||||
const breakdown = useMemo(
|
||||
() => queue?.breakdown(),
|
||||
// version invalidates the breakdown when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[queue, version]
|
||||
)
|
||||
if (!queue || !breakdown) return null
|
||||
const qualities = breakdown.byQuality.filter((entry) => entry.songs > 0)
|
||||
|
||||
return (
|
||||
<>
|
||||
<SettingsCard title="Storage">
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
{formatBytes(breakdown.bytes)} · {songCount(breakdown.songs)}
|
||||
{breakdown.queued > 0 ? ` · ${breakdown.queued} downloading` : ""}
|
||||
</Text>
|
||||
{breakdown.songs > 0 ? (
|
||||
<>
|
||||
<View
|
||||
style={[styles.storageBar, { backgroundColor: colors.muted }]}
|
||||
>
|
||||
{qualities.map((entry) => (
|
||||
<View
|
||||
key={entry.quality}
|
||||
style={{
|
||||
flex: entry.bytes,
|
||||
backgroundColor: colors.foreground,
|
||||
opacity: QUALITY_OPACITY[entry.quality],
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
{qualities.map((entry) => (
|
||||
<View key={entry.quality} style={styles.storageRow}>
|
||||
<View
|
||||
style={[
|
||||
styles.storageDot,
|
||||
{
|
||||
backgroundColor: colors.foreground,
|
||||
opacity: QUALITY_OPACITY[entry.quality],
|
||||
},
|
||||
]}
|
||||
/>
|
||||
<View style={{ flex: 1 }}>
|
||||
<QualityName
|
||||
quality={entry.quality}
|
||||
color={colors.foreground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
</View>
|
||||
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
|
||||
{songCount(entry.songs)}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.storageSize, { color: colors.foreground }]}
|
||||
>
|
||||
{formatBytes(entry.bytes)}
|
||||
</Text>
|
||||
</View>
|
||||
))}
|
||||
</>
|
||||
) : null}
|
||||
</SettingsCard>
|
||||
|
||||
<RememberedQualityCard />
|
||||
|
||||
{breakdown.collections.length > 0 ||
|
||||
breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<SettingsCard title="Downloaded">
|
||||
{breakdown.collections.map(
|
||||
({ collection, bytes, status, fallbackCount }) => (
|
||||
<View
|
||||
key={`${collection.kind}:${collection.id}`}
|
||||
style={styles.storageRow}
|
||||
>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text
|
||||
style={{ color: colors.foreground, fontSize: 15 }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{collection.title}
|
||||
</Text>
|
||||
<View style={styles.collectionMeta}>
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
{collection.kind === "album" ? "Album" : "Playlist"} ·
|
||||
</Text>
|
||||
<QualityName
|
||||
quality={collection.quality}
|
||||
color={colors.mutedForeground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
{fallbackCount > 0 ? (
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
({fallbackCount} in High)
|
||||
</Text>
|
||||
) : null}
|
||||
{status.downloaded < status.total ? (
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
· {status.downloaded} of {status.total}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
</View>
|
||||
<Text
|
||||
style={[styles.storageSize, { color: colors.foreground }]}
|
||||
>
|
||||
{formatBytes(bytes)}
|
||||
</Text>
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={`Remove download of ${collection.title}`}
|
||||
onPress={() =>
|
||||
confirm(
|
||||
`Remove ${collection.title}?`,
|
||||
() => void queue.removeCollection(collection)
|
||||
)
|
||||
}
|
||||
>
|
||||
<Ionicons
|
||||
name="trash-outline"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
)}
|
||||
{breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<View style={styles.storageRow}>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
Other Downloaded Songs
|
||||
</Text>
|
||||
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
|
||||
{songCount(breakdown.otherSongs.songIds.length)}
|
||||
</Text>
|
||||
</View>
|
||||
<Text style={[styles.storageSize, { color: colors.foreground }]}>
|
||||
{formatBytes(breakdown.otherSongs.bytes)}
|
||||
</Text>
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Remove Other Downloaded Songs"
|
||||
onPress={() =>
|
||||
confirm(
|
||||
"Remove Other Downloaded Songs?",
|
||||
() => void queue.removeOtherSongs()
|
||||
)
|
||||
}
|
||||
>
|
||||
<Ionicons
|
||||
name="trash-outline"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
) : null}
|
||||
<Button
|
||||
title="Remove All Downloads"
|
||||
variant="destructive"
|
||||
onPress={() =>
|
||||
confirm("Remove all downloads?", () => void queue.removeAll())
|
||||
}
|
||||
/>
|
||||
</SettingsCard>
|
||||
) : null}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function LibrarySection() {
|
||||
const updateLibrary = useAction(api.actions.updateLibrary)
|
||||
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
|
||||
@@ -770,6 +1083,7 @@ function ProfileAvatar({
|
||||
style?: StyleProp<ViewStyle>
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const imageUrl = useProfileImageUrl(user.image)
|
||||
const avatarStyle = [
|
||||
styles.avatar,
|
||||
{
|
||||
@@ -781,11 +1095,11 @@ function ProfileAvatar({
|
||||
style,
|
||||
]
|
||||
|
||||
if (user.image) {
|
||||
if (imageUrl) {
|
||||
return (
|
||||
<View style={avatarStyle}>
|
||||
<Image
|
||||
source={{ uri: user.image }}
|
||||
source={{ uri: imageUrl }}
|
||||
style={styles.avatarImage}
|
||||
contentFit="cover"
|
||||
/>
|
||||
@@ -872,6 +1186,31 @@ const styles = StyleSheet.create({
|
||||
divider: {
|
||||
height: StyleSheet.hairlineWidth,
|
||||
},
|
||||
storageBar: {
|
||||
height: 8,
|
||||
borderRadius: 4,
|
||||
overflow: "hidden",
|
||||
flexDirection: "row",
|
||||
},
|
||||
storageRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
minHeight: 36,
|
||||
},
|
||||
storageDot: { width: 8, height: 8, borderRadius: 4 },
|
||||
storageSize: {
|
||||
minWidth: 56,
|
||||
textAlign: "right",
|
||||
fontSize: 13,
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
collectionMeta: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 4,
|
||||
},
|
||||
optionRow: {
|
||||
borderWidth: 1,
|
||||
borderRadius: radius.lg,
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
@@ -14,26 +15,28 @@ export default function LibraryLayout() {
|
||||
const baseOptions = useStackScreenOptions({ title: "Library" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value="library">
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
@@ -24,6 +24,11 @@ const links = [
|
||||
{ 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: "Downloads",
|
||||
href: "/downloads",
|
||||
icon: "arrow.down.circle" as const,
|
||||
},
|
||||
{
|
||||
title: "Recently Played",
|
||||
href: "/recently-played",
|
||||
@@ -51,6 +56,7 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
||||
clock: "time",
|
||||
sparkles: "sparkles",
|
||||
star: "star",
|
||||
"arrow.down.circle": "arrow-down-circle",
|
||||
}
|
||||
return (
|
||||
<Ionicons
|
||||
@@ -118,12 +124,7 @@ export default function LibraryScreen() {
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
return (
|
||||
<View style={{ flex: 1, backgroundColor: colors.background }}>
|
||||
{listHeader}
|
||||
<MediaGridSkeleton contentInset={false} />
|
||||
</View>
|
||||
)
|
||||
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -1,6 +1,7 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
@@ -12,24 +13,26 @@ export default function SearchLayout() {
|
||||
const baseOptions = useStackScreenOptions({ title: "Search" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value="search">
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
@@ -1 +0,0 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -17,6 +17,7 @@ import { useEffect, useSyncExternalStore } from "react"
|
||||
import { AppIntentBridge } from "@/components/app-intent-bridge"
|
||||
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
||||
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
|
||||
import { DownloadsProvider } from "@/contexts/downloads"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { FavoritesProvider } from "@/contexts/favorites"
|
||||
import { PlaybackProvider } from "@/contexts/playback"
|
||||
@@ -73,54 +74,72 @@ export default function AppLayout() {
|
||||
return (
|
||||
<ConvexAuthRecovery onInvalidate={invalidateSession}>
|
||||
<PlaybackProvider>
|
||||
<AppIntentBridge />
|
||||
<AppNavigationSync />
|
||||
<AddToPlaylistProvider>
|
||||
<FavoritesProvider>
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
options={{ headerShown: false, animation: "none" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
fullScreenGestureEnabled: true,
|
||||
}}
|
||||
/>
|
||||
</Stack>
|
||||
</FavoritesProvider>
|
||||
<DownloadsProvider>
|
||||
<FavoritesProvider>
|
||||
<AppIntentBridge />
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
options={{ headerShown: false, animation: "none" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="playlist-cover"
|
||||
options={{
|
||||
title: "Cover",
|
||||
headerTitleAlign: "center",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerShadowVisible: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
fullScreenGestureEnabled: true,
|
||||
}}
|
||||
/>
|
||||
</Stack>
|
||||
</FavoritesProvider>
|
||||
</DownloadsProvider>
|
||||
</AddToPlaylistProvider>
|
||||
</PlaybackProvider>
|
||||
</ConvexAuthRecovery>
|
||||
|
||||
+170
-156
@@ -1,12 +1,15 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { TabletNowPlaying } from "@/components/tablet-now-playing"
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import {
|
||||
TabletNowPlaying,
|
||||
type PlayerPanel,
|
||||
} from "@/components/tablet-now-playing"
|
||||
import { atmosEnabled } 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 * as Haptics from "expo-haptics"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
import {
|
||||
Platform,
|
||||
@@ -39,22 +42,24 @@ import { MarqueeText } from "@/components/marquee-text"
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-actions-sheet"
|
||||
} from "@/components/media-context-menu"
|
||||
import {
|
||||
NowPlayingQueue,
|
||||
QUEUE_HORIZONTAL_INSET,
|
||||
} from "@/components/now-playing-queue"
|
||||
import { PlayerArtistMenu } from "@/components/player-artist-menu"
|
||||
import { PlayerProgress } from "@/components/player-progress"
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { LyricsView } from "@/components/lyrics-view"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useLyrics } from "@/hooks/use-lyrics"
|
||||
import { useCoverPalette } from "@/hooks/use-cover-palette"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import {
|
||||
nowPlayingColors,
|
||||
type NowPlayingColors,
|
||||
@@ -90,20 +95,19 @@ export default function PlayerScreen() {
|
||||
isPlaying,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
currentTime,
|
||||
duration,
|
||||
queueSongIds,
|
||||
setIsPlaying,
|
||||
seekTo,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
} = usePlayback()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const { queue } = useLocalSearchParams<{ queue?: string }>()
|
||||
const [showQueue, setShowQueue] = useState(queue === "1")
|
||||
} = usePlaybackQueue()
|
||||
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
|
||||
const params = useLocalSearchParams<{ queue?: string; lyrics?: string }>()
|
||||
// The queue or lyrics, shown in place of the artwork.
|
||||
const [panel, setPanel] = useState<PlayerPanel | null>(
|
||||
params.queue === "1" ? "queue" : params.lyrics === "1" ? "lyrics" : null
|
||||
)
|
||||
const showQueue = panel === "queue"
|
||||
const showLyrics = panel === "lyrics"
|
||||
const lyrics = useLyrics(currentSong?.id ?? null)
|
||||
const [isDismissing, setIsDismissing] = useState(false)
|
||||
const [stageHeight, setStageHeight] = useState(0)
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const playbackInfo = useCachedQuery(
|
||||
api.library.getSongPlaybackInfo,
|
||||
@@ -114,7 +118,7 @@ export default function PlayerScreen() {
|
||||
? playbackFormat(
|
||||
playbackInfo.files,
|
||||
user.playbackQuality,
|
||||
dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
atmosEnabled(user)
|
||||
)
|
||||
: null
|
||||
|
||||
@@ -126,7 +130,7 @@ export default function PlayerScreen() {
|
||||
coverUri,
|
||||
currentSong ? currentSong.album.cover != null : undefined
|
||||
)
|
||||
const colors = nowPlayingColors(palette)
|
||||
const colors = useMemo(() => nowPlayingColors(palette), [palette])
|
||||
|
||||
const background = useSharedValue(colors.background)
|
||||
useEffect(() => {
|
||||
@@ -159,33 +163,65 @@ export default function PlayerScreen() {
|
||||
}))
|
||||
|
||||
// The player covers the status bar, so it can't use the native sheet's
|
||||
// swipe to dismiss.
|
||||
function dismissGesture() {
|
||||
return Gesture.Pan()
|
||||
.activeOffsetY(12)
|
||||
.failOffsetY(-12)
|
||||
.failOffsetX([-20, 20])
|
||||
.onUpdate((event) => {
|
||||
dismissY.value = Math.max(0, event.translationY)
|
||||
})
|
||||
.onEnd((event) => {
|
||||
if (
|
||||
event.translationY > DISMISS_DISTANCE ||
|
||||
event.velocityY > DISMISS_VELOCITY
|
||||
) {
|
||||
scheduleOnRN(setIsDismissing, true)
|
||||
dismissY.value = withTiming(
|
||||
windowHeight,
|
||||
{ duration: 220 },
|
||||
(finished) => {
|
||||
if (finished) scheduleOnRN(router.back)
|
||||
}
|
||||
)
|
||||
} else {
|
||||
dismissY.value = withSpring(0, { duration: 350, dampingRatio: 0.85 })
|
||||
}
|
||||
})
|
||||
}
|
||||
// swipe to dismiss. Each GestureDetector needs its own gesture instance.
|
||||
const makeDismissGesture = useCallback(
|
||||
() =>
|
||||
Gesture.Pan()
|
||||
.activeOffsetY(12)
|
||||
.failOffsetY(-12)
|
||||
.failOffsetX([-20, 20])
|
||||
.onUpdate((event) => {
|
||||
dismissY.value = Math.max(0, event.translationY)
|
||||
})
|
||||
.onEnd((event) => {
|
||||
if (
|
||||
event.translationY > DISMISS_DISTANCE ||
|
||||
event.velocityY > DISMISS_VELOCITY
|
||||
) {
|
||||
scheduleOnRN(setIsDismissing, true)
|
||||
dismissY.value = withTiming(
|
||||
windowHeight,
|
||||
{ duration: 220 },
|
||||
(finished) => {
|
||||
if (finished) scheduleOnRN(router.back)
|
||||
}
|
||||
)
|
||||
} else {
|
||||
dismissY.value = withSpring(0, {
|
||||
duration: 350,
|
||||
dampingRatio: 0.85,
|
||||
})
|
||||
}
|
||||
}),
|
||||
[dismissY, router, windowHeight]
|
||||
)
|
||||
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||
const stageGesture = useMemo(
|
||||
() => makeDismissGesture().enabled(panel === null),
|
||||
[makeDismissGesture, panel]
|
||||
)
|
||||
|
||||
const hasCover = currentSong ? currentSong.album.cover != null : false
|
||||
const queueHeader = useMemo(
|
||||
() =>
|
||||
currentSong ? (
|
||||
<View style={styles.queueHeader}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={styles.queueArtwork}
|
||||
/>
|
||||
<SongMeta song={currentSong} colors={colors} compact />
|
||||
</View>
|
||||
) : null,
|
||||
[colors, coverUri, currentSong, hasCover]
|
||||
)
|
||||
const songMeta = useMemo(
|
||||
() =>
|
||||
currentSong ? <SongMeta song={currentSong} colors={colors} /> : null,
|
||||
[colors, currentSong]
|
||||
)
|
||||
|
||||
const hasQueue = queueSongIds.length > 0
|
||||
|
||||
@@ -204,7 +240,6 @@ export default function PlayerScreen() {
|
||||
return null
|
||||
}
|
||||
|
||||
const hasCover = currentSong.album.cover != null
|
||||
const bottomInset = Math.max(insets.bottom, spacing.md)
|
||||
const artworkSize = Math.max(
|
||||
0,
|
||||
@@ -213,18 +248,15 @@ export default function PlayerScreen() {
|
||||
stageHeight > 0 ? stageHeight - META_HEIGHT - spacing.xl : Infinity
|
||||
)
|
||||
)
|
||||
const displayedTime = scrubTime ?? currentTime
|
||||
const timeColor =
|
||||
scrubTime === null ? colors.secondaryForeground : colors.foreground
|
||||
|
||||
function togglePlayback() {
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light)
|
||||
setIsPlaying(!isPlaying)
|
||||
}
|
||||
|
||||
function toggleQueue() {
|
||||
function togglePanel(next: PlayerPanel) {
|
||||
void Haptics.selectionAsync()
|
||||
setShowQueue((value) => !value)
|
||||
setPanel((value) => (value === next ? null : next))
|
||||
}
|
||||
|
||||
if (isTablet) {
|
||||
@@ -234,10 +266,11 @@ export default function PlayerScreen() {
|
||||
colors={colors}
|
||||
backgroundStyle={backgroundStyle}
|
||||
dismissStyle={dismissStyle}
|
||||
dismissGesture={dismissGesture}
|
||||
showQueue={showQueue}
|
||||
toggleQueue={toggleQueue}
|
||||
metadata={<SongMeta song={currentSong} colors={colors} />}
|
||||
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
|
||||
panel={panel}
|
||||
togglePanel={togglePanel}
|
||||
lyrics={lyrics}
|
||||
metadata={songMeta}
|
||||
/>
|
||||
</MusicEntityView>
|
||||
)
|
||||
@@ -264,7 +297,7 @@ export default function PlayerScreen() {
|
||||
id={currentSong.id}
|
||||
style={[styles.safe, { paddingTop: insets.top }]}
|
||||
>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={handleGesture}>
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
hitSlop={12}
|
||||
@@ -278,7 +311,7 @@ export default function PlayerScreen() {
|
||||
</Pressable>
|
||||
</GestureDetector>
|
||||
|
||||
<GestureDetector gesture={dismissGesture().enabled(!showQueue)}>
|
||||
<GestureDetector gesture={stageGesture}>
|
||||
<View
|
||||
style={styles.stage}
|
||||
onLayout={(event) =>
|
||||
@@ -297,23 +330,24 @@ export default function PlayerScreen() {
|
||||
<NowPlayingQueue
|
||||
colors={colors}
|
||||
viewportHeight={stageHeight}
|
||||
currentHeader={
|
||||
<View style={styles.queueHeader}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={styles.queueArtwork}
|
||||
/>
|
||||
<SongMeta
|
||||
song={currentSong}
|
||||
colors={colors}
|
||||
compact
|
||||
/>
|
||||
</View>
|
||||
}
|
||||
currentHeader={queueHeader}
|
||||
/>
|
||||
</Animated.View>
|
||||
) : null
|
||||
) : showLyrics ? (
|
||||
<Animated.View
|
||||
key="lyrics"
|
||||
entering={MODE_FADE_IN}
|
||||
exiting={MODE_FADE_OUT}
|
||||
style={[styles.fill, styles.artworkMode]}
|
||||
>
|
||||
{queueHeader}
|
||||
<LyricsView
|
||||
key={currentSong.id}
|
||||
lyrics={lyrics}
|
||||
colors={colors}
|
||||
/>
|
||||
</Animated.View>
|
||||
) : (
|
||||
<Animated.View
|
||||
key="artwork"
|
||||
@@ -334,50 +368,28 @@ export default function PlayerScreen() {
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
<View style={styles.meta}>
|
||||
<SongMeta song={currentSong} colors={colors} />
|
||||
</View>
|
||||
<View style={styles.meta}>{songMeta}</View>
|
||||
</Animated.View>
|
||||
)}
|
||||
</LayoutAnimationConfig>
|
||||
</View>
|
||||
</GestureDetector>
|
||||
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={controlsGesture}>
|
||||
<View style={[styles.controls, { paddingBottom: bottomInset }]}>
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={displayedTime}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.timeRow}>
|
||||
<Text style={[styles.time, { color: timeColor }]}>
|
||||
{formatDuration(displayedTime)}
|
||||
</Text>
|
||||
{format ? (
|
||||
<View style={styles.format} pointerEvents="none">
|
||||
<PlayerProgress
|
||||
colors={colors}
|
||||
timeStyle={styles.time}
|
||||
center={
|
||||
format ? (
|
||||
<AudioFormatBadge
|
||||
format={format}
|
||||
color={colors.secondaryForeground}
|
||||
backgroundColor={colors.background}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
<Text style={[styles.time, { color: timeColor }]}>
|
||||
{formatRemainingDuration(displayedTime, duration).replace(
|
||||
"-",
|
||||
"\u2212"
|
||||
)}
|
||||
</Text>
|
||||
</View>
|
||||
) : null
|
||||
}
|
||||
/>
|
||||
|
||||
<View style={styles.transport}>
|
||||
<TransportButton
|
||||
@@ -419,50 +431,33 @@ export default function PlayerScreen() {
|
||||
</TransportButton>
|
||||
</View>
|
||||
|
||||
{volumeAvailable ? (
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
commitHoldMs={0}
|
||||
animateValueChanges
|
||||
value={volume}
|
||||
maximumValue={1}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setVolume}
|
||||
leading={
|
||||
<PlayerSymbol
|
||||
name="speaker.fill"
|
||||
fallback="volume-low"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
trailing={
|
||||
<PlayerSymbol
|
||||
name="speaker.wave.3.fill"
|
||||
fallback="volume-high"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
) : null}
|
||||
<VolumeSlider colors={colors} />
|
||||
|
||||
<View style={styles.footer}>
|
||||
<Pressable
|
||||
disabled
|
||||
onPress={() => togglePanel("lyrics")}
|
||||
disabled={!lyrics && !showLyrics}
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
style={[styles.queueButton, styles.unavailable]}
|
||||
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
|
||||
accessibilityState={{
|
||||
selected: showLyrics,
|
||||
disabled: !lyrics && !showLyrics,
|
||||
}}
|
||||
style={[
|
||||
styles.queueButton,
|
||||
!lyrics && !showLyrics && styles.unavailable,
|
||||
showLyrics && { backgroundColor: colors.selected },
|
||||
]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback={{ material: "lyrics" }}
|
||||
size={27}
|
||||
weight="semibold"
|
||||
color={colors.foreground}
|
||||
color={
|
||||
showLyrics ? colors.selectedForeground : colors.foreground
|
||||
}
|
||||
/>
|
||||
</Pressable>
|
||||
<AudioOutputButton
|
||||
@@ -470,7 +465,7 @@ export default function PlayerScreen() {
|
||||
style={styles.queueButton}
|
||||
/>
|
||||
<Pressable
|
||||
onPress={toggleQueue}
|
||||
onPress={() => togglePanel("queue")}
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||
@@ -517,6 +512,41 @@ export default function PlayerScreen() {
|
||||
)
|
||||
}
|
||||
|
||||
/** Phone volume slider. Owns the volume listener so volume changes stay local. */
|
||||
function VolumeSlider({ colors }: { colors: NowPlayingColors }) {
|
||||
const { volume, setVolume, available } = useSystemVolume()
|
||||
if (!available) return null
|
||||
return (
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
commitHoldMs={0}
|
||||
animateValueChanges
|
||||
value={volume}
|
||||
maximumValue={1}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setVolume}
|
||||
leading={
|
||||
<PlayerSymbol
|
||||
name="speaker.fill"
|
||||
fallback="volume-low"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
trailing={
|
||||
<PlayerSymbol
|
||||
name="speaker.wave.3.fill"
|
||||
fallback="volume-high"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/** Title and artist with the favorite and more buttons. */
|
||||
function SongMeta({
|
||||
song,
|
||||
@@ -739,23 +769,7 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: HORIZONTAL_INSET,
|
||||
paddingTop: spacing.md,
|
||||
},
|
||||
timeRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
format: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
alignItems: "center",
|
||||
},
|
||||
time: {
|
||||
fontSize: 12,
|
||||
fontWeight: "600",
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
time: { fontWeight: "600" },
|
||||
transport: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -0,0 +1,391 @@
|
||||
import { useMutation } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { router, Stack, useLocalSearchParams } from "expo-router"
|
||||
import { useMemo, useState, type ReactNode } from "react"
|
||||
import {
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
useWindowDimensions,
|
||||
View,
|
||||
} from "react-native"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { Button, LoadingView } from "@/components/ui/primitives"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import {
|
||||
COVER_GRID_ALBUMS,
|
||||
playlistCoverAlbums,
|
||||
randomPlaylistCovers,
|
||||
} from "@otunes/convex/client/playlist-cover"
|
||||
|
||||
type Choice =
|
||||
| { kind: "current" }
|
||||
| { kind: "albums"; albumIds: Id<"albums">[] }
|
||||
| { kind: "upload"; uri: string; image: string }
|
||||
|
||||
const STRIP_GAP = spacing.sm
|
||||
/** Selection border and padding around each thumb, both sides. */
|
||||
const THUMB_CHROME = 6
|
||||
|
||||
/**
|
||||
* Full screen cover editor for a playlist owner: a large preview of the
|
||||
* selected cover, the current cover pinned apart from four random album
|
||||
* grids, and Save in the header. Opened from the playlist's menu.
|
||||
*/
|
||||
export default function PlaylistCoverScreen() {
|
||||
const { id } = useLocalSearchParams<{ id: string }>()
|
||||
const playlistId = id as Id<"playlists">
|
||||
const playlist = useCachedQuery(api.playlists.browsePlaylistDetail, {
|
||||
id: playlistId,
|
||||
})
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { width } = useWindowDimensions()
|
||||
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
|
||||
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
|
||||
|
||||
const albums = useMemo(
|
||||
() => (playlist ? playlistCoverAlbums(playlist.songs) : []),
|
||||
[playlist]
|
||||
)
|
||||
const [options, setOptions] = useState<Id<"albums">[][] | null>(null)
|
||||
const [selected, setSelected] = useState<Choice | null>(null)
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
// Draw options once the songs arrive.
|
||||
if (options === null && playlist) {
|
||||
setOptions(randomPlaylistCovers(albums))
|
||||
}
|
||||
|
||||
const hasCurrent = playlist?.cover != null
|
||||
const choice: Choice | null =
|
||||
selected ??
|
||||
(hasCurrent
|
||||
? { kind: "current" }
|
||||
: options?.[0]
|
||||
? { kind: "albums", albumIds: options[0] }
|
||||
: null)
|
||||
|
||||
async function pickImage() {
|
||||
const result = await ImagePicker.launchImageLibraryAsync({
|
||||
mediaTypes: ["images"],
|
||||
allowsEditing: true,
|
||||
aspect: [1, 1],
|
||||
quality: 0.7,
|
||||
base64: true,
|
||||
})
|
||||
const asset = result.canceled ? undefined : result.assets[0]
|
||||
if (!asset?.base64) return
|
||||
setSelected({
|
||||
kind: "upload",
|
||||
uri: asset.uri,
|
||||
image: `data:${asset.mimeType ?? "image/jpeg"};base64,${asset.base64}`,
|
||||
})
|
||||
}
|
||||
|
||||
async function save() {
|
||||
if (!choice || choice.kind === "current") {
|
||||
router.back()
|
||||
return
|
||||
}
|
||||
setSaving(true)
|
||||
try {
|
||||
if (choice.kind === "albums") {
|
||||
await setCoverAlbums({ playlistId, albumIds: choice.albumIds })
|
||||
} else {
|
||||
await uploadCover({ playlistId, image: choice.image })
|
||||
}
|
||||
router.back()
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to change cover"
|
||||
)
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
const header = (
|
||||
<Stack.Screen
|
||||
options={{
|
||||
headerLeft: () => (
|
||||
<HeaderButton label="Cancel" onPress={() => router.back()} />
|
||||
),
|
||||
headerRight: () => (
|
||||
<HeaderButton
|
||||
label="Save"
|
||||
bold
|
||||
disabled={saving || !choice}
|
||||
onPress={() => void save()}
|
||||
/>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
)
|
||||
|
||||
if (!playlist || !config || !options) {
|
||||
return (
|
||||
<>
|
||||
{header}
|
||||
<LoadingView />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const serverUrl = config.serverUrl
|
||||
const currentUri = playlistCoverUrl(serverUrl, playlistId, playlist.cover)
|
||||
const previewSize = Math.min(width - spacing.lg * 2, 360)
|
||||
// One row: current | uploaded? | options, thumbs at most 72pt.
|
||||
const thumbCount =
|
||||
options.length + (hasCurrent ? 1 : 0) + (choice?.kind === "upload" ? 1 : 0)
|
||||
const rowItems = thumbCount + (hasCurrent ? 1 : 0)
|
||||
const thumbSize = Math.min(
|
||||
72,
|
||||
Math.floor(
|
||||
(width - spacing.lg * 2 - STRIP_GAP * (rowItems - 1) - 1) /
|
||||
Math.max(thumbCount, 1)
|
||||
) - THUMB_CHROME
|
||||
)
|
||||
|
||||
function renderChoice(item: Choice, size: number) {
|
||||
if (item.kind === "current") {
|
||||
return (
|
||||
<CoverImage
|
||||
uri={currentUri}
|
||||
hasCover
|
||||
style={{ width: size, height: size }}
|
||||
/>
|
||||
)
|
||||
}
|
||||
if (item.kind === "upload") {
|
||||
return (
|
||||
<Image
|
||||
source={{ uri: item.uri }}
|
||||
style={{ width: size, height: size }}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<AlbumGrid serverUrl={serverUrl} albumIds={item.albumIds} size={size} />
|
||||
)
|
||||
}
|
||||
|
||||
const isSelected = (item: Choice) =>
|
||||
choice?.kind === item.kind &&
|
||||
(item.kind !== "albums" ||
|
||||
(choice.kind === "albums" && choice.albumIds === item.albumIds))
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ backgroundColor: colors.background }}
|
||||
contentContainerStyle={styles.content}
|
||||
>
|
||||
{header}
|
||||
<View
|
||||
style={[
|
||||
styles.preview,
|
||||
{
|
||||
width: previewSize,
|
||||
height: previewSize,
|
||||
backgroundColor: colors.coverPlaceholder,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{choice ? renderChoice(choice, previewSize) : null}
|
||||
</View>
|
||||
|
||||
<View style={styles.strip}>
|
||||
{hasCurrent ? (
|
||||
<>
|
||||
<Thumb
|
||||
size={thumbSize}
|
||||
selected={isSelected({ kind: "current" })}
|
||||
label="Current cover"
|
||||
onPress={() => setSelected({ kind: "current" })}
|
||||
>
|
||||
{renderChoice({ kind: "current" }, thumbSize)}
|
||||
</Thumb>
|
||||
<View
|
||||
style={[styles.separator, { backgroundColor: colors.border }]}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{choice?.kind === "upload" ? (
|
||||
<Thumb size={thumbSize} selected label="Uploaded image">
|
||||
{renderChoice(choice, thumbSize)}
|
||||
</Thumb>
|
||||
) : null}
|
||||
{options.map((albumIds) => {
|
||||
const item: Choice = { kind: "albums", albumIds }
|
||||
return (
|
||||
<Thumb
|
||||
key={albumIds.join(",")}
|
||||
size={thumbSize}
|
||||
selected={isSelected(item)}
|
||||
label="Album cover option"
|
||||
onPress={() => setSelected(item)}
|
||||
>
|
||||
{renderChoice(item, thumbSize)}
|
||||
</Thumb>
|
||||
)
|
||||
})}
|
||||
</View>
|
||||
|
||||
{albums.length === 0 ? (
|
||||
<Text style={{ color: colors.mutedForeground, textAlign: "center" }}>
|
||||
No album artwork in this playlist yet.
|
||||
</Text>
|
||||
) : null}
|
||||
|
||||
<View style={styles.actions}>
|
||||
{albums.length >= COVER_GRID_ALBUMS ? (
|
||||
<Button
|
||||
title="Shuffle"
|
||||
icon="shuffle"
|
||||
variant="secondary"
|
||||
onPress={() => {
|
||||
setOptions(randomPlaylistCovers(albums))
|
||||
if (selected?.kind === "albums") setSelected(null)
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<Button
|
||||
title="Upload"
|
||||
icon="arrow-up"
|
||||
variant="secondary"
|
||||
onPress={() => void pickImage()}
|
||||
/>
|
||||
</View>
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
function HeaderButton({
|
||||
label,
|
||||
bold = false,
|
||||
disabled = false,
|
||||
onPress,
|
||||
}: {
|
||||
label: string
|
||||
bold?: boolean
|
||||
disabled?: boolean
|
||||
onPress: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
hitSlop={8}
|
||||
disabled={disabled}
|
||||
onPress={onPress}
|
||||
style={{ opacity: disabled ? 0.4 : 1, paddingHorizontal: spacing.xs }}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
color: colors.foreground,
|
||||
fontSize: 17,
|
||||
fontWeight: bold ? "600" : "400",
|
||||
}}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
function Thumb({
|
||||
size,
|
||||
selected,
|
||||
label,
|
||||
onPress,
|
||||
children,
|
||||
}: {
|
||||
size: number
|
||||
selected: boolean
|
||||
label: string
|
||||
onPress?: () => void
|
||||
children: ReactNode
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={label}
|
||||
accessibilityState={{ selected }}
|
||||
onPress={onPress}
|
||||
style={[
|
||||
styles.thumb,
|
||||
{
|
||||
width: size + THUMB_CHROME,
|
||||
height: size + THUMB_CHROME,
|
||||
borderColor: selected ? colors.foreground : "transparent",
|
||||
},
|
||||
]}
|
||||
>
|
||||
<View style={styles.thumbInner}>{children}</View>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
/** A generated cover option: one album alone, or four tiled 2x2. */
|
||||
function AlbumGrid({
|
||||
serverUrl,
|
||||
albumIds,
|
||||
size,
|
||||
}: {
|
||||
serverUrl: string
|
||||
albumIds: Id<"albums">[]
|
||||
size: number
|
||||
}) {
|
||||
const tile = albumIds.length > 1 ? size / 2 : size
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
width: size,
|
||||
height: size,
|
||||
flexDirection: "row",
|
||||
flexWrap: "wrap",
|
||||
}}
|
||||
>
|
||||
{albumIds.map((albumId) => (
|
||||
<CoverImage
|
||||
key={albumId}
|
||||
uri={albumCoverUrl(serverUrl, albumId)}
|
||||
hasCover
|
||||
style={{ width: tile, height: tile }}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
content: {
|
||||
alignItems: "center",
|
||||
gap: spacing.xl,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
preview: { borderRadius: radius.lg, overflow: "hidden" },
|
||||
strip: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: STRIP_GAP,
|
||||
},
|
||||
separator: { width: StyleSheet.hairlineWidth, alignSelf: "stretch" },
|
||||
thumb: {
|
||||
borderWidth: 2,
|
||||
borderRadius: radius.sm + 2,
|
||||
padding: 1,
|
||||
},
|
||||
thumbInner: { flex: 1, borderRadius: radius.sm, overflow: "hidden" },
|
||||
actions: { flexDirection: "row", gap: spacing.sm },
|
||||
})
|
||||
@@ -1,147 +1,21 @@
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import { useQuery } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
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 { useMemo, useSyncExternalStore } from "react"
|
||||
|
||||
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(
|
||||
@@ -154,669 +28,8 @@ export function AppIntentBridge() {
|
||||
}
|
||||
|
||||
function ReadyAppIntentBridge() {
|
||||
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.")
|
||||
}
|
||||
})
|
||||
|
||||
useMusicCatalogSync()
|
||||
useNowPlayingCatalog()
|
||||
useIntentDispatch()
|
||||
return null
|
||||
}
|
||||
@@ -0,0 +1,195 @@
|
||||
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 = FunctionReturnType<typeof api.favorites.getUserFavorites>
|
||||
|
||||
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
|
||||
return new Set<string>(
|
||||
(kind === "song"
|
||||
? favorites.favoriteSongs
|
||||
: kind === "album"
|
||||
? favorites.favoriteAlbums
|
||||
: favorites.favoriteArtists
|
||||
).flat()
|
||||
)
|
||||
}
|
||||
|
||||
/** 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])
|
||||
}
|
||||
@@ -0,0 +1,633 @@
|
||||
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 { usePlaybackActions, usePlaybackQueue } 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 = { ...usePlaybackQueue(), ...usePlaybackActions() }
|
||||
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") {
|
||||
const chunks = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: id as Id<"artists"> }
|
||||
)
|
||||
return chunks.flat()
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
if (id === FAVORITES_PLAYLIST_ID) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs.flat()
|
||||
}
|
||||
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,
|
||||
{}
|
||||
)
|
||||
const favoriteSongs = favorites.favoriteSongs.flat()
|
||||
if (favoriteSongs.length === 0) {
|
||||
throw new IntentRejected(
|
||||
"Nothing is queued, and your favorites are empty."
|
||||
)
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(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.")
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentEntity } from "expo-app-intents"
|
||||
import { useEffect } from "react"
|
||||
|
||||
import { usePlaybackQueue } from "@/contexts/playback"
|
||||
import { publishMusicCatalog } from "@/lib/app-intents"
|
||||
|
||||
type CurrentSong = NonNullable<
|
||||
ReturnType<typeof usePlaybackQueue>["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 = usePlaybackQueue()
|
||||
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,40 +1,33 @@
|
||||
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={(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 width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}>
|
||||
{DOLBY_PATHS.map((d) => (
|
||||
<Path key={d} d={d} 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.
|
||||
@@ -48,9 +41,9 @@ function LosslessMark({
|
||||
}) {
|
||||
return (
|
||||
<Svg
|
||||
width={(MARK_HEIGHT * 544) / 271}
|
||||
width={LOSSLESS_WIDTH}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="28 154 544 271"
|
||||
viewBox={LOSSLESS_VIEW_BOX}
|
||||
>
|
||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||
<Path
|
||||
@@ -75,12 +68,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
|
||||
@@ -93,12 +84,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>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,172 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
Alert,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
import Svg, { Circle, Rect } from "react-native-svg"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import {
|
||||
useDownloads,
|
||||
useDownloadsVersion,
|
||||
useIsCollectionDownloaded,
|
||||
type DownloadTarget,
|
||||
} from "@/contexts/downloads"
|
||||
import type { CollectionRef } from "@otunes/convex/client/download-queue"
|
||||
import { DOWNLOAD_QUALITY_LABELS } from "@otunes/convex/download-quality"
|
||||
|
||||
const SIZE = 22
|
||||
const RADIUS = 9
|
||||
const RING_LENGTH = 2 * Math.PI * RADIUS
|
||||
|
||||
/** Static ring that fills as songs finish; the square means "tap to stop". */
|
||||
function ProgressRing({
|
||||
fraction,
|
||||
color,
|
||||
}: {
|
||||
fraction: number
|
||||
color: string
|
||||
}) {
|
||||
return (
|
||||
<Svg width={SIZE} height={SIZE} viewBox="0 0 22 22">
|
||||
<Circle
|
||||
cx={11}
|
||||
cy={11}
|
||||
r={RADIUS}
|
||||
fill="none"
|
||||
stroke={color}
|
||||
strokeOpacity={0.3}
|
||||
strokeWidth={2}
|
||||
/>
|
||||
<Circle
|
||||
cx={11}
|
||||
cy={11}
|
||||
r={RADIUS}
|
||||
fill="none"
|
||||
stroke={color}
|
||||
strokeWidth={2}
|
||||
strokeDasharray={RING_LENGTH}
|
||||
strokeDashoffset={RING_LENGTH * (1 - fraction)}
|
||||
transform="rotate(-90 11 11)"
|
||||
/>
|
||||
<Rect x={8} y={8} width={6} height={6} fill={color} />
|
||||
</Svg>
|
||||
)
|
||||
}
|
||||
|
||||
export type CollectionDownloadTarget = Exclude<
|
||||
DownloadTarget,
|
||||
{ kind: "songs" }
|
||||
>
|
||||
|
||||
/** Download, progress, and downloaded states for an album or playlist hero, beside Play. */
|
||||
export function CollectionDownloadButton({
|
||||
target,
|
||||
color,
|
||||
style,
|
||||
}: {
|
||||
target: CollectionDownloadTarget
|
||||
color: string
|
||||
style?: StyleProp<ViewStyle>
|
||||
}) {
|
||||
const { queue, requestDownload, removeDownload } = useDownloads()
|
||||
useDownloadsVersion()
|
||||
const collection = queue?.getCollection(target)
|
||||
const status = queue?.status(target.songIds)
|
||||
const inProgress = collection !== undefined && (status?.queued ?? 0) > 0
|
||||
const done = collection !== undefined && !inProgress
|
||||
|
||||
function handlePress() {
|
||||
if (inProgress) {
|
||||
void removeDownload(target)
|
||||
} else if (done) {
|
||||
Alert.alert("Remove download?", undefined, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{
|
||||
text: "Remove",
|
||||
style: "destructive",
|
||||
onPress: () => void removeDownload(target),
|
||||
},
|
||||
])
|
||||
} else {
|
||||
void requestDownload(target)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={
|
||||
inProgress
|
||||
? "Stop downloading"
|
||||
: done
|
||||
? `Remove download of ${target.title}`
|
||||
: `Download ${target.title}`
|
||||
}
|
||||
disabled={target.songIds.length === 0}
|
||||
onPress={handlePress}
|
||||
style={style}
|
||||
>
|
||||
{inProgress && status ? (
|
||||
<ProgressRing
|
||||
fraction={status.downloaded / status.total}
|
||||
color={color}
|
||||
/>
|
||||
) : (
|
||||
<Ionicons
|
||||
name={done ? "checkmark" : "arrow-down"}
|
||||
size={24}
|
||||
color={color}
|
||||
/>
|
||||
)}
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
/** The quality an album or playlist was downloaded in, once downloaded. */
|
||||
export function DownloadedQuality({
|
||||
collection,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
collection: CollectionRef
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
const { queue } = useDownloads()
|
||||
const downloaded = useIsCollectionDownloaded(collection)
|
||||
const quality = downloaded
|
||||
? queue?.getCollection(collection)?.quality
|
||||
: undefined
|
||||
if (!quality) return null
|
||||
return (
|
||||
<View
|
||||
style={styles.quality}
|
||||
accessible
|
||||
accessibilityLabel={`Downloaded in ${DOWNLOAD_QUALITY_LABELS[quality]}`}
|
||||
>
|
||||
<Ionicons name="arrow-down-circle" size={14} color={color} />
|
||||
{quality === "lossless" || quality === "atmos" ? (
|
||||
<AudioFormatBadge
|
||||
format={quality}
|
||||
color={color}
|
||||
backgroundColor={backgroundColor}
|
||||
/>
|
||||
) : (
|
||||
<Text style={{ color, fontSize: 13 }}>
|
||||
{DOWNLOAD_QUALITY_LABELS[quality]}
|
||||
</Text>
|
||||
)}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
quality: { flexDirection: "row", alignItems: "center", 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>
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@@ -71,7 +71,10 @@ class ConvexAuthErrorBoundary extends Component<
|
||||
}
|
||||
}
|
||||
|
||||
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
|
||||
export function ConvexAuthRecovery({
|
||||
children,
|
||||
onInvalidate,
|
||||
}: ConvexAuthRecoveryProps) {
|
||||
const localAuth = useLocalConvexAuth()
|
||||
const serverAuth = useServerConvexAuth()
|
||||
const hadServerAuthRef = useRef(false)
|
||||
@@ -113,9 +116,9 @@ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecover
|
||||
|
||||
const sessionEstablished = Boolean(
|
||||
serverAuth &&
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
)
|
||||
|
||||
return (
|
||||
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
} from "react-native"
|
||||
|
||||
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||
import { downloadedCoverUri } from "@/lib/downloads"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
@@ -66,6 +67,7 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit = "cover",
|
||||
blurRadius,
|
||||
placeholderVariant = "icon",
|
||||
placeholderIcon = "musical-note",
|
||||
}: {
|
||||
uri: string
|
||||
hasCover: boolean
|
||||
@@ -73,6 +75,7 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit?: ImageContentFit
|
||||
blurRadius?: number
|
||||
placeholderVariant?: "icon" | "solid"
|
||||
placeholderIcon?: keyof typeof Ionicons.glyphMap
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
|
||||
@@ -81,6 +84,12 @@ export const CoverImage = memo(function CoverImage({
|
||||
[flatStyle, hasCover, uri]
|
||||
)
|
||||
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri])
|
||||
// A downloaded cover shows while the network copy loads, and offline.
|
||||
const savedUri = hasCover ? downloadedCoverUri(uri) : null
|
||||
const placeholder = useMemo(
|
||||
() => (savedUri ? { uri: savedUri } : undefined),
|
||||
[savedUri]
|
||||
)
|
||||
|
||||
if (!hasCover) {
|
||||
return (
|
||||
@@ -93,7 +102,7 @@ export const CoverImage = memo(function CoverImage({
|
||||
>
|
||||
{placeholderVariant === "icon" ? (
|
||||
<Ionicons
|
||||
name="musical-note"
|
||||
name={placeholderIcon}
|
||||
size={placeholderIconSize(flatStyle)}
|
||||
color={colors.coverPlaceholderIcon}
|
||||
/>
|
||||
@@ -107,6 +116,8 @@ export const CoverImage = memo(function CoverImage({
|
||||
source={source}
|
||||
style={[style, { backgroundColor: colors.coverPlaceholder }]}
|
||||
contentFit={contentFit}
|
||||
placeholder={placeholder}
|
||||
placeholderContentFit={contentFit}
|
||||
transition={150}
|
||||
blurRadius={blurRadius}
|
||||
onLoad={
|
||||
|
||||
@@ -35,7 +35,11 @@ export function HandoffBridge() {
|
||||
if (!active || !activity) return
|
||||
try {
|
||||
const source = new URL(activity.server)
|
||||
if (!config || source.origin !== new URL(config.serverUrl).origin) {
|
||||
if (!config) {
|
||||
showError("Connect to an oTunes server to continue this activity.")
|
||||
return
|
||||
}
|
||||
if (source.origin !== new URL(config.serverUrl).origin) {
|
||||
showError("This activity belongs to a different oTunes server.")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -112,7 +112,10 @@ function SwipeRowBody({
|
||||
setIsOpen(false)
|
||||
}, [removing, translateX])
|
||||
|
||||
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
|
||||
const handleSwipeStart = useCallback(
|
||||
() => group.setOpen(close),
|
||||
[close, group]
|
||||
)
|
||||
|
||||
const handleSettle = useCallback(
|
||||
(open: boolean) => {
|
||||
@@ -251,8 +254,7 @@ function SwipeRowBody({
|
||||
const pillWidth = Math.max(
|
||||
0,
|
||||
resting +
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
|
||||
commitProgress.value
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
|
||||
)
|
||||
const restingHeight = interpolate(
|
||||
pillWidth,
|
||||
|
||||
@@ -0,0 +1,351 @@
|
||||
import {
|
||||
memo,
|
||||
type ComponentType,
|
||||
type ReactElement,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
} from "react"
|
||||
import {
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ScrollViewInstance,
|
||||
type ViewProps,
|
||||
} from "react-native"
|
||||
import MaskedViewClass from "@react-native-masked-view/masked-view"
|
||||
import Animated, {
|
||||
useAnimatedStyle,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
|
||||
import {
|
||||
usePlaybackActions,
|
||||
usePlaybackProgress,
|
||||
usePlaybackQueue,
|
||||
} from "@/contexts/playback"
|
||||
import { useLyricsTime, usePlaybackClock } from "@/hooks/use-lyrics"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
import {
|
||||
activeLineIndex,
|
||||
type LyricLine,
|
||||
type LyricWord,
|
||||
type Lyrics,
|
||||
} from "@otunes/convex/client/lyrics"
|
||||
|
||||
// The package's class typings predate React 19's; this is its documented API.
|
||||
const MaskedView = MaskedViewClass as unknown as ComponentType<
|
||||
ViewProps & { maskElement: ReactElement }
|
||||
>
|
||||
|
||||
/** How long a manual scroll keeps the view from following the song. */
|
||||
const MANUAL_SCROLL_HOLD_MS = 3000
|
||||
/** Where the playing line sits, as a share of the view's height from the top. */
|
||||
const ACTIVE_LINE_POSITION = 0.12
|
||||
/** Blur radius by distance from the playing line; farther lines share the last. */
|
||||
const LINE_BLUR = [0, 1, 2, 3]
|
||||
/** Opacity of lines other than the one playing. */
|
||||
const INACTIVE_LINE_OPACITY = 0.35
|
||||
/** How long a line takes to brighten, dim, or change blur. */
|
||||
const LINE_FADE_MS = 300
|
||||
|
||||
/**
|
||||
* Lyrics in the player's own colors. Synced lines follow playback and seek
|
||||
* when tapped; `null` lyrics show a short note instead.
|
||||
*/
|
||||
export function LyricsView({
|
||||
lyrics,
|
||||
colors,
|
||||
fontSize = 30,
|
||||
}: {
|
||||
lyrics: Lyrics | null | undefined
|
||||
colors: NowPlayingColors
|
||||
fontSize?: number
|
||||
}) {
|
||||
if (lyrics === undefined) return null
|
||||
if (lyrics === null) {
|
||||
return (
|
||||
<View style={styles.empty}>
|
||||
<Text style={[styles.emptyText, { color: colors.secondaryForeground }]}>
|
||||
No lyrics
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
return <LyricsLines lyrics={lyrics} colors={colors} fontSize={fontSize} />
|
||||
}
|
||||
|
||||
function LyricsLines({
|
||||
lyrics,
|
||||
colors,
|
||||
fontSize,
|
||||
}: {
|
||||
lyrics: Lyrics
|
||||
colors: NowPlayingColors
|
||||
fontSize: number
|
||||
}) {
|
||||
const { currentTime } = usePlaybackProgress()
|
||||
const { isPlaying } = usePlaybackQueue()
|
||||
const { seekTo, setIsPlaying } = usePlaybackActions()
|
||||
const time = useLyricsTime(lyrics, currentTime, isPlaying)
|
||||
const clock = usePlaybackClock(currentTime, isPlaying)
|
||||
const active = activeLineIndex(lyrics, time)
|
||||
const synced = lyrics.synced !== "none"
|
||||
const scrollRef = useRef<ScrollViewInstance>(null)
|
||||
const lineOffsets = useRef<number[]>([])
|
||||
const [height, setHeight] = useState(0)
|
||||
// While the listener scrolls, lines stay sharp and the view stays put.
|
||||
const [browsing, setBrowsing] = useState(false)
|
||||
const browseTimer = useRef<ReturnType<typeof setTimeout>>(undefined)
|
||||
|
||||
useEffect(() => () => clearTimeout(browseTimer.current), [])
|
||||
|
||||
const scrollToLine = useCallback(
|
||||
(index: number) => {
|
||||
const y = lineOffsets.current[Math.max(index, 0)]
|
||||
if (y === undefined || !synced || height === 0 || browsing) return
|
||||
scrollRef.current?.scrollTo({
|
||||
y: Math.max(0, y - height * ACTIVE_LINE_POSITION),
|
||||
animated: true,
|
||||
})
|
||||
},
|
||||
[height, synced, browsing]
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
scrollToLine(active)
|
||||
}, [active, scrollToLine])
|
||||
|
||||
const activeRef = useRef(active)
|
||||
useEffect(() => {
|
||||
activeRef.current = active
|
||||
}, [active])
|
||||
const handleLineLayout = useCallback(
|
||||
(index: number, y: number) => {
|
||||
lineOffsets.current[index] = y
|
||||
// Opening mid-song: jump once the playing line has been measured.
|
||||
if (index === Math.max(activeRef.current, 0)) scrollToLine(index)
|
||||
},
|
||||
[scrollToLine]
|
||||
)
|
||||
|
||||
const playFrom = useCallback(
|
||||
(seconds: number) => {
|
||||
seekTo(seconds)
|
||||
setIsPlaying(true)
|
||||
clearTimeout(browseTimer.current)
|
||||
setBrowsing(false)
|
||||
},
|
||||
[seekTo, setIsPlaying]
|
||||
)
|
||||
|
||||
const releaseScroll = () => {
|
||||
clearTimeout(browseTimer.current)
|
||||
browseTimer.current = setTimeout(
|
||||
() => setBrowsing(false),
|
||||
MANUAL_SCROLL_HOLD_MS
|
||||
)
|
||||
}
|
||||
|
||||
const lineStyle = useMemo(
|
||||
() => ({ fontSize, lineHeight: Math.round(fontSize * 1.18) }),
|
||||
[fontSize]
|
||||
)
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
ref={scrollRef}
|
||||
style={styles.fill}
|
||||
contentContainerStyle={{
|
||||
paddingTop: height * ACTIVE_LINE_POSITION,
|
||||
paddingBottom: height * 0.7,
|
||||
}}
|
||||
showsVerticalScrollIndicator={false}
|
||||
onLayout={(event) => setHeight(event.nativeEvent.layout.height)}
|
||||
onScrollBeginDrag={() => {
|
||||
clearTimeout(browseTimer.current)
|
||||
setBrowsing(true)
|
||||
}}
|
||||
// Hold from when the scroll settles, not when the finger lifted.
|
||||
onScrollEndDrag={releaseScroll}
|
||||
onMomentumScrollEnd={releaseScroll}
|
||||
>
|
||||
{lyrics.lines.map((line, index) =>
|
||||
synced ? (
|
||||
<SyncedLine
|
||||
key={index}
|
||||
index={index}
|
||||
line={line}
|
||||
distance={
|
||||
browsing
|
||||
? 0
|
||||
: Math.min(Math.abs(index - active), LINE_BLUR.length - 1)
|
||||
}
|
||||
active={index === active}
|
||||
clock={clock}
|
||||
colors={colors}
|
||||
textStyle={lineStyle}
|
||||
onSelect={playFrom}
|
||||
onLayoutY={handleLineLayout}
|
||||
/>
|
||||
) : (
|
||||
<Text
|
||||
key={index}
|
||||
style={[
|
||||
styles.plainLine,
|
||||
{
|
||||
color: colors.foreground,
|
||||
fontSize: fontSize * 0.75,
|
||||
lineHeight: Math.round(fontSize * 0.75 * 1.25),
|
||||
},
|
||||
line.text === "" && styles.stanzaGap,
|
||||
]}
|
||||
>
|
||||
{line.text}
|
||||
</Text>
|
||||
)
|
||||
)}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* One timed line, laid out word by word whether or not it is playing, so it
|
||||
* never re-wraps. It fades and blurs by its `distance` from the playing line,
|
||||
* and only the playing line's words fill.
|
||||
*/
|
||||
const SyncedLine = memo(function SyncedLine({
|
||||
index,
|
||||
line,
|
||||
distance,
|
||||
active,
|
||||
clock,
|
||||
colors,
|
||||
textStyle,
|
||||
onSelect,
|
||||
onLayoutY,
|
||||
}: {
|
||||
index: number
|
||||
line: LyricLine
|
||||
distance: number
|
||||
active: boolean
|
||||
clock: SharedValue<number>
|
||||
colors: NowPlayingColors
|
||||
textStyle: { fontSize: number; lineHeight: number }
|
||||
onSelect: (seconds: number) => void
|
||||
onLayoutY: (index: number, y: number) => void
|
||||
}) {
|
||||
const wordStyle = [styles.lineText, textStyle, { color: colors.foreground }]
|
||||
return (
|
||||
<Pressable
|
||||
onPress={() => onSelect(line.start ?? 0)}
|
||||
onLayout={(event) => onLayoutY(index, event.nativeEvent.layout.y)}
|
||||
accessibilityRole="button"
|
||||
accessibilityHint="Plays from this line"
|
||||
style={styles.line}
|
||||
>
|
||||
<Animated.View
|
||||
style={{
|
||||
opacity: active ? 1 : INACTIVE_LINE_OPACITY,
|
||||
filter: [{ blur: LINE_BLUR[distance] }],
|
||||
transitionProperty: ["opacity", "filter"],
|
||||
transitionDuration: LINE_FADE_MS,
|
||||
}}
|
||||
>
|
||||
{line.words ? (
|
||||
<View
|
||||
style={[styles.words, { columnGap: textStyle.fontSize * 0.25 }]}
|
||||
>
|
||||
{line.words.map((word, wordIndex) =>
|
||||
active ? (
|
||||
<FilledWord
|
||||
key={wordIndex}
|
||||
word={word}
|
||||
clock={clock}
|
||||
colors={colors}
|
||||
textStyle={textStyle}
|
||||
/>
|
||||
) : (
|
||||
<Text key={wordIndex} style={wordStyle}>
|
||||
{word.text.trim()}
|
||||
</Text>
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
) : (
|
||||
<Text style={wordStyle}>{line.text}</Text>
|
||||
)}
|
||||
</Animated.View>
|
||||
</Pressable>
|
||||
)
|
||||
})
|
||||
|
||||
/**
|
||||
* A word of the playing line, filled from dim to bright with a soft edge as
|
||||
* it is sung: a gradient 2.5 times its width slides under the word's
|
||||
* shape, like the web panel's.
|
||||
*/
|
||||
function FilledWord({
|
||||
word,
|
||||
clock,
|
||||
colors,
|
||||
textStyle,
|
||||
}: {
|
||||
word: LyricWord
|
||||
clock: SharedValue<number>
|
||||
colors: NowPlayingColors
|
||||
textStyle: { fontSize: number; lineHeight: number }
|
||||
}) {
|
||||
const text = word.text.trim()
|
||||
const slide = useAnimatedStyle(() => {
|
||||
const progress =
|
||||
(clock.value - word.start) / Math.max(word.end - word.start, 0.05)
|
||||
const sung = Math.min(Math.max(progress, 0), 1)
|
||||
// -60% of the gradient's width shows its dim end; 0% its bright one.
|
||||
return { transform: [{ translateX: `${-60 * (1 - sung)}%` }] }
|
||||
})
|
||||
|
||||
return (
|
||||
<MaskedView
|
||||
maskElement={
|
||||
<Text style={[styles.lineText, textStyle, styles.mask]}>{text}</Text>
|
||||
}
|
||||
>
|
||||
{/* Sizes the word; the mask draws it. */}
|
||||
<Text style={[styles.lineText, textStyle, styles.hidden]}>{text}</Text>
|
||||
<Animated.View
|
||||
style={[
|
||||
styles.fillGradient,
|
||||
{
|
||||
backgroundImage: `linear-gradient(90deg, ${colors.foreground} 40%, ${colors.lyricsUnsung} 60%)`,
|
||||
},
|
||||
slide,
|
||||
]}
|
||||
/>
|
||||
</MaskedView>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
fill: { flex: 1 },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
emptyText: { fontSize: 17, fontWeight: "600" },
|
||||
line: { paddingVertical: 9 },
|
||||
lineText: { fontWeight: "800" },
|
||||
words: { flexDirection: "row", flexWrap: "wrap" },
|
||||
mask: { color: "black" },
|
||||
hidden: { opacity: 0 },
|
||||
fillGradient: {
|
||||
position: "absolute",
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
width: "250%",
|
||||
},
|
||||
plainLine: { fontWeight: "700", paddingVertical: 2 },
|
||||
stanzaGap: { height: 18 },
|
||||
})
|
||||
@@ -1,7 +0,0 @@
|
||||
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"
|
||||
@@ -20,6 +20,7 @@ import {
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { MediaContextMenu } from "@/components/media-context-menu"
|
||||
import { useIsCollectionDownloaded } from "@/contexts/downloads"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
@@ -51,6 +52,7 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||
const downloaded = useIsCollectionDownloaded({ kind: "album", id: album.id })
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
@@ -102,6 +104,7 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
hasArtwork: album.cover != null,
|
||||
}}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
downloaded={downloaded}
|
||||
stationArtistId={album.artist.id}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
@@ -187,6 +190,10 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handlePlaylistAction } = useMediaMenuActions()
|
||||
const downloaded = useIsCollectionDownloaded({
|
||||
kind: "playlist",
|
||||
id: playlist.id,
|
||||
})
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
@@ -200,7 +207,11 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
uri={playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist.id,
|
||||
playlist.cover
|
||||
)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={
|
||||
fluid
|
||||
@@ -231,6 +242,7 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
showFavorite={false}
|
||||
downloaded={downloaded}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlist.id,
|
||||
|
||||
@@ -32,7 +32,11 @@ export type MediaAction =
|
||||
| "favorite"
|
||||
| "go-artist"
|
||||
| "go-album"
|
||||
| "remove-from-playlist"
|
||||
| "change-cover"
|
||||
| "delete-playlist"
|
||||
| "download"
|
||||
| "remove-download"
|
||||
|
||||
export type MediaNavigation = {
|
||||
artist?: { id: string }
|
||||
@@ -54,9 +58,12 @@ export type MediaMenuConfig = {
|
||||
playlistLabel?: string
|
||||
favorited?: boolean
|
||||
showFavorite?: boolean
|
||||
showRemoveFromPlaylist?: boolean
|
||||
stationArtistId?: string
|
||||
navigation?: MediaNavigation
|
||||
share?: MediaShareContext
|
||||
/** Shows Download, or Remove Download when true. Omit to hide both. */
|
||||
downloaded?: boolean
|
||||
includeActions?: MediaAction[]
|
||||
onAction: (action: MediaAction) => void
|
||||
}
|
||||
@@ -70,32 +77,39 @@ const QUEUE_ACTIONS: MediaAction[] = ["play-next", "play-last", "shuffle"]
|
||||
|
||||
const MEDIA_ACTION_ITEMS: {
|
||||
action: MediaAction
|
||||
label: (
|
||||
countSuffix: string,
|
||||
favorited: boolean | undefined,
|
||||
playlistLabel: string
|
||||
) => string
|
||||
label: (favorited: boolean | undefined, playlistLabel: string) => string
|
||||
image: NonNullable<MenuAction["image"]> & string
|
||||
destructive?: boolean
|
||||
}[] = [
|
||||
{
|
||||
action: "playlist",
|
||||
label: (countSuffix, _favorited, playlistLabel) =>
|
||||
`${playlistLabel}${countSuffix}`,
|
||||
label: (_favorited, playlistLabel) => playlistLabel,
|
||||
image: "text.badge.plus",
|
||||
},
|
||||
{
|
||||
action: "download",
|
||||
label: () => "Download",
|
||||
image: "arrow.down.circle",
|
||||
},
|
||||
{
|
||||
action: "remove-download",
|
||||
label: () => "Remove Download",
|
||||
image: "xmark.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "play-next",
|
||||
label: (countSuffix) => `Play Next${countSuffix}`,
|
||||
label: () => "Play Next",
|
||||
image: "text.line.first.and.arrowtriangle.forward",
|
||||
},
|
||||
{
|
||||
action: "play-last",
|
||||
label: (countSuffix) => `Play Last${countSuffix}`,
|
||||
label: () => "Play Last",
|
||||
image: "text.line.last.and.arrowtriangle.forward",
|
||||
},
|
||||
{
|
||||
action: "shuffle",
|
||||
label: (countSuffix) => `Shuffle${countSuffix}`,
|
||||
label: () => "Shuffle",
|
||||
image: "shuffle",
|
||||
},
|
||||
{
|
||||
@@ -115,10 +129,20 @@ const MEDIA_ACTION_ITEMS: {
|
||||
},
|
||||
{
|
||||
action: "favorite",
|
||||
label: (countSuffix, favorited) =>
|
||||
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
|
||||
label: (favorited) => (favorited ? "Unfavorite" : "Favorite"),
|
||||
image: "star",
|
||||
},
|
||||
{
|
||||
action: "remove-from-playlist",
|
||||
label: () => "Remove from Playlist",
|
||||
image: "minus.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "change-cover",
|
||||
label: () => "Change Cover",
|
||||
image: "photo",
|
||||
},
|
||||
{
|
||||
action: "delete-playlist",
|
||||
label: () => "Delete Playlist",
|
||||
@@ -134,11 +158,23 @@ function isActionIncluded(
|
||||
return false
|
||||
}
|
||||
|
||||
if (action === "remove-from-playlist") {
|
||||
return config.showRemoveFromPlaylist === true
|
||||
}
|
||||
|
||||
if (action === "download") {
|
||||
return config.downloaded === false
|
||||
}
|
||||
|
||||
if (action === "remove-download") {
|
||||
return config.downloaded === true
|
||||
}
|
||||
|
||||
if (config.includeActions) {
|
||||
return config.includeActions.includes(action)
|
||||
}
|
||||
|
||||
if (action === "delete-playlist") {
|
||||
if (action === "delete-playlist" || action === "change-cover") {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -164,12 +200,7 @@ function isActionIncluded(
|
||||
export function buildMediaMenuActions(
|
||||
config: Omit<MediaMenuConfig, "onAction">
|
||||
): MenuAction[] {
|
||||
const {
|
||||
selectedCount = 1,
|
||||
favorited,
|
||||
playlistLabel = "Add to Playlist",
|
||||
} = config
|
||||
const countSuffix = selectedCount > 1 ? ` (${selectedCount})` : ""
|
||||
const { favorited, playlistLabel = "Add to Playlist" } = config
|
||||
|
||||
const actions: MenuAction[] = []
|
||||
|
||||
@@ -188,8 +219,9 @@ export function buildMediaMenuActions(
|
||||
|
||||
actions.push({
|
||||
id: item.action,
|
||||
title: item.label(countSuffix, favorited, playlistLabel),
|
||||
title: item.label(favorited, playlistLabel),
|
||||
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||
...(item.destructive ? { attributes: { destructive: true } } : {}),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -324,6 +356,7 @@ const NativeContextMenuAction: ComponentType<{
|
||||
identifier: string
|
||||
title: string
|
||||
icon?: string
|
||||
destructive?: boolean
|
||||
onSelected: () => void
|
||||
}> | null =
|
||||
Platform.OS === "ios"
|
||||
@@ -377,6 +410,7 @@ function NativeMediaContextMenu({
|
||||
identifier={action.id ?? action.title}
|
||||
title={action.title}
|
||||
icon={typeof action.image === "string" ? action.image : undefined}
|
||||
destructive={action.attributes?.destructive}
|
||||
onSelected={() => handleAction(action.id as MediaAction)}
|
||||
/>
|
||||
))}
|
||||
|
||||
@@ -25,7 +25,11 @@ const actionIcons = {
|
||||
favorite: "star-outline",
|
||||
"go-artist": "person-outline",
|
||||
"go-album": "disc-outline",
|
||||
"remove-from-playlist": "remove-circle-outline",
|
||||
"change-cover": "image-outline",
|
||||
"delete-playlist": "trash-outline",
|
||||
download: "arrow-down-circle-outline",
|
||||
"remove-download": "close-circle-outline",
|
||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||
|
||||
// The community MenuView creates a dynamic-color Host internally. Own this
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
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,8 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { useAndroidTabPalette } 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 +62,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 +70,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
@@ -86,8 +80,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={20}
|
||||
color={colors.foreground}
|
||||
@@ -105,8 +98,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 +106,8 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||
{ color: colors.mutedForeground },
|
||||
@@ -124,7 +115,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
@@ -138,12 +129,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 +140,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
@@ -169,12 +154,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>
|
||||
@@ -183,21 +163,10 @@ 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
|
||||
style={[
|
||||
styles.separator,
|
||||
styles.topBorder,
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
) : null}
|
||||
<View
|
||||
style={[
|
||||
styles.separator,
|
||||
@@ -205,7 +174,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -285,7 +254,6 @@ const styles = StyleSheet.create({
|
||||
height: 1,
|
||||
zIndex: 1,
|
||||
},
|
||||
topBorder: { top: 0 },
|
||||
bottomBorder: { bottom: 0 },
|
||||
content: {
|
||||
flexDirection: "row",
|
||||
|
||||
@@ -38,7 +38,7 @@ import {
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
@@ -110,18 +110,16 @@ export function NowPlayingQueue({
|
||||
tablet?: boolean
|
||||
fadeColor?: string
|
||||
}) {
|
||||
const { queueSongIds, queueHistorySongIds, shuffleEnabled, repeatEnabled } =
|
||||
usePlaybackQueue()
|
||||
const {
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
clearHistory,
|
||||
reorderQueue,
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
} = usePlayback()
|
||||
} = usePlaybackActions()
|
||||
const [viewportWidth, setViewportWidth] = useState(0)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const [scrollEnabled, setScrollEnabled] = useState(true)
|
||||
@@ -307,100 +305,126 @@ export function NowPlayingQueue({
|
||||
[drag]
|
||||
)
|
||||
|
||||
const renderItem = ({ item }: { item: QueueListItem }) => {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return (
|
||||
<View style={styles.historyHeader}>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
History
|
||||
</Text>
|
||||
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||
<Text
|
||||
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Clear
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
case "history":
|
||||
return (
|
||||
<HistoryRow
|
||||
songId={item.songId}
|
||||
historyIndex={item.historyIndex}
|
||||
colors={colors}
|
||||
onPress={skipToHistoryIndex}
|
||||
/>
|
||||
)
|
||||
case "current":
|
||||
return <View style={styles.current}>{currentHeader}</View>
|
||||
case "controls":
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : 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}
|
||||
{item.showTitle ? (
|
||||
const lastIndex = queueSongIds.length - 1
|
||||
const renderItem = useCallback(
|
||||
({ item }: { item: QueueListItem }) => {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return (
|
||||
<View style={styles.historyHeader}>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Continue Playing
|
||||
History
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
case "upcoming":
|
||||
return (
|
||||
<UpcomingRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={queueSongIds.length - 1}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
onPress={skipToQueueIndex}
|
||||
onRemove={handleRemove}
|
||||
onDragStart={handleDragStart}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
)
|
||||
case "empty":
|
||||
return (
|
||||
<View style={[styles.empty, { height: item.height }]}>
|
||||
<Text
|
||||
style={[styles.emptyText, { color: colors.secondaryForeground }]}
|
||||
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||
<Text
|
||||
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Clear
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
case "history":
|
||||
return (
|
||||
<HistoryRow
|
||||
songId={item.songId}
|
||||
historyIndex={item.historyIndex}
|
||||
colors={colors}
|
||||
onPress={skipToHistoryIndex}
|
||||
/>
|
||||
)
|
||||
case "current":
|
||||
return <View style={styles.current}>{currentHeader}</View>
|
||||
case "controls":
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
Nothing else is queued.
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
}
|
||||
{!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}
|
||||
{item.showTitle ? (
|
||||
<Text
|
||||
style={[styles.sectionTitle, { color: colors.foreground }]}
|
||||
>
|
||||
Continue Playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
case "upcoming":
|
||||
return (
|
||||
<UpcomingRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={lastIndex}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
onPress={skipToQueueIndex}
|
||||
onRemove={handleRemove}
|
||||
onDragStart={handleDragStart}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
)
|
||||
case "empty":
|
||||
return (
|
||||
<View style={[styles.empty, { height: item.height }]}>
|
||||
<Text
|
||||
style={[
|
||||
styles.emptyText,
|
||||
{ color: colors.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
Nothing else is queued.
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
},
|
||||
[
|
||||
clearHistory,
|
||||
colors,
|
||||
currentHeader,
|
||||
cycleRepeat,
|
||||
drag,
|
||||
handleDragStart,
|
||||
handleDrop,
|
||||
handleRemove,
|
||||
lastIndex,
|
||||
repeatEnabled,
|
||||
shuffleEnabled,
|
||||
skipToHistoryIndex,
|
||||
skipToQueueIndex,
|
||||
swipeGroup,
|
||||
tablet,
|
||||
toggleShuffle,
|
||||
]
|
||||
)
|
||||
|
||||
return (
|
||||
<View
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
connectivityStore,
|
||||
type PlatformNetwork,
|
||||
} from "@otunes/convex/client/connectivity"
|
||||
import { useConvex } from "convex/react"
|
||||
import {
|
||||
addNetworkStateListener,
|
||||
getNetworkStateAsync,
|
||||
type NetworkState,
|
||||
} from "expo-network"
|
||||
import { useTheme } from "expo-router"
|
||||
import { useContext, useSyncExternalStore } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
let deviceOnline = true
|
||||
|
||||
/** The device's network state. Unknown reachability counts as online. */
|
||||
const deviceNetwork: PlatformNetwork = {
|
||||
isOnline: () => deviceOnline,
|
||||
subscribe(onChange) {
|
||||
const apply = (state: NetworkState) => {
|
||||
deviceOnline =
|
||||
state.isConnected !== false && state.isInternetReachable !== false
|
||||
onChange()
|
||||
}
|
||||
const subscription = addNetworkStateListener(apply)
|
||||
void getNetworkStateAsync().then(apply)
|
||||
return () => subscription.remove()
|
||||
},
|
||||
}
|
||||
|
||||
/** True while the device has no network or the server can't be reached. */
|
||||
export function useIsOffline() {
|
||||
const store = connectivityStore(useConvex(), deviceNetwork)
|
||||
return useSyncExternalStore(store.subscribe, store.getSnapshot)
|
||||
}
|
||||
|
||||
type ScreenRoute = { name: string; params?: object }
|
||||
|
||||
/** Downloads screens, and albums and playlists opened from them, stay usable offline. */
|
||||
function worksOffline(route: ScreenRoute, tabletSection: string | undefined) {
|
||||
if (route.name.startsWith("downloads/")) return true
|
||||
if (route.name === "index" && tabletSection === "downloads") return true
|
||||
// Settings stays reachable so an unreachable server can be changed.
|
||||
if (route.name === "settings") return true
|
||||
return (route.params as { from?: string } | undefined)?.from === "downloads"
|
||||
}
|
||||
|
||||
/**
|
||||
* Covers a tab screen with a no-connection message while offline. The screen
|
||||
* stays mounted underneath so it picks up where it was once the server is back.
|
||||
*/
|
||||
export function OfflineOverlay({ route }: { route: ScreenRoute }) {
|
||||
const offline = useIsOffline()
|
||||
const tabletSection = useContext(TabletSectionContext)?.name
|
||||
const { push } = useAppNavigation()
|
||||
const { colors: routerColors } = useTheme()
|
||||
const colors = useThemeColors()
|
||||
|
||||
if (!offline || worksOffline(route, tabletSection)) return null
|
||||
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
StyleSheet.absoluteFill,
|
||||
styles.overlay,
|
||||
{ backgroundColor: routerColors.background },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
name="cloud-offline-outline"
|
||||
size={28}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
<Text style={[styles.title, { color: routerColors.text }]}>
|
||||
No connection
|
||||
</Text>
|
||||
<Text style={[styles.body, { color: colors.mutedForeground }]}>
|
||||
Your downloads still play.
|
||||
</Text>
|
||||
<Pressable
|
||||
accessibilityRole="link"
|
||||
hitSlop={spacing.sm}
|
||||
onPress={() => push("/downloads")}
|
||||
>
|
||||
<Text style={[styles.link, { color: colors.primary }]}>
|
||||
Go to Downloads
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
overlay: {
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
title: { fontSize: 17, fontWeight: "600", marginTop: spacing.xs },
|
||||
body: { fontSize: 15, textAlign: "center" },
|
||||
link: { fontSize: 15, fontWeight: "600", marginTop: spacing.xs },
|
||||
})
|
||||
@@ -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 />
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
import { useState, type ReactNode } from "react"
|
||||
import {
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type StyleProp,
|
||||
type TextStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { usePlaybackActions, usePlaybackProgress } from "@/contexts/playback"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
|
||||
/**
|
||||
* Position slider with elapsed and remaining labels. The only player piece
|
||||
* subscribed to the playback clock, so the rest of the player stays still
|
||||
* while audio plays.
|
||||
*/
|
||||
export function PlayerProgress({
|
||||
colors,
|
||||
center,
|
||||
timeStyle,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
/** Shown centered between the time labels. */
|
||||
center?: ReactNode
|
||||
timeStyle?: StyleProp<TextStyle>
|
||||
}) {
|
||||
const { currentTime, duration } = usePlaybackProgress()
|
||||
const { seekTo } = usePlaybackActions()
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const time = scrubTime ?? currentTime
|
||||
const timeColor =
|
||||
scrubTime === null ? colors.secondaryForeground : colors.foreground
|
||||
|
||||
return (
|
||||
<>
|
||||
<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.row}>
|
||||
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
|
||||
{formatDuration(time)}
|
||||
</Text>
|
||||
{center ? (
|
||||
<View style={styles.center} pointerEvents="none">
|
||||
{center}
|
||||
</View>
|
||||
) : null}
|
||||
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
|
||||
{formatRemainingDuration(time, duration).replace("-", "−")}
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
center: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
alignItems: "center",
|
||||
},
|
||||
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||
})
|
||||
@@ -1,11 +1,16 @@
|
||||
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"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
useSongDownloadState,
|
||||
useToggleSongDownload,
|
||||
} from "@/contexts/downloads"
|
||||
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
|
||||
import type { CoverPalette } from "@/lib/cover-palette"
|
||||
import { formatDuration } from "@/lib/format"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
@@ -16,7 +21,7 @@ import {
|
||||
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,
|
||||
@@ -34,8 +39,10 @@ export const SongRow = memo(function SongRow({
|
||||
palette,
|
||||
inset = false,
|
||||
swipe,
|
||||
downloadFrom,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
/** Search results also show the lyrics line they matched. */
|
||||
song: SearchSong
|
||||
onPress?: () => void
|
||||
contextMenu?: Omit<MediaMenuConfig, "onAction"> & {
|
||||
onAction: MediaMenuConfig["onAction"]
|
||||
@@ -45,13 +52,20 @@ export const SongRow = memo(function SongRow({
|
||||
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
|
||||
/** The download this row belongs to; removing only takes it out of that. */
|
||||
downloadFrom?: DownloadSource
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const downloadState = useSongDownloadState(song.id, downloadFrom)
|
||||
const downloaded = downloadState === "here"
|
||||
const toggleDownload = useToggleSongDownload()
|
||||
if (!config) return null
|
||||
|
||||
const foreground = palette?.foreground ?? colors.foreground
|
||||
@@ -62,27 +76,38 @@ 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>
|
||||
{song.lyricsSnippet ? (
|
||||
<Text
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
Lyrics: “{song.lyricsSnippet}”
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.duration, { color: secondaryForeground }]}
|
||||
>
|
||||
{downloaded || downloadState === "device" ? (
|
||||
<Ionicons
|
||||
name="arrow-down-circle"
|
||||
size={14}
|
||||
color={secondaryForeground}
|
||||
accessibilityLabel="Downloaded"
|
||||
/>
|
||||
) : null}
|
||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{trailing}
|
||||
</>
|
||||
)
|
||||
@@ -107,10 +132,14 @@ export const SongRow = memo(function SongRow({
|
||||
? styles.insetRow
|
||||
: [styles.row, { borderBottomColor: divider }]
|
||||
const row =
|
||||
swipe && Platform.OS === "ios" ? (
|
||||
swipe && Platform.OS !== "web" ? (
|
||||
<SongSwipeRow
|
||||
group={swipe.group}
|
||||
onPlayNext={swipe.onPlayNext}
|
||||
onAddToQueue={swipe.onAddToQueue}
|
||||
onRemove={swipe.onRemove}
|
||||
downloaded={downloaded}
|
||||
onDownload={() => toggleDownload(song, downloaded, downloadFrom)}
|
||||
backgroundColor={swipe.backgroundColor}
|
||||
onPress={onPress}
|
||||
style={rowStyle}
|
||||
@@ -156,10 +185,12 @@ export const SongListRow = memo(function SongListRow({
|
||||
palette,
|
||||
inset,
|
||||
swipe,
|
||||
removable,
|
||||
downloadFrom,
|
||||
onPlay,
|
||||
onAction,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
song: SearchSong
|
||||
favorited: boolean
|
||||
playlistLabel?: string
|
||||
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
||||
@@ -167,12 +198,19 @@ export const SongListRow = memo(function SongListRow({
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Shows "Remove from Playlist" in the context menu. */
|
||||
removable?: boolean
|
||||
/** The download this row belongs to; removing only takes it out of that. */
|
||||
downloadFrom?: DownloadSource
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const downloaded = useSongDownloadState(song.id, downloadFrom) === "here"
|
||||
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
||||
|
||||
return (
|
||||
@@ -181,6 +219,7 @@ export const SongListRow = memo(function SongListRow({
|
||||
palette={palette}
|
||||
inset={inset}
|
||||
swipe={swipe}
|
||||
downloadFrom={downloadFrom}
|
||||
onPress={handlePress}
|
||||
contextMenu={{
|
||||
preview: config
|
||||
@@ -195,7 +234,9 @@ export const SongListRow = memo(function SongListRow({
|
||||
: undefined,
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
downloaded,
|
||||
playlistLabel,
|
||||
showRemoveFromPlaylist: removable,
|
||||
navigation: {
|
||||
artist: { id: song.artist.id },
|
||||
album: { id: song.album.id },
|
||||
|
||||
@@ -2,21 +2,24 @@ import { useCallback, useMemo } from "react"
|
||||
import { Platform } from "react-native"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { useQuery } from "convex/react"
|
||||
|
||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
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(() => {
|
||||
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])
|
||||
const lyricsMatches = useQuery(
|
||||
api.lyrics.matchingSongIds,
|
||||
search.searchQuery.trim() ? { query: search.searchQuery } : "skip"
|
||||
)
|
||||
const filteredSongs = useMemo(
|
||||
() => filterSongs(songs, search.searchQuery, lyricsMatches),
|
||||
[songs, search.searchQuery, lyricsMatches]
|
||||
)
|
||||
|
||||
return { ...search, filteredSongs }
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import { Image } from "expo-image"
|
||||
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"
|
||||
@@ -13,6 +14,7 @@ export function ProfileHeaderButton() {
|
||||
const openSettings = useOpenSettings()
|
||||
const colors = useThemeColors()
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const imageUrl = useProfileImageUrl(user?.image)
|
||||
|
||||
if (tabletLayout) return null
|
||||
|
||||
@@ -33,9 +35,9 @@ export function ProfileHeaderButton() {
|
||||
},
|
||||
]}
|
||||
>
|
||||
{user?.image ? (
|
||||
{imageUrl ? (
|
||||
<Image
|
||||
source={{ uri: user.image }}
|
||||
source={{ uri: imageUrl }}
|
||||
style={styles.image}
|
||||
contentFit="cover"
|
||||
/>
|
||||
|
||||
@@ -16,7 +16,7 @@ import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
|
||||
@@ -64,7 +64,7 @@ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
|
||||
[handleSongAction]
|
||||
)
|
||||
const renderItem = useCallback(
|
||||
({ item: song }: ListRenderItemInfo<BrowseSong>) => (
|
||||
({ item: song }: ListRenderItemInfo<SearchSong>) => (
|
||||
<SongListRow
|
||||
song={song}
|
||||
favorited={isSongFavorite(song.id)}
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
CollectionDivider,
|
||||
collectionInset,
|
||||
} from "@/components/collection-list"
|
||||
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
|
||||
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 { type ComponentProps, type ReactNode } from "react"
|
||||
import {
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
View,
|
||||
type DimensionValue,
|
||||
@@ -17,34 +22,42 @@ import {
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
||||
function SkeletonContent({
|
||||
/**
|
||||
* Loading screens never scroll, so they cannot rely on scroll-view inset
|
||||
* adjustment. iOS headers are transparent and overlap the screen; Android
|
||||
* headers are opaque and already sit above it.
|
||||
*/
|
||||
function SkeletonScreen({
|
||||
children,
|
||||
embedded = false,
|
||||
style,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
children: ReactNode
|
||||
embedded?: boolean
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
}) {
|
||||
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"
|
||||
scrollEnabled={false}
|
||||
<Reanimated.View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.screen,
|
||||
{
|
||||
backgroundColor: backgroundColor ?? colors.background,
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
},
|
||||
style,
|
||||
]}
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
</Reanimated.View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -61,56 +74,103 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
|
||||
function TextLine({
|
||||
width,
|
||||
height = 14,
|
||||
fontSize,
|
||||
}: {
|
||||
width: DimensionValue
|
||||
height?: number
|
||||
fontSize: number
|
||||
}) {
|
||||
return <Skeleton style={{ width, height, borderRadius: 4 }} />
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
width,
|
||||
height: Math.round(fontSize * 1.2),
|
||||
justifyContent: "center",
|
||||
}}
|
||||
>
|
||||
<Skeleton
|
||||
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
|
||||
/>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
export function SongRowSkeleton() {
|
||||
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
|
||||
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
|
||||
const colors = useThemeColors()
|
||||
const meta = (
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" fontSize={16} />
|
||||
<View style={styles.songSubtitle}>
|
||||
<TextLine width="40%" fontSize={14} />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
if (inset) {
|
||||
return (
|
||||
<View style={styles.insetRow}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
<View
|
||||
style={[
|
||||
styles.insetSongContent,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
>
|
||||
{meta}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<View style={[styles.songRow, { borderBottomColor: colors.border }]}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" height={16} />
|
||||
<TextLine width="40%" />
|
||||
{meta}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function TrackRowSkeleton() {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<View style={styles.trackRow}>
|
||||
<View style={styles.trackNumber}>
|
||||
<TextLine width={12} fontSize={16} />
|
||||
</View>
|
||||
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
|
||||
<TextLine width="55%" fontSize={16} />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
embedded = false,
|
||||
}: {
|
||||
rows?: number
|
||||
embedded?: boolean
|
||||
}) {
|
||||
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
||||
return Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} inset={inset} />
|
||||
))
|
||||
}
|
||||
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<SkeletonScreen>
|
||||
<SongRows rows={rows} />
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
|
||||
function CardSkeleton({
|
||||
width,
|
||||
minHeight,
|
||||
round = false,
|
||||
}: {
|
||||
width: number
|
||||
minHeight?: number
|
||||
round?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.card, { width }]}>
|
||||
<View style={[styles.card, { width, minHeight }]}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width,
|
||||
@@ -118,35 +178,37 @@ function CardSkeleton({
|
||||
borderRadius: round ? width / 2 : radius.md,
|
||||
}}
|
||||
/>
|
||||
<TextLine width="80%" />
|
||||
{round ? null : <TextLine width="50%" height={12} />}
|
||||
<TextLine width="80%" fontSize={14} />
|
||||
{round ? null : <TextLine width="50%" fontSize={12} />}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
embedded = false,
|
||||
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
|
||||
function MediaGridContent({
|
||||
items,
|
||||
contentInset,
|
||||
header,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
items: number
|
||||
contentInset: boolean
|
||||
header?: ReactNode
|
||||
}) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||
useMediaGridLayout()
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<>
|
||||
{header}
|
||||
<View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
{
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
// FlatList applies its content gap after the list header as well.
|
||||
marginTop: header && !tabletLayout ? gap : 0,
|
||||
gap,
|
||||
},
|
||||
]}
|
||||
@@ -154,20 +216,47 @@ export function MediaGridSkeleton({
|
||||
{Array.from(
|
||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||
(_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
<CardSkeleton
|
||||
key={index}
|
||||
width={cardWidth}
|
||||
minHeight={
|
||||
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
|
||||
}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
header,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
|
||||
header?: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<MediaGridContent
|
||||
items={items}
|
||||
contentInset={contentInset}
|
||||
header={header}
|
||||
/>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
export function CarouselSkeleton() {
|
||||
return (
|
||||
<View style={styles.carousel}>
|
||||
<TextLine width={160} height={22} />
|
||||
<TextLine width={160} fontSize={22} />
|
||||
<View style={styles.carouselRow}>
|
||||
{Array.from({ length: 3 }, (_, index) => (
|
||||
{Array.from({ length: 8 }, (_, index) => (
|
||||
<CardSkeleton key={index} width={carouselCardWidth} />
|
||||
))}
|
||||
</View>
|
||||
@@ -176,140 +265,148 @@ 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"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</ScrollView>
|
||||
<SkeletonScreen>
|
||||
<View style={styles.home}>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</View>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
function HeroActions({
|
||||
favorite = true,
|
||||
reverse = false,
|
||||
}: {
|
||||
favorite?: boolean
|
||||
reverse?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.actions, reverse && styles.actionsReverse]}>
|
||||
{favorite ? <Skeleton style={styles.iconAction} /> : null}
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
||||
export function CollectionDetailSkeleton({
|
||||
zoomCoverSize,
|
||||
variant,
|
||||
style,
|
||||
round = false,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
zoomCoverSize?: number
|
||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
||||
round?: boolean
|
||||
variant: "album" | "playlist" | "favorites" | "artist"
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
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,
|
||||
}}
|
||||
/>
|
||||
)
|
||||
|
||||
if (variant === "artist" || variant === "favorites") {
|
||||
const artist = variant === "artist"
|
||||
const coverSize = artist ? 180 : 200
|
||||
const hero = (
|
||||
<View style={styles.centeredHero}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: artist ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
<TextLine width={200} fontSize={artist ? 28 : 24} />
|
||||
<HeroActions favorite={artist} />
|
||||
</View>
|
||||
)
|
||||
return (
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
onLayout={onLayout}
|
||||
>
|
||||
{artist ? (
|
||||
<MediaGridContent items={4} contentInset={false} header={hero} />
|
||||
) : (
|
||||
<>
|
||||
{hero}
|
||||
<CollectionDivider />
|
||||
<SongRows rows={8} inset />
|
||||
</>
|
||||
)}
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
const album = variant === "album"
|
||||
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
|
||||
return (
|
||||
<Reanimated.ScrollView
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
onLayout={onLayout}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
|
||||
style,
|
||||
]}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
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>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: radius.lg,
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={<HeroActions favorite={album} reverse={landscape} />}
|
||||
>
|
||||
<TextLine
|
||||
width={landscape ? "85%" : 200}
|
||||
fontSize={landscape ? 22 : 24}
|
||||
/>
|
||||
<TextLine
|
||||
width={landscape ? "60%" : 120}
|
||||
fontSize={landscape ? 22 : 16}
|
||||
/>
|
||||
{album ? (
|
||||
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
|
||||
) : null}
|
||||
</CollectionHero>
|
||||
<CollectionDivider />
|
||||
{album ? (
|
||||
Array.from({ length: 10 }, (_, index) => (
|
||||
<TrackRowSkeleton key={index} />
|
||||
))
|
||||
) : (
|
||||
<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>
|
||||
<SongRows rows={8} inset />
|
||||
)}
|
||||
{round ? (
|
||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||
) : (
|
||||
<SongListSkeleton rows={8} embedded />
|
||||
)}
|
||||
</Reanimated.ScrollView>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" height={16} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<SkeletonScreen>
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" fontSize={16} />
|
||||
</View>
|
||||
))}
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
screen: { flex: 1, overflow: "hidden" },
|
||||
songRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
@@ -319,22 +416,55 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: spacing.lg,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
insetRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
paddingLeft: collectionInset,
|
||||
},
|
||||
insetSongContent: {
|
||||
flex: 1,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
alignSelf: "stretch",
|
||||
minHeight: 64,
|
||||
paddingVertical: 10,
|
||||
marginRight: collectionInset,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
songArtwork: { width: 44, height: 44, borderRadius: 6 },
|
||||
songMeta: { flex: 1, gap: 6 },
|
||||
card: { gap: spacing.xs },
|
||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
||||
gridInset: { padding: spacing.lg },
|
||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
||||
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 },
|
||||
actions: {
|
||||
songMeta: { flex: 1 },
|
||||
songSubtitle: { marginTop: 3 },
|
||||
trackRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.sm,
|
||||
paddingLeft: collectionInset,
|
||||
},
|
||||
trackNumber: { width: 24, alignItems: "center" },
|
||||
trackContent: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignSelf: "stretch",
|
||||
minHeight: 52,
|
||||
paddingVertical: 12,
|
||||
marginRight: collectionInset,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
card: { gap: spacing.xs },
|
||||
grid: { flexDirection: "row", flexWrap: "wrap" },
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
marginTop: spacing.sm,
|
||||
},
|
||||
actionsReverse: { flexDirection: "row-reverse" },
|
||||
iconAction: { width: 44, height: 44, borderRadius: 22 },
|
||||
playButton: { width: 160, height: 44, borderRadius: 999 },
|
||||
artistRow: {
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { SymbolView } from "expo-symbols"
|
||||
import {
|
||||
@@ -8,6 +9,7 @@ import {
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
@@ -26,14 +28,23 @@ import Animated, {
|
||||
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
|
||||
/** Width of each action when two share a side. */
|
||||
const PAIRED_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. */
|
||||
/**
|
||||
* A tap competes with the swipe so dragging a moving row never starts playback.
|
||||
* A full swipe commits the outer action: Add to Queue on the leading side, and
|
||||
* Remove on the trailing side when `onRemove` is set, else Download. Download
|
||||
* turns into a red Remove Download once `downloaded`.
|
||||
*/
|
||||
export function SongSwipeRow({
|
||||
children,
|
||||
style,
|
||||
@@ -41,6 +52,10 @@ export function SongSwipeRow({
|
||||
group,
|
||||
onPress,
|
||||
onPlayNext,
|
||||
onAddToQueue,
|
||||
onRemove,
|
||||
onDownload,
|
||||
downloaded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
@@ -48,7 +63,13 @@ export function SongSwipeRow({
|
||||
group: SwipeRowGroup
|
||||
onPress?: () => void
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
onDownload?: () => void
|
||||
downloaded?: boolean
|
||||
}) {
|
||||
const hasRemove = !!onRemove
|
||||
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
|
||||
const x = useSharedValue(0)
|
||||
const startX = useSharedValue(0)
|
||||
const width = useSharedValue(0)
|
||||
@@ -78,10 +99,11 @@ export function SongSwipeRow({
|
||||
const activate = useCallback(
|
||||
(side: number) => {
|
||||
close()
|
||||
if (side > 0) onPlayNext()
|
||||
// Download is intentionally a placeholder.
|
||||
if (side > 0) onAddToQueue()
|
||||
else if (onRemove) onRemove()
|
||||
else onDownload?.()
|
||||
},
|
||||
[close, onPlayNext]
|
||||
[close, onAddToQueue, onRemove, onDownload]
|
||||
)
|
||||
const tapRow = useCallback(() => {
|
||||
if (open) close()
|
||||
@@ -105,7 +127,11 @@ export function SongSwipeRow({
|
||||
Math.min(width.value, startX.value + event.translationX)
|
||||
)
|
||||
const commit =
|
||||
Math.abs(x.value) > Math.max(ACTION_WIDTH, width.value * 0.55)
|
||||
Math.abs(x.value) >
|
||||
Math.max(
|
||||
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth,
|
||||
width.value * 0.55
|
||||
)
|
||||
if (commit !== committed.value) {
|
||||
committed.value = commit
|
||||
commitProgress.value = withSpring(commit ? 1 : 0, SPRING)
|
||||
@@ -124,10 +150,13 @@ export function SongSwipeRow({
|
||||
Math.abs(x.value) > 10 && projected * side > ACTION_WIDTH / 2
|
||||
? side
|
||||
: 0
|
||||
x.value = withSpring(target * ACTION_WIDTH, {
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
})
|
||||
x.value = withSpring(
|
||||
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth),
|
||||
{
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
}
|
||||
)
|
||||
scheduleOnRN(settle, target)
|
||||
})
|
||||
.onFinalize((_event, success) => {
|
||||
@@ -152,18 +181,21 @@ export function SongSwipeRow({
|
||||
settle,
|
||||
startX,
|
||||
tapRow,
|
||||
trailingWidth,
|
||||
width,
|
||||
x,
|
||||
])
|
||||
|
||||
const rowStyle = useAnimatedStyle(() => ({
|
||||
transform: [{ translateX: x.value }],
|
||||
borderRadius: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, height.value / 2],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
borderRadius: IS_ANDROID
|
||||
? 0
|
||||
: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, height.value / 2],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
}))
|
||||
const fillStyle = useAnimatedStyle(() => ({
|
||||
opacity: interpolate(
|
||||
@@ -190,25 +222,72 @@ export function SongSwipeRow({
|
||||
open={open === 1}
|
||||
onPress={() => activate(1)}
|
||||
/>
|
||||
<SwipeAction
|
||||
side={1}
|
||||
secondary
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === 1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onPlayNext()
|
||||
}}
|
||||
/>
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
paired={hasRemove}
|
||||
remove={hasRemove}
|
||||
downloaded={downloaded}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => activate(-1)}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
downloaded={downloaded}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onDownload?.()
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<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" },
|
||||
{
|
||||
name: "download",
|
||||
label: downloaded ? "Remove Download" : "Download",
|
||||
},
|
||||
...(hasRemove
|
||||
? [{ name: "remove", label: "Remove from Playlist" }]
|
||||
: []),
|
||||
]}
|
||||
onAccessibilityAction={(event) => {
|
||||
if (event.nativeEvent.actionName === "playNext") activate(1)
|
||||
if (event.nativeEvent.actionName === "remove") activate(-1)
|
||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||
if (event.nativeEvent.actionName === "download") {
|
||||
close()
|
||||
onDownload?.()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "playNext") {
|
||||
close()
|
||||
onPlayNext()
|
||||
}
|
||||
}}
|
||||
style={[styles.row, { backgroundColor }, rowStyle]}
|
||||
>
|
||||
@@ -225,6 +304,10 @@ export function SongSwipeRow({
|
||||
|
||||
function SwipeAction({
|
||||
side,
|
||||
secondary = false,
|
||||
paired = side > 0,
|
||||
remove = false,
|
||||
downloaded = false,
|
||||
x,
|
||||
height,
|
||||
progress,
|
||||
@@ -232,22 +315,50 @@ function SwipeAction({
|
||||
onPress,
|
||||
}: {
|
||||
side: 1 | -1
|
||||
secondary?: boolean
|
||||
paired?: boolean
|
||||
remove?: boolean
|
||||
/** Shows the download action as Remove Download. */
|
||||
downloaded?: boolean
|
||||
x: SharedValue<number>
|
||||
height: SharedValue<number>
|
||||
progress: SharedValue<number>
|
||||
open: boolean
|
||||
onPress: () => void
|
||||
}) {
|
||||
const actionStyle = useAnimatedStyle(() => ({
|
||||
width: Math.max(0, x.value * side),
|
||||
}))
|
||||
const pillStyle = useAnimatedStyle(() => {
|
||||
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 - 20,
|
||||
interpolate(revealed, [24, ACTION_WIDTH, 220], [0, 62, 200])
|
||||
revealed - (paired ? 10 : 20),
|
||||
interpolate(
|
||||
revealed,
|
||||
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[0, 62, 200]
|
||||
)
|
||||
)
|
||||
)
|
||||
const pillWidth =
|
||||
@@ -279,6 +390,8 @@ function SwipeAction({
|
||||
},
|
||||
],
|
||||
}))
|
||||
const removesDownload = side < 0 && !remove && downloaded
|
||||
const destructive = remove || removesDownload
|
||||
return (
|
||||
<Animated.View
|
||||
pointerEvents={open ? "auto" : "none"}
|
||||
@@ -292,27 +405,67 @@ function SwipeAction({
|
||||
>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={side > 0 ? "Play Next" : "Download"}
|
||||
accessibilityLabel={
|
||||
remove
|
||||
? "Remove from Playlist"
|
||||
: removesDownload
|
||||
? "Remove Download"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
}
|
||||
onPress={onPress}
|
||||
style={styles.actionButton}
|
||||
>
|
||||
<Animated.View
|
||||
style={[
|
||||
styles.pill,
|
||||
{ backgroundColor: side > 0 ? "#6b5bff" : "#008dff" },
|
||||
{
|
||||
backgroundColor: destructive
|
||||
? IS_ANDROID
|
||||
? "#d32f2f"
|
||||
: "#ff3b30"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "#6b5bff"
|
||||
: "#f29943"
|
||||
: "#008dff",
|
||||
},
|
||||
pillStyle,
|
||||
]}
|
||||
>
|
||||
<Animated.View style={iconStyle}>
|
||||
<SymbolView
|
||||
name={
|
||||
side > 0
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
/>
|
||||
{IS_ANDROID ? (
|
||||
<Ionicons
|
||||
name={
|
||||
destructive
|
||||
? "trash-outline"
|
||||
: side < 0
|
||||
? "arrow-down"
|
||||
: secondary
|
||||
? "play-forward"
|
||||
: "list"
|
||||
}
|
||||
size={22}
|
||||
color="white"
|
||||
/>
|
||||
) : (
|
||||
<SymbolView
|
||||
name={
|
||||
destructive
|
||||
? "trash"
|
||||
: 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>
|
||||
|
||||
@@ -3,18 +3,48 @@ 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 { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||
import { OfflineOverlay } from "@/components/offline-overlay"
|
||||
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||
|
||||
type ScreenRoute = { name: string; params?: object }
|
||||
|
||||
/**
|
||||
* Screen content with the no-connection overlay layered on top. A fragment
|
||||
* keeps the scroll view as the screen's first subview for large titles.
|
||||
*/
|
||||
function ScreenBody({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<>
|
||||
{children}
|
||||
<OfflineOverlay route={route} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
/** 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}</>
|
||||
export function TabScreenContent({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
if (Platform.OS !== "ios" || !Platform.isPad) {
|
||||
return <ScreenBody route={route}>{children}</ScreenBody>
|
||||
}
|
||||
return (
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
|
||||
{children}
|
||||
<ScreenBody route={route}>{children}</ScreenBody>
|
||||
</SafeAreaView>
|
||||
<TabletSidebar />
|
||||
<TabletPlayerLayoutSync />
|
||||
@@ -22,6 +52,13 @@ export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||
)
|
||||
}
|
||||
|
||||
export function renderTabScreenContent({ children }: { children: ReactNode }) {
|
||||
return <TabScreenContent>{children}</TabScreenContent>
|
||||
/** `screenLayout` for every tab stack. */
|
||||
export function renderTabScreenContent({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
return <TabScreenContent route={route}>{children}</TabScreenContent>
|
||||
}
|
||||
@@ -19,6 +19,9 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** Height reserved under each tablet card's artwork for its title and subtitle. */
|
||||
export const tabletCardTextHeight = 48
|
||||
|
||||
type GridProps = {
|
||||
content: MediaItem[]
|
||||
paddingBottom: number
|
||||
@@ -48,7 +51,7 @@ export function TabletMediaGrid({
|
||||
const [headerHeight, setHeaderHeight] = useState(0)
|
||||
const [scrollY, setScrollY] = useState(0)
|
||||
const lastRequestedLength = useRef(-1)
|
||||
const rowHeight = cardWidth + 48 + gap
|
||||
const rowHeight = cardWidth + tabletCardTextHeight + gap
|
||||
const firstRow = Math.max(
|
||||
0,
|
||||
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||
|
||||
@@ -18,11 +18,12 @@ import {
|
||||
import { useTabletPlayerInsets } from "@/contexts/tablet-player-layout"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { MediaActionMenu } from "@/components/media-actions-sheet"
|
||||
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 { useLyrics } from "@/hooks/use-lyrics"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { tabletMiniPlayerHeight } from "@/lib/theme"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
@@ -58,6 +59,7 @@ export function TabletMiniPlayer() {
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const roomy = width - insets.left - insets.right >= 650
|
||||
const lyrics = useLyrics(roomy ? (currentSong?.id ?? null) : null)
|
||||
|
||||
if (!focused || !config || !currentSong || queueSongIds.length === 0)
|
||||
return null
|
||||
@@ -166,16 +168,22 @@ export function TabletMiniPlayer() {
|
||||
{roomy ? (
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
disabled
|
||||
disabled={!lyrics}
|
||||
onPress={() =>
|
||||
router.push({
|
||||
pathname: "/(app)/player",
|
||||
params: { lyrics: "1" },
|
||||
})
|
||||
}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
accessibilityLabel="Show lyrics"
|
||||
accessibilityState={{ disabled: !lyrics }}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback="chatbox-outline"
|
||||
size={23}
|
||||
color={inactive}
|
||||
color={lyrics ? color : inactive}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
|
||||
import {
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
useWindowDimensions,
|
||||
} from "react-native"
|
||||
import { Pressable, StyleSheet, View, useWindowDimensions } from "react-native"
|
||||
import Animated, {
|
||||
Easing,
|
||||
ReduceMotion,
|
||||
@@ -14,22 +8,27 @@ import Animated, {
|
||||
useSharedValue,
|
||||
withTiming,
|
||||
} from "react-native-reanimated"
|
||||
import { GestureDetector, Gesture } from "react-native-gesture-handler"
|
||||
import { GestureDetector, type 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 { LyricsView } from "@/components/lyrics-view"
|
||||
import { NowPlayingQueue } from "@/components/now-playing-queue"
|
||||
import { PlayerProgress } from "@/components/player-progress"
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackActions, usePlaybackQueue } 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"
|
||||
import type { Lyrics } from "@otunes/convex/client/lyrics"
|
||||
|
||||
/** What the Now Playing screen shows beside or instead of the artwork. */
|
||||
export type PlayerPanel = "queue" | "lyrics"
|
||||
|
||||
const queueMotion = {
|
||||
duration: 420,
|
||||
@@ -37,47 +36,46 @@ const queueMotion = {
|
||||
reduceMotion: ReduceMotion.System,
|
||||
}
|
||||
|
||||
/** Tablet player keeps transport controls visible while the queue opens beside them. */
|
||||
/**
|
||||
* Tablet player keeps transport controls visible while the queue or lyrics
|
||||
* open beside them.
|
||||
*/
|
||||
export function TabletNowPlaying({
|
||||
colors,
|
||||
backgroundStyle,
|
||||
dismissStyle,
|
||||
dismissGesture,
|
||||
showQueue,
|
||||
toggleQueue,
|
||||
dismissGestures,
|
||||
panel,
|
||||
togglePanel,
|
||||
lyrics,
|
||||
metadata,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
backgroundStyle: ComponentProps<typeof Animated.View>["style"]
|
||||
dismissStyle: ComponentProps<typeof Animated.View>["style"]
|
||||
dismissGesture: () => ReturnType<typeof Gesture.Pan>
|
||||
showQueue: boolean
|
||||
toggleQueue: () => void
|
||||
dismissGestures: {
|
||||
handle: ReturnType<typeof Gesture.Pan>
|
||||
artwork: ReturnType<typeof Gesture.Pan>
|
||||
}
|
||||
panel: PlayerPanel | null
|
||||
togglePanel: (panel: PlayerPanel) => void
|
||||
lyrics: Lyrics | null | undefined
|
||||
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 { currentSong, isPlaying, shuffleEnabled, repeatEnabled } =
|
||||
usePlaybackQueue()
|
||||
const { setIsPlaying, skipNext, skipPrevious, toggleShuffle, cycleRepeat } =
|
||||
usePlaybackActions()
|
||||
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 showQueue = panel === "queue"
|
||||
const showLyrics = panel === "lyrics"
|
||||
const sideBySide = panel !== null && wideLayout
|
||||
const progress = useSharedValue(sideBySide ? 1 : 0)
|
||||
useEffect(() => {
|
||||
progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
|
||||
@@ -113,7 +111,6 @@ export function TabletNowPlaying({
|
||||
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,
|
||||
@@ -139,7 +136,14 @@ export function TabletNowPlaying({
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
const queue = (
|
||||
const panelContent = showLyrics ? (
|
||||
<LyricsView
|
||||
key={currentSong.id}
|
||||
lyrics={lyrics}
|
||||
colors={colors}
|
||||
fontSize={34}
|
||||
/>
|
||||
) : (
|
||||
<NowPlayingQueue
|
||||
tablet
|
||||
colors={colors}
|
||||
@@ -150,7 +154,7 @@ export function TabletNowPlaying({
|
||||
return (
|
||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={dismissGestures.handle}>
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
accessibilityRole="button"
|
||||
@@ -164,7 +168,7 @@ export function TabletNowPlaying({
|
||||
</GestureDetector>
|
||||
<View style={styles.body}>
|
||||
<Animated.View style={[styles.main, mainMotion]}>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={dismissGestures.artwork}>
|
||||
<View style={styles.artworkArea}>
|
||||
<Animated.View style={artworkMotion}>
|
||||
<CoverImage
|
||||
@@ -177,31 +181,7 @@ export function TabletNowPlaying({
|
||||
</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>
|
||||
<PlayerProgress colors={colors} />
|
||||
<View style={styles.transport}>
|
||||
{control(
|
||||
"Shuffle",
|
||||
@@ -280,20 +260,18 @@ export function TabletNowPlaying({
|
||||
</Animated.View>
|
||||
{wideLayout ? (
|
||||
<Animated.View
|
||||
pointerEvents={showQueue ? "auto" : "none"}
|
||||
accessibilityElementsHidden={!showQueue}
|
||||
importantForAccessibility={
|
||||
showQueue ? "auto" : "no-hide-descendants"
|
||||
}
|
||||
pointerEvents={panel ? "auto" : "none"}
|
||||
accessibilityElementsHidden={!panel}
|
||||
importantForAccessibility={panel ? "auto" : "no-hide-descendants"}
|
||||
style={[styles.queue, queueStyle]}
|
||||
onLayout={(event) =>
|
||||
setQueueHeight(event.nativeEvent.layout.height)
|
||||
}
|
||||
>
|
||||
{queueHeight > 0 ? queue : null}
|
||||
{queueHeight > 0 ? panelContent : null}
|
||||
</Animated.View>
|
||||
) : null}
|
||||
{showQueue && !sideBySide ? (
|
||||
{panel && !sideBySide ? (
|
||||
<View
|
||||
style={[
|
||||
styles.portraitQueue,
|
||||
@@ -303,7 +281,7 @@ export function TabletNowPlaying({
|
||||
setQueueHeight(event.nativeEvent.layout.height)
|
||||
}
|
||||
>
|
||||
{queueHeight > 0 ? queue : null}
|
||||
{queueHeight > 0 ? panelContent : null}
|
||||
</View>
|
||||
) : null}
|
||||
</View>
|
||||
@@ -319,21 +297,29 @@ export function TabletNowPlaying({
|
||||
/>
|
||||
<View style={styles.footerActions}>
|
||||
<Pressable
|
||||
disabled
|
||||
onPress={() => togglePanel("lyrics")}
|
||||
disabled={!lyrics && !showLyrics}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
style={[styles.footerButton, { opacity: 0.4 }]}
|
||||
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
|
||||
accessibilityState={{
|
||||
selected: showLyrics,
|
||||
disabled: !lyrics && !showLyrics,
|
||||
}}
|
||||
style={[
|
||||
styles.footerButton,
|
||||
!lyrics && !showLyrics && { opacity: 0.4 },
|
||||
showLyrics && { backgroundColor: colors.selected },
|
||||
]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback="chatbox-outline"
|
||||
size={25}
|
||||
color={colors.foreground}
|
||||
color={showLyrics ? colors.selectedForeground : colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Pressable
|
||||
onPress={toggleQueue}
|
||||
onPress={() => togglePanel("queue")}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||
accessibilityState={{ selected: showQueue }}
|
||||
@@ -376,12 +362,6 @@ const styles = StyleSheet.create({
|
||||
},
|
||||
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",
|
||||
|
||||
@@ -1,12 +1,19 @@
|
||||
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||
import { requireNativeView } from "expo"
|
||||
import { useIsFocused } from "expo-router"
|
||||
import { useIsFocused, useRouter } from "expo-router"
|
||||
import { useMemo } from "react"
|
||||
import { Platform, type ViewProps } from "react-native"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { tabPath } from "@/lib/app-navigation"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { playlistCoverUrl } from "@/lib/urls"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
|
||||
|
||||
const NativeSidebar =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
@@ -15,15 +22,39 @@ const NativeSidebar =
|
||||
initials: string
|
||||
imageURL?: string
|
||||
active: boolean
|
||||
playlists: SidebarPlaylist[]
|
||||
onProfilePress: () => void
|
||||
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
|
||||
}
|
||||
>("TabletSidebar")
|
||||
: null
|
||||
|
||||
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
|
||||
export function TabletSidebar() {
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
|
||||
const { config } = useServerConfig()
|
||||
const imageUrl = useProfileImageUrl(user?.image)
|
||||
const openSettings = useOpenSettings()
|
||||
const router = useRouter()
|
||||
const active = useIsFocused()
|
||||
const serverUrl = config?.serverUrl
|
||||
|
||||
const playlists = useMemo(
|
||||
() =>
|
||||
[
|
||||
...(sidebarPlaylists?.owned ?? []),
|
||||
...(sidebarPlaylists?.subscribed ?? []),
|
||||
].map((playlist): SidebarPlaylist => ({
|
||||
id: playlist.id,
|
||||
title: playlist.title,
|
||||
imageURL:
|
||||
serverUrl && playlist.cover
|
||||
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
|
||||
: undefined,
|
||||
})),
|
||||
[serverUrl, sidebarPlaylists]
|
||||
)
|
||||
|
||||
if (!NativeSidebar) return null
|
||||
return (
|
||||
@@ -31,9 +62,13 @@ export function TabletSidebar() {
|
||||
style={{ position: "absolute", width: 0, height: 0 }}
|
||||
accountName={user?.name ?? "Account"}
|
||||
initials={initialsFromName(user?.name ?? "Me")}
|
||||
imageURL={user?.image}
|
||||
imageURL={imageUrl}
|
||||
active={active}
|
||||
playlists={playlists}
|
||||
onProfilePress={openSettings}
|
||||
onPlaylistPress={({ nativeEvent }) =>
|
||||
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -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>
|
||||
|
||||
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
|
||||
{ artistId }
|
||||
)
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
setPendingSongIds(songIds)
|
||||
setPendingSongIds(songIds.flat())
|
||||
setOpen(true)
|
||||
} catch (error) {
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
|
||||
@@ -14,14 +14,10 @@ import {
|
||||
useState,
|
||||
type PropsWithChildren,
|
||||
} from "react"
|
||||
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
||||
import Reanimated, {
|
||||
import { Platform } from "react-native"
|
||||
import {
|
||||
useSharedValue,
|
||||
useAnimatedStyle,
|
||||
useAnimatedReaction,
|
||||
useAnimatedRef,
|
||||
setNativeProps,
|
||||
processColor,
|
||||
withTiming,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
@@ -29,19 +25,17 @@ import Reanimated, {
|
||||
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>
|
||||
hasArtworkPalette: boolean
|
||||
tabletBackground: SharedValue<string>
|
||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||
}
|
||||
const AndroidTabTheme = createContext<TabTheme | null>(null)
|
||||
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette = Platform.OS === "android" || isTablet
|
||||
|
||||
function useDefaultPalette() {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
@@ -60,52 +54,37 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
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,
|
||||
})
|
||||
const tabletBackground = useSharedValue(defaultPalette.background)
|
||||
useLayoutEffect(() => {
|
||||
const { isDark: _isDark, ...colors } = palette
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: hasArtwork
|
||||
? palette.foreground
|
||||
: defaultPalette.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
}, [animatedColors, palette, defaultPalette, hasArtwork])
|
||||
if (!isTablet) return
|
||||
tabletBackground.value = withTiming(palette.background, {
|
||||
duration: TABLET_FADE_MS,
|
||||
})
|
||||
}, [tabletBackground, palette.background])
|
||||
const paletteOwner = useRef<string | null>(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 }
|
||||
)
|
||||
if (isTablet) {
|
||||
// React may defer commits while the iPad stack is animating.
|
||||
tabletBackground.value = withTiming(
|
||||
(palette ?? defaultPalette).background,
|
||||
{ duration: TABLET_FADE_MS }
|
||||
)
|
||||
}
|
||||
setScreen(palette ? { palette, owner } : null)
|
||||
},
|
||||
[animatedColors, defaultPalette]
|
||||
[tabletBackground, defaultPalette]
|
||||
)
|
||||
const artworkPalette = hasArtwork ? palette : null
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
palette: artworkPalette ?? defaultPalette,
|
||||
colors: animatedColors,
|
||||
hasArtworkPalette: artworkPalette !== null,
|
||||
palette: hasArtwork ? palette : defaultPalette,
|
||||
hasArtworkPalette: hasArtwork,
|
||||
tabletBackground,
|
||||
setPalette,
|
||||
}),
|
||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
||||
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground]
|
||||
)
|
||||
return (
|
||||
<AndroidTabTheme.Provider value={value}>
|
||||
@@ -114,50 +93,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,53 +103,29 @@ export function useAndroidTabHasArtworkPalette() {
|
||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||
}
|
||||
|
||||
export function useAndroidTabBackgroundStyle() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const fallback = useDefaultPalette().background
|
||||
const colors = theme?.colors
|
||||
/** iPad fades the sidebar and content pane together; other layouts skip it. */
|
||||
export function useTabletBackgroundStyle() {
|
||||
const background = useContext(AndroidTabTheme)?.tabletBackground
|
||||
return useAnimatedStyle(() =>
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
? { backgroundColor: colors?.value.background ?? fallback }
|
||||
: {}
|
||||
isTablet && background ? { backgroundColor: background.value } : {}
|
||||
)
|
||||
}
|
||||
|
||||
/** 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] }
|
||||
: {}
|
||||
)
|
||||
}
|
||||
const TABLET_FADE_MS = 400
|
||||
|
||||
/** 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. */
|
||||
/**
|
||||
* Artwork screens always paint their own palette so it slides with the page.
|
||||
* Shared chrome (tab bar, mini player) switches when the transition starts.
|
||||
*/
|
||||
export function useScreenPalette(palette: CoverPalette) {
|
||||
const isFocused = useIsFocused()
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette =
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
const owner = useRoute().key
|
||||
const navigation =
|
||||
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
|
||||
const [laidOut, setLaidOut] = useState(false)
|
||||
const [closing, setClosing] = useState(false)
|
||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const setPalette = theme?.setPalette
|
||||
const setPalette = useContext(AndroidTabTheme)?.setPalette
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette) return
|
||||
const start = navigation.addListener("transitionStart", ({ data }) => {
|
||||
@@ -230,20 +141,18 @@ export function useScreenPalette(palette: CoverPalette) {
|
||||
start()
|
||||
cancel()
|
||||
}
|
||||
}, [navigation, sharesPalette, setPalette, owner, palette])
|
||||
const defaultPalette = useDefaultPalette()
|
||||
}, [navigation, setPalette, owner, palette])
|
||||
const ready = laidOut || isTablet
|
||||
const target = isFocused && ready && !closing ? palette : defaultPalette
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
||||
setPalette(palette, owner)
|
||||
return () => setPalette(null, owner)
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette])
|
||||
|
||||
return {
|
||||
palette: Platform.OS === "android" ? target : palette,
|
||||
palette,
|
||||
backgroundStyle,
|
||||
onLayout: sharesPalette ? onLayout : undefined,
|
||||
}
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import { createContext, useContext, type ReactNode } from "react"
|
||||
import { createContext, useContext, useMemo, 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,
|
||||
@@ -15,8 +14,9 @@ export function ConvexAuthSessionProvider({
|
||||
children: ReactNode
|
||||
invalidateSession: () => Promise<void>
|
||||
}) {
|
||||
const value = useMemo(() => ({ invalidateSession }), [invalidateSession])
|
||||
return (
|
||||
<ConvexAuthSessionContext.Provider value={{ invalidateSession }}>
|
||||
<ConvexAuthSessionContext.Provider value={value}>
|
||||
{children}
|
||||
</ConvexAuthSessionContext.Provider>
|
||||
)
|
||||
@@ -25,7 +25,9 @@ export function ConvexAuthSessionProvider({
|
||||
export function useInvalidateAuthSession() {
|
||||
const context = useContext(ConvexAuthSessionContext)
|
||||
if (!context) {
|
||||
throw new Error("useInvalidateAuthSession must be used within ConvexAppProvider")
|
||||
throw new Error(
|
||||
"useInvalidateAuthSession must be used within ConvexAuthSessionProvider"
|
||||
)
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -0,0 +1,493 @@
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import {
|
||||
createContext,
|
||||
useCallback,
|
||||
useContext,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useState,
|
||||
useSyncExternalStore,
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
Alert,
|
||||
Modal,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Switch,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { toast } from "sonner-native"
|
||||
|
||||
import { AndroidSheet } from "@/components/android-sheet"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useBackgroundDownloads } from "@/hooks/use-background-downloads"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import {
|
||||
downloadQueueFor,
|
||||
readRememberedDownloadQuality,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||
import { downloadQualitySupported } from "@/lib/playback-capabilities"
|
||||
import type { ServerConfig } from "@/lib/server-config"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type {
|
||||
CollectionRef,
|
||||
DownloadableSong,
|
||||
DownloadSource,
|
||||
DownloadQueue,
|
||||
SongDownloadState,
|
||||
} from "@otunes/convex/client/download-queue"
|
||||
import { FAVORITES_ID } from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
DOWNLOAD_OPTIONS_PATH,
|
||||
DOWNLOAD_QUALITY_DETAILS,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadOptionsResponse,
|
||||
type DownloadQuality,
|
||||
type SizedDownloadOption,
|
||||
} from "@otunes/convex/download-quality"
|
||||
|
||||
/** Songs on their own, or an album or playlist that stays downloaded as a whole. */
|
||||
export type DownloadTarget =
|
||||
| {
|
||||
kind: "songs"
|
||||
songIds: string[]
|
||||
title: string
|
||||
/** Removing takes the songs out of only this download. */
|
||||
from?: DownloadSource
|
||||
}
|
||||
| (CollectionRef & { title: string; songIds: string[] })
|
||||
|
||||
/** The Favorites playlist has no ID, so downloads use this one. */
|
||||
export const FAVORITES_DOWNLOAD_ID = FAVORITES_ID
|
||||
|
||||
type DownloadsContextValue = {
|
||||
queue: DownloadQueue | null
|
||||
/** Asks for a quality (unless remembered) and starts downloading. */
|
||||
requestDownload: (target: DownloadTarget) => Promise<void>
|
||||
removeDownload: (target: DownloadTarget) => Promise<void>
|
||||
}
|
||||
|
||||
const DownloadsContext = createContext<DownloadsContextValue | null>(null)
|
||||
|
||||
export function useDownloads() {
|
||||
const context = useContext(DownloadsContext)
|
||||
if (!context) {
|
||||
throw new Error("useDownloads must be used within DownloadsProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
|
||||
const noopSubscribe = () => () => {}
|
||||
|
||||
/** Re-renders on every download change. Prefer the narrower hooks in lists. */
|
||||
export function useDownloadsVersion() {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.getVersion() ?? 0
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A song's download state as seen from `from` (see `downloadState`). Only
|
||||
* re-renders when that state changes.
|
||||
*/
|
||||
export function useSongDownloadState(
|
||||
songId: string,
|
||||
from?: DownloadSource
|
||||
): SongDownloadState {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.downloadState(songId, from) ?? "none"
|
||||
)
|
||||
}
|
||||
|
||||
/** Whether an album or playlist is downloaded. */
|
||||
export function useIsCollectionDownloaded(ref: CollectionRef) {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.getCollection(ref) !== undefined
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* For swipe actions: downloads a song, or asks before removing its download
|
||||
* (from `from` only, when given).
|
||||
*/
|
||||
export function useToggleSongDownload() {
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
return useCallback(
|
||||
(
|
||||
song: { id: string; title: string },
|
||||
downloaded: boolean,
|
||||
from?: DownloadSource
|
||||
) => {
|
||||
const target = {
|
||||
kind: "songs" as const,
|
||||
songIds: [song.id],
|
||||
title: song.title,
|
||||
from,
|
||||
}
|
||||
if (!downloaded) {
|
||||
void requestDownload(target)
|
||||
return
|
||||
}
|
||||
Alert.alert("Remove download?", song.title, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{
|
||||
text: "Remove",
|
||||
style: "destructive",
|
||||
onPress: () => void removeDownload(target),
|
||||
},
|
||||
])
|
||||
},
|
||||
[requestDownload, removeDownload]
|
||||
)
|
||||
}
|
||||
|
||||
async function fetchDownloadOptions(config: ServerConfig, songIds: string[]) {
|
||||
const cookieHeader = await getAuthCookieHeader(
|
||||
config.serverUrl,
|
||||
config.convexUrl
|
||||
)
|
||||
if (!cookieHeader) throw new Error("Sign in to download")
|
||||
const response = await fetch(`${config.serverUrl}${DOWNLOAD_OPTIONS_PATH}`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json", Cookie: cookieHeader },
|
||||
body: JSON.stringify({
|
||||
songIds,
|
||||
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
|
||||
}),
|
||||
})
|
||||
if (!response.ok) {
|
||||
throw new Error("Could not reach the server to download")
|
||||
}
|
||||
return (await response.json()) as DownloadOptionsResponse
|
||||
}
|
||||
|
||||
function startDownload(
|
||||
queue: DownloadQueue,
|
||||
target: DownloadTarget,
|
||||
songs: DownloadableSong[],
|
||||
quality: DownloadQuality
|
||||
) {
|
||||
if (target.kind === "songs") return queue.enqueue(songs, quality)
|
||||
return queue.downloadCollection(
|
||||
{ kind: target.kind, id: target.id, title: target.title, quality },
|
||||
songs
|
||||
)
|
||||
}
|
||||
|
||||
function optionDetail(option: SizedDownloadOption, songCount: number) {
|
||||
if (option.fallbackCount === 0) {
|
||||
return DOWNLOAD_QUALITY_DETAILS[option.quality]
|
||||
}
|
||||
const included = songCount - option.fallbackCount
|
||||
return `${included} of ${songCount} songs, ${option.fallbackCount} in High`
|
||||
}
|
||||
|
||||
/** Centered popup asking which quality to download a target at. */
|
||||
function DownloadQualityPopup({
|
||||
pending,
|
||||
onClose,
|
||||
onPick,
|
||||
}: {
|
||||
pending: { target: DownloadTarget; response: DownloadOptionsResponse } | null
|
||||
onClose: () => void
|
||||
onPick: (quality: DownloadQuality, remember: boolean) => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const [remember, setRemember] = useState(false)
|
||||
const songCount = pending?.response.songs.length ?? 0
|
||||
|
||||
return (
|
||||
<Modal
|
||||
visible={pending !== null}
|
||||
animationType="fade"
|
||||
transparent
|
||||
onRequestClose={onClose}
|
||||
>
|
||||
<AndroidSheet>
|
||||
<Pressable style={styles.overlay} onPress={onClose}>
|
||||
<Pressable
|
||||
style={[
|
||||
styles.popup,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={(event) => event.stopPropagation()}
|
||||
>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
Download Quality
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{pending?.target.title}
|
||||
</Text>
|
||||
{pending?.response.options
|
||||
.filter((option) => downloadQualitySupported(option.quality))
|
||||
.map((option) => (
|
||||
<Pressable
|
||||
key={option.quality}
|
||||
accessibilityRole="button"
|
||||
style={[styles.row, { borderBottomColor: colors.border }]}
|
||||
onPress={() => onPick(option.quality, remember)}
|
||||
>
|
||||
<View style={styles.rowText}>
|
||||
{option.quality === "lossless" ||
|
||||
option.quality === "atmos" ? (
|
||||
<AudioFormatBadge
|
||||
format={option.quality}
|
||||
color={colors.foreground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
) : (
|
||||
<Text
|
||||
style={[styles.label, { color: colors.foreground }]}
|
||||
>
|
||||
{DOWNLOAD_QUALITY_LABELS[option.quality]}
|
||||
</Text>
|
||||
)}
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 12 }}
|
||||
>
|
||||
{optionDetail(option, songCount)}
|
||||
</Text>
|
||||
</View>
|
||||
<Text
|
||||
style={[styles.size, { color: colors.mutedForeground }]}
|
||||
>
|
||||
{option.estimated ? "~" : ""}
|
||||
{formatBytes(option.bytes)}
|
||||
</Text>
|
||||
</Pressable>
|
||||
))}
|
||||
<View style={styles.rememberRow}>
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
Remember my choice
|
||||
</Text>
|
||||
<Switch value={remember} onValueChange={setRemember} />
|
||||
</View>
|
||||
</Pressable>
|
||||
</Pressable>
|
||||
</AndroidSheet>
|
||||
</Modal>
|
||||
)
|
||||
}
|
||||
|
||||
/** Keeps a downloaded playlist's songs in step with the playlist. */
|
||||
function useSyncDownloadedPlaylist(
|
||||
queue: DownloadQueue,
|
||||
id: string,
|
||||
songIds: readonly string[] | undefined
|
||||
) {
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
useEffect(() => {
|
||||
if (!songIds) return
|
||||
void queue
|
||||
.syncCollection({ kind: "playlist", id }, songIds, async (added) => {
|
||||
const songs = await loadPlaybackSongs(
|
||||
convex,
|
||||
cacheScope,
|
||||
added as Id<"songs">[]
|
||||
)
|
||||
return songs.filter((song) => song !== null)
|
||||
})
|
||||
.catch(() => {})
|
||||
}, [cacheScope, convex, id, queue, songIds])
|
||||
}
|
||||
|
||||
function PlaylistSync({ queue, id }: { queue: DownloadQueue; id: string }) {
|
||||
const songIds = useQuery(api.playlists.getPlaylistSongIds, {
|
||||
playlistId: id as Id<"playlists">,
|
||||
})
|
||||
useSyncDownloadedPlaylist(queue, id, songIds)
|
||||
return null
|
||||
}
|
||||
|
||||
function FavoritesSync({ queue }: { queue: DownloadQueue }) {
|
||||
const favorites = useCachedQuery(api.favorites.getUserFavorites)
|
||||
const songIds = useMemo(() => favorites?.favoriteSongs.flat(), [favorites])
|
||||
useSyncDownloadedPlaylist(queue, FAVORITES_DOWNLOAD_ID, songIds)
|
||||
return null
|
||||
}
|
||||
|
||||
function DownloadSync({ queue }: { queue: DownloadQueue }) {
|
||||
useSyncExternalStore(queue.subscribe, queue.getVersion)
|
||||
return queue
|
||||
.collections()
|
||||
.filter((collection) => collection.kind === "playlist")
|
||||
.map((collection) =>
|
||||
collection.id === FAVORITES_DOWNLOAD_ID ? (
|
||||
<FavoritesSync key={collection.id} queue={queue} />
|
||||
) : (
|
||||
<PlaylistSync key={collection.id} queue={queue} id={collection.id} />
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
export function DownloadsProvider({ children }: { children: ReactNode }) {
|
||||
const { config } = useServerConfig()
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const queue = useMemo(
|
||||
() => (config ? downloadQueueFor(config) : null),
|
||||
[config]
|
||||
)
|
||||
const [pending, setPending] = useState<{
|
||||
target: DownloadTarget
|
||||
response: DownloadOptionsResponse
|
||||
} | null>(null)
|
||||
const keepDownloading = useBackgroundDownloads(queue)
|
||||
|
||||
useEffect(() => {
|
||||
if (!queue) return
|
||||
void queue.load().catch(() => {})
|
||||
// Reports failed songs once per burst instead of once per song.
|
||||
let failed = 0
|
||||
let timer: ReturnType<typeof setTimeout> | null = null
|
||||
const unsubscribe = queue.onFailure(() => {
|
||||
failed += 1
|
||||
timer ??= setTimeout(() => {
|
||||
showError(
|
||||
failed === 1
|
||||
? "A song could not be downloaded"
|
||||
: `${failed} songs could not be downloaded`
|
||||
)
|
||||
failed = 0
|
||||
timer = null
|
||||
}, 1000)
|
||||
})
|
||||
return () => {
|
||||
unsubscribe()
|
||||
if (timer) clearTimeout(timer)
|
||||
}
|
||||
}, [queue])
|
||||
|
||||
const requestDownload = useCallback(
|
||||
async (target: DownloadTarget) => {
|
||||
if (!config || !queue || target.songIds.length === 0) return
|
||||
if (target.songIds.every((id) => queue.getDownloaded(id))) {
|
||||
// Already on this device: just give them back to their downloads.
|
||||
await queue.enqueue(
|
||||
target.songIds.map((id) => ({ id, files: {} })),
|
||||
"high"
|
||||
)
|
||||
return
|
||||
}
|
||||
try {
|
||||
// Caches titles and formats so downloads can be queued offline.
|
||||
void loadPlaybackSongs(
|
||||
convex,
|
||||
cacheScope,
|
||||
target.songIds as Id<"songs">[]
|
||||
).catch(() => {})
|
||||
const response = await fetchDownloadOptions(config, target.songIds)
|
||||
const remembered = await readRememberedDownloadQuality()
|
||||
if (remembered) {
|
||||
await startDownload(queue, target, response.songs, remembered)
|
||||
keepDownloading()
|
||||
toast(`Downloading ${target.title}`)
|
||||
} else {
|
||||
setPending({ target, response })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(error instanceof Error ? error.message : "Download failed")
|
||||
}
|
||||
},
|
||||
[cacheScope, config, convex, keepDownloading, queue]
|
||||
)
|
||||
|
||||
const removeDownload = useCallback(
|
||||
async (target: DownloadTarget) => {
|
||||
if (!queue) return
|
||||
if (target.kind === "songs") {
|
||||
await queue.removeSongs(target.songIds, target.from)
|
||||
} else await queue.removeCollection(target)
|
||||
},
|
||||
[queue]
|
||||
)
|
||||
|
||||
const handlePick = useCallback(
|
||||
(quality: DownloadQuality, remember: boolean) => {
|
||||
if (!pending || !queue) return
|
||||
setPending(null)
|
||||
if (remember) void writeRememberedDownloadQuality(quality)
|
||||
void startDownload(
|
||||
queue,
|
||||
pending.target,
|
||||
pending.response.songs,
|
||||
quality
|
||||
).then(keepDownloading)
|
||||
},
|
||||
[keepDownloading, pending, queue]
|
||||
)
|
||||
|
||||
const value = useMemo(
|
||||
() => ({ queue, requestDownload, removeDownload }),
|
||||
[queue, requestDownload, removeDownload]
|
||||
)
|
||||
|
||||
return (
|
||||
<DownloadsContext.Provider value={value}>
|
||||
{children}
|
||||
{queue ? <DownloadSync queue={queue} /> : null}
|
||||
<DownloadQualityPopup
|
||||
pending={pending}
|
||||
onClose={() => setPending(null)}
|
||||
onPick={handlePick}
|
||||
/>
|
||||
</DownloadsContext.Provider>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
overlay: {
|
||||
flex: 1,
|
||||
backgroundColor: "rgba(0,0,0,0.6)",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
padding: 24,
|
||||
},
|
||||
popup: {
|
||||
width: "100%",
|
||||
maxWidth: 420,
|
||||
borderRadius: 16,
|
||||
borderWidth: 1,
|
||||
padding: 16,
|
||||
},
|
||||
title: { fontSize: 18, fontWeight: "700" },
|
||||
subtitle: { fontSize: 13, marginBottom: 4 },
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 12,
|
||||
paddingVertical: 12,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
rowText: { flex: 1, minWidth: 0, gap: 2 },
|
||||
label: { fontSize: 15, fontWeight: "500" },
|
||||
size: { fontSize: 13, fontVariant: ["tabular-nums"] },
|
||||
rememberRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
paddingTop: 12,
|
||||
},
|
||||
})
|
||||
@@ -12,22 +12,28 @@ 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. The
|
||||
* update is captured on first render, so it must not close over render state.
|
||||
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a
|
||||
* module-level update so it does not change between renders.
|
||||
*/
|
||||
function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>(
|
||||
mutation: Mutation,
|
||||
optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>>
|
||||
): ReactMutation<Mutation> {
|
||||
const base = useMutation(mutation)
|
||||
const updateRef = useRef(optimisticUpdate)
|
||||
return useMemo(() => base.withOptimisticUpdate(updateRef.current), [base])
|
||||
return useMemo(
|
||||
() => base.withOptimisticUpdate(optimisticUpdate),
|
||||
[base, optimisticUpdate]
|
||||
)
|
||||
}
|
||||
|
||||
type FavoriteTables = { song: "songs"; album: "albums"; artist: "artists" }
|
||||
export type FavoriteKind = keyof FavoriteTables
|
||||
|
||||
type FavoritesContextValue = {
|
||||
isSongFavorite: (songId: string) => boolean
|
||||
isAlbumFavorite: (albumId: string) => boolean
|
||||
@@ -36,6 +42,20 @@ 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)
|
||||
@@ -52,191 +72,114 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
const favorites = useCachedQuery(api.favorites.getUserFavorites)
|
||||
const favoriteSong = useOptimisticMutation(
|
||||
api.favorites.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],
|
||||
}
|
||||
)
|
||||
}
|
||||
favoriteOptimisticUpdates.favoriteSong
|
||||
)
|
||||
const unfavoriteSong = useOptimisticMutation(
|
||||
api.favorites.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),
|
||||
}
|
||||
)
|
||||
}
|
||||
favoriteOptimisticUpdates.unfavoriteSong
|
||||
)
|
||||
const favoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.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],
|
||||
}
|
||||
)
|
||||
}
|
||||
favoriteOptimisticUpdates.favoriteAlbum
|
||||
)
|
||||
const unfavoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.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),
|
||||
}
|
||||
)
|
||||
}
|
||||
favoriteOptimisticUpdates.unfavoriteAlbum
|
||||
)
|
||||
const favoriteArtist = useOptimisticMutation(
|
||||
api.favorites.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],
|
||||
}
|
||||
)
|
||||
}
|
||||
favoriteOptimisticUpdates.favoriteArtist
|
||||
)
|
||||
const unfavoriteArtist = useOptimisticMutation(
|
||||
api.favorites.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
|
||||
),
|
||||
}
|
||||
)
|
||||
}
|
||||
favoriteOptimisticUpdates.unfavoriteArtist
|
||||
)
|
||||
const favoriteSongsMutation = useOptimisticMutation(
|
||||
api.favorites.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])],
|
||||
}
|
||||
)
|
||||
}
|
||||
favoriteOptimisticUpdates.favoriteSongs
|
||||
)
|
||||
|
||||
const songIds = useMemo(
|
||||
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
|
||||
() => new Set<string>(favorites?.favoriteSongs.flat()),
|
||||
[favorites?.favoriteSongs]
|
||||
)
|
||||
const albumIds = useMemo(
|
||||
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
|
||||
() => new Set<string>(favorites?.favoriteAlbums.flat()),
|
||||
[favorites?.favoriteAlbums]
|
||||
)
|
||||
const artistIds = useMemo(
|
||||
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
|
||||
() => new Set<string>(favorites?.favoriteArtists.flat()),
|
||||
[favorites?.favoriteArtists]
|
||||
)
|
||||
const idsRef = useRef({ songIds, albumIds, artistIds })
|
||||
idsRef.current = { songIds, albumIds, artistIds }
|
||||
|
||||
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"
|
||||
)
|
||||
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 })
|
||||
}
|
||||
},
|
||||
[favoriteSong, unfavoriteSong]
|
||||
[
|
||||
favoriteSong,
|
||||
unfavoriteSong,
|
||||
favoriteAlbum,
|
||||
unfavoriteAlbum,
|
||||
favoriteArtist,
|
||||
unfavoriteArtist,
|
||||
]
|
||||
)
|
||||
|
||||
const toggleSongFavorite = useCallback(
|
||||
(songId: Id<"songs">) =>
|
||||
setFavorite("song", songId, !idsRef.current.songIds.has(songId)).catch(
|
||||
showFavoritesError
|
||||
),
|
||||
[setFavorite]
|
||||
)
|
||||
|
||||
const toggleAlbumFavorite = useCallback(
|
||||
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]
|
||||
(albumId: Id<"albums">) =>
|
||||
setFavorite(
|
||||
"album",
|
||||
albumId,
|
||||
!idsRef.current.albumIds.has(albumId)
|
||||
).catch(showFavoritesError),
|
||||
[setFavorite]
|
||||
)
|
||||
|
||||
const toggleArtistFavorite = useCallback(
|
||||
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"
|
||||
)
|
||||
}
|
||||
(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 })
|
||||
},
|
||||
[favoriteArtist, unfavoriteArtist]
|
||||
[favoriteSongsMutation]
|
||||
)
|
||||
|
||||
const favoriteSongs = useCallback(
|
||||
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]
|
||||
(ids: Id<"songs">[]) => addFavoriteSongs(ids).catch(showFavoritesError),
|
||||
[addFavoriteSongs]
|
||||
)
|
||||
|
||||
const value = useMemo(
|
||||
@@ -248,6 +191,8 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
toggleAlbumFavorite,
|
||||
toggleArtistFavorite,
|
||||
favoriteSongs,
|
||||
setFavorite,
|
||||
addFavoriteSongs,
|
||||
}),
|
||||
[
|
||||
songIds,
|
||||
@@ -257,6 +202,8 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
toggleAlbumFavorite,
|
||||
toggleArtistFavorite,
|
||||
favoriteSongs,
|
||||
setFavorite,
|
||||
addFavoriteSongs,
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
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"
|
||||
@@ -9,21 +10,6 @@ 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,
|
||||
|
||||
+195
-835
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,152 @@
|
||||
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,
|
||||
}
|
||||
}
|
||||
|
||||
/** Forget in-memory swatches so covers are re-extracted. */
|
||||
function clear() {
|
||||
swatchesByKey.clear()
|
||||
pending.clear()
|
||||
}
|
||||
|
||||
return { prefetch, usePalette, clear }
|
||||
}
|
||||
|
||||
function sameSwatches(a: unknown, b: unknown) {
|
||||
return a === b || JSON.stringify(a) === JSON.stringify(b)
|
||||
}
|
||||
@@ -0,0 +1,164 @@
|
||||
import { requireOptionalNativeModule } from "expo"
|
||||
import Constants from "expo-constants"
|
||||
import { useCallback, useEffect, useRef } from "react"
|
||||
import { AppState, Platform } from "react-native"
|
||||
import {
|
||||
ContinuedTasks,
|
||||
type ContinuedTask,
|
||||
} from "react-native-continued-task"
|
||||
|
||||
import { setKeptRunning } from "@/lib/downloads"
|
||||
import type { DownloadQueue } from "@otunes/convex/client/download-queue"
|
||||
|
||||
const downloadService = requireOptionalNativeModule<{
|
||||
update: (remaining: number) => void
|
||||
}>("DownloadService")
|
||||
|
||||
/** Songs downloading at once while the app runs, as the queue defaults to. */
|
||||
const RUNNING_CONCURRENCY = 2
|
||||
|
||||
// Stopping right after starting can beat the service to `startForeground`,
|
||||
// which Android treats as a crash.
|
||||
const STOP_DELAY_MS = 2000
|
||||
|
||||
// Must match `identifierPrefixes` in app.config.ts.
|
||||
const TASK_PREFIX = `${Constants.expoConfig?.ios?.bundleIdentifier}.downloads`
|
||||
|
||||
function songsLeft(count: number) {
|
||||
return count === 1 ? "1 song left" : `${count} songs left`
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps downloads going while the app is in the background. Call the returned
|
||||
* function right after the person starts a download.
|
||||
*
|
||||
* iOS 26+: a continued processing task keeps the app running, with progress
|
||||
* in a Live Activity, so songs keep downloading a few at a time with fresh
|
||||
* sign-in tokens. It must start from the person's action, so it covers
|
||||
* downloads they start, not playlist syncs.
|
||||
*
|
||||
* iOS otherwise (and once that task ends): songs download in a background URL
|
||||
* session. Songs started while suspended may wait for Wi-Fi and power, so
|
||||
* every waiting song is handed over as the app leaves the screen.
|
||||
*
|
||||
* Android: a foreground service keeps the app running while songs are queued.
|
||||
*/
|
||||
export function useBackgroundDownloads(queue: DownloadQueue | null) {
|
||||
const startTask = useRef<() => void>(() => {})
|
||||
|
||||
useEffect(() => {
|
||||
if (!queue) return
|
||||
|
||||
if (Platform.OS === "ios") {
|
||||
let active = AppState.currentState === "active"
|
||||
let task: ContinuedTask | null = null
|
||||
let submitting = false
|
||||
let total = 0
|
||||
let lastPending = 0
|
||||
|
||||
const updateConcurrency = () =>
|
||||
queue.setConcurrency(
|
||||
active || task?.state === "running" ? RUNNING_CONCURRENCY : Infinity
|
||||
)
|
||||
|
||||
const end = () => {
|
||||
task = null
|
||||
setKeptRunning(false)
|
||||
updateConcurrency()
|
||||
}
|
||||
|
||||
const report = () => {
|
||||
const pending = queue.pendingCount()
|
||||
if (pending > lastPending) total += pending - lastPending
|
||||
lastPending = pending
|
||||
if (task?.state !== "running") return
|
||||
if (pending === 0) {
|
||||
task.complete(true)
|
||||
end()
|
||||
return
|
||||
}
|
||||
task.setProgress(total - pending, total)
|
||||
task.updateTitle("Downloading", songsLeft(pending))
|
||||
}
|
||||
|
||||
startTask.current = () => {
|
||||
if (!ContinuedTasks.isSupported || task || submitting) return
|
||||
const pending = queue.pendingCount()
|
||||
if (pending === 0) return
|
||||
submitting = true
|
||||
total = pending
|
||||
lastPending = pending
|
||||
ContinuedTasks.submit({
|
||||
identifierPrefix: TASK_PREFIX,
|
||||
title: "Downloading",
|
||||
subtitle: songsLeft(pending),
|
||||
totalUnitCount: total,
|
||||
// A task that cannot start now is no use once the app is closed.
|
||||
ios: { submissionStrategy: "fail" },
|
||||
})
|
||||
.then((submitted) => {
|
||||
task = submitted
|
||||
submitted.addOnStartListener(() => {
|
||||
setKeptRunning(true)
|
||||
updateConcurrency()
|
||||
report()
|
||||
})
|
||||
// iOS reports a cancel from the Live Activity as expiry too, so
|
||||
// either way the songs carry on in the background session.
|
||||
submitted.addOnStopListener(() => {
|
||||
if (task === submitted) end()
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
// Not permitted or unavailable: the background session covers it.
|
||||
})
|
||||
.finally(() => {
|
||||
submitting = false
|
||||
})
|
||||
}
|
||||
|
||||
updateConcurrency()
|
||||
const unsubscribe = queue.subscribe(report)
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
active = state === "active"
|
||||
updateConcurrency()
|
||||
})
|
||||
return () => {
|
||||
startTask.current = () => {}
|
||||
unsubscribe()
|
||||
subscription.remove()
|
||||
task?.cancel()
|
||||
end()
|
||||
}
|
||||
}
|
||||
|
||||
if (!downloadService) return
|
||||
const service = downloadService
|
||||
let shown = 0
|
||||
let stopTimer: ReturnType<typeof setTimeout> | null = null
|
||||
const update = () => {
|
||||
const remaining = queue.pendingCount()
|
||||
if (remaining === shown) return
|
||||
if (stopTimer) clearTimeout(stopTimer)
|
||||
stopTimer = null
|
||||
if (remaining > 0) {
|
||||
shown = remaining
|
||||
service.update(remaining)
|
||||
} else {
|
||||
stopTimer = setTimeout(() => {
|
||||
shown = 0
|
||||
service.update(0)
|
||||
}, STOP_DELAY_MS)
|
||||
}
|
||||
}
|
||||
update()
|
||||
const unsubscribe = queue.subscribe(update)
|
||||
return () => {
|
||||
unsubscribe()
|
||||
if (stopTimer) clearTimeout(stopTimer)
|
||||
service.update(0)
|
||||
}
|
||||
}, [queue])
|
||||
|
||||
return useCallback(() => startTask.current(), [])
|
||||
}
|
||||
@@ -1,147 +1,59 @@
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import {
|
||||
artworkColorsEnabled,
|
||||
createCoverPaletteSource,
|
||||
type CoverPaletteResult,
|
||||
} from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
clearLegacyCoverPaletteCache,
|
||||
prefetchLegacyCoverPalette,
|
||||
useLegacyCoverPalette,
|
||||
} from "@/hooks/use-legacy-cover-palette"
|
||||
import {
|
||||
loadArtworkColorsEnabled,
|
||||
useArtworkColorsEnabled,
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { prefetchLegacyCoverPalette, useLegacyCoverPalette } from "@/hooks/use-legacy-cover-palette"
|
||||
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
||||
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
|
||||
import { clearCachePrefix } from "@/lib/persistent-cache"
|
||||
|
||||
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"
|
||||
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
|
||||
|
||||
// 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
|
||||
const region = createCoverPaletteSource<CoverSwatches>({
|
||||
cacheKey: (colorSourceUri) => `palette:v2:${colorSourceUri}`,
|
||||
extract: extractCoverSwatches,
|
||||
derive: (swatches) => deriveCoverPalette(swatches),
|
||||
})
|
||||
|
||||
const swatchesByKey = new Map<string, CoverSwatches | null>()
|
||||
const pending = new Map<string, Promise<CoverSwatches | null>>()
|
||||
|
||||
function cacheKey(colorSourceUri: string) {
|
||||
return `palette:v2:${colorSourceUri}`
|
||||
}
|
||||
|
||||
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 = extractCoverSwatches(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
|
||||
/**
|
||||
* Forget every extracted palette, in memory and on device, so covers are
|
||||
* re-extracted. Both pipelines share the `palette:` cache prefix.
|
||||
*/
|
||||
export function clearCoverPaletteCache() {
|
||||
region.clear()
|
||||
clearLegacyCoverPaletteCache()
|
||||
clearCachePrefix("palette")
|
||||
}
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export function prefetchCoverPalette(uri: string) {
|
||||
if (!artworkColorsEnabled()) {
|
||||
prefetchLegacyCoverPalette(uri)
|
||||
return
|
||||
}
|
||||
const key = withCoverImageSize(uri, 64)
|
||||
if (cachedSwatches(key) !== undefined) return
|
||||
void extractSwatches(key)
|
||||
void loadArtworkColorsEnabled().then((enabled) =>
|
||||
enabled ? region.prefetch(uri) : prefetchLegacyCoverPalette(uri)
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
* 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.
|
||||
*/
|
||||
function useRegionCoverPalette(
|
||||
export function useCoverPalette(
|
||||
uri: string,
|
||||
hasCover: boolean | undefined
|
||||
): { palette: CoverPalette; settled: boolean } {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
const key = uri ? withCoverImageSize(uri, 64) : ""
|
||||
const [resolved, setResolved] = useState(() => ({
|
||||
key,
|
||||
swatches: key ? cachedSwatches(key) : null,
|
||||
}))
|
||||
const [waitedKey, setWaitedKey] = useState<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)
|
||||
: null
|
||||
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||
}, [hasCover, isDark, swatches, theme])
|
||||
|
||||
return {
|
||||
palette,
|
||||
settled:
|
||||
!key || hasCover === false || swatches !== undefined || waitedKey === key,
|
||||
}
|
||||
}
|
||||
|
||||
/** Switch both extraction and palette derivation without mixing their caches. */
|
||||
export function useCoverPalette(uri: string, hasCover: boolean | undefined) {
|
||||
): CoverPaletteResult {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const region = useRegionCoverPalette(enabled ? uri : "", hasCover)
|
||||
const legacy = useLegacyCoverPalette(enabled ? "" : uri, hasCover)
|
||||
return enabled ? region : legacy
|
||||
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 }
|
||||
}
|
||||
return enabled ? current : legacy
|
||||
}
|
||||
@@ -1,29 +1,14 @@
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import { getColors, type ImageColorsResult } from "react-native-image-colors"
|
||||
|
||||
import { createCoverPaletteSource } from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
themeCoverPalette,
|
||||
type CoverPalette,
|
||||
} from "@/lib/cover-palette"
|
||||
import { deriveCoverPalette, type LegacyCoverSwatches as CoverSwatches } from "@/lib/legacy-cover-palette"
|
||||
import { readCache, writeCache } from "@/lib/persistent-cache"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
import { withCoverImageSize } from "@/lib/urls"
|
||||
|
||||
// How long a screen holds its skeleton for the first extraction of a cover,
|
||||
// so rows render once with final colors instead of flashing from the theme.
|
||||
const COVER_PALETTE_WAIT_MS = 400
|
||||
deriveCoverPalette,
|
||||
type LegacyCoverSwatches as CoverSwatches,
|
||||
} from "@/lib/legacy-cover-palette"
|
||||
|
||||
// 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
|
||||
@@ -59,120 +44,26 @@ function toSwatches(result: ImageColorsResult): CoverSwatches | null {
|
||||
}
|
||||
}
|
||||
|
||||
function sameSwatches(
|
||||
a: CoverSwatches | null | undefined,
|
||||
b: CoverSwatches | null | undefined
|
||||
) {
|
||||
return a === b || JSON.stringify(a) === JSON.stringify(b)
|
||||
}
|
||||
|
||||
function cachedSwatches(key: string): CoverSwatches | null | undefined {
|
||||
if (swatchesByKey.has(key)) return swatchesByKey.get(key)
|
||||
const cached = readCache<CoverSwatches>(cacheKey(key))
|
||||
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.
|
||||
return cached && (!Array.isArray(cached.text) || !Array.isArray(cached.accent))
|
||||
? undefined
|
||||
: cached
|
||||
}
|
||||
|
||||
function extractSwatches(key: string) {
|
||||
const inFlight = pending.get(key)
|
||||
if (inFlight) return inFlight
|
||||
|
||||
const request = getColors(key, {
|
||||
fallback: MISSING,
|
||||
cache: true,
|
||||
key,
|
||||
quality: "low",
|
||||
pixelSpacing: 4,
|
||||
})
|
||||
.then(toSwatches)
|
||||
.catch(() => null)
|
||||
.then((swatches) => {
|
||||
swatchesByKey.set(key, swatches)
|
||||
if (swatches) writeCache(cacheKey(key), swatches)
|
||||
pending.delete(key)
|
||||
return swatches
|
||||
})
|
||||
pending.set(key, request)
|
||||
return request
|
||||
}
|
||||
isValidCache: (cached) =>
|
||||
Array.isArray(cached.text) && Array.isArray(cached.accent),
|
||||
})
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export function prefetchLegacyCoverPalette(uri: string) {
|
||||
const key = withCoverImageSize(uri, 64)
|
||||
if (cachedSwatches(key) !== undefined) return
|
||||
void extractSwatches(key)
|
||||
}
|
||||
export const prefetchLegacyCoverPalette = legacy.prefetch
|
||||
|
||||
/**
|
||||
* Colors for a screen tinted by `uri`'s cover art. Extraction runs once per
|
||||
* cover and is cached on device. Pass `hasCover` as `undefined` while it isn't
|
||||
* known yet so extraction can start early.
|
||||
*
|
||||
* `settled` turns true once the palette is final or after
|
||||
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
|
||||
*/
|
||||
export function useLegacyCoverPalette(
|
||||
uri: string,
|
||||
hasCover: boolean | undefined
|
||||
): { palette: CoverPalette; settled: boolean } {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
const key = uri ? withCoverImageSize(uri, 64) : ""
|
||||
const [resolved, setResolved] = useState(() => ({
|
||||
key,
|
||||
swatches: key ? cachedSwatches(key) : null,
|
||||
}))
|
||||
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
|
||||
export const useLegacyCoverPalette = legacy.usePalette
|
||||
|
||||
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,
|
||||
}
|
||||
}
|
||||
export const clearLegacyCoverPaletteCache = legacy.clear
|
||||
@@ -0,0 +1,158 @@
|
||||
import { File } from "expo-file-system"
|
||||
import {
|
||||
useEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
useSyncExternalStore,
|
||||
} from "react"
|
||||
import {
|
||||
cancelAnimation,
|
||||
Easing,
|
||||
useSharedValue,
|
||||
withSequence,
|
||||
withTiming,
|
||||
} from "react-native-reanimated"
|
||||
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import {
|
||||
followLyrics,
|
||||
parseLyrics,
|
||||
type Lyrics,
|
||||
} from "@otunes/convex/client/lyrics"
|
||||
import { readLyricsTag } from "@otunes/convex/client/lyrics-tags"
|
||||
import { useDownloads } from "@/contexts/downloads"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { downloadedAudioUri } from "@/lib/downloads"
|
||||
|
||||
// Lyrics read from downloaded files, by file. Files do not change once saved.
|
||||
const localLyrics = new Map<string, Promise<string | null>>()
|
||||
|
||||
async function readFileLyrics(uri: string) {
|
||||
const handle = new File(uri).open()
|
||||
try {
|
||||
const text = await readLyricsTag({
|
||||
size: handle.size ?? 0,
|
||||
read: (offset, length) => {
|
||||
handle.offset = offset
|
||||
return handle.readBytes(length)
|
||||
},
|
||||
})
|
||||
return text?.trim() || null
|
||||
} finally {
|
||||
handle.close()
|
||||
}
|
||||
}
|
||||
|
||||
function readLocalLyrics(uri: string) {
|
||||
let lyrics = localLyrics.get(uri)
|
||||
if (!lyrics) {
|
||||
lyrics = readFileLyrics(uri).catch(() => null)
|
||||
localLyrics.set(uri, lyrics)
|
||||
}
|
||||
return lyrics
|
||||
}
|
||||
|
||||
const noopSubscribe = () => () => {}
|
||||
|
||||
/**
|
||||
* A song's lyrics: from its downloaded file when there is one, otherwise from
|
||||
* the server. `undefined` while loading, `null` when the song has none.
|
||||
*/
|
||||
export function useLyrics(songId: Id<"songs"> | null) {
|
||||
const { config } = useServerConfig()
|
||||
const { queue } = useDownloads()
|
||||
const fileUri = useSyncExternalStore(queue?.subscribe ?? noopSubscribe, () =>
|
||||
songId && config && queue?.getDownloaded(songId)
|
||||
? downloadedAudioUri(config, songId)
|
||||
: null
|
||||
)
|
||||
const [local, setLocal] = useState<{ uri: string; text: string | null }>()
|
||||
|
||||
useEffect(() => {
|
||||
if (!fileUri) return
|
||||
let current = true
|
||||
void readLocalLyrics(fileUri).then((text) => {
|
||||
if (current) setLocal({ uri: fileUri, text })
|
||||
})
|
||||
return () => {
|
||||
current = false
|
||||
}
|
||||
}, [fileUri])
|
||||
|
||||
const localText = fileUri && local?.uri === fileUri ? local.text : undefined
|
||||
// Songs without a downloaded copy, or whose copy has no lyrics tag.
|
||||
const remote = useCachedQuery(
|
||||
api.lyrics.forSong,
|
||||
songId && (!fileUri || localText === null) ? { id: songId } : "skip"
|
||||
)
|
||||
const text = localText || remote
|
||||
|
||||
return useMemo<Lyrics | null | undefined>(() => {
|
||||
if (!songId) return null
|
||||
if (text === undefined) return undefined
|
||||
return text ? parseLyrics(text) : null
|
||||
}, [songId, text])
|
||||
}
|
||||
|
||||
/**
|
||||
* The playback time for highlighting lyrics: the player's `currentTime`,
|
||||
* advanced by `followLyrics` between its progress updates.
|
||||
*/
|
||||
export function useLyricsTime(
|
||||
lyrics: Lyrics | null | undefined,
|
||||
currentTime: number,
|
||||
isPlaying: boolean
|
||||
) {
|
||||
// Time reached since the player last reported `from`.
|
||||
const [advanced, setAdvanced] = useState<{ from: number; time: number }>()
|
||||
|
||||
useEffect(() => {
|
||||
if (!lyrics || !isPlaying) return
|
||||
return followLyrics(lyrics, currentTime, (time) =>
|
||||
setAdvanced({ from: currentTime, time })
|
||||
)
|
||||
}, [lyrics, currentTime, isPlaying])
|
||||
|
||||
return isPlaying && advanced?.from === currentTime
|
||||
? advanced.time
|
||||
: currentTime
|
||||
}
|
||||
|
||||
/** How far the clock may drift from the player before it is reset. */
|
||||
const CLOCK_DRIFT_SECONDS = 0.15
|
||||
/** How far ahead the clock runs on its own; progress updates come long before. */
|
||||
const CLOCK_RUN_SECONDS = 3600
|
||||
|
||||
/**
|
||||
* Playback time in seconds on the UI thread, running smoothly between the
|
||||
* player's progress updates. It is reset only when it drifts, so animations
|
||||
* driven by it never restart mid-word.
|
||||
*/
|
||||
export function usePlaybackClock(currentTime: number, isPlaying: boolean) {
|
||||
const clock = useSharedValue(currentTime)
|
||||
const running = useRef(false)
|
||||
|
||||
useEffect(() => {
|
||||
if (!isPlaying) {
|
||||
running.current = false
|
||||
cancelAnimation(clock)
|
||||
clock.value = currentTime
|
||||
return
|
||||
}
|
||||
const drift = Math.abs(clock.value - currentTime)
|
||||
if (running.current && drift < CLOCK_DRIFT_SECONDS) return
|
||||
running.current = true
|
||||
clock.value = withSequence(
|
||||
withTiming(currentTime, { duration: 0 }),
|
||||
withTiming(currentTime + CLOCK_RUN_SECONDS, {
|
||||
duration: CLOCK_RUN_SECONDS * 1000,
|
||||
easing: Easing.linear,
|
||||
})
|
||||
)
|
||||
}, [clock, currentTime, isPlaying])
|
||||
|
||||
return clock
|
||||
}
|
||||
@@ -2,7 +2,9 @@ import { useConvex } from "convex/react"
|
||||
import { useCallback } from "react"
|
||||
|
||||
import type { MediaAction } from "@/components/media-context-menu"
|
||||
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
|
||||
import { useDownloads } from "@/contexts/downloads"
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
@@ -48,6 +50,7 @@ export function useMediaMenuActions() {
|
||||
} = useFavorites()
|
||||
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
|
||||
usePlaybackActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
|
||||
const runQueueAction = useCallback(
|
||||
async (action: MediaAction, songIds: Id<"songs">[]) => {
|
||||
@@ -71,8 +74,9 @@ export function useMediaMenuActions() {
|
||||
[addToQueueLast, addToQueueNext, playShuffled]
|
||||
)
|
||||
|
||||
/** `from` limits removing a download to that album, playlist, or Other. */
|
||||
const handleSongAction = useCallback(
|
||||
async (song: BrowseSong, action: MediaAction) => {
|
||||
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => {
|
||||
const songIds = [song.id as Id<"songs">]
|
||||
switch (action) {
|
||||
case "create-station":
|
||||
@@ -97,6 +101,19 @@ export function useMediaMenuActions() {
|
||||
case "go-album":
|
||||
push(`/album/${song.album.id}`)
|
||||
break
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const target = {
|
||||
kind: "songs" as const,
|
||||
songIds,
|
||||
title: song.title,
|
||||
from,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
@@ -107,6 +124,8 @@ export function useMediaMenuActions() {
|
||||
runQueueAction,
|
||||
toggleSongFavorite,
|
||||
playArtistShuffled,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -138,6 +157,25 @@ export function useMediaMenuActions() {
|
||||
case "go-artist":
|
||||
push(`/artist/${album.artist.id}`)
|
||||
break
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: album.id as Id<"albums"> }
|
||||
)
|
||||
const target = {
|
||||
kind: "album" as const,
|
||||
id: album.id,
|
||||
title: album.title,
|
||||
songIds,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
@@ -151,6 +189,8 @@ export function useMediaMenuActions() {
|
||||
push,
|
||||
runQueueAction,
|
||||
toggleAlbumFavorite,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -173,7 +213,7 @@ export function useMediaMenuActions() {
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: artist.id as Id<"artists"> }
|
||||
)
|
||||
await runQueueAction(action, songIds)
|
||||
await runQueueAction(action, songIds.flat())
|
||||
break
|
||||
}
|
||||
default:
|
||||
@@ -211,12 +251,38 @@ export function useMediaMenuActions() {
|
||||
await runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: playlist.id as Id<"playlists"> }
|
||||
)
|
||||
const target = {
|
||||
kind: "playlist" as const,
|
||||
id: playlist.id,
|
||||
title: playlist.title,
|
||||
songIds,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
})
|
||||
},
|
||||
[convex, cacheScope, openAddPlaylistToPlaylist, runQueueAction]
|
||||
[
|
||||
convex,
|
||||
cacheScope,
|
||||
openAddPlaylistToPlaylist,
|
||||
runQueueAction,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
const handleAlbumDetailAction = useCallback(
|
||||
@@ -265,7 +331,7 @@ export function useMediaMenuActions() {
|
||||
cover: album.cover,
|
||||
},
|
||||
}
|
||||
await handleSongAction(song, action)
|
||||
await handleSongAction(song, action, { kind: "album", id: album.id })
|
||||
},
|
||||
[handleSongAction]
|
||||
)
|
||||
|
||||
@@ -0,0 +1,748 @@
|
||||
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 { streamDownloadQuality } from "@otunes/convex/download-quality"
|
||||
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 { downloadedAudioUri, downloadQueueFor } from "@/lib/downloads"
|
||||
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,
|
||||
fromDownloads,
|
||||
}: {
|
||||
store: PlaybackStore
|
||||
queueSongIds: Id<"songs">[]
|
||||
queueHistorySongIds: Id<"songs">[]
|
||||
repeatEnabled: RepeatMode
|
||||
currentSong: BrowseSong | null
|
||||
queueStartVersion: number
|
||||
/** Plays downloads in any quality, for queues started from Downloads. */
|
||||
fromDownloads: boolean
|
||||
}) {
|
||||
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 durationRef = useRef(duration)
|
||||
durationRef.current = duration
|
||||
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]
|
||||
)
|
||||
|
||||
// Reads duration from a ref so seekTo, and every action built on it, stays
|
||||
// stable across track changes.
|
||||
const seekTo = useCallback(async (seconds: number) => {
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
const maxDuration = playlist.duration || durationRef.current || 0
|
||||
const clamped = Math.max(0, Math.min(seconds, maxDuration))
|
||||
await playlist.seekTo(clamped)
|
||||
currentTimeRef.current = clamped
|
||||
setCurrentTime(clamped)
|
||||
}, [])
|
||||
|
||||
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)}:${fromDownloads}:${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 Promise.all([
|
||||
loadPlaybackSongs(convex, cacheScope, songIds),
|
||||
downloadQueueFor(config)
|
||||
.load()
|
||||
.catch(() => {}),
|
||||
])
|
||||
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)
|
||||
)
|
||||
// Downloads stand in for streams in the same quality, and always
|
||||
// play in queues started from Downloads.
|
||||
const download = downloadQueueFor(config).getDownloaded(song.id)
|
||||
const localUri =
|
||||
download &&
|
||||
(fromDownloads || download.quality === streamDownloadQuality(plan))
|
||||
? downloadedAudioUri(config, song.id)
|
||||
: null
|
||||
if (localUri) {
|
||||
sources.set(song.id, { uri: localUri, name: song.title })
|
||||
continue
|
||||
}
|
||||
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,
|
||||
fromDownloads,
|
||||
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,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
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
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
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 }
|
||||
}
|
||||
@@ -5,6 +5,7 @@ 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 = [
|
||||
@@ -20,6 +21,7 @@ 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, [])),
|
||||
@@ -28,6 +30,39 @@ 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,6 +50,13 @@ 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,5 +1,5 @@
|
||||
import { useRouter, useSegments, type Href } from "expo-router"
|
||||
import { useCallback } from "react"
|
||||
import { createContext, use, useCallback } from "react"
|
||||
|
||||
import { tabletSections } from "@/lib/tablet-navigation"
|
||||
|
||||
@@ -30,6 +30,13 @@ export function tabPath(tab: AppTab, path: string): Href {
|
||||
return `/(app)/(tabs)/${tab}${normalized}` as Href
|
||||
}
|
||||
|
||||
/**
|
||||
* The tab whose stack a screen lives in. Each tab stack layout provides it so
|
||||
* links resolve against the screen's own tab, even when the global segments
|
||||
* ref has not caught up with a tab switch yet.
|
||||
*/
|
||||
export const TabStackContext = createContext<AppTab | undefined>(undefined)
|
||||
|
||||
function getActiveTabFromRef(): AppTab {
|
||||
return getActiveTab(activeSegmentsRef.current)
|
||||
}
|
||||
@@ -41,8 +48,15 @@ export function AppNavigationSync() {
|
||||
return null
|
||||
}
|
||||
|
||||
/** Tab-aware navigation: paths resolve inside the caller's tab stack, falling back to the active tab outside one. */
|
||||
export function useAppNavigation() {
|
||||
const router = useRouter()
|
||||
const stackTab = use(TabStackContext)
|
||||
|
||||
const currentTab = useCallback(
|
||||
() => stackTab ?? getActiveTabFromRef(),
|
||||
[stackTab]
|
||||
)
|
||||
|
||||
const push = useCallback(
|
||||
(path: string) => {
|
||||
@@ -53,26 +67,26 @@ export function useAppNavigation() {
|
||||
return
|
||||
}
|
||||
|
||||
router.push(tabPath(getActiveTabFromRef(), path))
|
||||
router.push(tabPath(currentTab(), path))
|
||||
},
|
||||
[router]
|
||||
[router, currentTab]
|
||||
)
|
||||
|
||||
const replace = useCallback(
|
||||
(path: string) => {
|
||||
router.replace(tabPath(getActiveTabFromRef(), path))
|
||||
router.replace(tabPath(currentTab(), path))
|
||||
},
|
||||
[router]
|
||||
[router, currentTab]
|
||||
)
|
||||
|
||||
const href = useCallback(
|
||||
(path: string) => tabPath(getActiveTabFromRef(), path),
|
||||
[]
|
||||
(path: string) => tabPath(currentTab(), path),
|
||||
[currentTab]
|
||||
)
|
||||
|
||||
return {
|
||||
get tab() {
|
||||
return getActiveTabFromRef()
|
||||
return currentTab()
|
||||
},
|
||||
href,
|
||||
push,
|
||||
|
||||
@@ -3,8 +3,8 @@ import { useSyncExternalStore } from "react"
|
||||
|
||||
const STORAGE_KEY = "otunes:artwork-colors"
|
||||
const listeners = new Set<() => void>()
|
||||
let enabled = true
|
||||
let loaded = false
|
||||
// Undefined until storage has been read, so callers never act on a guess.
|
||||
let enabled: boolean | undefined
|
||||
let loading: Promise<void> | undefined
|
||||
|
||||
function notify() {
|
||||
@@ -13,37 +13,40 @@ function notify() {
|
||||
|
||||
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 !== "false"
|
||||
})
|
||||
.catch(() => {
|
||||
// Keep the default when local storage is unavailable.
|
||||
})
|
||||
.finally(() => {
|
||||
loaded = true
|
||||
enabled = value
|
||||
notify()
|
||||
}))
|
||||
}
|
||||
|
||||
void load()
|
||||
|
||||
function subscribe(listener: () => void) {
|
||||
listeners.add(listener)
|
||||
void load()
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
/** Device preference, kept outside account data and the disposable query cache. */
|
||||
/**
|
||||
* Device preference, kept outside account data and the disposable query cache.
|
||||
* `undefined` until it has loaded.
|
||||
*/
|
||||
export function useArtworkColorsEnabled() {
|
||||
return useSyncExternalStore(subscribe, () => loaded && enabled, () => false)
|
||||
return useSyncExternalStore(
|
||||
subscribe,
|
||||
() => enabled,
|
||||
() => undefined
|
||||
)
|
||||
}
|
||||
|
||||
export function useArtworkColorPreferenceLoaded() {
|
||||
return useSyncExternalStore(subscribe, () => loaded, () => false)
|
||||
}
|
||||
|
||||
export function artworkColorsEnabled() {
|
||||
return loaded && enabled
|
||||
/** Resolves with the preference once it has loaded. */
|
||||
export async function loadArtworkColorsEnabled() {
|
||||
await load()
|
||||
return enabled ?? true
|
||||
}
|
||||
|
||||
export async function setArtworkColorsEnabled(value: boolean) {
|
||||
|
||||
Loaded 100 of 292 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user