Compare commits

..
227 changed files with 5793 additions and 13781 deletions

No files matched your search

+15 -7
View File
@@ -25,16 +25,20 @@ FROM node:${NODE_VERSION} AS dependencies
WORKDIR /app WORKDIR /app
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex). # Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
# Mobile's manifest is never copied, so the workspace globs cannot discover it. # Mobile is intentionally omitted so its deps are never installed.
# The workspace file must be the real one: its overrides and patches are COPY package.json pnpm-lock.yaml .npmrc ./
# 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. # pnpm validates patches even when their packages are outside the install filter.
COPY patches ./patches COPY patches ./patches
COPY apps/web/package.json ./apps/web/ COPY apps/web/package.json ./apps/web/
COPY packages/convex/package.json ./packages/convex/ COPY packages/convex/package.json ./packages/convex/
RUN printf '\n%s\n' \ # 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' \
'supportedArchitectures.os=current' \ 'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \ 'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \ 'supportedArchitectures.libc=current' \
@@ -78,11 +82,15 @@ FROM node:${NODE_VERSION} AS convex-functions
WORKDIR /app WORKDIR /app
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./ COPY package.json pnpm-lock.yaml .npmrc ./
COPY patches ./patches COPY patches ./patches
COPY packages/convex/package.json ./packages/convex/ COPY packages/convex/package.json ./packages/convex/
RUN printf '\n%s\n' \ RUN printf '%s\n' \
'packages:' \
' - "packages/convex"' \
> pnpm-workspace.yaml \
&& printf '\n%s\n' \
'supportedArchitectures.os=current' \ 'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \ 'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \ 'supportedArchitectures.libc=current' \
+4 -9
View File
@@ -73,15 +73,10 @@ 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 Archive action with the Catalyst destination. EAS's existing iOS profiles still
build iPhone/iPad apps. build iPhone/iPad apps.
Don't enable Catalyst by hand in Xcode; the plugin configures everything during The Catalyst plugin enables the Xcode target and React Native's CocoaPods
prebuild. It enables the Xcode target and React Native's CocoaPods patches, patches. It disables precompiled React Native and Expo modules so dependencies
raises pod deployment targets to the app's, and disables precompiled React can compile for Catalyst. The Mac app derives a separate bundle identifier with
Native and Expo modules so dependencies can compile for Catalyst. System volume Apple's `maccatalyst.` prefix. System volume stays under macOS control.
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 To return a checkout to ordinary iOS builds, rerun prebuild without
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro. `MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
+2 -4
View File
@@ -4,9 +4,7 @@ This integration uses Expo 58 inline modules and `expo-app-intents`. Rebuild the
Playback and library changes open oTunes because they need its authenticated React runtime. Swift dispatches a request and waits for an app-owned completion acknowledgment. Playback waits for the native audio player to load the requested track; warmup waits for it to load while paused. Errors reach Siri, and requests that have expired are discarded before starting a side effect. Native catalog reads do not open the app. Playback and library changes open oTunes because they need its authenticated React runtime. Swift dispatches a request and waits for an app-owned completion acknowledgment. Playback waits for the native audio player to load the requested track; warmup waits for it to load while paused. Errors reach Siri, and requests that have expired are discarded before starting a side effect. Native catalog reads do not open the app.
The full entity catalog lives in Application Support. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog. 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.
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. Songs, albums, artists, and playlists have Spotlight open intents and on-screen entity associations. Associations require iOS 18.4 and Xcode 27; Spotlight indexing requires iOS 18. Playback donations are made after the player starts, preserve shuffle, and resolve real catalog entities. Removed records trigger donation cleanup. Sign-out clears catalogs, Spotlight entries, donations, and pending invocations. On iOS 27, the query types also handle system requests to rebuild Spotlight indexes.
@@ -16,7 +14,7 @@ Audio schema intents require Xcode 27 and iOS 27. Custom intents remain availabl
Deploy the companion Convex changes before installing the new mobile build: Deploy the companion Convex changes before installing the new mobile build:
- `intentCatalog.head`, `intentCatalog.page` and `intentCatalog.playlists` supply the entity catalog. Library mutations record renames and deletions in `intentCatalogChanges`, pruned daily. - `library.intentCatalogPage` supplies authenticated, paginated entity records.
- `appIntentPlaylists` records playlist-creation request IDs in the same transaction as creation. Replaying a request returns the original playlist ID. - `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. - `playlists.createPlaylist` accepts an optional `invocationId`; existing callers can omit it.
+2 -5
View File
@@ -26,8 +26,6 @@ export default ({ config }: ConfigContext): ExpoConfig => {
production: "oTunes", production: "oTunes",
}[variant] }[variant]
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
return { return {
...config, ...config,
plugins: [ plugins: [
@@ -42,12 +40,11 @@ export default ({ config }: ConfigContext): ExpoConfig => {
icon: `./assets/icon${iconSuffix}.png`, icon: `./assets/icon${iconSuffix}.png`,
ios: { ios: {
...config.ios, ...config.ios,
bundleIdentifier, bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
icon: `./assets/${composer}.icon`, icon: `./assets/${composer}.icon`,
infoPlist: { infoPlist: {
...config.ios?.infoPlist, ...config.ios?.infoPlist,
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID. NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
NSUserActivityTypes: [`${bundleIdentifier}.media`],
}, },
}, },
android: { android: {
-1
View File
@@ -54,7 +54,6 @@
"expo-status-bar", "expo-status-bar",
"expo-app-intents", "expo-app-intents",
"./plugins/with-android-colors", "./plugins/with-android-colors",
"./plugins/with-android-fast-fade",
[ [
"expo-navigation-bar", "expo-navigation-bar",
{ {
@@ -5,7 +5,6 @@ import Songs from "../home/browse/songs"
import Playlists from "../home/browse/playlists" import Playlists from "../home/browse/playlists"
import Favorites from "../home/playlist/favorites" import Favorites from "../home/playlist/favorites"
import RecentlyPlayed from "../home/recently-played" import RecentlyPlayed from "../home/recently-played"
import Downloads from "../home/downloads"
import { TabletSectionContext } from "@/lib/tablet-navigation" import { TabletSectionContext } from "@/lib/tablet-navigation"
const screens = { const screens = {
@@ -15,7 +14,6 @@ const screens = {
playlists: Playlists, playlists: Playlists,
favorites: Favorites, favorites: Favorites,
recent: RecentlyPlayed, recent: RecentlyPlayed,
downloads: Downloads,
} }
export default function TabletSectionScreen() { export default function TabletSectionScreen() {
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
+25 -24
View File
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
import { import {
ScreenPaletteProvider, ScreenPaletteProvider,
useAndroidTabPalette, useAndroidTabPalette,
useAndroidTabHasArtworkPalette, useAndroidTabBackgroundStyle,
useTabletBackgroundStyle, useAndroidNativeTabColors,
} from "@/contexts/android-tab-theme" } from "@/contexts/android-tab-theme"
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router" import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
import { NativeTabs } from "expo-router/native-tabs" import { NativeTabs } from "expo-router/native-tabs"
@@ -46,13 +46,12 @@ function useRouterTheme() {
} }
function useNativeTabColors() { function useNativeTabColors() {
// These props initialize native tabs; the worklet owns subsequent colors.
const selectedColor = colors.dark.primary
const themeIsDark = useIsDark() const themeIsDark = useIsDark()
const androidPalette = useAndroidTabPalette() const androidPalette = colors.dark
const hasArtworkPalette = useAndroidTabHasArtworkPalette() const artworkPalette = useAndroidTabPalette()
const selectedColor = hasArtworkPalette const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
? androidPalette.foreground
: androidPalette.accentText
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
const inactive = appleMusic.tabInactive const inactive = appleMusic.tabInactive
const iconColor = const iconColor =
@@ -62,14 +61,14 @@ function useNativeTabColors() {
selected: appleMusic.pink, selected: appleMusic.pink,
} }
: { : {
default: androidPalette.secondaryForeground, default: androidPalette.mutedForeground,
selected: selectedColor, selected: selectedColor,
} }
const labelColor = const labelColor =
Platform.OS === "ios" Platform.OS === "ios"
? DynamicColorIOS({ dark: inactive, light: "#636366" }) ? DynamicColorIOS({ dark: inactive, light: "#636366" })
: androidPalette.secondaryForeground : androidPalette.mutedForeground
return { return {
isDark, isDark,
@@ -86,17 +85,20 @@ function useNativeTabColors() {
blurEffect: isDark blurEffect: isDark
? "systemChromeMaterialDark" ? "systemChromeMaterialDark"
: "systemChromeMaterialLight", : "systemChromeMaterialLight",
backgroundColor: // Reveal the shared UI-thread background beneath the native tab bar.
Platform.OS === "ios" ? undefined : androidPalette.background, backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
} }
} }
function TabsContent() { function TabsContent() {
const tabletLayout = useTabletLayout() const tabletLayout = useTabletLayout()
const homeColors = useAndroidNativeTabColors()
const libraryColors = useAndroidNativeTabColors()
const searchColors = useAndroidNativeTabColors()
const keyboardVisible = useAndroidKeyboardVisible() const keyboardVisible = useAndroidKeyboardVisible()
const routerTheme = useRouterTheme() const routerTheme = useRouterTheme()
const tabColors = useNativeTabColors() const tabColors = useNativeTabColors()
const backgroundStyle = useTabletBackgroundStyle() const backgroundStyle = useAndroidTabBackgroundStyle()
const { currentSong, queueSongIds } = usePlaybackQueue() const { currentSong, queueSongIds } = usePlaybackQueue()
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0) const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
@@ -127,9 +129,7 @@ function TabsContent() {
tintColor={tabColors.tintColor} tintColor={tabColors.tintColor}
minimizeBehavior="onScrollDown" minimizeBehavior="onScrollDown"
{...(Platform.OS === "android" {...(Platform.OS === "android"
? // A new ripple color rebuilds Material's item backgrounds and ? { disableIndicator: true, rippleColor: tabColors.tintColor }
// cuts off the in-flight ripple, so it must not follow the palette.
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
: {})} : {})}
> >
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? ( {Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
@@ -140,6 +140,9 @@ function TabsContent() {
<NativeTabs.Trigger <NativeTabs.Trigger
name="home" name="home"
unstable_nativeProps={
Platform.OS === "android" ? homeColors : undefined
}
disableTransparentOnScrollEdge disableTransparentOnScrollEdge
contentStyle={androidContentStyle} contentStyle={androidContentStyle}
> >
@@ -149,6 +152,9 @@ function TabsContent() {
<NativeTabs.Trigger <NativeTabs.Trigger
name="library" name="library"
unstable_nativeProps={
Platform.OS === "android" ? libraryColors : undefined
}
disableTransparentOnScrollEdge disableTransparentOnScrollEdge
contentStyle={androidContentStyle} contentStyle={androidContentStyle}
> >
@@ -163,6 +169,9 @@ function TabsContent() {
<NativeTabs.Trigger <NativeTabs.Trigger
name="search" name="search"
unstable_nativeProps={
Platform.OS === "android" ? searchColors : undefined
}
disableTransparentOnScrollEdge disableTransparentOnScrollEdge
contentStyle={androidContentStyle} contentStyle={androidContentStyle}
> >
@@ -217,14 +226,6 @@ function TabsContent() {
<NativeTabs.Trigger.Icon sf="clock" /> <NativeTabs.Trigger.Icon sf="clock" />
<NativeTabs.Trigger.Label>Recently Played</NativeTabs.Trigger.Label> <NativeTabs.Trigger.Label>Recently Played</NativeTabs.Trigger.Label>
</NativeTabs.Trigger> </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> </NativeTabs>
{!keyboardVisible ? <AndroidMiniPlayer /> : null} {!keyboardVisible ? <AndroidMiniPlayer /> : null}
{tabletLayout ? <TabletMiniPlayer /> : null} {tabletLayout ? <TabletMiniPlayer /> : null}
+108 -141
View File
@@ -1,4 +1,3 @@
import { Ionicons } from "@expo/vector-icons"
import { SongSwipeRow } from "@/components/song-swipe-row" import { SongSwipeRow } from "@/components/song-swipe-row"
import { import {
useSwipeRowGroup, useSwipeRowGroup,
@@ -8,13 +7,21 @@ import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
} from "@/components/collection-hero" } from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated" import Animated from "react-native-reanimated"
import { useScreenPalette } from "@/contexts/android-tab-theme" import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router" import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import { Platform, Pressable, StyleSheet, View } from "react-native"
import { import {
CollectionDivider, CollectionDivider,
@@ -22,18 +29,6 @@ import {
DiscHeader, DiscHeader,
} from "@/components/collection-list" } from "@/components/collection-list"
import { AudioFormatBadge } from "@/components/audio-format-badge" import { AudioFormatBadge } from "@/components/audio-format-badge"
import {
DownloadHeaderButton,
DownloadedQuality,
} from "@/components/download-header-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 { CoverImage } from "@/components/cover-image"
import { import {
@@ -70,17 +65,7 @@ export default function AlbumScreen() {
api.library.browseAlbumDetail, api.library.browseAlbumDetail,
typeof id === "string" ? { id: id as Id<"albums"> } : "skip" typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
) )
const { const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
playAlbum,
playAlbumShuffled,
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin(`album:${id}`)
: `album:${id}`
const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } = const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
useFavorites() useFavorites()
const { const {
@@ -103,17 +88,20 @@ export default function AlbumScreen() {
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [], () => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
[album] [album]
) )
const { requestDownload, removeDownload } = useDownloads()
const downloadTarget = useMemo( // Older servers do not include album format availability yet.
() => ({ const formatTracks = useCachedQuery(
kind: "album" as const, api.library.getSongsForPlayback,
id: typeof id === "string" ? id : "", album && (album.hasLossless === undefined || album.hasAtmos === undefined)
title: album?.title ?? "", ? { ids: songIds }
songIds, : "skip"
}),
[album?.title, id, songIds]
) )
const albumDownloaded = useIsCollectionDownloaded(downloadTarget) const hasLossless =
album?.hasLossless ??
formatTracks?.some((track) => track && "lossless" in track.files)
const hasAtmos =
album?.hasAtmos ??
formatTracks?.some((track) => track && "atmos" in track.files)
useEffect(() => { useEffect(() => {
if (album) { if (album) {
@@ -123,12 +111,6 @@ export default function AlbumScreen() {
const listItems = useMemo(() => albumListItems(album?.tracks ?? []), [album]) 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( const renderItem = useCallback(
({ item }: { item: AlbumListItem }) => { ({ item }: { item: AlbumListItem }) => {
if (item.type === "disc") { if (item.type === "disc") {
@@ -143,7 +125,9 @@ export default function AlbumScreen() {
songIds={songIds} songIds={songIds}
palette={palette} palette={palette}
favorited={isSongFavorite(item.track.id)} favorited={isSongFavorite(item.track.id)}
onPlay={playTrack} onPlay={(songId, ids) =>
playFromSong(songId, ids, `album:${album.id}`)
}
onAction={handleAlbumTrackAction} onAction={handleAlbumTrackAction}
/> />
) : null ) : null
@@ -153,7 +137,7 @@ export default function AlbumScreen() {
handleAlbumTrackAction, handleAlbumTrackAction,
isSongFavorite, isSongFavorite,
palette, palette,
playTrack, playFromSong,
songIds, songIds,
swipeGroup, swipeGroup,
] ]
@@ -168,14 +152,17 @@ export default function AlbumScreen() {
headerLargeTitle: false, headerLargeTitle: false,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
} }
: {}), : {}),
}} }}
/> />
<CollectionDetailSkeleton <CollectionDetailSkeleton
variant="album" zoomCoverSize={220}
onLayout={onLayout} onLayout={onLayout}
style={backgroundStyle} style={backgroundStyle}
backgroundColor={ backgroundColor={
@@ -196,9 +183,9 @@ export default function AlbumScreen() {
}} }}
/> />
<View style={[styles.empty, { backgroundColor: colors.background }]}> <View style={[styles.empty, { backgroundColor: colors.background }]}>
<Text style={{ color: colors.mutedForeground }}> <PaletteText style={{ color: colors.mutedForeground }}>
Album not found. Album not found.
</Text> </PaletteText>
</View> </View>
</> </>
) )
@@ -219,48 +206,39 @@ export default function AlbumScreen() {
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark statusBarStyle: palette.isDark
? ("light" as const) ? ("light" as const)
: ("dark" as const), : ("dark" as const),
} }
: {}), : {}),
headerRight: () => ( headerRight: () => (
<View style={styles.headerActions}> <MediaActionMenu
<DownloadHeaderButton stationArtistId={album.artist.id}
target={downloadTarget} selectedCount={album.tracks.length}
color={colors.foreground} favorited={isAlbumFav(album.id)}
/> share={{ type: "album", albumId: album.id, title: album.title }}
<MediaActionMenu onAction={(action) =>
stationArtistId={album.artist.id} void handleAlbumDetailAction(
selectedCount={album.tracks.length} album.id as Id<"albums">,
favorited={isAlbumFav(album.id)} songIds,
downloaded={albumDownloaded} action,
share={{ type: "album", albumId: album.id, title: album.title }} album.artist.id as Id<"artists">
onAction={(action) => { )
if (action === "download") { }
void requestDownload(downloadTarget) >
} else if (action === "remove-download") { <Pressable hitSlop={8}>
void removeDownload(downloadTarget) <PaletteIcon
} else { tone="foreground"
void handleAlbumDetailAction( name="ellipsis-horizontal"
album.id as Id<"albums">, size={22}
songIds, color={palette.isDark ? "#fff" : "#000"}
action, />
album.artist.id as Id<"artists"> </Pressable>
) </MediaActionMenu>
}
}}
>
<Pressable hitSlop={8}>
<Ionicons
name="ellipsis-horizontal"
size={22}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
</View>
), ),
}} }}
/> />
@@ -315,7 +293,8 @@ export default function AlbumScreen() {
{ backgroundColor: palette.surface }, { backgroundColor: palette.surface },
]} ]}
> >
<Ionicons <PaletteIcon
tone={favorited ? "accent" : "foreground"}
name={favorited ? "star" : "star-outline"} name={favorited ? "star" : "star-outline"}
size={24} size={24}
color={favorited ? palette.accent : palette.foreground} color={favorited ? palette.accent : palette.foreground}
@@ -324,11 +303,7 @@ export default function AlbumScreen() {
<Button <Button
title="Play" title="Play"
icon="play" icon="play"
onPress={() => onPress={() => void playAlbum(album.id, songIds)}
void (fromDownloads
? playInOrder(songIds, playOrigin)
: playAlbum(album.id, songIds))
}
style={styles.playButton} style={styles.playButton}
tint={{ tint={{
background: palette.accent, background: palette.accent,
@@ -339,17 +314,14 @@ export default function AlbumScreen() {
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel="Shuffle" accessibilityLabel="Shuffle"
hitSlop={8} hitSlop={8}
onPress={() => onPress={() => void playAlbumShuffled(album.id, songIds)}
void (fromDownloads
? playShuffled(songIds, playOrigin)
: playAlbumShuffled(album.id, songIds))
}
style={[ style={[
styles.iconAction, styles.iconAction,
{ backgroundColor: palette.surface }, { backgroundColor: palette.surface },
]} ]}
> >
<Ionicons <PaletteIcon
tone="foreground"
name="shuffle" name="shuffle"
size={24} size={24}
color={palette.foreground} color={palette.foreground}
@@ -358,7 +330,8 @@ export default function AlbumScreen() {
</View> </View>
} }
> >
<Text <PaletteText
tone="foreground"
style={[ style={[
styles.title, styles.title,
heroLayout.landscape && styles.titleLandscape, heroLayout.landscape && styles.titleLandscape,
@@ -366,12 +339,13 @@ export default function AlbumScreen() {
]} ]}
> >
{album.title} {album.title}
</Text> </PaletteText>
<Pressable <Pressable
onPress={() => push(`/artist/${album.artist.id}`)} onPress={() => push(`/artist/${album.artist.id}`)}
style={styles.artistPressable} style={styles.artistPressable}
> >
<Text <PaletteText
tone="accentText"
style={[ style={[
styles.artist, styles.artist,
heroLayout.landscape && styles.artistLandscape, heroLayout.landscape && styles.artistLandscape,
@@ -379,7 +353,7 @@ export default function AlbumScreen() {
]} ]}
> >
{album.artist.name} {album.artist.name}
</Text> </PaletteText>
</Pressable> </Pressable>
<View <View
style={{ style={{
@@ -393,32 +367,43 @@ export default function AlbumScreen() {
}} }}
> >
{metadata ? ( {metadata ? (
<Text style={{ color: palette.secondaryForeground }}> <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
{metadata} {metadata}
</Text> </PaletteText>
) : null} ) : null}
{album.hasLossless ? ( {hasLossless ? (
<> <>
{metadata ? ( {metadata ? (
<Text style={{ color: palette.secondaryForeground }}> <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
· ·
</Text> </PaletteText>
) : null} ) : null}
<AudioFormatBadge <AudioFormatBadge
artwork
format="lossless" format="lossless"
color={palette.secondaryForeground} color={palette.secondaryForeground}
backgroundColor={palette.background} backgroundColor={palette.background}
/> />
</> </>
) : null} ) : null}
{album.hasAtmos ? ( {hasAtmos ? (
<> <>
{metadata || album.hasLossless ? ( {metadata || hasLossless ? (
<Text style={{ color: palette.secondaryForeground }}> <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
· ·
</Text> </PaletteText>
) : null} ) : null}
<AudioFormatBadge <AudioFormatBadge
artwork
format="atmos" format="atmos"
color={palette.secondaryForeground} color={palette.secondaryForeground}
backgroundColor={palette.background} backgroundColor={palette.background}
@@ -426,11 +411,6 @@ export default function AlbumScreen() {
</> </>
) : null} ) : null}
</View> </View>
<DownloadedQuality
collection={downloadTarget}
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</CollectionHero> </CollectionHero>
</MusicEntityView> </MusicEntityView>
<CollectionDivider color={palette.divider} /> <CollectionDivider color={palette.divider} />
@@ -510,13 +490,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
}) { }) {
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
const { config } = useServerConfig() 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 ( return (
<MediaContextMenu <MediaContextMenu
preview={ preview={
@@ -533,7 +506,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
} }
stationArtistId={album.artist.id} stationArtistId={album.artist.id}
favorited={favorited} favorited={favorited}
downloaded={downloaded}
navigation={{ navigation={{
artist: { id: album.artist.id }, artist: { id: album.artist.id },
album: { id: album.id }, album: { id: album.id },
@@ -552,16 +524,15 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
backgroundColor={palette.background} backgroundColor={palette.background}
onPlayNext={() => void onAction(track, album, "play-next")} onPlayNext={() => void onAction(track, album, "play-next")}
onAddToQueue={() => void onAction(track, album, "play-last")} onAddToQueue={() => void onAction(track, album, "play-last")}
downloaded={downloaded}
onDownload={() => toggleDownload(track, downloaded, downloadRef)}
style={styles.trackRow} style={styles.trackRow}
onPress={() => void onPlay(track.id as Id<"songs">, songIds)} onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
> >
<Text <PaletteText
tone="secondaryForeground"
style={[styles.trackNumber, { color: palette.secondaryForeground }]} style={[styles.trackNumber, { color: palette.secondaryForeground }]}
> >
{number} {number}
</Text> </PaletteText>
<View <View
style={[ style={[
styles.trackContent, styles.trackContent,
@@ -569,32 +540,29 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
]} ]}
> >
<View style={styles.trackMeta}> <View style={styles.trackMeta}>
<Text <PaletteText
tone="foreground"
style={[styles.trackTitle, { color: palette.foreground }]} style={[styles.trackTitle, { color: palette.foreground }]}
numberOfLines={1} numberOfLines={1}
> >
{track.title} {track.title}
</Text> </PaletteText>
{track.artists ? ( {track.artists ? (
<Text <PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }} style={{ color: palette.secondaryForeground }}
numberOfLines={1} numberOfLines={1}
> >
{track.artists.join(", ")} {track.artists.join(", ")}
</Text> </PaletteText>
) : null} ) : null}
</View> </View>
{downloaded || downloadState === "device" ? ( <PaletteText
<Ionicons tone="secondaryForeground"
name="arrow-down-circle" style={{ color: palette.secondaryForeground }}
size={14} >
color={palette.secondaryForeground}
accessibilityLabel="Downloaded"
/>
) : null}
<Text style={{ color: palette.secondaryForeground }}>
{formatDuration(track.durationSeconds)} {formatDuration(track.durationSeconds)}
</Text> </PaletteText>
</View> </View>
</Row> </Row>
</MusicEntityView> </MusicEntityView>
@@ -604,7 +572,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
const styles = StyleSheet.create({ const styles = StyleSheet.create({
empty: { flex: 1, alignItems: "center", justifyContent: "center" }, empty: { flex: 1, alignItems: "center", justifyContent: "center" },
headerActions: { flexDirection: "row", alignItems: "center", gap: 16 },
cover: { cover: {
width: 220, width: 220,
height: 220, height: 220,
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
headerLargeTitle: false, headerLargeTitle: false,
}} }}
/> />
<CollectionDetailSkeleton variant="artist" /> <CollectionDetailSkeleton round />
</> </>
) )
} }
@@ -1,176 +0,0 @@
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 },
})
@@ -1,152 +0,0 @@
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}>
<Button
title="Play"
icon="play"
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
style={styles.play}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
style={[styles.shuffle, { backgroundColor: colors.card }]}
>
<Ionicons name="shuffle" size={24} color={colors.foreground} />
</Pressable>
</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",
gap: spacing.sm,
padding: spacing.lg,
},
play: { flex: 1 },
shuffle: {
width: 48,
height: 48,
borderRadius: 24,
alignItems: "center",
justifyContent: "center",
},
empty: { padding: spacing.lg, textAlign: "center" },
})
+1 -4
View File
@@ -62,10 +62,7 @@ export default function HomeScreen() {
return ( return (
<ScrollView <ScrollView
style={{ flex: 1, backgroundColor: colors.background }} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[ contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
styles.content,
{ paddingBottom: tabContentBottomInset },
]}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
> >
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} /> <HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
@@ -1,14 +1,21 @@
import { Ionicons } from "@expo/vector-icons"
import { import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
} from "@/components/collection-hero" } from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated" import Animated from "react-native-reanimated"
import { import {
PlaylistSearchBar, PlaylistSearchBar,
usePlaylistSearch, usePlaylistSearch,
} from "@/components/playlist-search-bar" } from "@/components/playlist-search-bar"
import { useScreenPalette } from "@/contexts/android-tab-theme" import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { useMutation } from "convex/react" import { useMutation } from "convex/react"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
@@ -24,7 +31,6 @@ import {
Platform, Platform,
Pressable, Pressable,
StyleSheet, StyleSheet,
Text,
View, View,
type ListRenderItemInfo, type ListRenderItemInfo,
} from "react-native" } from "react-native"
@@ -44,18 +50,6 @@ import {
import { CollectionDetailSkeleton } from "@/components/skeletons" import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives" import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player" import { contentBottomInset, SongListRow } from "@/components/player"
import {
DownloadHeaderButton,
DownloadedQuality,
} from "@/components/download-header-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 { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback" import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
@@ -80,7 +74,6 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
"play-last", "play-last",
"shuffle", "shuffle",
"favorite", "favorite",
"change-cover",
"delete-playlist", "delete-playlist",
] ]
@@ -96,11 +89,7 @@ export default function PlaylistScreen() {
const songs = playlist?.songs const songs = playlist?.songs
const coverUri = const coverUri =
config && playlistId config && playlistId
? playlistCoverUrl( ? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
config.serverUrl,
playlist?.id ?? playlistId,
playlist?.cover ?? null
)
: "" : ""
const { palette: artworkPalette, settled } = useCoverPalette( const { palette: artworkPalette, settled } = useCoverPalette(
coverUri, coverUri,
@@ -122,14 +111,17 @@ export default function PlaylistScreen() {
headerLargeTitle: false, headerLargeTitle: false,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
} }
: {}), : {}),
}} }}
/> />
<CollectionDetailSkeleton <CollectionDetailSkeleton
variant="playlist" zoomCoverSize={200}
onLayout={onLayout} onLayout={onLayout}
style={backgroundStyle} style={backgroundStyle}
backgroundColor={ backgroundColor={
@@ -150,9 +142,9 @@ export default function PlaylistScreen() {
}} }}
/> />
<View style={[styles.empty, { backgroundColor: colors.background }]}> <View style={[styles.empty, { backgroundColor: colors.background }]}>
<Text style={{ color: colors.mutedForeground }}> <PaletteText style={{ color: colors.mutedForeground }}>
Playlist not found. Playlist not found.
</Text> </PaletteText>
</View> </View>
</> </>
) )
@@ -187,18 +179,10 @@ function PlaylistContent({
}) { }) {
const router = useRouter() const router = useRouter()
const isFocused = useIsFocused() const isFocused = useIsFocused()
const colors = useThemeColors() const { playPlaylist, playPlaylistShuffled, playFromSong } =
const { usePlaybackActions()
playPlaylist,
playPlaylistShuffled,
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions() const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
const { requestDownload, removeDownload } = useDownloads()
const subscribe = useMutation(api.playlists.subscribeToPlaylist) const subscribe = useMutation(api.playlists.subscribeToPlaylist)
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist) const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
const deletePlaylist = useMutation(api.playlists.deletePlaylist) const deletePlaylist = useMutation(api.playlists.deletePlaylist)
@@ -211,25 +195,17 @@ function PlaylistContent({
const { filteredSongs, onQueryChange, onSearchSubmit } = const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs) usePlaylistSearch(songs)
const swipeGroup = useSwipeRowGroup() 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( const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin), (song: BrowseSong) =>
[playFromSong, songIds, playOrigin] void playFromSong(song.id, songIds, `playlist:${playlistId}`),
[playFromSong, songIds, playlistId]
)
const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) =>
void handleSongAction(song, action),
[handleSongAction]
) )
const handleRemoveSong = useCallback( const handleRemoveSong = useCallback(
@@ -250,37 +226,13 @@ function PlaylistContent({
[playlistId, removeSongs] [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(() => { const handlePlay = useCallback(() => {
if (fromDownloads) void playInOrder(songIds, playOrigin) if (playlistId) void playPlaylist(playlistId, songIds)
else if (playlistId) void playPlaylist(playlistId, songIds) }, [playPlaylist, playlistId, songIds])
}, [
fromDownloads,
playInOrder,
playOrigin,
playPlaylist,
playlistId,
songIds,
])
const handleShuffle = useCallback(() => { const handleShuffle = useCallback(() => {
if (fromDownloads) void playShuffled(songIds, playOrigin) if (playlistId) void playPlaylistShuffled(playlistId, songIds)
else if (playlistId) void playPlaylistShuffled(playlistId, songIds) }, [playPlaylistShuffled, playlistId, songIds])
}, [
fromDownloads,
playShuffled,
playOrigin,
playPlaylistShuffled,
playlistId,
songIds,
])
const handleSubscribeToggle = useCallback(async () => { const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return if (!playlistId) return
@@ -315,23 +267,6 @@ function PlaylistContent({
void handleDelete() void handleDelete()
return 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) void handlePlaylistDetailAction(songIds, action)
} }
@@ -342,49 +277,41 @@ function PlaylistContent({
headerTintColor: palette.foreground, headerTintColor: palette.foreground,
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
headerStyle: { backgroundColor: palette.background }, headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark statusBarStyle: palette.isDark
? ("light" as const) ? ("light" as const)
: ("dark" as const), : ("dark" as const),
} }
: {}), : {}),
headerRight: () => ( headerRight: () => (
<View style={styles.headerActions}> <MediaActionMenu
<DownloadHeaderButton selectedCount={songIds.length}
target={downloadTarget} playlistLabel={PLAYLIST_LABEL}
color={colors.foreground} share={{
/> type: "playlist",
<MediaActionMenu playlistId: playlistId ?? "favorites",
selectedCount={songIds.length} title: playlist?.title ?? "oTunes",
playlistLabel={PLAYLIST_LABEL} }}
downloaded={playlistDownloaded} includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
share={{ onAction={handlePlaylistMenuAction}
type: "playlist", >
playlistId: playlistId ?? "favorites", <Pressable hitSlop={8}>
title: playlist?.title ?? "oTunes", <PaletteIcon
}} tone="foreground"
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined} name="ellipsis-horizontal"
onAction={handlePlaylistMenuAction} size={22}
> color={palette.isDark ? "#fff" : "#000"}
<Pressable hitSlop={8}> />
<Ionicons </Pressable>
name="ellipsis-horizontal" </MediaActionMenu>
size={22}
color={colors.foreground}
/>
</Pressable>
</MediaActionMenu>
</View>
), ),
} }
}, [ }, [
canEdit, canEdit,
colors.foreground,
deletePlaylist, deletePlaylist,
downloadTarget,
playlistDownloaded,
requestDownload,
removeDownload,
handlePlaylistDetailAction, handlePlaylistDetailAction,
palette.foreground, palette.foreground,
palette.isDark, palette.isDark,
@@ -402,7 +329,6 @@ function PlaylistContent({
removable={canEdit} removable={canEdit}
palette={palette} palette={palette}
swipeGroup={swipeGroup} swipeGroup={swipeGroup}
downloadRef={downloadRef}
onPlay={handlePlaySong} onPlay={handlePlaySong}
onAction={handleSongMenuAction} onAction={handleSongMenuAction}
onRemove={handleRemoveSong} onRemove={handleRemoveSong}
@@ -410,7 +336,6 @@ function PlaylistContent({
), ),
[ [
canEdit, canEdit,
downloadRef,
handlePlaySong, handlePlaySong,
handleRemoveSong, handleRemoveSong,
handleSongMenuAction, handleSongMenuAction,
@@ -445,14 +370,15 @@ function PlaylistContent({
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow} onScrollBeginDrag={swipeGroup.closeOpenRow}
ListEmptyComponent={ ListEmptyComponent={
<Text <PaletteText
tone="secondaryForeground"
style={[ style={[
styles.emptyResults, styles.emptyResults,
{ color: palette.secondaryForeground }, { color: palette.secondaryForeground },
]} ]}
> >
{songs.length ? "No songs found." : "No songs in this playlist."} {songs.length ? "No songs found." : "No songs in this playlist."}
</Text> </PaletteText>
} }
ListHeaderComponent={ ListHeaderComponent={
<PlaylistHero <PlaylistHero
@@ -465,7 +391,6 @@ function PlaylistContent({
isSubscribed={isSubscribed} isSubscribed={isSubscribed}
showSubscribe={!playlist.isOwner && playlistId !== null} showSubscribe={!playlist.isOwner && playlistId !== null}
onSubscribeToggle={handleSubscribeToggle} onSubscribeToggle={handleSubscribeToggle}
downloadRef={downloadRef}
onPlay={handlePlay} onPlay={handlePlay}
onShuffle={handleShuffle} onShuffle={handleShuffle}
/> />
@@ -485,7 +410,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
removable, removable,
palette, palette,
swipeGroup, swipeGroup,
downloadRef,
onPlay, onPlay,
onAction, onAction,
onRemove, onRemove,
@@ -495,7 +419,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
removable: boolean removable: boolean
palette: CoverPalette palette: CoverPalette
swipeGroup: SwipeRowGroup swipeGroup: SwipeRowGroup
downloadRef: CollectionRef
onPlay: (song: BrowseSong) => void onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void onAction: (song: BrowseSong, action: MediaAction) => void
onRemove: (songId: Id<"songs">) => Promise<boolean> onRemove: (songId: Id<"songs">) => Promise<boolean>
@@ -509,8 +432,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
playlistLabel={PLAYLIST_LABEL} playlistLabel={PLAYLIST_LABEL}
palette={palette} palette={palette}
inset inset
removable={removable}
downloadFrom={downloadRef}
swipe={ swipe={
Platform.OS !== "web" Platform.OS !== "web"
? { ? {
@@ -518,7 +439,12 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
backgroundColor: palette.background, backgroundColor: palette.background,
onPlayNext: () => onAction(song, "play-next"), onPlayNext: () => onAction(song, "play-next"),
onAddToQueue: () => onAction(song, "play-last"), onAddToQueue: () => onAction(song, "play-last"),
onRemove: removable ? () => void handleRemove() : undefined, onRemove:
Platform.OS === "android" && removable
? () => {
void onRemove(song.id)
}
: undefined,
} }
: undefined : undefined
} }
@@ -549,15 +475,19 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
}} }}
style={[styles.removeAction, { backgroundColor: colors.destructive }]} style={[styles.removeAction, { backgroundColor: colors.destructive }]}
> >
<Ionicons name="trash" size={22} color={colors.primaryForeground} /> <PaletteIcon
<Text name="trash"
size={22}
color={colors.primaryForeground}
/>
<PaletteText
style={[ style={[
styles.removeActionText, styles.removeActionText,
{ color: colors.primaryForeground }, { color: colors.primaryForeground },
]} ]}
> >
Remove Remove
</Text> </PaletteText>
</Pressable> </Pressable>
)} )}
> >
@@ -576,11 +506,9 @@ const PlaylistHero = memo(function PlaylistHero({
isSubscribed, isSubscribed,
showSubscribe = false, showSubscribe = false,
onSubscribeToggle, onSubscribeToggle,
downloadRef,
onPlay, onPlay,
onShuffle, onShuffle,
}: { }: {
downloadRef: CollectionRef
entityId: string entityId: string
coverUri: string coverUri: string
hasCover: boolean hasCover: boolean
@@ -639,7 +567,8 @@ const PlaylistHero = memo(function PlaylistHero({
}, },
]} ]}
> >
<Ionicons <PaletteIcon
tone={isSubscribed ? "foreground" : "accentForeground"}
name={isSubscribed ? "checkmark" : "add"} name={isSubscribed ? "checkmark" : "add"}
size={24} size={24}
color={ color={
@@ -665,12 +594,18 @@ const PlaylistHero = memo(function PlaylistHero({
onPress={onShuffle} onPress={onShuffle}
style={[styles.iconAction, { backgroundColor: palette.surface }]} style={[styles.iconAction, { backgroundColor: palette.surface }]}
> >
<Ionicons name="shuffle" size={24} color={palette.foreground} /> <PaletteIcon
tone="foreground"
name="shuffle"
size={24}
color={palette.foreground}
/>
</Pressable> </Pressable>
</View> </View>
} }
> >
<Text <PaletteText
tone="foreground"
style={[ style={[
styles.title, styles.title,
heroLayout.landscape && styles.titleLandscape, heroLayout.landscape && styles.titleLandscape,
@@ -678,20 +613,16 @@ const PlaylistHero = memo(function PlaylistHero({
]} ]}
> >
{title} {title}
</Text> </PaletteText>
<Text <PaletteText
tone="foreground"
style={{ style={{
color: palette.foreground, color: palette.foreground,
fontSize: heroLayout.landscape ? 22 : 16, fontSize: heroLayout.landscape ? 22 : 16,
}} }}
> >
{ownerName} {ownerName}
</Text> </PaletteText>
<DownloadedQuality
collection={downloadRef}
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</CollectionHero> </CollectionHero>
<CollectionDivider color={palette.divider} /> <CollectionDivider color={palette.divider} />
</MusicEntityView> </MusicEntityView>
@@ -701,7 +632,6 @@ const PlaylistHero = memo(function PlaylistHero({
const styles = StyleSheet.create({ const styles = StyleSheet.create({
emptyResults: { padding: spacing.lg, textAlign: "center" }, emptyResults: { padding: spacing.lg, textAlign: "center" },
empty: { flex: 1, alignItems: "center", justifyContent: "center" }, empty: { flex: 1, alignItems: "center", justifyContent: "center" },
headerActions: { flexDirection: "row", alignItems: "center", gap: 16 },
listContent: { paddingBottom: contentBottomInset }, listContent: { paddingBottom: contentBottomInset },
cover: { cover: {
width: 200, width: 200,
@@ -16,13 +16,6 @@ import { CollectionDivider } from "@/components/collection-list"
import { CollectionDetailSkeleton } from "@/components/skeletons" import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives" import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player" import { contentBottomInset, SongListRow } from "@/components/player"
import {
DownloadHeaderButton,
DownloadedQuality,
} from "@/components/download-header-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 { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback" import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
@@ -38,61 +31,39 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router" import { Stack } from "expo-router"
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false } const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
const DOWNLOAD_REF = { kind: "playlist", id: FAVORITES_DOWNLOAD_ID } as const
export default function FavoritesScreen() { export default function FavoritesScreen() {
const colors = useThemeColors() const colors = useThemeColors()
const { config } = useServerConfig() const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail) const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites]) const songs = favorites?.songs ?? []
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions() const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions() const { handleSongAction } = useMediaMenuActions()
const songIds = useMemo(() => songs.map((song) => song.id), [songs]) const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin("playlist:favorites")
: undefined
const screenOptions = useMemo(
() => ({
...SCREEN_OPTIONS,
headerRight: () => (
<DownloadHeaderButton
target={{
kind: "playlist",
id: FAVORITES_DOWNLOAD_ID,
title: favorites?.title ?? "Favorites",
songIds,
}}
color={colors.foreground}
/>
),
}),
[colors.foreground, favorites?.title, songIds]
)
const { filteredSongs, onQueryChange, onSearchSubmit } = const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs) usePlaylistSearch(songs)
useEffect(() => { useEffect(() => {
rememberSongs(songs) if (favorites) rememberSongs(favorites.songs)
}, [songs]) }, [favorites])
const handlePlaySong = useCallback( const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin), (song: BrowseSong) => void playFromSong(song.id, songIds),
[playFromSong, playOrigin, songIds] [playFromSong, songIds]
) )
const handleSongMenuAction = useCallback( const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) => (song: BrowseSong, action: MediaAction) =>
void handleSongAction(song, action, DOWNLOAD_REF), void handleSongAction(song, action),
[handleSongAction] [handleSongAction]
) )
const handlePlay = useCallback( const handlePlay = useCallback(
() => void playInOrder(songIds, playOrigin), () => void playInOrder(songIds),
[playInOrder, playOrigin, songIds] [playInOrder, songIds]
) )
const handleShuffle = useCallback( const handleShuffle = useCallback(
() => void playShuffled(songIds, playOrigin), () => void playShuffled(songIds),
[playShuffled, playOrigin, songIds] [playShuffled, songIds]
) )
const renderItem = useCallback( const renderItem = useCallback(
@@ -102,7 +73,6 @@ export default function FavoritesScreen() {
favorited={isSongFavorite(song.id)} favorited={isSongFavorite(song.id)}
playlistLabel="Add to Another Playlist" playlistLabel="Add to Another Playlist"
inset inset
downloadFrom={DOWNLOAD_REF}
onPlay={handlePlaySong} onPlay={handlePlaySong}
onAction={handleSongMenuAction} onAction={handleSongMenuAction}
/> />
@@ -114,7 +84,7 @@ export default function FavoritesScreen() {
return ( return (
<> <>
<Stack.Screen options={SCREEN_OPTIONS} /> <Stack.Screen options={SCREEN_OPTIONS} />
<CollectionDetailSkeleton variant="favorites" /> <CollectionDetailSkeleton />
</> </>
) )
} }
@@ -134,7 +104,7 @@ export default function FavoritesScreen() {
return ( return (
<> <>
<Stack.Screen options={screenOptions} /> <Stack.Screen options={SCREEN_OPTIONS} />
<PlaylistSearchBar <PlaylistSearchBar
onQueryChange={onQueryChange} onQueryChange={onQueryChange}
onSearchSubmit={onSearchSubmit} onSearchSubmit={onSearchSubmit}
@@ -196,11 +166,6 @@ const FavoritesHero = memo(function FavoritesHero({
<Text style={[styles.title, { color: colors.foreground }]}> <Text style={[styles.title, { color: colors.foreground }]}>
{title} {title}
</Text> </Text>
<DownloadedQuality
collection={DOWNLOAD_REF}
color={colors.mutedForeground}
backgroundColor={colors.background}
/>
<View style={styles.actions}> <View style={styles.actions}>
<Button <Button
title="Play" title="Play"
+5 -340
View File
@@ -1,12 +1,11 @@
import { atmosEnabled, dolbyAtmosSupported } from "@/lib/playback-capabilities" import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { Ionicons } from "@expo/vector-icons" import { Ionicons } from "@expo/vector-icons"
import { useAction, useMutation, useQuery } from "convex/react" import { useAction, useMutation, useQuery } from "convex/react"
import { Image } from "expo-image" import { Image } from "expo-image"
import * as ImagePicker from "expo-image-picker" import * as ImagePicker from "expo-image-picker"
import { useEffect, useMemo, useState } from "react" import { useState } from "react"
import { router } from "expo-router" import { router } from "expo-router"
import { import {
Alert,
Platform, Platform,
Pressable, Pressable,
ScrollView, ScrollView,
@@ -17,20 +16,7 @@ import {
} from "react-native" } from "react-native"
import type { StyleProp, ViewStyle } from "react-native" import type { StyleProp, ViewStyle } from "react-native"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { contentBottomInset } from "@/components/player" import { contentBottomInset } from "@/components/player"
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
import {
readRememberedDownloadQuality,
writeRememberedDownloadQuality,
} from "@/lib/downloads"
import {
DOWNLOAD_QUALITIES,
DOWNLOAD_QUALITY_DETAILS,
DOWNLOAD_QUALITY_LABELS,
formatBytes,
type DownloadQuality,
} from "@otunes/convex/download-quality"
import { Button, Input, LoadingView } from "@/components/ui/primitives" import { Button, Input, LoadingView } from "@/components/ui/primitives"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session" import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
@@ -40,16 +26,15 @@ import {
} from "@/lib/artwork-color-preference" } from "@/lib/artwork-color-preference"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url" import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { changeServer, signOut } from "@/lib/session" import { changeServer, signOut } from "@/lib/session"
import { radius, spacing, useThemeColors } from "@/lib/theme" import { radius, spacing, useThemeColors } from "@/lib/theme"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
import type { PlaybackQuality } from "@otunes/convex/playback-stream" import type { PlaybackQuality } from "@/lib/urls"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
type Section = "profile" | "quality" | "downloads" | "library" | "users" type Section = "profile" | "quality" | "library" | "users"
type CurrentUser = { type CurrentUser = {
_id: Id<"users"> _id: Id<"users">
@@ -89,7 +74,6 @@ const QUALITY_OPTIONS: {
const SECTIONS: SectionConfig[] = [ const SECTIONS: SectionConfig[] = [
{ id: "profile", label: "Profile", icon: "person-circle-outline" }, { id: "profile", label: "Profile", icon: "person-circle-outline" },
{ id: "quality", label: "Playback", icon: "volume-high-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: "library", label: "Library", icon: "library-outline", admin: true },
{ id: "users", label: "Users", icon: "people-outline", admin: true }, { id: "users", label: "Users", icon: "people-outline", admin: true },
] ]
@@ -171,7 +155,6 @@ export default function SettingsScreen() {
</> </>
) : null} ) : null}
{section === "quality" ? <QualitySection user={user} /> : null} {section === "quality" ? <QualitySection user={user} /> : null}
{section === "downloads" ? <DownloadsSection /> : null}
{section === "library" && isAdmin ? <LibrarySection /> : null} {section === "library" && isAdmin ? <LibrarySection /> : null}
{section === "users" && isAdmin && allUsers ? ( {section === "users" && isAdmin && allUsers ? (
<UsersSection users={allUsers} currentUserId={user._id} /> <UsersSection users={allUsers} currentUserId={user._id} />
@@ -202,7 +185,6 @@ function AppearanceSection() {
setSaving(true) setSaving(true)
try { try {
await setArtworkColorsEnabled(checked) await setArtworkColorsEnabled(checked)
clearCoverPaletteCache()
} catch { } catch {
showError("Could not save artwork colors preference.") showError("Could not save artwork colors preference.")
} finally { } finally {
@@ -436,7 +418,7 @@ function QualitySection({ user }: { user: CurrentUser }) {
: "This device does not support Dolby Atmos playback." : "This device does not support Dolby Atmos playback."
} }
disabled={!dolbyAtmosSupported} disabled={!dolbyAtmosSupported}
value={atmosEnabled(user)} value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
onValueChange={(checked) => onValueChange={(checked) =>
void updateAtmos({ preferAtmos: checked }).catch((error: Error) => void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
showError(error.message) showError(error.message)
@@ -448,298 +430,6 @@ function QualitySection({ user }: { user: CurrentUser }) {
) )
} }
/** Shades of the text color, faintest for the smallest files. */
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
medium: 0.25,
high: 0.45,
lossless: 0.7,
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" },
...DOWNLOAD_QUALITIES.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() { function LibrarySection() {
const updateLibrary = useAction(api.actions.updateLibrary) const updateLibrary = useAction(api.actions.updateLibrary)
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams) const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
@@ -1182,31 +872,6 @@ const styles = StyleSheet.create({
divider: { divider: {
height: StyleSheet.hairlineWidth, 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: { optionRow: {
borderWidth: 1, borderWidth: 1,
borderRadius: radius.lg, borderRadius: radius.lg,
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
@@ -30,11 +30,6 @@ const links = [
icon: "clock" as const, icon: "clock" as const,
}, },
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const }, { title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
{
title: "Downloads",
href: "/downloads",
icon: "arrow.down.circle" as const,
},
] ]
function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) { function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
@@ -56,7 +51,6 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
clock: "time", clock: "time",
sparkles: "sparkles", sparkles: "sparkles",
star: "star", star: "star",
"arrow.down.circle": "arrow-down-circle",
} }
return ( return (
<Ionicons <Ionicons
@@ -124,7 +118,12 @@ export default function LibraryScreen() {
) )
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton contentInset={false} header={listHeader} /> return (
<View style={{ flex: 1, backgroundColor: colors.background }}>
{listHeader}
<MediaGridSkeleton contentInset={false} />
</View>
)
} }
return ( return (
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
+46 -65
View File
@@ -17,7 +17,6 @@ import { useEffect, useSyncExternalStore } from "react"
import { AppIntentBridge } from "@/components/app-intent-bridge" import { AppIntentBridge } from "@/components/app-intent-bridge"
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery" import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist" import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
import { DownloadsProvider } from "@/contexts/downloads"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session" import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { FavoritesProvider } from "@/contexts/favorites" import { FavoritesProvider } from "@/contexts/favorites"
import { PlaybackProvider } from "@/contexts/playback" import { PlaybackProvider } from "@/contexts/playback"
@@ -74,72 +73,54 @@ export default function AppLayout() {
return ( return (
<ConvexAuthRecovery onInvalidate={invalidateSession}> <ConvexAuthRecovery onInvalidate={invalidateSession}>
<PlaybackProvider> <PlaybackProvider>
<AppIntentBridge />
<AppNavigationSync /> <AppNavigationSync />
<AddToPlaylistProvider> <AddToPlaylistProvider>
<DownloadsProvider> <FavoritesProvider>
<FavoritesProvider> <Stack screenOptions={stackOptions}>
<AppIntentBridge /> <Stack.Screen
<Stack screenOptions={stackOptions}> name="(tabs)"
<Stack.Screen options={{ headerShown: false, animation: "none" }}
name="(tabs)" />
options={{ headerShown: false, animation: "none" }} <Stack.Screen
/> name="settings"
<Stack.Screen options={{
name="settings" headerShown: Platform.OS === "android",
options={{ title: "Settings",
headerShown: Platform.OS === "android", presentation:
title: "Settings", Platform.OS === "ios" ? "modal" : "fullScreenModal",
presentation: animation: "slide_from_bottom",
Platform.OS === "ios" ? "modal" : "fullScreenModal", gestureEnabled: true,
animation: "slide_from_bottom", gestureDirection: "vertical",
gestureEnabled: true, }}
gestureDirection: "vertical", />
}} <Stack.Screen
/> name="create-account"
<Stack.Screen options={{
name="create-account" title: "Create account",
options={{ presentation: "modal",
title: "Create account", headerLargeTitle: false,
presentation: "modal", headerTransparent: false,
headerLargeTitle: false, headerStyle: { backgroundColor: "#000" },
headerTransparent: false, headerTintColor: "#fff",
headerStyle: { backgroundColor: "#000" }, contentStyle: { backgroundColor: "#000" },
headerTintColor: "#fff", }}
contentStyle: { backgroundColor: "#000" }, />
}} <Stack.Screen
/> name="player"
<Stack.Screen options={{
name="playlist-cover" headerShown: false,
options={{ // Keep the library visible behind the custom swipe animation.
title: "Cover", presentation: "transparentModal",
headerTitleAlign: "center", contentStyle: { backgroundColor: "transparent" },
presentation: animation: "slide_from_bottom",
Platform.OS === "ios" ? "modal" : "fullScreenModal", gestureEnabled: true,
animation: "slide_from_bottom", gestureDirection: "vertical",
headerLargeTitle: false, fullScreenGestureEnabled: true,
headerTransparent: false, }}
headerShadowVisible: false, />
headerStyle: { backgroundColor: "#000" }, </Stack>
headerTintColor: "#fff", </FavoritesProvider>
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> </AddToPlaylistProvider>
</PlaybackProvider> </PlaybackProvider>
</ConvexAuthRecovery> </ConvexAuthRecovery>
+142 -119
View File
@@ -1,12 +1,12 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout" import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { TabletNowPlaying } from "@/components/tablet-now-playing" import { TabletNowPlaying } from "@/components/tablet-now-playing"
import { atmosEnabled } from "@/lib/playback-capabilities" import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { NavigationBar } from "expo-navigation-bar" import { NavigationBar } from "expo-navigation-bar"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { Stack, useRouter, useLocalSearchParams } from "expo-router" import { Stack, useRouter, useLocalSearchParams } from "expo-router"
import * as Haptics from "expo-haptics" import * as Haptics from "expo-haptics"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { useCallback, useEffect, useMemo, useRef, useState } from "react" import { useEffect, useRef, useState } from "react"
import { Gesture, GestureDetector } from "react-native-gesture-handler" import { Gesture, GestureDetector } from "react-native-gesture-handler"
import { import {
Platform, Platform,
@@ -45,16 +45,16 @@ import {
QUEUE_HORIZONTAL_INSET, QUEUE_HORIZONTAL_INSET,
} from "@/components/now-playing-queue" } from "@/components/now-playing-queue"
import { PlayerArtistMenu } from "@/components/player-artist-menu" import { PlayerArtistMenu } from "@/components/player-artist-menu"
import { PlayerProgress } from "@/components/player-progress"
import { PlayerSlider } from "@/components/player-slider" import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol" import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback" import { usePlayback } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useCoverPalette } from "@/hooks/use-cover-palette" import { useCoverPalette } from "@/hooks/use-cover-palette"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { useSystemVolume } from "@/hooks/use-system-volume" import { useSystemVolume } from "@/hooks/use-system-volume"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import { import {
nowPlayingColors, nowPlayingColors,
type NowPlayingColors, type NowPlayingColors,
@@ -90,13 +90,20 @@ export default function PlayerScreen() {
isPlaying, isPlaying,
shuffleEnabled, shuffleEnabled,
repeatEnabled, repeatEnabled,
currentTime,
duration,
queueSongIds, queueSongIds,
} = usePlaybackQueue() setIsPlaying,
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions() seekTo,
skipNext,
skipPrevious,
} = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const { queue } = useLocalSearchParams<{ queue?: string }>() const { queue } = useLocalSearchParams<{ queue?: string }>()
const [showQueue, setShowQueue] = useState(queue === "1") const [showQueue, setShowQueue] = useState(queue === "1")
const [isDismissing, setIsDismissing] = useState(false) const [isDismissing, setIsDismissing] = useState(false)
const [stageHeight, setStageHeight] = useState(0) const [stageHeight, setStageHeight] = useState(0)
const [scrubTime, setScrubTime] = useState<number | null>(null)
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const playbackInfo = useCachedQuery( const playbackInfo = useCachedQuery(
api.library.getSongPlaybackInfo, api.library.getSongPlaybackInfo,
@@ -107,7 +114,7 @@ export default function PlayerScreen() {
? playbackFormat( ? playbackFormat(
playbackInfo.files, playbackInfo.files,
user.playbackQuality, user.playbackQuality,
atmosEnabled(user) dolbyAtmosSupported && (user.preferAtmos ?? false)
) )
: null : null
@@ -119,7 +126,7 @@ export default function PlayerScreen() {
coverUri, coverUri,
currentSong ? currentSong.album.cover != null : undefined currentSong ? currentSong.album.cover != null : undefined
) )
const colors = useMemo(() => nowPlayingColors(palette), [palette]) const colors = nowPlayingColors(palette)
const background = useSharedValue(colors.background) const background = useSharedValue(colors.background)
useEffect(() => { useEffect(() => {
@@ -152,65 +159,33 @@ export default function PlayerScreen() {
})) }))
// The player covers the status bar, so it can't use the native sheet's // The player covers the status bar, so it can't use the native sheet's
// swipe to dismiss. Each GestureDetector needs its own gesture instance. // swipe to dismiss.
const makeDismissGesture = useCallback( function dismissGesture() {
() => return Gesture.Pan()
Gesture.Pan() .activeOffsetY(12)
.activeOffsetY(12) .failOffsetY(-12)
.failOffsetY(-12) .failOffsetX([-20, 20])
.failOffsetX([-20, 20]) .onUpdate((event) => {
.onUpdate((event) => { dismissY.value = Math.max(0, event.translationY)
dismissY.value = Math.max(0, event.translationY) })
}) .onEnd((event) => {
.onEnd((event) => { if (
if ( event.translationY > DISMISS_DISTANCE ||
event.translationY > DISMISS_DISTANCE || event.velocityY > DISMISS_VELOCITY
event.velocityY > DISMISS_VELOCITY ) {
) { scheduleOnRN(setIsDismissing, true)
scheduleOnRN(setIsDismissing, true) dismissY.value = withTiming(
dismissY.value = withTiming( windowHeight,
windowHeight, { duration: 220 },
{ duration: 220 }, (finished) => {
(finished) => { if (finished) scheduleOnRN(router.back)
if (finished) scheduleOnRN(router.back) }
} )
) } else {
} else { dismissY.value = withSpring(0, { duration: 350, dampingRatio: 0.85 })
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(!showQueue),
[makeDismissGesture, showQueue]
)
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 const hasQueue = queueSongIds.length > 0
@@ -229,6 +204,7 @@ export default function PlayerScreen() {
return null return null
} }
const hasCover = currentSong.album.cover != null
const bottomInset = Math.max(insets.bottom, spacing.md) const bottomInset = Math.max(insets.bottom, spacing.md)
const artworkSize = Math.max( const artworkSize = Math.max(
0, 0,
@@ -237,6 +213,9 @@ export default function PlayerScreen() {
stageHeight > 0 ? stageHeight - META_HEIGHT - spacing.xl : Infinity stageHeight > 0 ? stageHeight - META_HEIGHT - spacing.xl : Infinity
) )
) )
const displayedTime = scrubTime ?? currentTime
const timeColor =
scrubTime === null ? colors.secondaryForeground : colors.foreground
function togglePlayback() { function togglePlayback() {
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light) void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light)
@@ -255,10 +234,10 @@ export default function PlayerScreen() {
colors={colors} colors={colors}
backgroundStyle={backgroundStyle} backgroundStyle={backgroundStyle}
dismissStyle={dismissStyle} dismissStyle={dismissStyle}
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }} dismissGesture={dismissGesture}
showQueue={showQueue} showQueue={showQueue}
toggleQueue={toggleQueue} toggleQueue={toggleQueue}
metadata={songMeta} metadata={<SongMeta song={currentSong} colors={colors} />}
/> />
</MusicEntityView> </MusicEntityView>
) )
@@ -285,7 +264,7 @@ export default function PlayerScreen() {
id={currentSong.id} id={currentSong.id}
style={[styles.safe, { paddingTop: insets.top }]} style={[styles.safe, { paddingTop: insets.top }]}
> >
<GestureDetector gesture={handleGesture}> <GestureDetector gesture={dismissGesture()}>
<Pressable <Pressable
onPress={() => router.back()} onPress={() => router.back()}
hitSlop={12} hitSlop={12}
@@ -299,7 +278,7 @@ export default function PlayerScreen() {
</Pressable> </Pressable>
</GestureDetector> </GestureDetector>
<GestureDetector gesture={stageGesture}> <GestureDetector gesture={dismissGesture().enabled(!showQueue)}>
<View <View
style={styles.stage} style={styles.stage}
onLayout={(event) => onLayout={(event) =>
@@ -318,7 +297,20 @@ export default function PlayerScreen() {
<NowPlayingQueue <NowPlayingQueue
colors={colors} colors={colors}
viewportHeight={stageHeight} viewportHeight={stageHeight}
currentHeader={queueHeader} currentHeader={
<View style={styles.queueHeader}>
<CoverImage
uri={coverUri}
hasCover={hasCover}
style={styles.queueArtwork}
/>
<SongMeta
song={currentSong}
colors={colors}
compact
/>
</View>
}
/> />
</Animated.View> </Animated.View>
) : null ) : null
@@ -342,28 +334,50 @@ export default function PlayerScreen() {
/> />
</Animated.View> </Animated.View>
</View> </View>
<View style={styles.meta}>{songMeta}</View> <View style={styles.meta}>
<SongMeta song={currentSong} colors={colors} />
</View>
</Animated.View> </Animated.View>
)} )}
</LayoutAnimationConfig> </LayoutAnimationConfig>
</View> </View>
</GestureDetector> </GestureDetector>
<GestureDetector gesture={controlsGesture}> <GestureDetector gesture={dismissGesture()}>
<View style={[styles.controls, { paddingBottom: bottomInset }]}> <View style={[styles.controls, { paddingBottom: bottomInset }]}>
<PlayerProgress <PlayerSlider
colors={colors} accessibilityLabel="Playback position"
timeStyle={styles.time} value={displayedTime}
center={ maximumValue={duration}
format ? ( 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">
<AudioFormatBadge <AudioFormatBadge
format={format} format={format}
color={colors.secondaryForeground} color={colors.secondaryForeground}
backgroundColor={colors.background} backgroundColor={colors.background}
/> />
) : null </View>
} ) : null}
/> <Text style={[styles.time, { color: timeColor }]}>
{formatRemainingDuration(displayedTime, duration).replace(
"-",
"\u2212"
)}
</Text>
</View>
<View style={styles.transport}> <View style={styles.transport}>
<TransportButton <TransportButton
@@ -405,7 +419,35 @@ export default function PlayerScreen() {
</TransportButton> </TransportButton>
</View> </View>
<VolumeSlider colors={colors} /> {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}
<View style={styles.footer}> <View style={styles.footer}>
<Pressable <Pressable
@@ -475,41 +517,6 @@ 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. */ /** Title and artist with the favorite and more buttons. */
function SongMeta({ function SongMeta({
song, song,
@@ -732,7 +739,23 @@ const styles = StyleSheet.create({
paddingHorizontal: HORIZONTAL_INSET, paddingHorizontal: HORIZONTAL_INSET,
paddingTop: spacing.md, paddingTop: spacing.md,
}, },
time: { fontWeight: "600" }, 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"],
},
transport: { transport: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
-391
View File
@@ -1,391 +0,0 @@
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 },
})
+799 -12
View File
@@ -1,21 +1,147 @@
import { useQuery } from "convex/react" import { useConvex, useQuery } from "convex/react"
import * as AppIntents from "expo-app-intents" import * as AppIntents from "expo-app-intents"
import { useMemo, useSyncExternalStore } from "react" import type { AppIntentEntity, AppIntentInvocation } from "expo-app-intents"
import { useEffect, useMemo, useRef, useSyncExternalStore } from "react"
import { AppState } from "react-native"
import {
completeMusicInvocation,
publishMusicCatalog,
trackMusicCatalogSync,
} from "@/lib/app-intents"
import { useAppNavigation } from "@/lib/app-navigation"
import { useMusicCatalogSync } from "@/components/app-intents/catalog-sync"
import { useIntentDispatch } from "@/components/app-intents/dispatch"
import { useNowPlayingCatalog } from "@/components/app-intents/now-playing"
import { import {
ANONYMOUS_CACHE_SCOPE, ANONYMOUS_CACHE_SCOPE,
useCacheScope, useCacheScope,
} from "@/contexts/persistent-cache" } 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 { getPlaybackStore } from "@otunes/convex/client/playback-store"
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import { api } from "@otunes/convex/_generated/api" 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() { export function AppIntentBridge() {
const scope = useCacheScope() const scope = useCacheScope()
const store = useMemo( const store = useMemo(
@@ -28,8 +154,669 @@ export function AppIntentBridge() {
} }
function ReadyAppIntentBridge() { function ReadyAppIntentBridge() {
useMusicCatalogSync() const convex = useConvex()
useNowPlayingCatalog() const cacheScope = useCacheScope()
useIntentDispatch() const playback = usePlayback()
const user = useQuery(api.auth.currentUser)
const navigation = useAppNavigation()
const favorites = useQuery(api.favorites.getUserFavorites)
const catalogUserKey = user ? JSON.stringify([user._id, favorites]) : null
const store = useMemo(
() =>
getPlaybackStore(
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
),
[cacheScope]
)
const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot)
const handledIds = useRef<Set<string> | null>(null)
const publishChain = useRef(Promise.resolve())
const publishGeneration = useRef(0)
const playbackRef = useRef(playback)
playbackRef.current = playback
useEffect(() => {
if (!AppIntents.isAvailable() || !user) return
const generation = ++publishGeneration.current
let stopped = false
let refreshing = false
const refresh = () => {
if (refreshing || stopped) return
refreshing = true
publishChain.current = publishChain.current
.catch(() => undefined)
.then(async () => {
for (const kind of ["artist", "album", "song", "playlist"] as const) {
const entities: AppIntentEntity[] = []
let cursor: string | null = null
do {
const result: {
page: AppIntentEntity[]
isDone: boolean
continueCursor: string
} = await convex.query(api.library.intentCatalogPage, {
kind,
paginationOpts: { cursor, numItems: 200 },
})
if (stopped || generation !== publishGeneration.current) return
entities.push(...result.page)
cursor = result.isDone ? null : result.continueCursor
} while (cursor !== null)
await publishMusicCatalog(kind, entities)
}
})
.catch((error) =>
console.warn("Could not publish music catalog.", error)
)
.finally(() => {
refreshing = false
})
trackMusicCatalogSync(publishChain.current)
}
refresh()
const subscription = AppState.addEventListener("change", (state) => {
if (state === "active") refresh()
})
const timer = setInterval(() => {
if (AppState.currentState === "active") refresh()
}, 5 * 60_000)
return () => {
stopped = true
++publishGeneration.current
subscription.remove()
clearInterval(timer)
}
}, [convex, cacheScope, catalogUserKey])
const currentSongId = playback.queueSongIds[0] ?? null
const currentSong = playback.currentSong
useEffect(() => {
if (!snapshot.hydrated || !AppIntents.isAvailable()) {
return
}
if (!currentSongId) {
void publishMusicCatalog("nowPlaying", []).catch((error) => {
console.warn("Could not clear the current song.", error)
})
return
}
if (!currentSong || currentSong.id !== currentSongId) {
return
}
void publishMusicCatalog("nowPlaying", [
songEntity({
id: currentSong.id,
title: currentSong.title,
artistName: currentSong.artist.name,
artistId: currentSong.artist.id,
albumTitle: currentSong.album.title,
albumId: currentSong.album.id,
durationSeconds: currentSong.durationSeconds,
}),
]).catch((error) => {
console.warn("Could not publish the current song.", error)
})
}, [currentSong, currentSongId, snapshot.hydrated])
AppIntents.useAppIntents(async (pendingIntents) => {
if (!handledIds.current) {
handledIds.current = await loadHandledIntentIds()
}
const handled = handledIds.current
for (const invocation of pendingIntents) {
if (handled.has(invocation.id)) {
const token = readString(invocation.params.completionToken)
if (token) await completeMusicInvocation(token, null)
await AppIntents.removePendingInvocationAsync(invocation.id)
continue
}
if (!KNOWN_INTENTS.has(invocation.name)) {
await AppIntents.removePendingInvocationAsync(invocation.id)
continue
}
const token = readString(invocation.params.completionToken)
try {
ensureActive(invocation)
await performInvocation(invocation)
if (
["playMusic", "warmupAudio", "transport", "createStation"].includes(
invocation.name
)
) {
const id = store.getState().queue[0]
const song = playbackRef.current.currentSong
if (!id) await publishMusicCatalog("nowPlaying", [])
else if (song?.id === id)
await publishMusicCatalog("nowPlaying", [
songEntity({
id: song.id,
title: song.title,
artistName: song.artist.name,
artistId: song.artist.id,
albumTitle: song.album.title,
albumId: song.album.id,
durationSeconds: song.durationSeconds,
}),
])
}
await rememberHandledIntentId(handled, invocation.id)
if (token) await completeMusicInvocation(token, null)
await AppIntents.removePendingInvocationAsync(invocation.id)
} catch (error) {
if (token) {
await completeMusicInvocation(
token,
error instanceof Error ? error.message : "oTunes couldn't do that."
)
}
if (token || error instanceof IntentRejected || !isTransient(error)) {
const message =
error instanceof Error ? error.message : "oTunes couldn't do that."
if (!(error instanceof IntentRejected) || message) {
showError(message)
}
try {
await rememberHandledIntentId(handled, invocation.id)
await AppIntents.removePendingInvocationAsync(invocation.id)
} catch (removeError) {
console.warn(
"App Intent remains pending",
invocation.id,
removeError
)
}
continue
}
console.warn("App Intent remains pending", invocation.id, error)
}
}
async function songIdsFor(kind: string, id: string) {
if (kind === "song") {
return [id as Id<"songs">]
}
if (kind === "album") {
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{
albumId: id as Id<"albums">,
}
)
}
if (kind === "artist") {
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: id as Id<"artists"> }
)
}
if (kind === "playlist") {
if (id === FAVORITES_PLAYLIST_ID) {
const favorites = await fetchCachedQuery(
convex,
cacheScope,
api.favorites.getUserFavorites,
{}
)
return favorites.favoriteSongs
}
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getPlaylistSongIds,
{ playlistId: id as Id<"playlists"> }
)
}
throw new IntentRejected("Choose a song, album, artist, or playlist.")
}
async function uniqueSongIds(sources: MusicSource[]) {
const ids: Id<"songs">[] = []
for (const source of sources) {
ids.push(...(await songIdsFor(source.kind, source.id)))
}
return [...new Set(ids)]
}
async function performInvocation(invocation: AppIntentInvocation) {
const actions = playbackRef.current
switch (invocation.name) {
case "openMusic": {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!id || !kind) throw new IntentRejected("Choose music to open.")
if (kind === "song") {
const song = await convex.query(api.library.getSong, {
id: id as Id<"songs">,
})
if (!song)
throw new IntentRejected("This song is no longer available.")
navigation.push(`/album/${song.album}`)
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
navigation.push("/playlist/favorites")
} else if (["album", "artist", "playlist"].includes(kind)) {
navigation.push(`/${kind}/${id}`)
} else throw new IntentRejected("Unknown music type.")
return
}
case "playMusic":
await playMusic(invocation)
if (!["next", "tail"].includes(String(invocation.params.queue))) {
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(true)
}
return
case "warmupAudio":
await warmup(invocation)
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(false)
warmedAudioIds.add(invocation.id)
return
case "addToPlaylist":
await addToPlaylist(invocation)
return
case "addToUpNext":
await addToUpNext(invocation)
return
case "clearUpNext":
ensureActive(invocation)
await actions.clearUpNext()
return
case "createPlaylist":
await createPlaylist(invocation)
return
case "createStation":
await createStation(invocation)
ensureActive(invocation)
await playbackRef.current.waitForPlaybackReady(true)
return
case "updateAffinity":
await updateAffinity(invocation)
return
case "transport":
await transport(invocation)
if (store.getState().queue.length > 0) {
const command = invocation.params.command
await playbackRef.current.waitForPlaybackReady(
command === "resume"
? true
: command === "pause"
? false
: undefined
)
}
return
default:
return
}
}
async function playMusic(invocation: AppIntentInvocation) {
const actions = playbackRef.current
const queue = readString(invocation.params.queue) ?? "now"
const warmupId = readString(invocation.params.warmupId)
const repeat = repeatChoice(invocation.params.repeat)
if (repeat) {
ensureActive(invocation)
await actions.setRepeatMode(repeat)
}
if (queue === "next" || queue === "tail") {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!kind || !id) {
throw new IntentRejected("Choose music to add to Up Next.")
}
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to add to Up Next.")
}
if (queue === "next") {
ensureActive(invocation)
await actions.addToQueueNext(ids)
} else {
ensureActive(invocation)
await actions.addToQueueLast(ids)
}
return
}
if (warmupId && warmedAudioIds.has(warmupId)) {
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
const kind = readString(invocation.params.kind) ?? "resume"
if (kind === "resume") {
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (shuffled !== actions.shuffleEnabled) {
ensureActive(invocation)
await actions.setShuffleEnabled(shuffled)
}
if (actions.queueSongIds.length === 0) {
const favorites = await fetchCachedQuery(
convex,
cacheScope,
api.favorites.getUserFavorites,
{}
)
if (favorites.favoriteSongs.length === 0) {
throw new IntentRejected(
"Nothing is queued, and your favorites are empty."
)
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(favorites.favoriteSongs)
} else {
ensureActive(invocation)
await actions.playInOrder(favorites.favoriteSongs)
}
return
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
const id = readString(invocation.params.id)
if (!id) {
throw new IntentRejected("Choose music to play.")
}
const shuffled = shuffleChoice(
invocation.params.shuffle,
actions.shuffleEnabled
)
if (kind === "song") {
const song = await fetchCachedQuery(
convex,
cacheScope,
api.library.getSong,
{
id: id as Id<"songs">,
}
)
if (!song) {
throw new IntentRejected("That song is no longer in your library.")
}
const albumSongIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: song.album }
)
ensureActive(invocation)
await actions.startFromSong(
song._id,
albumSongIds.length > 0 ? albumSongIds : [song._id],
shuffled,
true
)
return
}
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to play.")
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(ids)
} else {
ensureActive(invocation)
await actions.playInOrder(ids)
}
}
async function warmup(invocation: AppIntentInvocation) {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
if (!kind || !id) {
throw new IntentRejected("Choose music to get ready.")
}
const shuffled = shuffleChoice(invocation.params.shuffle, false)
if (kind === "song") {
const song = await fetchCachedQuery(
convex,
cacheScope,
api.library.getSong,
{
id: id as Id<"songs">,
}
)
if (!song) {
throw new IntentRejected("That song is no longer in your library.")
}
const albumSongIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: song.album }
)
ensureActive(invocation)
await playbackRef.current.startFromSong(
song._id,
albumSongIds.length > 0 ? albumSongIds : [song._id],
shuffled,
false
)
} else {
const ids = await songIdsFor(kind, id)
if (ids.length === 0) {
throw new IntentRejected("Nothing to get ready.")
}
ensureActive(invocation)
await playbackRef.current.prepareQueue(ids, shuffled)
}
}
async function addToPlaylist(invocation: AppIntentInvocation) {
const playlistId = readString(invocation.params.playlistId)
const sources = readSources(invocation.params.sources)
if (!playlistId || sources.length === 0) {
throw new IntentRejected("Choose music and a playlist.")
}
const songIds = await uniqueSongIds(sources)
if (songIds.length === 0) {
throw new IntentRejected("Those items have no songs to add.")
}
if (playlistId === FAVORITES_PLAYLIST_ID) {
for (const source of sources) {
if (source.kind === "song") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteSong, {
songId: source.id as Id<"songs">,
})
} else if (source.kind === "album") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteAlbum, {
albumId: source.id as Id<"albums">,
})
} else if (source.kind === "artist") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteArtist, {
artistId: source.id as Id<"artists">,
})
} else if (source.kind === "playlist") {
const ids = await songIdsFor(source.kind, source.id)
if (ids.length > 0) {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteSongs, {
songIds: ids,
})
}
} else {
throw new IntentRejected(
"Choose a song, album, artist, or playlist."
)
}
}
return
}
ensureActive(invocation)
await convex.mutation(api.playlists.addSongsToPlaylist, {
playlistId: playlistId as Id<"playlists">,
songIds,
})
}
async function addToUpNext(invocation: AppIntentInvocation) {
const sources = readSources(invocation.params.sources)
if (sources.length === 0) {
throw new IntentRejected("Choose music to add to Up Next.")
}
const ids = await uniqueSongIds(sources)
if (ids.length === 0) {
throw new IntentRejected("Nothing to add to Up Next.")
}
const position =
readString(invocation.params.position) === "last" ? "last" : "next"
if (position === "last") {
ensureActive(invocation)
await playbackRef.current.addToQueueLast(ids)
} else {
ensureActive(invocation)
await playbackRef.current.addToQueueNext(ids)
}
}
async function createPlaylist(invocation: AppIntentInvocation) {
const name = readString(invocation.params.name)
if (!name) {
throw new IntentRejected("A playlist needs a name.")
}
const songIds = await uniqueSongIds(
readSources(invocation.params.sources)
)
ensureActive(invocation)
await convex.mutation(api.playlists.createPlaylist, {
name,
songIds,
invocationId: invocation.id,
})
}
async function createStation(invocation: AppIntentInvocation) {
const artistId = readString(invocation.params.artistId)
if (!artistId) {
throw new IntentRejected("Nothing is playing in oTunes.")
}
const ids = await songIdsFor("artist", artistId)
if (ids.length === 0)
throw new IntentRejected("This artist has no songs to play.")
ensureActive(invocation)
await playbackRef.current.playShuffled(ids)
}
async function updateAffinity(invocation: AppIntentInvocation) {
const kind = readString(invocation.params.kind)
const id = readString(invocation.params.id)
const state = readString(invocation.params.state)
if (!kind || !id || (state !== "like" && state !== "unset")) {
throw new IntentRejected(
"oTunes can love or unlike a song, album, or artist."
)
}
if (kind === "playlist") {
throw new IntentRejected("oTunes can love songs, albums, and artists.")
}
if (state === "like") {
if (kind === "song") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteSong, {
songId: id as Id<"songs">,
})
} else if (kind === "album") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteAlbum, {
albumId: id as Id<"albums">,
})
} else if (kind === "artist") {
ensureActive(invocation)
await convex.mutation(api.favorites.favoriteArtist, {
artistId: id as Id<"artists">,
})
} else {
throw new IntentRejected(
"oTunes can love songs, albums, and artists."
)
}
return
}
if (kind === "song") {
ensureActive(invocation)
await convex.mutation(api.favorites.unfavoriteSong, {
songId: id as Id<"songs">,
})
} else if (kind === "album") {
ensureActive(invocation)
await convex.mutation(api.favorites.unfavoriteAlbum, {
albumId: id as Id<"albums">,
})
} else if (kind === "artist") {
ensureActive(invocation)
await convex.mutation(api.favorites.unfavoriteArtist, {
artistId: id as Id<"artists">,
})
} else {
throw new IntentRejected("oTunes can love songs, albums, and artists.")
}
}
async function transport(invocation: AppIntentInvocation) {
const actions = playbackRef.current
const command = readString(invocation.params.command)
if (command === "pause") {
ensureActive(invocation)
actions.setIsPlaying(false)
return
}
if (command === "resume") {
if (actions.queueSongIds.length === 0) {
throw new IntentRejected("Nothing is queued in oTunes.")
}
ensureActive(invocation)
actions.setIsPlaying(true)
return
}
if (command === "next") {
ensureActive(invocation)
await actions.skipNext()
return
}
if (command === "previous") {
ensureActive(invocation)
await actions.skipPrevious()
return
}
throw new IntentRejected("oTunes doesn't know that playback control.")
}
})
return null return null
} }
@@ -1,195 +0,0 @@
import { useConvex, useQuery } from "convex/react"
import * as AppIntents from "expo-app-intents"
import type { AppIntentEntity } from "expo-app-intents"
import { useEffect, useRef } from "react"
import { AppState } from "react-native"
import { useCacheScope } from "@/contexts/persistent-cache"
import {
loadCatalogCursors,
saveCatalogCursors,
type CatalogCursors,
} from "@/lib/app-intent-handled"
import {
publishMusicCatalog,
readMusicCatalog,
trackMusicCatalogSync,
} from "@/lib/app-intents"
import { api } from "@otunes/convex/_generated/api"
import type { FunctionReturnType } from "convex/server"
const LIBRARY_KINDS = ["artist", "album", "song"] as const
type LibraryKind = (typeof LIBRARY_KINDS)[number]
const PAGE_SIZE = 500
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
type Favorites = 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])
}
@@ -1,633 +0,0 @@
import { useConvex } from "convex/react"
import * as AppIntents from "expo-app-intents"
import type { AppIntentInvocation } from "expo-app-intents"
import { useMemo, useRef } from "react"
import { useFavorites, type FavoriteKind } from "@/contexts/favorites"
import {
ANONYMOUS_CACHE_SCOPE,
useCacheScope,
} from "@/contexts/persistent-cache"
import { 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.")
}
})
}
@@ -1,59 +0,0 @@
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])
}
+35 -21
View File
@@ -1,33 +1,40 @@
import { StyleSheet, Text, View } from "react-native" import { PaletteText } from "@/components/palette-text"
import { StyleSheet, View } from "react-native"
import Svg, { G, Path } from "react-native-svg" import 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" import type { PlaybackFormat } from "@otunes/convex/playback-stream"
const LABEL_SIZE = 13 const LABEL_SIZE = 13
const MARK_HEIGHT = 11
function DolbyMark({ color }: { color: string }) { function DolbyMark({ color }: { color: string }) {
return ( return (
<Svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}> <Svg
{DOLBY_PATHS.map((d) => ( width={(MARK_HEIGHT * 23) / 16}
<Path key={d} d={d} fill={color} /> 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> </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 * Three overlapping waves. Each thick downstroke is outlined in the
* background color so it reads as passing over the strokes behind it. * background color so it reads as passing over the strokes behind it.
@@ -41,9 +48,9 @@ function LosslessMark({
}) { }) {
return ( return (
<Svg <Svg
width={LOSSLESS_WIDTH} width={(MARK_HEIGHT * 544) / 271}
height={MARK_HEIGHT} height={MARK_HEIGHT}
viewBox={LOSSLESS_VIEW_BOX} viewBox="28 154 544 271"
> >
{LOSSLESS_STROKES.map(([peak, d], index) => ( {LOSSLESS_STROKES.map(([peak, d], index) => (
<Path <Path
@@ -68,10 +75,12 @@ function LosslessMark({
/** The Dolby Atmos or Lossless label shown under the progress bar. */ /** The Dolby Atmos or Lossless label shown under the progress bar. */
export function AudioFormatBadge({ export function AudioFormatBadge({
artwork = false,
format, format,
color, color,
backgroundColor, backgroundColor,
}: { }: {
artwork?: boolean
format: PlaybackFormat format: PlaybackFormat
color: string color: string
backgroundColor: string backgroundColor: string
@@ -84,7 +93,12 @@ export function AudioFormatBadge({
) : ( ) : (
<LosslessMark color={color} backgroundColor={backgroundColor} /> <LosslessMark color={color} backgroundColor={backgroundColor} />
)} )}
<Text style={[styles.label, { color }]}>{label}</Text> <PaletteText
tone={artwork ? "secondaryForeground" : undefined}
style={[styles.label, { color }]}
>
{label}
</PaletteText>
</View> </View>
) )
} }
+7 -3
View File
@@ -1,5 +1,6 @@
import { PaletteText } from "@/components/palette-text"
import { memo } from "react" import { memo } from "react"
import { StyleSheet, Text, View } from "react-native" import { StyleSheet, View } from "react-native"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
@@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}> <PaletteText
tone={color ? "foreground" : undefined}
style={[styles.discHeader, { color: color ?? colors.foreground }]}
>
{label} {label}
</Text> </PaletteText>
) )
}) })
@@ -71,10 +71,7 @@ class ConvexAuthErrorBoundary extends Component<
} }
} }
export function ConvexAuthRecovery({ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
children,
onInvalidate,
}: ConvexAuthRecoveryProps) {
const localAuth = useLocalConvexAuth() const localAuth = useLocalConvexAuth()
const serverAuth = useServerConvexAuth() const serverAuth = useServerConvexAuth()
const hadServerAuthRef = useRef(false) const hadServerAuthRef = useRef(false)
@@ -116,9 +113,9 @@ export function ConvexAuthRecovery({
const sessionEstablished = Boolean( const sessionEstablished = Boolean(
serverAuth && serverAuth &&
!serverAuth.isLoading && !serverAuth.isLoading &&
!serverAuth.isRefreshing && !serverAuth.isRefreshing &&
serverAuth.isAuthenticated serverAuth.isAuthenticated
) )
return ( return (
+1 -12
View File
@@ -11,7 +11,6 @@ import {
} from "react-native" } from "react-native"
import { prefetchCoverPalette } from "@/hooks/use-cover-palette" import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
import { downloadedCoverUri } from "@/lib/downloads"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
import { import {
@@ -67,7 +66,6 @@ export const CoverImage = memo(function CoverImage({
contentFit = "cover", contentFit = "cover",
blurRadius, blurRadius,
placeholderVariant = "icon", placeholderVariant = "icon",
placeholderIcon = "musical-note",
}: { }: {
uri: string uri: string
hasCover: boolean hasCover: boolean
@@ -75,7 +73,6 @@ export const CoverImage = memo(function CoverImage({
contentFit?: ImageContentFit contentFit?: ImageContentFit
blurRadius?: number blurRadius?: number
placeholderVariant?: "icon" | "solid" placeholderVariant?: "icon" | "solid"
placeholderIcon?: keyof typeof Ionicons.glyphMap
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style]) const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
@@ -84,12 +81,6 @@ export const CoverImage = memo(function CoverImage({
[flatStyle, hasCover, uri] [flatStyle, hasCover, uri]
) )
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri]) 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) { if (!hasCover) {
return ( return (
@@ -102,7 +93,7 @@ export const CoverImage = memo(function CoverImage({
> >
{placeholderVariant === "icon" ? ( {placeholderVariant === "icon" ? (
<Ionicons <Ionicons
name={placeholderIcon} name="musical-note"
size={placeholderIconSize(flatStyle)} size={placeholderIconSize(flatStyle)}
color={colors.coverPlaceholderIcon} color={colors.coverPlaceholderIcon}
/> />
@@ -116,8 +107,6 @@ export const CoverImage = memo(function CoverImage({
source={source} source={source}
style={[style, { backgroundColor: colors.coverPlaceholder }]} style={[style, { backgroundColor: colors.coverPlaceholder }]}
contentFit={contentFit} contentFit={contentFit}
placeholder={placeholder}
placeholderContentFit={contentFit}
transition={150} transition={150}
blurRadius={blurRadius} blurRadius={blurRadius}
onLoad={ onLoad={
@@ -1,156 +0,0 @@
import { Ionicons } from "@expo/vector-icons"
import { Alert, Pressable, StyleSheet, Text, View } 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>
)
}
/** Download, progress, and downloaded states for an album or playlist header. */
export function DownloadHeaderButton({
target,
color,
}: {
target: Exclude<DownloadTarget, { kind: "songs" }>
color: string
}) {
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}
>
{inProgress && status ? (
<ProgressRing
fraction={status.downloaded / status.total}
color={color}
/>
) : (
<Ionicons
name={done ? "checkmark-circle" : "arrow-down-circle-outline"}
size={SIZE + 2}
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 -5
View File
@@ -35,11 +35,7 @@ export function HandoffBridge() {
if (!active || !activity) return if (!active || !activity) return
try { try {
const source = new URL(activity.server) const source = new URL(activity.server)
if (!config) { if (!config || source.origin !== new URL(config.serverUrl).origin) {
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.") showError("This activity belongs to a different oTunes server.")
return return
} }
@@ -112,10 +112,7 @@ function SwipeRowBody({
setIsOpen(false) setIsOpen(false)
}, [removing, translateX]) }, [removing, translateX])
const handleSwipeStart = useCallback( const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
() => group.setOpen(close),
[close, group]
)
const handleSettle = useCallback( const handleSettle = useCallback(
(open: boolean) => { (open: boolean) => {
@@ -254,7 +251,8 @@ function SwipeRowBody({
const pillWidth = Math.max( const pillWidth = Math.max(
0, 0,
resting + resting +
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value (revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
commitProgress.value
) )
const restingHeight = interpolate( const restingHeight = interpolate(
pillWidth, pillWidth,
+1 -13
View File
@@ -20,7 +20,6 @@ import {
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { MediaContextMenu } from "@/components/media-context-menu" import { MediaContextMenu } from "@/components/media-context-menu"
import { useIsCollectionDownloaded } from "@/contexts/downloads"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useAppNavigation } from "@/lib/app-navigation" import { useAppNavigation } from "@/lib/app-navigation"
@@ -52,7 +51,6 @@ export const AlbumCard = memo(function AlbumCard({
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions() const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
const downloaded = useIsCollectionDownloaded({ kind: "album", id: album.id })
if (!config) return null if (!config) return null
const card = ( const card = (
@@ -104,7 +102,6 @@ export const AlbumCard = memo(function AlbumCard({
hasArtwork: album.cover != null, hasArtwork: album.cover != null,
}} }}
favorited={isAlbumFavorite(album.id)} favorited={isAlbumFavorite(album.id)}
downloaded={downloaded}
stationArtistId={album.artist.id} stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }} navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id, title: album.title }} share={{ type: "album", albumId: album.id, title: album.title }}
@@ -190,10 +187,6 @@ export const PlaylistCard = memo(function PlaylistCard({
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const { handlePlaylistAction } = useMediaMenuActions() const { handlePlaylistAction } = useMediaMenuActions()
const downloaded = useIsCollectionDownloaded({
kind: "playlist",
id: playlist.id,
})
if (!config) return null if (!config) return null
const card = ( const card = (
@@ -207,11 +200,7 @@ export const PlaylistCard = memo(function PlaylistCard({
<Link.AppleZoom> <Link.AppleZoom>
<View collapsable={false}> <View collapsable={false}>
<CoverImage <CoverImage
uri={playlistCoverUrl( uri={playlistCoverUrl(config.serverUrl, playlist.id)}
config.serverUrl,
playlist.id,
playlist.cover
)}
hasCover={playlist.cover != null} hasCover={playlist.cover != null}
style={ style={
fluid fluid
@@ -242,7 +231,6 @@ export const PlaylistCard = memo(function PlaylistCard({
return ( return (
<MediaContextMenu <MediaContextMenu
showFavorite={false} showFavorite={false}
downloaded={downloaded}
share={{ share={{
type: "playlist", type: "playlist",
playlistId: playlist.id, playlistId: playlist.id,
+1 -46
View File
@@ -32,11 +32,7 @@ export type MediaAction =
| "favorite" | "favorite"
| "go-artist" | "go-artist"
| "go-album" | "go-album"
| "remove-from-playlist"
| "change-cover"
| "delete-playlist" | "delete-playlist"
| "download"
| "remove-download"
export type MediaNavigation = { export type MediaNavigation = {
artist?: { id: string } artist?: { id: string }
@@ -58,12 +54,9 @@ export type MediaMenuConfig = {
playlistLabel?: string playlistLabel?: string
favorited?: boolean favorited?: boolean
showFavorite?: boolean showFavorite?: boolean
showRemoveFromPlaylist?: boolean
stationArtistId?: string stationArtistId?: string
navigation?: MediaNavigation navigation?: MediaNavigation
share?: MediaShareContext share?: MediaShareContext
/** Shows Download, or Remove Download when true. Omit to hide both. */
downloaded?: boolean
includeActions?: MediaAction[] includeActions?: MediaAction[]
onAction: (action: MediaAction) => void onAction: (action: MediaAction) => void
} }
@@ -83,7 +76,6 @@ const MEDIA_ACTION_ITEMS: {
playlistLabel: string playlistLabel: string
) => string ) => string
image: NonNullable<MenuAction["image"]> & string image: NonNullable<MenuAction["image"]> & string
destructive?: boolean
}[] = [ }[] = [
{ {
action: "playlist", action: "playlist",
@@ -91,17 +83,6 @@ const MEDIA_ACTION_ITEMS: {
`${playlistLabel}${countSuffix}`, `${playlistLabel}${countSuffix}`,
image: "text.badge.plus", image: "text.badge.plus",
}, },
{
action: "download",
label: (countSuffix) => `Download${countSuffix}`,
image: "arrow.down.circle",
},
{
action: "remove-download",
label: (countSuffix) => `Remove Download${countSuffix}`,
image: "xmark.circle",
destructive: true,
},
{ {
action: "play-next", action: "play-next",
label: (countSuffix) => `Play Next${countSuffix}`, label: (countSuffix) => `Play Next${countSuffix}`,
@@ -138,17 +119,6 @@ const MEDIA_ACTION_ITEMS: {
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`, `${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
image: "star", 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", action: "delete-playlist",
label: () => "Delete Playlist", label: () => "Delete Playlist",
@@ -164,23 +134,11 @@ function isActionIncluded(
return false 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) { if (config.includeActions) {
return config.includeActions.includes(action) return config.includeActions.includes(action)
} }
if (action === "delete-playlist" || action === "change-cover") { if (action === "delete-playlist") {
return false return false
} }
@@ -232,7 +190,6 @@ export function buildMediaMenuActions(
id: item.action, id: item.action,
title: item.label(countSuffix, favorited, playlistLabel), title: item.label(countSuffix, favorited, playlistLabel),
image: item.action === "favorite" && favorited ? "star.fill" : item.image, image: item.action === "favorite" && favorited ? "star.fill" : item.image,
...(item.destructive ? { attributes: { destructive: true } } : {}),
}) })
} }
@@ -367,7 +324,6 @@ const NativeContextMenuAction: ComponentType<{
identifier: string identifier: string
title: string title: string
icon?: string icon?: string
destructive?: boolean
onSelected: () => void onSelected: () => void
}> | null = }> | null =
Platform.OS === "ios" Platform.OS === "ios"
@@ -421,7 +377,6 @@ function NativeMediaContextMenu({
identifier={action.id ?? action.title} identifier={action.id ?? action.title}
title={action.title} title={action.title}
icon={typeof action.image === "string" ? action.image : undefined} icon={typeof action.image === "string" ? action.image : undefined}
destructive={action.attributes?.destructive}
onSelected={() => handleAction(action.id as MediaAction)} onSelected={() => handleAction(action.id as MediaAction)}
/> />
))} ))}
@@ -25,11 +25,7 @@ const actionIcons = {
favorite: "star-outline", favorite: "star-outline",
"go-artist": "person-outline", "go-artist": "person-outline",
"go-album": "disc-outline", "go-album": "disc-outline",
"remove-from-playlist": "remove-circle-outline",
"change-cover": "image-outline",
"delete-playlist": "trash-outline", "delete-playlist": "trash-outline",
download: "arrow-down-circle-outline",
"remove-download": "close-circle-outline",
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]> } satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
// The community MenuView creates a dynamic-color Host internally. Own this // The community MenuView creates a dynamic-color Host internally. Own this
+32 -14
View File
@@ -1,11 +1,13 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import Animated from "react-native-reanimated"
import { import {
useAndroidTabPalette, useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidTabHasArtworkPalette, useAndroidTabHasArtworkPalette,
} from "@/contexts/android-tab-theme" } from "@/contexts/android-tab-theme"
import { Ionicons } from "@expo/vector-icons"
import { NativeTabs } from "expo-router/native-tabs" import { NativeTabs } from "expo-router/native-tabs"
import { useRouter } from "expo-router" import { useRouter } from "expo-router"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import { Platform, Pressable, StyleSheet, View } from "react-native"
import { useSafeAreaInsets } from "react-native-safe-area-context" import { useSafeAreaInsets } from "react-native-safe-area-context"
@@ -65,7 +67,8 @@ function MiniPlayerContent({
<View <View
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta} style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
> >
<Text <PaletteText
tone="foreground"
style={[ style={[
isAccessory ? styles.accessoryTitle : styles.title, isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground }, { color: colors.foreground },
@@ -73,7 +76,7 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.title} {currentSong.title}
</Text> </PaletteText>
</View> </View>
<Pressable <Pressable
style={styles.controlButton} style={styles.controlButton}
@@ -83,7 +86,8 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons <PaletteIcon
tone="foreground"
name={isPlaying ? "pause" : "play"} name={isPlaying ? "pause" : "play"}
size={20} size={20}
color={colors.foreground} color={colors.foreground}
@@ -101,7 +105,8 @@ function MiniPlayerContent({
style={artworkStyle} style={artworkStyle}
/> />
<View style={isAccessory ? styles.accessoryMeta : styles.meta}> <View style={isAccessory ? styles.accessoryMeta : styles.meta}>
<Text <PaletteText
tone="foreground"
style={[ style={[
isAccessory ? styles.accessoryTitle : styles.title, isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground }, { color: colors.foreground },
@@ -109,8 +114,9 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.title} {currentSong.title}
</Text> </PaletteText>
<Text <PaletteText
tone="secondaryForeground"
style={[ style={[
isAccessory ? styles.accessoryArtist : styles.artist, isAccessory ? styles.accessoryArtist : styles.artist,
{ color: colors.mutedForeground }, { color: colors.mutedForeground },
@@ -118,7 +124,7 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.artist.name} {currentSong.artist.name}
</Text> </PaletteText>
</View> </View>
<View style={styles.controls}> <View style={styles.controls}>
{Platform.OS === "android" && !isAccessory ? ( {Platform.OS === "android" && !isAccessory ? (
@@ -132,7 +138,12 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons name="play-back" size={24} color={colors.foreground} /> <PaletteIcon
tone="foreground"
name="play-back"
size={24}
color={colors.foreground}
/>
</Pressable> </Pressable>
) : null} ) : null}
<Pressable <Pressable
@@ -143,7 +154,8 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons <PaletteIcon
tone="foreground"
name={isPlaying ? "pause" : "play"} name={isPlaying ? "pause" : "play"}
size={24} size={24}
color={colors.foreground} color={colors.foreground}
@@ -157,7 +169,12 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<Ionicons name="play-forward" size={24} color={colors.foreground} /> <PaletteIcon
tone="foreground"
name="play-forward"
size={24}
color={colors.foreground}
/>
</Pressable> </Pressable>
</View> </View>
</Pressable> </Pressable>
@@ -167,9 +184,10 @@ function MiniPlayerContent({
function MiniPlayerChrome({ children }: { children: React.ReactNode }) { function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
const palette = useAndroidTabPalette() const palette = useAndroidTabPalette()
const hasArtworkPalette = useAndroidTabHasArtworkPalette() const hasArtworkPalette = useAndroidTabHasArtworkPalette()
const backgroundStyle = useAndroidTabBackgroundStyle()
return ( return (
<View style={[styles.androidBar, { backgroundColor: palette.background }]}> <Animated.View style={[styles.androidBar, backgroundStyle]}>
{children} {children}
{hasArtworkPalette ? ( {hasArtworkPalette ? (
<View <View
@@ -187,7 +205,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
{ backgroundColor: palette.secondaryForeground }, { backgroundColor: palette.secondaryForeground },
]} ]}
/> />
</View> </Animated.View>
) )
} }
+97 -121
View File
@@ -38,7 +38,7 @@ import {
type SwipeRowGroup, type SwipeRowGroup,
} from "@/components/ios-swipe-to-remove-row" } from "@/components/ios-swipe-to-remove-row"
import { PlayerSymbol } from "@/components/player-symbol" import { PlayerSymbol } from "@/components/player-symbol"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback" import { usePlayback } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { NowPlayingColors } from "@/lib/now-playing-colors" import type { NowPlayingColors } from "@/lib/now-playing-colors"
@@ -110,16 +110,18 @@ export function NowPlayingQueue({
tablet?: boolean tablet?: boolean
fadeColor?: string fadeColor?: string
}) { }) {
const { queueSongIds, queueHistorySongIds, shuffleEnabled, repeatEnabled } =
usePlaybackQueue()
const { const {
queueSongIds,
queueHistorySongIds,
shuffleEnabled,
repeatEnabled,
toggleShuffle, toggleShuffle,
cycleRepeat, cycleRepeat,
clearHistory, clearHistory,
reorderQueue, reorderQueue,
skipToQueueIndex, skipToQueueIndex,
skipToHistoryIndex, skipToHistoryIndex,
} = usePlaybackActions() } = usePlayback()
const [viewportWidth, setViewportWidth] = useState(0) const [viewportWidth, setViewportWidth] = useState(0)
const swipeGroup = useSwipeRowGroup() const swipeGroup = useSwipeRowGroup()
const [scrollEnabled, setScrollEnabled] = useState(true) const [scrollEnabled, setScrollEnabled] = useState(true)
@@ -305,126 +307,100 @@ export function NowPlayingQueue({
[drag] [drag]
) )
const lastIndex = queueSongIds.length - 1 const renderItem = ({ item }: { item: QueueListItem }) => {
const renderItem = useCallback( switch (item.type) {
({ item }: { item: QueueListItem }) => { case "history-header":
switch (item.type) { return (
case "history-header": <View style={styles.historyHeader}>
return ( <Text style={[styles.sectionTitle, { color: colors.foreground }]}>
<View style={styles.historyHeader}> History
<Text style={[styles.sectionTitle, { color: colors.foreground }]}> </Text>
History <Pressable onPress={() => void clearHistory()} hitSlop={10}>
</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 ? (
<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 <Text
style={[ style={[styles.clear, { color: colors.secondaryForeground }]}
styles.emptyText,
{ color: colors.secondaryForeground },
]}
> >
Nothing else is queued. Clear
</Text> </Text>
</View> </Pressable>
) </View>
} )
}, case "history":
[ return (
clearHistory, <HistoryRow
colors, songId={item.songId}
currentHeader, historyIndex={item.historyIndex}
cycleRepeat, colors={colors}
drag, onPress={skipToHistoryIndex}
handleDragStart, />
handleDrop, )
handleRemove, case "current":
lastIndex, return <View style={styles.current}>{currentHeader}</View>
repeatEnabled, case "controls":
shuffleEnabled, return (
skipToHistoryIndex, <View
skipToQueueIndex, style={[
swipeGroup, styles.controls,
tablet, {
toggleShuffle, 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 ? (
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Continue Playing
</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 }]}
>
Nothing else is queued.
</Text>
</View>
)
}
}
return ( return (
<View <View
-109
View File
@@ -1,109 +0,0 @@
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 },
})
+49
View File
@@ -0,0 +1,49 @@
import { Ionicons } from "@expo/vector-icons"
import type { ComponentProps } from "react"
import { Pressable, type TextProps } from "react-native"
import { useRouter } from "expo-router"
import Animated from "react-native-reanimated"
import {
useAnimatedPaletteColor,
type PaletteColor,
} from "@/contexts/android-tab-theme"
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
/** Keep artwork text colors on the same UI-thread animation as the background. */
export function PaletteText({
tone,
style,
...props
}: TextProps & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <Animated.Text {...props} style={[style, colorStyle]} />
}
export function PaletteIcon({
tone,
style,
...props
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <AnimatedIcon {...props} style={[style, colorStyle]} />
}
function ArtworkBackButton() {
const router = useRouter()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel="Navigate up"
hitSlop={8}
onPress={() => router.back()}
>
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
</Pressable>
)
}
export function renderArtworkBackButton() {
return <ArtworkBackButton />
}
@@ -1,83 +0,0 @@
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"] },
})
+13 -39
View File
@@ -1,14 +1,9 @@
import { SongSwipeRow } from "@/components/song-swipe-row" import { SongSwipeRow } from "@/components/song-swipe-row"
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-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 { MusicEntityView } from "@/components/music-entity-view"
import { collectionInset } from "@/components/collection-list" import { collectionInset } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image" 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 { useServerConfig } from "@/contexts/server-config"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import type { CoverPalette } from "@/lib/cover-palette" import type { CoverPalette } from "@/lib/cover-palette"
@@ -21,7 +16,7 @@ import {
useThemeColors, useThemeColors,
} from "@/lib/theme" } from "@/lib/theme"
import { memo, useCallback } from "react" import { memo, useCallback } from "react"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import { Platform, Pressable, StyleSheet, View } from "react-native"
import { import {
MediaContextMenu, MediaContextMenu,
@@ -39,7 +34,6 @@ export const SongRow = memo(function SongRow({
palette, palette,
inset = false, inset = false,
swipe, swipe,
downloadFrom,
}: { }: {
song: BrowseSong song: BrowseSong
onPress?: () => void onPress?: () => void
@@ -57,14 +51,9 @@ export const SongRow = memo(function SongRow({
} }
/** Album/playlist layout: the divider starts at the title, not the artwork. */ /** Album/playlist layout: the divider starts at the title, not the artwork. */
inset?: boolean inset?: boolean
/** The download this row belongs to; removing only takes it out of that. */
downloadFrom?: DownloadSource
}) { }) {
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const downloadState = useSongDownloadState(song.id, downloadFrom)
const downloaded = downloadState === "here"
const toggleDownload = useToggleSongDownload()
if (!config) return null if (!config) return null
const foreground = palette?.foreground ?? colors.foreground const foreground = palette?.foreground ?? colors.foreground
@@ -75,30 +64,27 @@ export const SongRow = memo(function SongRow({
const content = ( const content = (
<> <>
<View style={styles.rowMeta}> <View style={styles.rowMeta}>
<Text <PaletteText
tone={palette ? "foreground" : undefined}
style={[styles.rowTitle, { color: foreground }]} style={[styles.rowTitle, { color: foreground }]}
numberOfLines={1} numberOfLines={1}
> >
{song.title} {song.title}
</Text> </PaletteText>
<Text <PaletteText
tone={palette ? "secondaryForeground" : undefined}
style={[styles.rowSubtitle, { color: secondaryForeground }]} style={[styles.rowSubtitle, { color: secondaryForeground }]}
numberOfLines={1} numberOfLines={1}
> >
{song.artist.name} · {song.album.title} {song.artist.name} · {song.album.title}
</Text> </PaletteText>
</View> </View>
{downloaded || downloadState === "device" ? ( <PaletteText
<Ionicons tone={palette ? "secondaryForeground" : undefined}
name="arrow-down-circle" style={[styles.duration, { color: secondaryForeground }]}
size={14} >
color={secondaryForeground}
accessibilityLabel="Downloaded"
/>
) : null}
<Text style={[styles.duration, { color: secondaryForeground }]}>
{formatDuration(song.durationSeconds)} {formatDuration(song.durationSeconds)}
</Text> </PaletteText>
{trailing} {trailing}
</> </>
) )
@@ -129,8 +115,6 @@ export const SongRow = memo(function SongRow({
onPlayNext={swipe.onPlayNext} onPlayNext={swipe.onPlayNext}
onAddToQueue={swipe.onAddToQueue} onAddToQueue={swipe.onAddToQueue}
onRemove={swipe.onRemove} onRemove={swipe.onRemove}
downloaded={downloaded}
onDownload={() => toggleDownload(song, downloaded, downloadFrom)}
backgroundColor={swipe.backgroundColor} backgroundColor={swipe.backgroundColor}
onPress={onPress} onPress={onPress}
style={rowStyle} style={rowStyle}
@@ -176,8 +160,6 @@ export const SongListRow = memo(function SongListRow({
palette, palette,
inset, inset,
swipe, swipe,
removable,
downloadFrom,
onPlay, onPlay,
onAction, onAction,
}: { }: {
@@ -193,15 +175,10 @@ export const SongListRow = memo(function SongListRow({
onRemove?: () => void onRemove?: () => void
backgroundColor: string 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 onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void onAction: (song: BrowseSong, action: MediaAction) => void
}) { }) {
const { config } = useServerConfig() const { config } = useServerConfig()
const downloaded = useSongDownloadState(song.id, downloadFrom) === "here"
const handlePress = useCallback(() => onPlay(song), [onPlay, song]) const handlePress = useCallback(() => onPlay(song), [onPlay, song])
return ( return (
@@ -210,7 +187,6 @@ export const SongListRow = memo(function SongListRow({
palette={palette} palette={palette}
inset={inset} inset={inset}
swipe={swipe} swipe={swipe}
downloadFrom={downloadFrom}
onPress={handlePress} onPress={handlePress}
contextMenu={{ contextMenu={{
preview: config preview: config
@@ -225,9 +201,7 @@ export const SongListRow = memo(function SongListRow({
: undefined, : undefined,
stationArtistId: song.artist.id, stationArtistId: song.artist.id,
favorited, favorited,
downloaded,
playlistLabel, playlistLabel,
showRemoveFromPlaylist: removable,
navigation: { navigation: {
artist: { id: song.artist.id }, artist: { id: song.artist.id },
album: { id: song.album.id }, album: { id: song.album.id },
@@ -4,15 +4,19 @@ import { Stack } from "expo-router"
import { useDebouncedSearch } from "@/hooks/use-debounced-search" import { useDebouncedSearch } from "@/hooks/use-debounced-search"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
import { filterSongs } from "@otunes/convex/client/song-search"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
export function usePlaylistSearch(songs: BrowseSong[]) { export function usePlaylistSearch(songs: BrowseSong[]) {
const search = useDebouncedSearch() const search = useDebouncedSearch()
const filteredSongs = useMemo( const filteredSongs = useMemo(() => {
() => filterSongs(songs, search.searchQuery), const query = search.searchQuery.toLowerCase()
[songs, search.searchQuery] if (!query) return songs
) return songs.filter((song) =>
[song.title, song.artist.name, song.album.title].some((value) =>
value.toLowerCase().includes(query)
)
)
}, [songs, search.searchQuery])
return { ...search, filteredSongs } return { ...search, filteredSongs }
} }
+167 -297
View File
@@ -1,20 +1,15 @@
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout" import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
} from "@/components/collection-hero" } from "@/components/collection-hero"
import {
CollectionDivider,
collectionInset,
} from "@/components/collection-list"
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
import { Link } from "expo-router" import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation" import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated" import Reanimated from "react-native-reanimated"
import { type ComponentProps, type ReactNode } from "react" import { type ReactNode, type ComponentProps } from "react"
import { import {
Platform, Platform,
ScrollView,
StyleSheet, StyleSheet,
View, View,
type DimensionValue, type DimensionValue,
@@ -22,42 +17,34 @@ import {
type ViewStyle, type ViewStyle,
} from "react-native" } from "react-native"
import { contentBottomInset } from "@/components/player"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme" import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
/** /** Reserve the transparent native header explicitly while skeletons cannot scroll. */
* Loading screens never scroll, so they cannot rely on scroll-view inset function SkeletonContent({
* adjustment. iOS headers are transparent and overlap the screen; Android
* headers are opaque and already sit above it.
*/
function SkeletonScreen({
children, children,
style, embedded = false,
backgroundColor,
onLayout,
}: { }: {
children: ReactNode children: ReactNode
style?: ComponentProps<typeof Reanimated.View>["style"] embedded?: boolean
backgroundColor?: string
onLayout?: () => void
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const headerHeight = useHeaderHeight() const headerHeight = useHeaderHeight()
if (embedded) return <>{children}</>
return ( return (
<Reanimated.View <ScrollView
onLayout={onLayout} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading" accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[
styles.screen,
{
backgroundColor: backgroundColor ?? colors.background,
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
},
style,
]}
> >
{children} {children}
</Reanimated.View> </ScrollView>
) )
} }
@@ -74,103 +61,56 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
) )
} }
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
function TextLine({ function TextLine({
width, width,
fontSize, height = 14,
}: { }: {
width: DimensionValue width: DimensionValue
fontSize: number height?: number
}) { }) {
return ( return <Skeleton style={{ width, height, borderRadius: 4 }} />
<View
style={{
width,
height: Math.round(fontSize * 1.2),
justifyContent: "center",
}}
>
<Skeleton
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
/>
</View>
)
} }
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */ export function SongRowSkeleton() {
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
const colors = useThemeColors() 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 ( return (
<View style={[styles.songRow, { borderBottomColor: colors.border }]}> <View style={[styles.songRow, { borderBottomColor: colors.border }]}>
<Skeleton style={styles.songArtwork} /> <Skeleton style={styles.songArtwork} />
{meta} <View style={styles.songMeta}>
</View> <TextLine width="60%" height={16} />
) <TextLine width="40%" />
}
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>
</View> </View>
) )
} }
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) { export function SongListSkeleton({
return Array.from({ length: rows }, (_, index) => ( rows = 10,
<SongRowSkeleton key={index} inset={inset} /> embedded = false,
)) }: {
} rows?: number
embedded?: boolean
export function SongListSkeleton({ rows = 10 }: { rows?: number }) { }) {
return ( return (
<SkeletonScreen> <SkeletonContent embedded={embedded}>
<SongRows rows={rows} /> <View accessibilityLabel="Loading" accessibilityRole="progressbar">
</SkeletonScreen> {Array.from({ length: rows }, (_, index) => (
<SongRowSkeleton key={index} />
))}
</View>
</SkeletonContent>
) )
} }
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
function CardSkeleton({ function CardSkeleton({
width, width,
minHeight,
round = false, round = false,
}: { }: {
width: number width: number
minHeight?: number
round?: boolean round?: boolean
}) { }) {
return ( return (
<View style={[styles.card, { width, minHeight }]}> <View style={[styles.card, { width }]}>
<Skeleton <Skeleton
style={{ style={{
width, width,
@@ -178,37 +118,35 @@ function CardSkeleton({
borderRadius: round ? width / 2 : radius.md, borderRadius: round ? width / 2 : radius.md,
}} }}
/> />
<TextLine width="80%" fontSize={14} /> <TextLine width="80%" />
{round ? null : <TextLine width="50%" fontSize={12} />} {round ? null : <TextLine width="50%" height={12} />}
</View> </View>
) )
} }
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */ export function MediaGridSkeleton({
function MediaGridContent({ items = 6,
items, contentInset = true,
contentInset, embedded = false,
header,
}: { }: {
items: number items?: number
contentInset: boolean contentInset?: boolean
header?: ReactNode embedded?: boolean
}) { }) {
const tabletLayout = useTabletLayout()
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } = const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout() useMediaGridLayout()
return ( return (
<> <SkeletonContent embedded={embedded}>
{header}
<View <View
onLayout={onLayout} onLayout={onLayout}
accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[ style={[
styles.grid, styles.grid,
contentInset ? styles.gridInset : styles.gridRowInset,
{ {
paddingHorizontal: horizontalPadding, paddingHorizontal: horizontalPadding,
paddingTop: contentInset ? horizontalPadding : 0, paddingTop: contentInset ? horizontalPadding : 0,
// FlatList applies its content gap after the list header as well.
marginTop: header && !tabletLayout ? gap : 0,
gap, gap,
}, },
]} ]}
@@ -216,47 +154,20 @@ function MediaGridContent({
{Array.from( {Array.from(
{ length: ready ? Math.max(items, columns * 3) : 0 }, { length: ready ? Math.max(items, columns * 3) : 0 },
(_, index) => ( (_, index) => (
<CardSkeleton <CardSkeleton key={index} width={cardWidth} />
key={index}
width={cardWidth}
minHeight={
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
}
/>
) )
)} )}
</View> </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() { export function CarouselSkeleton() {
return ( return (
<View style={styles.carousel}> <View style={styles.carousel}>
<TextLine width={160} fontSize={22} /> <TextLine width={160} height={22} />
<View style={styles.carouselRow}> <View style={styles.carouselRow}>
{Array.from({ length: 8 }, (_, index) => ( {Array.from({ length: 3 }, (_, index) => (
<CardSkeleton key={index} width={carouselCardWidth} /> <CardSkeleton key={index} width={carouselCardWidth} />
))} ))}
</View> </View>
@@ -265,148 +176,140 @@ export function CarouselSkeleton() {
} }
export function HomeSkeleton() { export function HomeSkeleton() {
const headerHeight = useHeaderHeight()
const colors = useThemeColors()
return ( return (
<SkeletonScreen> <ScrollView
<View style={styles.home}> style={{ flex: 1, backgroundColor: colors.background }}
<CarouselSkeleton /> contentContainerStyle={[
<CarouselSkeleton /> styles.home,
</View> { paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
</SkeletonScreen> ]}
) contentInsetAdjustmentBehavior="never"
} scrollEnabled={false}
accessibilityLabel="Loading"
function HeroActions({ >
favorite = true, <CarouselSkeleton />
reverse = false, <CarouselSkeleton />
}: { </ScrollView>
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. */ /** Album and playlist pages: cover, title, play buttons, then tracks. */
export function CollectionDetailSkeleton({ export function CollectionDetailSkeleton({
variant, zoomCoverSize,
style, style,
round = false,
backgroundColor, backgroundColor,
onLayout, onLayout,
}: { }: {
variant: "album" | "playlist" | "favorites" | "artist" zoomCoverSize?: number
style?: ComponentProps<typeof Reanimated.View>["style"] style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
round?: boolean
backgroundColor?: string backgroundColor?: string
onLayout?: () => void onLayout?: () => void
}) { }) {
const colors = useThemeColors()
const headerHeight = useHeaderHeight()
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout() const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
const coverSize =
if (variant === "artist" || variant === "favorites") { !round && landscape
const artist = variant === "artist" ? tabletCoverSize!
const coverSize = artist ? 180 : 200 : (zoomCoverSize ?? (round ? 180 : 210))
const hero = ( const actions = (
<View style={styles.centeredHero}> <View style={styles.actions}>
<Skeleton <Skeleton style={styles.iconAction} />
style={{ <Skeleton style={styles.playButton} />
width: coverSize, <Skeleton style={styles.iconAction} />
height: coverSize, </View>
borderRadius: artist ? coverSize / 2 : radius.lg, )
}} const artwork = (
/> <Skeleton
<TextLine width={200} fontSize={artist ? 28 : 24} /> style={{
<HeroActions favorite={artist} /> width: coverSize,
</View> height: coverSize,
) borderRadius: round ? coverSize / 2 : radius.lg,
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 ( return (
<SkeletonScreen <Reanimated.ScrollView
style={style}
backgroundColor={backgroundColor}
onLayout={onLayout} 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"
> >
<CollectionHero {round ? (
artwork={ <View style={styles.artistHero}>
<Link.AppleZoomTarget> {zoomCoverSize ? (
<View collapsable={false}> <Link.AppleZoomTarget>
<Skeleton <View collapsable={false}>{artwork}</View>
style={{ </Link.AppleZoomTarget>
width: coverSize, ) : (
height: coverSize, artwork
borderRadius: radius.lg, )}
}} <TextLine width={200} height={24} />
/> <TextLine width={120} height={16} />
</View> {actions}
</Link.AppleZoomTarget> </View>
}
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} />
))
) : ( ) : (
<SongRows rows={8} inset /> <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>
)} )}
</SkeletonScreen> {round ? (
<MediaGridSkeleton items={4} contentInset={false} embedded />
) : (
<SongListSkeleton rows={8} embedded />
)}
</Reanimated.ScrollView>
) )
} }
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) { export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<SkeletonScreen> <SkeletonContent>
{Array.from({ length: rows }, (_, index) => ( <View accessibilityLabel="Loading" accessibilityRole="progressbar">
<View {Array.from({ length: rows }, (_, index) => (
key={index} <View
style={[styles.artistRow, { borderBottomColor: colors.border }]} key={index}
> style={[styles.artistRow, { borderBottomColor: colors.border }]}
<Skeleton style={styles.artistAvatar} /> >
<TextLine width="50%" fontSize={16} /> <Skeleton style={styles.artistAvatar} />
</View> <TextLine width="50%" height={16} />
))} </View>
</SkeletonScreen> ))}
</View>
</SkeletonContent>
) )
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
screen: { flex: 1, overflow: "hidden" },
songRow: { songRow: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
@@ -416,55 +319,22 @@ const styles = StyleSheet.create({
paddingHorizontal: spacing.lg, paddingHorizontal: spacing.lg,
borderBottomWidth: StyleSheet.hairlineWidth, 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 }, songArtwork: { width: 44, height: 44, borderRadius: 6 },
songMeta: { flex: 1 }, songMeta: { flex: 1, gap: 6 },
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 }, card: { gap: spacing.xs },
grid: { flexDirection: "row", flexWrap: "wrap" }, grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
gridInset: { padding: spacing.lg },
gridRowInset: { paddingHorizontal: spacing.lg },
carousel: { gap: spacing.md, overflow: "hidden" }, carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md }, carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl }, home: { padding: spacing.lg, gap: spacing.xl },
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm }, artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: { actions: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
justifyContent: "center",
gap: spacing.sm, gap: spacing.sm,
marginTop: spacing.sm, marginTop: spacing.sm,
}, },
actionsReverse: { flexDirection: "row-reverse" },
iconAction: { width: 44, height: 44, borderRadius: 22 }, iconAction: { width: 44, height: 44, borderRadius: 22 },
playButton: { width: 160, height: 44, borderRadius: 999 }, playButton: { width: 160, height: 44, borderRadius: 999 },
artistRow: { artistRow: {
+43 -67
View File
@@ -31,20 +31,14 @@ import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
const IS_ANDROID = Platform.OS === "android" const IS_ANDROID = Platform.OS === "android"
const ACTION_WIDTH = 82 const ACTION_WIDTH = 82
/** Width of each action when two share a side. */ const LEADING_ACTION_WIDTH = 72
const PAIRED_ACTION_WIDTH = 72
const SPRING = { duration: 450, dampingRatio: 1 } const SPRING = { duration: 450, dampingRatio: 1 }
function impact() { function impact() {
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium) 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({ export function SongSwipeRow({
children, children,
style, style,
@@ -54,8 +48,6 @@ export function SongSwipeRow({
onPlayNext, onPlayNext,
onAddToQueue, onAddToQueue,
onRemove, onRemove,
onDownload,
downloaded = false,
}: { }: {
children: ReactNode children: ReactNode
style?: StyleProp<ViewStyle> style?: StyleProp<ViewStyle>
@@ -65,11 +57,8 @@ export function SongSwipeRow({
onPlayNext: () => void onPlayNext: () => void
onAddToQueue: () => void onAddToQueue: () => void
onRemove?: () => void onRemove?: () => void
onDownload?: () => void
downloaded?: boolean
}) { }) {
const hasRemove = !!onRemove const hasRemove = IS_ANDROID && !!onRemove
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
const x = useSharedValue(0) const x = useSharedValue(0)
const startX = useSharedValue(0) const startX = useSharedValue(0)
const width = useSharedValue(0) const width = useSharedValue(0)
@@ -100,10 +89,9 @@ export function SongSwipeRow({
(side: number) => { (side: number) => {
close() close()
if (side > 0) onAddToQueue() if (side > 0) onAddToQueue()
else if (onRemove) onRemove() // Download is intentionally a placeholder.
else onDownload?.()
}, },
[close, onAddToQueue, onRemove, onDownload] [close, onAddToQueue]
) )
const tapRow = useCallback(() => { const tapRow = useCallback(() => {
if (open) close() if (open) close()
@@ -129,7 +117,9 @@ export function SongSwipeRow({
const commit = const commit =
Math.abs(x.value) > Math.abs(x.value) >
Math.max( Math.max(
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth, x.value > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1),
width.value * 0.55 width.value * 0.55
) )
if (commit !== committed.value) { if (commit !== committed.value) {
@@ -151,7 +141,10 @@ export function SongSwipeRow({
? side ? side
: 0 : 0
x.value = withSpring( x.value = withSpring(
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth), target *
(target > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
{ {
...SPRING, ...SPRING,
velocity: event.velocityX, velocity: event.velocityX,
@@ -174,6 +167,7 @@ export function SongSwipeRow({
return Gesture.Exclusive(pan, tap) return Gesture.Exclusive(pan, tap)
}, [ }, [
activate, activate,
hasRemove,
begin, begin,
close, close,
commitProgress, commitProgress,
@@ -181,7 +175,6 @@ export function SongSwipeRow({
settle, settle,
startX, startX,
tapRow, tapRow,
trailingWidth,
width, width,
x, x,
]) ])
@@ -234,33 +227,31 @@ export function SongSwipeRow({
onPlayNext() onPlayNext()
}} }}
/> />
<SwipeAction
side={-1}
paired={hasRemove}
remove={hasRemove}
downloaded={downloaded}
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => activate(-1)}
/>
{hasRemove && ( {hasRemove && (
<SwipeAction <SwipeAction
side={-1} side={-1}
secondary secondary
paired paired
downloaded={downloaded} remove
x={x} x={x}
height={height} height={height}
progress={commitProgress} progress={commitProgress}
open={open === -1} open={open === -1}
onPress={() => { onPress={() => {
close() close()
onDownload?.() onRemove?.()
}} }}
/> />
)} )}
<SwipeAction
side={-1}
paired={hasRemove}
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => activate(-1)}
/>
<GestureDetector gesture={gesture}> <GestureDetector gesture={gesture}>
<Animated.View <Animated.View
accessible accessible
@@ -269,21 +260,17 @@ export function SongSwipeRow({
accessibilityActions={[ accessibilityActions={[
{ name: "addToQueue", label: "Add to Queue" }, { name: "addToQueue", label: "Add to Queue" },
{ name: "playNext", label: "Play Next" }, { name: "playNext", label: "Play Next" },
{ { name: "download", label: "Download" },
name: "download",
label: downloaded ? "Remove Download" : "Download",
},
...(hasRemove ...(hasRemove
? [{ name: "remove", label: "Remove from Playlist" }] ? [{ name: "remove", label: "Remove from Playlist" }]
: []), : []),
]} ]}
onAccessibilityAction={(event) => { onAccessibilityAction={(event) => {
if (event.nativeEvent.actionName === "remove") activate(-1) if (event.nativeEvent.actionName === "remove" && hasRemove) {
if (event.nativeEvent.actionName === "addToQueue") activate(1)
if (event.nativeEvent.actionName === "download") {
close() close()
onDownload?.() onRemove?.()
} }
if (event.nativeEvent.actionName === "addToQueue") activate(1)
if (event.nativeEvent.actionName === "playNext") { if (event.nativeEvent.actionName === "playNext") {
close() close()
onPlayNext() onPlayNext()
@@ -307,7 +294,6 @@ function SwipeAction({
secondary = false, secondary = false,
paired = side > 0, paired = side > 0,
remove = false, remove = false,
downloaded = false,
x, x,
height, height,
progress, progress,
@@ -318,8 +304,6 @@ function SwipeAction({
secondary?: boolean secondary?: boolean
paired?: boolean paired?: boolean
remove?: boolean remove?: boolean
/** Shows the download action as Remove Download. */
downloaded?: boolean
x: SharedValue<number> x: SharedValue<number>
height: SharedValue<number> height: SharedValue<number>
progress: SharedValue<number> progress: SharedValue<number>
@@ -353,10 +337,10 @@ function SwipeAction({
const resting = Math.max( const resting = Math.max(
0, 0,
Math.min( Math.min(
revealed - (paired ? 10 : 20), revealed - (side > 0 ? 10 : 20),
interpolate( interpolate(
revealed, revealed,
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220], [24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
[0, 62, 200] [0, 62, 200]
) )
) )
@@ -390,8 +374,6 @@ function SwipeAction({
}, },
], ],
})) }))
const removesDownload = side < 0 && !remove && downloaded
const destructive = remove || removesDownload
return ( return (
<Animated.View <Animated.View
pointerEvents={open ? "auto" : "none"} pointerEvents={open ? "auto" : "none"}
@@ -408,13 +390,11 @@ function SwipeAction({
accessibilityLabel={ accessibilityLabel={
remove remove
? "Remove from Playlist" ? "Remove from Playlist"
: removesDownload : side > 0
? "Remove Download" ? secondary
: side > 0 ? "Play Next"
? secondary : "Add to Queue"
? "Play Next" : "Download"
: "Add to Queue"
: "Download"
} }
onPress={onPress} onPress={onPress}
style={styles.actionButton} style={styles.actionButton}
@@ -423,10 +403,8 @@ function SwipeAction({
style={[ style={[
styles.pill, styles.pill,
{ {
backgroundColor: destructive backgroundColor: remove
? IS_ANDROID ? "#d32f2f"
? "#d32f2f"
: "#ff3b30"
: side > 0 : side > 0
? secondary ? secondary
? "#6b5bff" ? "#6b5bff"
@@ -440,7 +418,7 @@ function SwipeAction({
{IS_ANDROID ? ( {IS_ANDROID ? (
<Ionicons <Ionicons
name={ name={
destructive remove
? "trash-outline" ? "trash-outline"
: side < 0 : side < 0
? "arrow-down" ? "arrow-down"
@@ -454,13 +432,11 @@ function SwipeAction({
) : ( ) : (
<SymbolView <SymbolView
name={ name={
destructive side > 0
? "trash" ? secondary
: side > 0 ? "text.line.first.and.arrowtriangle.forward"
? secondary : "text.line.last.and.arrowtriangle.forward"
? "text.line.first.and.arrowtriangle.forward" : "arrow.down"
: "text.line.last.and.arrowtriangle.forward"
: "arrow.down"
} }
size={22} size={22}
tintColor="white" tintColor="white"
+7 -44
View File
@@ -3,48 +3,18 @@ import { SafeAreaView } from "react-native-safe-area-context"
import { Platform } from "react-native" import { Platform } from "react-native"
import type { ReactNode } from "react" import type { ReactNode } from "react"
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme" import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout" import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
import { OfflineOverlay } from "@/components/offline-overlay"
import { TabletSidebar } from "@/components/tablet-sidebar" 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. */ /** Apply sidebar insets natively, before Yoga measures the content pane. */
export function TabScreenContent({ export function TabScreenContent({ children }: { children: ReactNode }) {
route, const backgroundStyle = useAndroidTabBackgroundStyle()
children, if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
}: {
route: ScreenRoute
children: ReactNode
}) {
const backgroundStyle = useTabletBackgroundStyle()
if (Platform.OS !== "ios" || !Platform.isPad) {
return <ScreenBody route={route}>{children}</ScreenBody>
}
return ( return (
<Animated.View style={[{ flex: 1 }, backgroundStyle]}> <Animated.View style={[{ flex: 1 }, backgroundStyle]}>
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}> <SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
<ScreenBody route={route}>{children}</ScreenBody> {children}
</SafeAreaView> </SafeAreaView>
<TabletSidebar /> <TabletSidebar />
<TabletPlayerLayoutSync /> <TabletPlayerLayoutSync />
@@ -52,13 +22,6 @@ export function TabScreenContent({
) )
} }
/** `screenLayout` for every tab stack. */ export function renderTabScreenContent({ children }: { children: ReactNode }) {
export function renderTabScreenContent({ return <TabScreenContent>{children}</TabScreenContent>
route,
children,
}: {
route: ScreenRoute
children: ReactNode
}) {
return <TabScreenContent route={route}>{children}</TabScreenContent>
} }
+1 -4
View File
@@ -19,9 +19,6 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { tabletLayoutTransition } from "@/lib/tablet-motion" import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
/** Height reserved under each tablet card's artwork for its title and subtitle. */
export const tabletCardTextHeight = 48
type GridProps = { type GridProps = {
content: MediaItem[] content: MediaItem[]
paddingBottom: number paddingBottom: number
@@ -51,7 +48,7 @@ export function TabletMediaGrid({
const [headerHeight, setHeaderHeight] = useState(0) const [headerHeight, setHeaderHeight] = useState(0)
const [scrollY, setScrollY] = useState(0) const [scrollY, setScrollY] = useState(0)
const lastRequestedLength = useRef(-1) const lastRequestedLength = useRef(-1)
const rowHeight = cardWidth + tabletCardTextHeight + gap const rowHeight = cardWidth + 48 + gap
const firstRow = Math.max( const firstRow = Math.max(
0, 0,
Math.floor((scrollY - headerHeight) / rowHeight) - 2 Math.floor((scrollY - headerHeight) / rowHeight) - 2
+61 -16
View File
@@ -1,5 +1,11 @@
import { useEffect, useState, type ComponentProps, type ReactNode } from "react" import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
import { Pressable, StyleSheet, View, useWindowDimensions } from "react-native" import {
Pressable,
StyleSheet,
Text,
View,
useWindowDimensions,
} from "react-native"
import Animated, { import Animated, {
Easing, Easing,
ReduceMotion, ReduceMotion,
@@ -8,7 +14,7 @@ import Animated, {
useSharedValue, useSharedValue,
withTiming, withTiming,
} from "react-native-reanimated" } from "react-native-reanimated"
import { GestureDetector, type Gesture } from "react-native-gesture-handler" import { GestureDetector, Gesture } from "react-native-gesture-handler"
import { useSafeAreaInsets } from "react-native-safe-area-context" import { useSafeAreaInsets } from "react-native-safe-area-context"
import { useRouter } from "expo-router" import { useRouter } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
@@ -16,12 +22,12 @@ import { StatusBar } from "expo-status-bar"
import { AudioOutputButton } from "@/components/audio-output-button" import { AudioOutputButton } from "@/components/audio-output-button"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { NowPlayingQueue } from "@/components/now-playing-queue" import { NowPlayingQueue } from "@/components/now-playing-queue"
import { PlayerProgress } from "@/components/player-progress"
import { PlayerSlider } from "@/components/player-slider" import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol" import { PlayerSymbol } from "@/components/player-symbol"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback" import { usePlayback } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useSystemVolume } from "@/hooks/use-system-volume" import { useSystemVolume } from "@/hooks/use-system-volume"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import type { NowPlayingColors } from "@/lib/now-playing-colors" import type { NowPlayingColors } from "@/lib/now-playing-colors"
import { albumCoverUrl } from "@/lib/urls" import { albumCoverUrl } from "@/lib/urls"
@@ -36,7 +42,7 @@ export function TabletNowPlaying({
colors, colors,
backgroundStyle, backgroundStyle,
dismissStyle, dismissStyle,
dismissGestures, dismissGesture,
showQueue, showQueue,
toggleQueue, toggleQueue,
metadata, metadata,
@@ -44,10 +50,7 @@ export function TabletNowPlaying({
colors: NowPlayingColors colors: NowPlayingColors
backgroundStyle: ComponentProps<typeof Animated.View>["style"] backgroundStyle: ComponentProps<typeof Animated.View>["style"]
dismissStyle: ComponentProps<typeof Animated.View>["style"] dismissStyle: ComponentProps<typeof Animated.View>["style"]
dismissGestures: { dismissGesture: () => ReturnType<typeof Gesture.Pan>
handle: ReturnType<typeof Gesture.Pan>
artwork: ReturnType<typeof Gesture.Pan>
}
showQueue: boolean showQueue: boolean
toggleQueue: () => void toggleQueue: () => void
metadata: ReactNode metadata: ReactNode
@@ -56,11 +59,22 @@ export function TabletNowPlaying({
const insets = useSafeAreaInsets() const insets = useSafeAreaInsets()
const { width, height } = useWindowDimensions() const { width, height } = useWindowDimensions()
const { config } = useServerConfig() const { config } = useServerConfig()
const { currentSong, isPlaying, shuffleEnabled, repeatEnabled } = const {
usePlaybackQueue() currentSong,
const { setIsPlaying, skipNext, skipPrevious, toggleShuffle, cycleRepeat } = currentTime,
usePlaybackActions() duration,
isPlaying,
setIsPlaying,
seekTo,
skipNext,
skipPrevious,
shuffleEnabled,
repeatEnabled,
toggleShuffle,
cycleRepeat,
} = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume() const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const [scrubTime, setScrubTime] = useState<number | null>(null)
const [queueHeight, setQueueHeight] = useState(0) const [queueHeight, setQueueHeight] = useState(0)
const wideLayout = width >= 700 const wideLayout = width >= 700
const sideBySide = showQueue && wideLayout const sideBySide = showQueue && wideLayout
@@ -99,6 +113,7 @@ export function TabletNowPlaying({
opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]), opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
transform: [{ translateX: (1 - progress.value) * 48 }], transform: [{ translateX: (1 - progress.value) * 48 }],
})) }))
const time = scrubTime ?? currentTime
if (!currentSong || !config) return null if (!currentSong || !config) return null
const control = ( const control = (
label: string, label: string,
@@ -135,7 +150,7 @@ export function TabletNowPlaying({
return ( return (
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}> <Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
<StatusBar style={colors.isDark ? "light" : "dark"} /> <StatusBar style={colors.isDark ? "light" : "dark"} />
<GestureDetector gesture={dismissGestures.handle}> <GestureDetector gesture={dismissGesture()}>
<Pressable <Pressable
onPress={() => router.back()} onPress={() => router.back()}
accessibilityRole="button" accessibilityRole="button"
@@ -149,7 +164,7 @@ export function TabletNowPlaying({
</GestureDetector> </GestureDetector>
<View style={styles.body}> <View style={styles.body}>
<Animated.View style={[styles.main, mainMotion]}> <Animated.View style={[styles.main, mainMotion]}>
<GestureDetector gesture={dismissGestures.artwork}> <GestureDetector gesture={dismissGesture()}>
<View style={styles.artworkArea}> <View style={styles.artworkArea}>
<Animated.View style={artworkMotion}> <Animated.View style={artworkMotion}>
<CoverImage <CoverImage
@@ -162,7 +177,31 @@ export function TabletNowPlaying({
</GestureDetector> </GestureDetector>
<Animated.View style={[styles.controls, controlsMotion]}> <Animated.View style={[styles.controls, controlsMotion]}>
<View style={styles.meta}>{metadata}</View> <View style={styles.meta}>{metadata}</View>
<PlayerProgress colors={colors} /> <PlayerSlider
accessibilityLabel="Playback position"
value={time}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.times}>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatDuration(time)}
</Text>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatRemainingDuration(time, duration).replace("-", "−")}
</Text>
</View>
<View style={styles.transport}> <View style={styles.transport}>
{control( {control(
"Shuffle", "Shuffle",
@@ -337,6 +376,12 @@ const styles = StyleSheet.create({
}, },
controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 }, controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
meta: { height: 48 }, meta: { height: 48 },
times: {
flexDirection: "row",
justifyContent: "space-between",
marginTop: -4,
},
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
transport: { transport: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
+1 -34
View File
@@ -1,19 +1,13 @@
import { useOpenSettings } from "@/hooks/use-open-settings" import { useOpenSettings } from "@/hooks/use-open-settings"
import { requireNativeView } from "expo" import { requireNativeView } from "expo"
import { useIsFocused, useRouter } from "expo-router" import { useIsFocused } from "expo-router"
import { useMemo } from "react"
import { Platform, type ViewProps } from "react-native" import { Platform, type ViewProps } from "react-native"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url" import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { tabPath } from "@/lib/app-navigation"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { playlistCoverUrl } from "@/lib/urls"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
const NativeSidebar = const NativeSidebar =
Platform.OS === "ios" Platform.OS === "ios"
? requireNativeView< ? requireNativeView<
@@ -22,39 +16,16 @@ const NativeSidebar =
initials: string initials: string
imageURL?: string imageURL?: string
active: boolean active: boolean
playlists: SidebarPlaylist[]
onProfilePress: () => void onProfilePress: () => void
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
} }
>("TabletSidebar") >("TabletSidebar")
: null : null
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
export function TabletSidebar() { export function TabletSidebar() {
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
const { config } = useServerConfig()
const imageUrl = useProfileImageUrl(user?.image) const imageUrl = useProfileImageUrl(user?.image)
const openSettings = useOpenSettings() const openSettings = useOpenSettings()
const router = useRouter()
const active = useIsFocused() 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 if (!NativeSidebar) return null
return ( return (
@@ -64,11 +35,7 @@ export function TabletSidebar() {
initials={initialsFromName(user?.name ?? "Me")} initials={initialsFromName(user?.name ?? "Me")}
imageURL={imageUrl} imageURL={imageUrl}
active={active} active={active}
playlists={playlists}
onProfilePress={openSettings} onProfilePress={openSettings}
onPlaylistPress={({ nativeEvent }) =>
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
}
/> />
) )
} }
+15 -2
View File
@@ -1,3 +1,4 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import { import {
ActivityIndicator, ActivityIndicator,
Platform, Platform,
@@ -73,8 +74,20 @@ export function Button({
<ActivityIndicator color={textColor} /> <ActivityIndicator color={textColor} />
) : ( ) : (
<View style={styles.buttonContent}> <View style={styles.buttonContent}>
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null} {icon ? (
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text> <PaletteIcon
tone={tint ? "accentForeground" : undefined}
name={icon}
size={18}
color={textColor}
/>
) : null}
<PaletteText
tone={tint ? "accentForeground" : undefined}
style={[styles.buttonText, { color: textColor }]}
>
{title}
</PaletteText>
</View> </View>
)} )}
</Pressable> </Pressable>
+1 -1
View File
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
{ artistId } { artistId }
) )
if (selectionRequestIdRef.current !== requestId) return if (selectionRequestIdRef.current !== requestId) return
setPendingSongIds(songIds.flat()) setPendingSongIds(songIds)
setOpen(true) setOpen(true)
} catch (error) { } catch (error) {
if (selectionRequestIdRef.current !== requestId) return if (selectionRequestIdRef.current !== requestId) return
+129 -38
View File
@@ -14,10 +14,14 @@ import {
useState, useState,
type PropsWithChildren, type PropsWithChildren,
} from "react" } from "react"
import { Platform } from "react-native" import { Platform, StyleSheet, type HostInstance } from "react-native"
import { import Reanimated, {
useSharedValue, useSharedValue,
useAnimatedStyle, useAnimatedStyle,
useAnimatedReaction,
useAnimatedRef,
setNativeProps,
processColor,
withTiming, withTiming,
type SharedValue, type SharedValue,
} from "react-native-reanimated" } from "react-native-reanimated"
@@ -25,17 +29,19 @@ import {
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette" import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
import { useIsDark, useThemeColors } from "@/lib/theme" import { useIsDark, useThemeColors } from "@/lib/theme"
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
selectedColor: string
}
type TabTheme = { type TabTheme = {
palette: CoverPalette palette: CoverPalette
colors: SharedValue<PaletteColors>
hasArtworkPalette: boolean hasArtworkPalette: boolean
tabletBackground: SharedValue<string>
setPalette: (palette: CoverPalette | null, owner: string) => void setPalette: (palette: CoverPalette | null, owner: string) => void
} }
const AndroidTabTheme = createContext<TabTheme | null>(null) const AndroidTabTheme = createContext<TabTheme | null>(null)
const isTablet = Platform.OS === "ios" && Platform.isPad
const sharesPalette = Platform.OS === "android" || isTablet
function useDefaultPalette() { function useDefaultPalette() {
const theme = useThemeColors() const theme = useThemeColors()
const isDark = useIsDark() const isDark = useIsDark()
@@ -54,37 +60,52 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
palette.foreground !== defaultPalette.foreground || palette.foreground !== defaultPalette.foreground ||
palette.secondaryForeground !== defaultPalette.secondaryForeground || palette.secondaryForeground !== defaultPalette.secondaryForeground ||
palette.accent !== defaultPalette.accent palette.accent !== defaultPalette.accent
const tabletBackground = useSharedValue(defaultPalette.background) const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
const animatedColors = useSharedValue<PaletteColors>({
...defaultColors,
selectedColor: defaultPalette.accentText,
})
useLayoutEffect(() => { useLayoutEffect(() => {
if (!isTablet) return const { isDark: _isDark, ...colors } = palette
tabletBackground.value = withTiming(palette.background, { animatedColors.value = withTiming(
duration: TABLET_FADE_MS, {
}) ...colors,
}, [tabletBackground, palette.background]) selectedColor: hasArtwork
? palette.foreground
: defaultPalette.accentText,
},
{ duration: PALETTE_FADE_MS }
)
}, [animatedColors, palette, defaultPalette, hasArtwork])
const paletteOwner = useRef<string | null>(null) const paletteOwner = useRef<string | null>(null)
const setPalette = useCallback( const setPalette = useCallback(
(palette: CoverPalette | null, owner: string) => { (palette: CoverPalette | null, owner: string) => {
if (!palette && paletteOwner.current !== owner) return if (!palette && paletteOwner.current !== owner) return
paletteOwner.current = palette ? owner : null paletteOwner.current = palette ? owner : null
if (isTablet) { // Start on the UI thread immediately. React may defer commits while
// React may defer commits while the iPad stack is animating. // the native stack is animating, including transitionStart state updates.
tabletBackground.value = withTiming( const target = palette ?? defaultPalette
(palette ?? defaultPalette).background, const { isDark: _isDark, ...colors } = target
{ duration: TABLET_FADE_MS } animatedColors.value = withTiming(
) {
} ...colors,
selectedColor: palette ? target.foreground : target.accentText,
},
{ duration: PALETTE_FADE_MS }
)
setScreen(palette ? { palette, owner } : null) setScreen(palette ? { palette, owner } : null)
}, },
[tabletBackground, defaultPalette] [animatedColors, defaultPalette]
) )
const artworkPalette = hasArtwork ? palette : null
const value = useMemo( const value = useMemo(
() => ({ () => ({
palette: hasArtwork ? palette : defaultPalette, palette: artworkPalette ?? defaultPalette,
hasArtworkPalette: hasArtwork, colors: animatedColors,
tabletBackground, hasArtworkPalette: artworkPalette !== null,
setPalette, setPalette,
}), }),
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground] [defaultPalette, artworkPalette, setPalette, animatedColors]
) )
return ( return (
<AndroidTabTheme.Provider value={value}> <AndroidTabTheme.Provider value={value}>
@@ -93,6 +114,50 @@ 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() { export function useAndroidTabPalette() {
const theme = useContext(AndroidTabTheme) const theme = useContext(AndroidTabTheme)
const defaultPalette = useDefaultPalette() const defaultPalette = useDefaultPalette()
@@ -103,29 +168,53 @@ export function useAndroidTabHasArtworkPalette() {
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
} }
/** iPad fades the sidebar and content pane together; other layouts skip it. */ export function useAndroidTabBackgroundStyle() {
export function useTabletBackgroundStyle() { const theme = useContext(AndroidTabTheme)
const background = useContext(AndroidTabTheme)?.tabletBackground const fallback = useDefaultPalette().background
const colors = theme?.colors
return useAnimatedStyle(() => return useAnimatedStyle(() =>
isTablet && background ? { backgroundColor: background.value } : {} Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
? { backgroundColor: colors?.value.background ?? fallback }
: {}
) )
} }
const TABLET_FADE_MS = 400 /** Color tokens share the background's UI-thread timing. */
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
const colors = useContext(AndroidTabTheme)?.colors
return useAnimatedStyle(() =>
Platform.OS === "android" && tone && colors
? { color: colors.value[tone] }
: {}
)
}
/** /** Native headers draw this same UI-thread background as the page and bars. */
* Artwork screens always paint their own palette so it slides with the page. function AndroidArtworkBackground() {
* Shared chrome (tab bar, mini player) switches when the transition starts. const style = useAndroidTabBackgroundStyle()
*/ return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
}
export function renderAndroidArtworkBackground() {
return <AndroidArtworkBackground />
}
const PALETTE_FADE_MS = 400
/** The focused artwork screen selects the shared background for page and bars. */
export function useScreenPalette(palette: CoverPalette) { export function useScreenPalette(palette: CoverPalette) {
const isFocused = useIsFocused() 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 owner = useRoute().key
const navigation = const navigation =
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>() useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
const [laidOut, setLaidOut] = useState(false) const [laidOut, setLaidOut] = useState(false)
const [closing, setClosing] = useState(false) const [closing, setClosing] = useState(false)
const onLayout = useCallback(() => setLaidOut(true), []) const onLayout = useCallback(() => setLaidOut(true), [])
const setPalette = useContext(AndroidTabTheme)?.setPalette const theme = useContext(AndroidTabTheme)
const setPalette = theme?.setPalette
useLayoutEffect(() => { useLayoutEffect(() => {
if (!sharesPalette) return if (!sharesPalette) return
const start = navigation.addListener("transitionStart", ({ data }) => { const start = navigation.addListener("transitionStart", ({ data }) => {
@@ -141,18 +230,20 @@ export function useScreenPalette(palette: CoverPalette) {
start() start()
cancel() cancel()
} }
}, [navigation, setPalette, owner, palette]) }, [navigation, sharesPalette, setPalette, owner, palette])
const defaultPalette = useDefaultPalette()
const ready = laidOut || isTablet const ready = laidOut || isTablet
const backgroundStyle = useTabletBackgroundStyle() const target = isFocused && ready && !closing ? palette : defaultPalette
const backgroundStyle = useAndroidTabBackgroundStyle()
useLayoutEffect(() => { useLayoutEffect(() => {
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
setPalette(palette, owner) setPalette(palette, owner)
return () => setPalette(null, owner) return () => setPalette(null, owner)
}, [closing, ready, isFocused, owner, palette, setPalette]) }, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
return { return {
palette, palette: Platform.OS === "android" ? target : palette,
backgroundStyle, backgroundStyle,
onLayout: sharesPalette ? onLayout : undefined, onLayout: sharesPalette ? onLayout : undefined,
} }
-484
View File
@@ -1,484 +0,0 @@
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 { 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 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`
}
function DownloadQualitySheet({
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="slide"
transparent
onRequestClose={onClose}
>
<AndroidSheet>
<Pressable style={styles.overlay} onPress={onClose}>
<Pressable
style={[
styles.sheet,
{ backgroundColor: colors.card, borderColor: colors.border },
]}
onPress={(event) => event.stopPropagation()}
>
<View
style={[styles.grabber, { backgroundColor: colors.border }]}
/>
<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.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)
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)
toast(`Downloading ${target.title}`)
} else {
setPending({ target, response })
}
} catch (error) {
showError(error instanceof Error ? error.message : "Download failed")
}
},
[cacheScope, config, convex, 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)
},
[pending, queue]
)
const value = useMemo(
() => ({ queue, requestDownload, removeDownload }),
[queue, requestDownload, removeDownload]
)
return (
<DownloadsContext.Provider value={value}>
{children}
{queue ? <DownloadSync queue={queue} /> : null}
<DownloadQualitySheet
pending={pending}
onClose={() => setPending(null)}
onPick={handlePick}
/>
</DownloadsContext.Provider>
)
}
const styles = StyleSheet.create({
overlay: {
flex: 1,
backgroundColor: "rgba(0,0,0,0.45)",
justifyContent: "flex-end",
},
sheet: {
borderTopLeftRadius: 16,
borderTopRightRadius: 16,
borderWidth: 1,
paddingHorizontal: 16,
paddingTop: 8,
paddingBottom: 24,
},
grabber: {
width: 36,
height: 4,
borderRadius: 2,
alignSelf: "center",
marginBottom: 12,
},
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,
},
})
+145 -92
View File
@@ -12,28 +12,22 @@ import {
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import { favoriteOptimisticUpdates } from "@otunes/convex/client/favorites"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
/** /**
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a * `useMutation(...).withOptimisticUpdate(...)` with a stable identity. The
* module-level update so it does not change between renders. * update is captured on first render, so it must not close over render state.
*/ */
function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>( function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>(
mutation: Mutation, mutation: Mutation,
optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>> optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>>
): ReactMutation<Mutation> { ): ReactMutation<Mutation> {
const base = useMutation(mutation) const base = useMutation(mutation)
return useMemo( const updateRef = useRef(optimisticUpdate)
() => base.withOptimisticUpdate(optimisticUpdate), return useMemo(() => base.withOptimisticUpdate(updateRef.current), [base])
[base, optimisticUpdate]
)
} }
type FavoriteTables = { song: "songs"; album: "albums"; artist: "artists" }
export type FavoriteKind = keyof FavoriteTables
type FavoritesContextValue = { type FavoritesContextValue = {
isSongFavorite: (songId: string) => boolean isSongFavorite: (songId: string) => boolean
isAlbumFavorite: (albumId: string) => boolean isAlbumFavorite: (albumId: string) => boolean
@@ -42,20 +36,6 @@ type FavoritesContextValue = {
toggleAlbumFavorite: (albumId: Id<"albums">) => Promise<void> toggleAlbumFavorite: (albumId: Id<"albums">) => Promise<void>
toggleArtistFavorite: (artistId: Id<"artists">) => Promise<void> toggleArtistFavorite: (artistId: Id<"artists">) => Promise<void>
favoriteSongs: (songIds: Id<"songs">[]) => 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) const FavoritesContext = createContext<FavoritesContextValue | null>(null)
@@ -72,114 +52,191 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
const favorites = useCachedQuery(api.favorites.getUserFavorites) const favorites = useCachedQuery(api.favorites.getUserFavorites)
const favoriteSong = useOptimisticMutation( const favoriteSong = useOptimisticMutation(
api.favorites.favoriteSong, api.favorites.favoriteSong,
favoriteOptimisticUpdates.favoriteSong (store, { songId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current || current.favoriteSongs.includes(songId)) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteSongs: [...current.favoriteSongs, songId],
}
)
}
) )
const unfavoriteSong = useOptimisticMutation( const unfavoriteSong = useOptimisticMutation(
api.favorites.unfavoriteSong, api.favorites.unfavoriteSong,
favoriteOptimisticUpdates.unfavoriteSong (store, { songId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteSongs: current.favoriteSongs.filter((id) => id !== songId),
}
)
}
) )
const favoriteAlbum = useOptimisticMutation( const favoriteAlbum = useOptimisticMutation(
api.favorites.favoriteAlbum, api.favorites.favoriteAlbum,
favoriteOptimisticUpdates.favoriteAlbum (store, { albumId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current || current.favoriteAlbums.includes(albumId)) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteAlbums: [...current.favoriteAlbums, albumId],
}
)
}
) )
const unfavoriteAlbum = useOptimisticMutation( const unfavoriteAlbum = useOptimisticMutation(
api.favorites.unfavoriteAlbum, api.favorites.unfavoriteAlbum,
favoriteOptimisticUpdates.unfavoriteAlbum (store, { albumId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteAlbums: current.favoriteAlbums.filter((id) => id !== albumId),
}
)
}
) )
const favoriteArtist = useOptimisticMutation( const favoriteArtist = useOptimisticMutation(
api.favorites.favoriteArtist, api.favorites.favoriteArtist,
favoriteOptimisticUpdates.favoriteArtist (store, { artistId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current || current.favoriteArtists.includes(artistId)) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteArtists: [...current.favoriteArtists, artistId],
}
)
}
) )
const unfavoriteArtist = useOptimisticMutation( const unfavoriteArtist = useOptimisticMutation(
api.favorites.unfavoriteArtist, api.favorites.unfavoriteArtist,
favoriteOptimisticUpdates.unfavoriteArtist (store, { artistId }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteArtists: current.favoriteArtists.filter(
(id) => id !== artistId
),
}
)
}
) )
const favoriteSongsMutation = useOptimisticMutation( const favoriteSongsMutation = useOptimisticMutation(
api.favorites.favoriteSongs, api.favorites.favoriteSongs,
favoriteOptimisticUpdates.favoriteSongs (store, { songIds }) => {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
favoriteSongs: [...new Set([...current.favoriteSongs, ...songIds])],
}
)
}
) )
const songIds = useMemo( const songIds = useMemo(
() => new Set<string>(favorites?.favoriteSongs.flat()), () => new Set(favorites?.favoriteSongs.map(String) ?? []),
[favorites?.favoriteSongs] [favorites?.favoriteSongs]
) )
const albumIds = useMemo( const albumIds = useMemo(
() => new Set<string>(favorites?.favoriteAlbums.flat()), () => new Set(favorites?.favoriteAlbums.map(String) ?? []),
[favorites?.favoriteAlbums] [favorites?.favoriteAlbums]
) )
const artistIds = useMemo( const artistIds = useMemo(
() => new Set<string>(favorites?.favoriteArtists.flat()), () => new Set(favorites?.favoriteArtists.map(String) ?? []),
[favorites?.favoriteArtists] [favorites?.favoriteArtists]
) )
const idsRef = useRef({ songIds, albumIds, artistIds }) const idsRef = useRef({ songIds, albumIds, artistIds })
idsRef.current = { songIds, albumIds, artistIds } idsRef.current = { songIds, albumIds, artistIds }
const setFavorite = useCallback( const toggleSongFavorite = useCallback(
async <Kind extends FavoriteKind>( async (songId: Id<"songs">) => {
kind: Kind, try {
id: Id<FavoriteTables[Kind]>, if (idsRef.current.songIds.has(songId)) {
favorite: boolean await unfavoriteSong({ songId })
) => { } else {
if (kind === "song") { await favoriteSong({ songId })
const songId = id as Id<"songs"> }
await (favorite ? favoriteSong : unfavoriteSong)({ songId }) } catch (error) {
} else if (kind === "album") { showError(
const albumId = id as Id<"albums"> error instanceof Error ? error.message : "Failed to update favorites"
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( const toggleAlbumFavorite = useCallback(
(albumId: Id<"albums">) => async (albumId: Id<"albums">) => {
setFavorite( try {
"album", if (idsRef.current.albumIds.has(albumId)) {
albumId, await unfavoriteAlbum({ albumId })
!idsRef.current.albumIds.has(albumId) } else {
).catch(showFavoritesError), await favoriteAlbum({ albumId })
[setFavorite] }
} catch (error) {
showError(
error instanceof Error ? error.message : "Failed to update favorites"
)
}
},
[favoriteAlbum, unfavoriteAlbum]
) )
const toggleArtistFavorite = useCallback( const toggleArtistFavorite = useCallback(
(artistId: Id<"artists">) => async (artistId: Id<"artists">) => {
setFavorite( try {
"artist", if (idsRef.current.artistIds.has(artistId)) {
artistId, await unfavoriteArtist({ artistId })
!idsRef.current.artistIds.has(artistId) } else {
).catch(showFavoritesError), await favoriteArtist({ artistId })
[setFavorite] }
) } catch (error) {
showError(
const addFavoriteSongs = useCallback( error instanceof Error ? error.message : "Failed to update favorites"
async (ids: Id<"songs">[]) => { )
const unique = [...new Set(ids)] }
if (unique.length > 0) await favoriteSongsMutation({ songIds: unique })
}, },
[favoriteSongsMutation] [favoriteArtist, unfavoriteArtist]
) )
const favoriteSongs = useCallback( const favoriteSongs = useCallback(
(ids: Id<"songs">[]) => addFavoriteSongs(ids).catch(showFavoritesError), async (ids: Id<"songs">[]) => {
[addFavoriteSongs] const unique = [...new Set(ids)]
if (unique.length === 0) return
try {
await favoriteSongsMutation({ songIds: unique })
} catch (error) {
showError(
error instanceof Error ? error.message : "Failed to update favorites"
)
}
},
[favoriteSongsMutation]
) )
const value = useMemo( const value = useMemo(
@@ -191,8 +248,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
toggleAlbumFavorite, toggleAlbumFavorite,
toggleArtistFavorite, toggleArtistFavorite,
favoriteSongs, favoriteSongs,
setFavorite,
addFavoriteSongs,
}), }),
[ [
songIds, songIds,
@@ -202,8 +257,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
toggleAlbumFavorite, toggleAlbumFavorite,
toggleArtistFavorite, toggleArtistFavorite,
favoriteSongs, favoriteSongs,
setFavorite,
addFavoriteSongs,
] ]
) )
+15 -1
View File
@@ -1,5 +1,4 @@
import { useAuthToken } from "@convex-dev/auth/react" import { useAuthToken } from "@convex-dev/auth/react"
import { userIdFromToken } from "@otunes/convex/client/auth-token"
import { createContext, useContext, useMemo, type ReactNode } from "react" import { createContext, useContext, useMemo, type ReactNode } from "react"
import { loadPersistentCache } from "@/lib/persistent-cache" import { loadPersistentCache } from "@/lib/persistent-cache"
@@ -10,6 +9,21 @@ const CacheScopeContext = createContext(ANONYMOUS_CACHE_SCOPE)
void loadPersistentCache() 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. */ /** Namespaces persisted client data by server and signed-in user. */
export function PersistentCacheProvider({ export function PersistentCacheProvider({
serverUrl, serverUrl,
+45 -44
View File
@@ -24,7 +24,6 @@ import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
import * as playbackQueue from "@otunes/convex/client/playback-queue" import * as playbackQueue from "@otunes/convex/client/playback-queue"
import type { RepeatMode } from "@otunes/convex/client/playback-queue" import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import { getPlaybackStore } from "@otunes/convex/client/playback-store" import { getPlaybackStore } from "@otunes/convex/client/playback-store"
import { isDownloadsQueueOrigin } from "@otunes/convex/download-quality"
import { rememberSongs, useSong, useSongs } from "@/lib/song-cache" import { rememberSongs, useSong, useSongs } from "@/lib/song-cache"
import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents" import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
@@ -44,9 +43,8 @@ type PlaybackContextValue = {
seekTo: (seconds: number) => void seekTo: (seconds: number) => void
waitForPlaybackReady: (playing?: boolean) => Promise<void> waitForPlaybackReady: (playing?: boolean) => Promise<void>
setIsPlaying: (playing: boolean) => void setIsPlaying: (playing: boolean) => void
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */ playInOrder: (songIds: Id<"songs">[]) => Promise<void>
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void> playShuffled: (songIds: Id<"songs">[]) => Promise<void>
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void> addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void> addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
playFromSong: ( playFromSong: (
@@ -99,8 +97,6 @@ type PlaybackContextValue = {
type PlaybackActionsValue = Pick< type PlaybackActionsValue = Pick<
PlaybackContextValue, PlaybackContextValue,
| "seekTo"
| "waitForPlaybackReady"
| "setIsPlaying" | "setIsPlaying"
| "playInOrder" | "playInOrder"
| "playShuffled" | "playShuffled"
@@ -140,11 +136,6 @@ type PlaybackQueueValue = Pick<
| "repeatEnabled" | "repeatEnabled"
> >
type PlaybackProgressValue = Pick<
PlaybackContextValue,
"currentTime" | "duration"
>
type CollectionPlayers = Pick< type CollectionPlayers = Pick<
PlaybackActionsValue, PlaybackActionsValue,
| "playAlbum" | "playAlbum"
@@ -166,17 +157,14 @@ type CollectionPlay = {
recorded: RecordedPlay recorded: RecordedPlay
} }
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
const PlaybackActionsContext = createContext<PlaybackActionsValue | null>(null) const PlaybackActionsContext = createContext<PlaybackActionsValue | null>(null)
const PlaybackQueueContext = createContext<PlaybackQueueValue | null>(null) const PlaybackQueueContext = createContext<PlaybackQueueValue | null>(null)
const PlaybackProgressContext = createContext<PlaybackProgressValue | null>(
null
)
/** Ticks while audio plays. Keep consumers small (slider and time labels). */ export function usePlayback() {
export function usePlaybackProgress() { const context = useContext(PlaybackContext)
const context = useContext(PlaybackProgressContext)
if (!context) { if (!context) {
throw new Error("usePlaybackProgress must be used within PlaybackProvider") throw new Error("usePlayback must be used within PlaybackProvider")
} }
return context return context
} }
@@ -247,8 +235,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const queueOriginRef = useRef<string | undefined>(undefined) const queueOriginRef = useRef<string | undefined>(undefined)
const playRequestRef = useRef(0) const playRequestRef = useRef(0)
const [queueStartVersion, setQueueStartVersion] = useState(0) const [queueStartVersion, setQueueStartVersion] = useState(0)
// Queues started from the Downloads page play downloads in any quality.
const [fromDownloads, setFromDownloads] = useState(false)
const queueSongIds = playback.queue const queueSongIds = playback.queue
const queueHistorySongIds = playback.history const queueHistorySongIds = playback.history
@@ -284,7 +270,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
repeatEnabled, repeatEnabled,
currentSong, currentSong,
queueStartVersion, queueStartVersion,
fromDownloads,
}) })
const { resetProgress } = useProgressPersistence({ const { resetProgress } = useProgressPersistence({
@@ -315,7 +300,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
queueOriginRef.current = queueOriginRef.current =
recorded.origin ?? recorded.origin ??
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined) (recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
resetQueuePlayback() resetQueuePlayback()
store.update(playbackQueue.clearQueue) store.update(playbackQueue.clearQueue)
store.update(recipe) store.update(recipe)
@@ -369,11 +353,10 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
) )
const playSongs = useCallback( const playSongs = useCallback(
(shuffled: boolean) => async (songIds: Id<"songs">[], origin?: string) => { (shuffled: boolean) => async (songIds: Id<"songs">[]) => {
if (songIds.length === 0) return if (songIds.length === 0) return
startPlayback( startPlayback((state) =>
(state) => playbackQueue.startQueue(state, songIds, shuffled), playbackQueue.startQueue(state, songIds, shuffled)
{ origin }
) )
}, },
[startPlayback] [startPlayback]
@@ -408,7 +391,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope, cacheScope,
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId } { artistId }
).then((chunks) => chunks.flat()), ),
recorded: { entity: { kind: "artist", id: artistId } }, recorded: { entity: { kind: "artist", id: artistId } },
})) }))
const playlist = collection( const playlist = collection(
@@ -489,14 +472,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[] let songIds: Id<"songs">[]
try { try {
songIds = ( songIds = await fetchCachedQuery(
await fetchCachedQuery( convex,
convex, cacheScope,
cacheScope, api.library.browseSortedSongIds,
api.library.browseSortedSongIds, sort
sort )
)
).flat()
} catch { } catch {
return return
} }
@@ -650,8 +631,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const actionsValue = useMemo<PlaybackActionsValue>( const actionsValue = useMemo<PlaybackActionsValue>(
() => ({ () => ({
seekTo,
waitForPlaybackReady,
...collectionPlayers, ...collectionPlayers,
setIsPlaying, setIsPlaying,
playInOrder, playInOrder,
@@ -692,14 +671,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playInOrder, playInOrder,
playShuffled, playShuffled,
reorderQueue, reorderQueue,
seekTo,
setIsPlaying, setIsPlaying,
skipNext, skipNext,
skipPrevious, skipPrevious,
skipToHistoryIndex, skipToHistoryIndex,
skipToQueueIndex, skipToQueueIndex,
toggleShuffle, toggleShuffle,
waitForPlaybackReady,
] ]
) )
@@ -724,17 +701,41 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
] ]
) )
const progressValue = useMemo<PlaybackProgressValue>( const value = useMemo<PlaybackContextValue>(
() => ({ currentTime, duration }), () => ({
[currentTime, duration] ...actionsValue,
waitForPlaybackReady,
queueSongIds,
queueHistorySongIds,
currentSong,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled,
isPlaying: isPlaybackActive,
currentTime,
duration,
seekTo,
}),
[
actionsValue,
waitForPlaybackReady,
currentSong,
currentTime,
duration,
isPlaybackActive,
playback.shuffleEnabled,
queueHistorySongIds,
queueSongIds,
repeatEnabled,
seekTo,
]
) )
return ( return (
<PlaybackActionsContext.Provider value={actionsValue}> <PlaybackActionsContext.Provider value={actionsValue}>
<PlaybackQueueContext.Provider value={queueValue}> <PlaybackQueueContext.Provider value={queueValue}>
<PlaybackProgressContext.Provider value={progressValue}> <PlaybackContext.Provider value={value}>
{children} {children}
</PlaybackProgressContext.Provider> </PlaybackContext.Provider>
</PlaybackQueueContext.Provider> </PlaybackQueueContext.Provider>
</PlaybackActionsContext.Provider> </PlaybackActionsContext.Provider>
) )
+2 -12
View File
@@ -83,11 +83,7 @@ export function createCoverPaletteSource<Swatches>({
const [waitedKey, setWaitedKey] = useState<string | null>(null) const [waitedKey, setWaitedKey] = useState<string | null>(null)
const swatches = const swatches =
resolved.key === key resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
? resolved.swatches
: key
? cachedSwatches(key)
: null
useEffect(() => { useEffect(() => {
if (!key || hasCover === false) return if (!key || hasCover === false) return
@@ -138,13 +134,7 @@ export function createCoverPaletteSource<Swatches>({
} }
} }
/** Forget in-memory swatches so covers are re-extracted. */ return { prefetch, usePalette }
function clear() {
swatchesByKey.clear()
pending.clear()
}
return { prefetch, usePalette, clear }
} }
function sameSwatches(a: unknown, b: unknown) { function sameSwatches(a: unknown, b: unknown) {
-12
View File
@@ -3,7 +3,6 @@ import {
type CoverPaletteResult, type CoverPaletteResult,
} from "@/hooks/cover-palette-source" } from "@/hooks/cover-palette-source"
import { import {
clearLegacyCoverPaletteCache,
prefetchLegacyCoverPalette, prefetchLegacyCoverPalette,
useLegacyCoverPalette, useLegacyCoverPalette,
} from "@/hooks/use-legacy-cover-palette" } from "@/hooks/use-legacy-cover-palette"
@@ -13,7 +12,6 @@ import {
} from "@/lib/artwork-color-preference" } from "@/lib/artwork-color-preference"
import { extractCoverSwatches } from "@/lib/artwork-colors" import { extractCoverSwatches } from "@/lib/artwork-colors"
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette" import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
import { clearCachePrefix } from "@/lib/persistent-cache"
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source" export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
@@ -23,16 +21,6 @@ const region = createCoverPaletteSource<CoverSwatches>({
derive: (swatches) => deriveCoverPalette(swatches), derive: (swatches) => deriveCoverPalette(swatches),
}) })
/**
* 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. */ /** Warm visible artwork colors before a detail page is pushed. */
export function prefetchCoverPalette(uri: string) { export function prefetchCoverPalette(uri: string) {
void loadArtworkColorsEnabled().then((enabled) => void loadArtworkColorsEnabled().then((enabled) =>
@@ -65,5 +65,3 @@ export const prefetchLegacyCoverPalette = legacy.prefetch
/** `react-native-image-colors` pipeline used when new artwork colors are off. */ /** `react-native-image-colors` pipeline used when new artwork colors are off. */
export const useLegacyCoverPalette = legacy.usePalette export const useLegacyCoverPalette = legacy.usePalette
export const clearLegacyCoverPaletteCache = legacy.clear
+4 -70
View File
@@ -2,9 +2,7 @@ import { useConvex } from "convex/react"
import { useCallback } from "react" import { useCallback } from "react"
import type { MediaAction } from "@/components/media-context-menu" 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 { useAddToPlaylist } from "@/contexts/add-to-playlist"
import { useDownloads } from "@/contexts/downloads"
import { useCacheScope } from "@/contexts/persistent-cache" import { useCacheScope } from "@/contexts/persistent-cache"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback" import { usePlaybackActions } from "@/contexts/playback"
@@ -50,7 +48,6 @@ export function useMediaMenuActions() {
} = useFavorites() } = useFavorites()
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } = const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlaybackActions() usePlaybackActions()
const { requestDownload, removeDownload } = useDownloads()
const runQueueAction = useCallback( const runQueueAction = useCallback(
async (action: MediaAction, songIds: Id<"songs">[]) => { async (action: MediaAction, songIds: Id<"songs">[]) => {
@@ -74,9 +71,8 @@ export function useMediaMenuActions() {
[addToQueueLast, addToQueueNext, playShuffled] [addToQueueLast, addToQueueNext, playShuffled]
) )
/** `from` limits removing a download to that album, playlist, or Other. */
const handleSongAction = useCallback( const handleSongAction = useCallback(
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => { async (song: BrowseSong, action: MediaAction) => {
const songIds = [song.id as Id<"songs">] const songIds = [song.id as Id<"songs">]
switch (action) { switch (action) {
case "create-station": case "create-station":
@@ -101,19 +97,6 @@ export function useMediaMenuActions() {
case "go-album": case "go-album":
push(`/album/${song.album.id}`) push(`/album/${song.album.id}`)
break 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: default:
break break
} }
@@ -124,8 +107,6 @@ export function useMediaMenuActions() {
runQueueAction, runQueueAction,
toggleSongFavorite, toggleSongFavorite,
playArtistShuffled, playArtistShuffled,
requestDownload,
removeDownload,
] ]
) )
@@ -157,25 +138,6 @@ export function useMediaMenuActions() {
case "go-artist": case "go-artist":
push(`/artist/${album.artist.id}`) push(`/artist/${album.artist.id}`)
break 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: default:
break break
} }
@@ -189,8 +151,6 @@ export function useMediaMenuActions() {
push, push,
runQueueAction, runQueueAction,
toggleAlbumFavorite, toggleAlbumFavorite,
requestDownload,
removeDownload,
] ]
) )
@@ -213,7 +173,7 @@ export function useMediaMenuActions() {
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> } { artistId: artist.id as Id<"artists"> }
) )
await runQueueAction(action, songIds.flat()) await runQueueAction(action, songIds)
break break
} }
default: default:
@@ -251,38 +211,12 @@ export function useMediaMenuActions() {
await runQueueAction(action, songIds) await runQueueAction(action, songIds)
break 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: default:
break break
} }
}) })
}, },
[ [convex, cacheScope, openAddPlaylistToPlaylist, runQueueAction]
convex,
cacheScope,
openAddPlaylistToPlaylist,
runQueueAction,
requestDownload,
removeDownload,
]
) )
const handleAlbumDetailAction = useCallback( const handleAlbumDetailAction = useCallback(
@@ -331,7 +265,7 @@ export function useMediaMenuActions() {
cover: album.cover, cover: album.cover,
}, },
} }
await handleSongAction(song, action, { kind: "album", id: album.id }) await handleSongAction(song, action)
}, },
[handleSongAction] [handleSongAction]
) )
+21 -41
View File
@@ -1,4 +1,4 @@
import { atmosEnabled } from "@/lib/playback-capabilities" import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { import {
createAudioPlaylist, createAudioPlaylist,
setAudioModeAsync, setAudioModeAsync,
@@ -18,12 +18,10 @@ import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import { playbackStreamPlan } from "@otunes/convex/playback-stream" import { playbackStreamPlan } from "@otunes/convex/playback-stream"
import { streamDownloadQuality } from "@otunes/convex/download-quality"
import * as playbackQueue from "@otunes/convex/client/playback-queue" import * as playbackQueue from "@otunes/convex/client/playback-queue"
import type { RepeatMode } 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 type { PlaybackStore } from "@otunes/convex/client/playback-store"
import { getAuthCookieHeader } from "@/lib/auth-cookies" import { getAuthCookieHeader } from "@/lib/auth-cookies"
import { downloadedAudioUri, downloadQueueFor } from "@/lib/downloads"
import { loadPlaybackSongs } from "@/lib/playback-files" import { loadPlaybackSongs } from "@/lib/playback-files"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
import { albumCoverUrl, songAudioSource } from "@/lib/urls" import { albumCoverUrl, songAudioSource } from "@/lib/urls"
@@ -73,7 +71,6 @@ export function useNativePlaylistSync({
repeatEnabled, repeatEnabled,
currentSong, currentSong,
queueStartVersion, queueStartVersion,
fromDownloads,
}: { }: {
store: PlaybackStore store: PlaybackStore
queueSongIds: Id<"songs">[] queueSongIds: Id<"songs">[]
@@ -81,8 +78,6 @@ export function useNativePlaylistSync({
repeatEnabled: RepeatMode repeatEnabled: RepeatMode
currentSong: BrowseSong | null currentSong: BrowseSong | null
queueStartVersion: number queueStartVersion: number
/** Plays downloads in any quality, for queues started from Downloads. */
fromDownloads: boolean
}) { }) {
const convex = useConvex() const convex = useConvex()
const { config } = useServerConfig() const { config } = useServerConfig()
@@ -118,8 +113,6 @@ export function useNativePlaylistSync({
measuredDuration > 0 measuredDuration > 0
? measuredDuration ? measuredDuration
: (currentSong?.durationSeconds ?? 0) : (currentSong?.durationSeconds ?? 0)
const durationRef = useRef(duration)
durationRef.current = duration
const queueSyncKey = useMemo( const queueSyncKey = useMemo(
() => JSON.stringify(queueSongIds), () => JSON.stringify(queueSongIds),
[queueSongIds] [queueSongIds]
@@ -139,7 +132,11 @@ export function useNativePlaylistSync({
]) ])
: "" : ""
const userPlaybackKey = user const userPlaybackKey = user
? JSON.stringify([user._id, user.playbackQuality, atmosEnabled(user)]) ? JSON.stringify([
user._id,
user.playbackQuality,
dolbyAtmosSupported && (user.preferAtmos ?? false),
])
: "" : ""
const settleWaiters = useCallback(() => { const settleWaiters = useCallback(() => {
@@ -416,17 +413,18 @@ export function useNativePlaylistSync({
[startPlayer] [startPlayer]
) )
// Reads duration from a ref so seekTo, and every action built on it, stays const seekTo = useCallback(
// stable across track changes. async (seconds: number) => {
const seekTo = useCallback(async (seconds: number) => { const playlist = playlistRef.current
const playlist = playlistRef.current if (!playlist) return
if (!playlist) return const maxDuration = playlist.duration || duration || 0
const maxDuration = playlist.duration || durationRef.current || 0 const clamped = Math.max(0, Math.min(seconds, maxDuration))
const clamped = Math.max(0, Math.min(seconds, maxDuration)) await playlist.seekTo(clamped)
await playlist.seekTo(clamped) currentTimeRef.current = clamped
currentTimeRef.current = clamped setCurrentTime(clamped)
setCurrentTime(clamped) },
}, []) [duration]
)
const handlePlaybackLoadFailure = useCallback(() => { const handlePlaybackLoadFailure = useCallback(() => {
autoPlayNextRef.current = false autoPlayNextRef.current = false
@@ -464,7 +462,7 @@ export function useNativePlaylistSync({
} }
if (!isCurrentLoad()) return if (!isCurrentLoad()) return
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${fromDownloads}:${cookieHeader}` const loadKey = `${user.playbackQuality}:${dolbyAtmosSupported && (user.preferAtmos ?? false)}:${cookieHeader}`
const needsRebuild = const needsRebuild =
loadedLoadKeyRef.current !== loadKey || loadedLoadKeyRef.current !== loadKey ||
nativePlaylistNeedsRebuild( nativePlaylistNeedsRebuild(
@@ -498,32 +496,15 @@ export function useNativePlaylistSync({
} }
const buildSources = async (songIds: Id<"songs">[]) => { const buildSources = async (songIds: Id<"songs">[]) => {
const [songs] = await Promise.all([ const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
loadPlaybackSongs(convex, cacheScope, songIds),
downloadQueueFor(config)
.load()
.catch(() => {}),
])
const sources = new Map<Id<"songs">, AudioSource>() const sources = new Map<Id<"songs">, AudioSource>()
for (const song of songs) { for (const song of songs) {
if (!song) return null if (!song) return null
const plan = playbackStreamPlan( const plan = playbackStreamPlan(
song.files, song.files,
user.playbackQuality, user.playbackQuality,
atmosEnabled(user) dolbyAtmosSupported && (user.preferAtmos ?? false)
) )
// 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( sources.set(
song.id, song.id,
songAudioSource( songAudioSource(
@@ -650,7 +631,6 @@ export function useNativePlaylistSync({
currentSongId, currentSongId,
currentSongSyncKey, currentSongSyncKey,
destroyPlaylist, destroyPlaylist,
fromDownloads,
ensurePlaylist, ensurePlaylist,
handlePlaybackLoadFailure, handlePlaybackLoadFailure,
historySyncKey, historySyncKey,
-35
View File
@@ -5,7 +5,6 @@ import { publishMusicCatalog } from "@/lib/app-intents"
export const FAVORITES_PLAYLIST_ID = "otunes:favorites" export const FAVORITES_PLAYLIST_ID = "otunes:favorites"
const HANDLED_KEY = "otunes:handled-app-intents" const HANDLED_KEY = "otunes:handled-app-intents"
const CATALOG_CURSORS_KEY = "otunes:app-intent-catalog-cursors"
const MAX_HANDLED = 200 const MAX_HANDLED = 200
const CATALOG_KINDS = [ const CATALOG_KINDS = [
@@ -21,7 +20,6 @@ export async function clearAppIntentCatalogs() {
return return
} }
const results = await Promise.allSettled([ const results = await Promise.allSettled([
AsyncStorage.removeItem(CATALOG_CURSORS_KEY),
AppIntents.deleteDonationsAsync({ intent: "playMusic" }), AppIntents.deleteDonationsAsync({ intent: "playMusic" }),
AppIntents.clearPendingInvocationsAsync(), AppIntents.clearPendingInvocationsAsync(),
...CATALOG_KINDS.map((kind) => publishMusicCatalog(kind, [])), ...CATALOG_KINDS.map((kind) => publishMusicCatalog(kind, [])),
@@ -30,39 +28,6 @@ export async function clearAppIntentCatalogs() {
if (failed?.status === "rejected") throw failed.reason 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() { export async function loadHandledIntentIds() {
const raw = await AsyncStorage.getItem(HANDLED_KEY) const raw = await AsyncStorage.getItem(HANDLED_KEY)
if (!raw) { if (!raw) {
-7
View File
@@ -50,13 +50,6 @@ export function publishMusicCatalog(kind: string, entities: AppIntentEntity[]) {
return write 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( export async function completeMusicInvocation(
token: string, token: string,
error: string | null error: string | null
+4 -1
View File
@@ -1,6 +1,9 @@
import { ConvexError, type Value } from "convex/values" import { ConvexError, type Value } from "convex/values"
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"]) const AUTH_ERROR_MESSAGES = new Set([
"Not authenticated",
"User not logged in",
])
function matchesAuthMessage(message: string): boolean { function matchesAuthMessage(message: string): boolean {
if (AUTH_ERROR_MESSAGES.has(message)) { if (AUTH_ERROR_MESSAGES.has(message)) {
+1 -3
View File
@@ -37,9 +37,7 @@ export function authStorageKey(key: string, storageNamespace: string): string {
return `${key}_${escapedNamespace}` return `${key}_${escapedNamespace}`
} }
export async function clearStoredAuthTokens( export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
storageNamespace: string
): Promise<void> {
await Promise.all( await Promise.all(
AUTH_STORAGE_KEYS.map((key) => AUTH_STORAGE_KEYS.map((key) =>
secureRemoveItem(authStorageKey(key, storageNamespace)) secureRemoveItem(authStorageKey(key, storageNamespace))
-15
View File
@@ -1,15 +0,0 @@
import { useLocalSearchParams } from "expo-router"
export const OTHER_DOWNLOADS_TITLE = "Other Downloaded Songs"
/** Route param marking album and playlist screens opened from Downloads. */
export const FROM_DOWNLOADS_PARAM = "from=downloads"
/**
* True on album and playlist screens opened from Downloads, where playback
* uses the downloads whatever their quality.
*/
export function useOpenedFromDownloads() {
const { from } = useLocalSearchParams<{ from?: string }>()
return from === "downloads"
}
-229
View File
@@ -1,229 +0,0 @@
import AsyncStorage from "@react-native-async-storage/async-storage"
import { Directory, File, Paths } from "expo-file-system"
import { Platform } from "react-native"
import {
createDownloadQueue,
type DownloadedCover,
type DownloadedSong,
type DownloadIndex,
type DownloadQueue,
type DownloadStorage,
} from "@otunes/convex/client/download-queue"
import {
parseDownloadQuality,
songDownloadPath,
type DownloadQuality,
} from "@otunes/convex/download-quality"
import { getAuthCookieHeader } from "@/lib/auth-cookies"
import type { ServerConfig } from "@/lib/server-config"
const REMEMBERED_QUALITY_KEY = "otunes.download-quality"
const PARTIAL_SUFFIX = ".partial"
const COVERS_FOLDER = "covers"
const COVER_SIZE = 1024
// Each song is a folder named `<songId>.<quality>.<albumId>` holding one audio
// file, named by the server so it keeps the right extension. Folders end in
// `.partial` until their download completes. Covers are files named
// `<kind>-<id>` in the `covers` folder.
function serverDirectory(config: ServerConfig) {
const host = config.hostname.replace(/[^a-z0-9.-]/gi, "_")
return new Directory(Paths.document, "downloads", host)
}
function songFolderName(song: {
songId: string
quality: DownloadQuality
albumId?: string
}) {
return [song.songId, song.quality, song.albumId].filter(Boolean).join(".")
}
function parseSongFolder(name: string) {
const [songId, rawQuality, albumId, ...rest] = name.split(".")
const quality = parseDownloadQuality(rawQuality)
if (!songId || !quality || rest.length > 0) return null
return { songId, quality, albumId: albumId || undefined }
}
function songFolders(root: Directory) {
if (!root.exists) return []
return root
.list()
.filter(
(entry): entry is Directory =>
entry instanceof Directory && entry.name !== COVERS_FOLDER
)
}
function coverFileName({ kind, id }: DownloadedCover) {
return `${kind}-${id}`
}
// Saved covers by their server URL, for `downloadedCoverUri`.
const savedCoverUris = new Map<string, string>()
function coverUrl(config: ServerConfig, { kind, id }: DownloadedCover) {
return `${config.serverUrl}/api/${kind}/${id}/cover`
}
function audioFile(folder: Directory) {
return folder.list().find((entry): entry is File => entry instanceof File)
}
function createStorage(config: ServerConfig): DownloadStorage {
const root = serverDirectory(config)
const indexFile = new File(root, "index.json")
const coversFolder = new Directory(root, COVERS_FOLDER)
// Remembers the covers saved in earlier launches.
if (coversFolder.exists) {
for (const entry of coversFolder.list()) {
const dash = entry.name.indexOf("-")
const kind = entry.name.slice(0, dash)
if (entry instanceof File && (kind === "album" || kind === "playlist")) {
const cover = { kind, id: entry.name.slice(dash + 1) } as const
savedCoverUris.set(coverUrl(config, cover), entry.uri)
}
}
}
function foldersFor(songIds: ReadonlySet<string>) {
return songFolders(root).filter((folder) => {
const name = folder.name.replace(PARTIAL_SUFFIX, "")
const parsed = parseSongFolder(name)
return parsed !== null && songIds.has(parsed.songId)
})
}
return {
async list() {
const songs: DownloadedSong[] = []
for (const folder of songFolders(root)) {
const parsed = parseSongFolder(folder.name)
const file = parsed ? audioFile(folder) : undefined
if (!parsed || !file) {
// Interrupted downloads from an earlier launch.
folder.delete()
continue
}
songs.push({ ...parsed, bytes: file.size ?? 0 })
}
return songs
},
async save({ songId, requested, quality, albumId }, signal) {
const cookieHeader = await getAuthCookieHeader(
config.serverUrl,
config.convexUrl
)
if (!cookieHeader) throw new Error("Sign in to download")
root.create({ intermediates: true, idempotent: true })
const name = songFolderName({ songId, quality, albumId })
const partial = new Directory(root, `${name}${PARTIAL_SUFFIX}`)
if (partial.exists) partial.delete()
partial.create()
try {
const path = songDownloadPath(songId, requested, {
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
})
const file = await File.downloadFileAsync(
`${config.serverUrl}${path}`,
partial,
{ headers: { Cookie: cookieHeader }, signal }
)
signal.throwIfAborted()
partial.rename(name)
return file.size ?? 0
} catch (error) {
if (partial.exists) partial.delete()
throw error
}
},
async saveCover(cover) {
const file = new File(coversFolder, coverFileName(cover))
if (file.exists) return
coversFolder.create({ intermediates: true, idempotent: true })
const url = coverUrl(config, cover)
await File.downloadFileAsync(`${url}?size=${COVER_SIZE}`, file)
savedCoverUris.set(url, file.uri)
},
async pruneCovers(keep) {
if (!coversFolder.exists) return
const kept = new Set(keep.map(coverFileName))
for (const entry of coversFolder.list()) {
if (kept.has(entry.name)) continue
entry.delete()
for (const [url, uri] of savedCoverUris) {
if (uri === entry.uri) savedCoverUris.delete(url)
}
}
},
async readIndex() {
if (indexFile.exists) {
try {
return JSON.parse(await indexFile.text()) as DownloadIndex
} catch {
// An unreadable index starts empty.
}
}
return { collections: [], otherSongIds: [] }
},
async writeIndex(index) {
root.create({ intermediates: true, idempotent: true })
if (!indexFile.exists) indexFile.create()
await indexFile.write(JSON.stringify(index))
},
async remove(songIds) {
for (const folder of foldersFor(new Set(songIds))) folder.delete()
},
}
}
const queues = new Map<string, DownloadQueue>()
/** Downloads are kept per server, since song IDs only mean something there. */
export function downloadQueueFor(config: ServerConfig) {
let queue = queues.get(config.hostname)
if (!queue) {
queue = createDownloadQueue(createStorage(config))
queues.set(config.hostname, queue)
}
return queue
}
/** The local file for a downloaded song, for the player to use offline. */
export function downloadedAudioUri(config: ServerConfig, songId: string) {
const song = downloadQueueFor(config).getDownloaded(songId)
if (!song) return null
const folder = new Directory(serverDirectory(config), songFolderName(song))
return folder.exists ? (audioFile(folder)?.uri ?? null) : null
}
/**
* The saved copy of a cover URL (`albumCoverUrl` or `playlistCoverUrl`,
* without size), for showing while the network copy loads or fails.
*/
export function downloadedCoverUri(url: string) {
return savedCoverUris.get(url.split("?")[0]) ?? null
}
export async function readRememberedDownloadQuality() {
try {
return parseDownloadQuality(
await AsyncStorage.getItem(REMEMBERED_QUALITY_KEY)
)
} catch {
return undefined
}
}
/** Pass undefined to ask every time again. */
export async function writeRememberedDownloadQuality(
quality: DownloadQuality | undefined
) {
if (quality) await AsyncStorage.setItem(REMEMBERED_QUALITY_KEY, quality)
else await AsyncStorage.removeItem(REMEMBERED_QUALITY_KEY)
}
+1 -4
View File
@@ -5,10 +5,7 @@ export function formatDuration(seconds: number): string {
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}` return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
} }
export function formatRemainingDuration( export function formatRemainingDuration(current: number, total: number): string {
current: number,
total: number
): string {
const remaining = Math.max(0, Math.floor(total) - Math.floor(current)) const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
return `-${formatDuration(remaining)}` return `-${formatDuration(remaining)}`
} }
+5 -17
View File
@@ -79,9 +79,7 @@ export function deriveCoverPalette(
secondaryForeground: toHex(secondaryForeground), secondaryForeground: toHex(secondaryForeground),
accent: toHex(accent), accent: toHex(accent),
accentForeground: toHex(accentForeground), accentForeground: toHex(accentForeground),
accentText: toHex( accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
),
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)), surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)), divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
isDark: lightText, isDark: lightText,
@@ -96,10 +94,7 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
? withLightness(color, Math.min(lch.l, 0.86)) ? withLightness(color, Math.min(lch.l, 0.86))
: withLightness(color, Math.max(lch.l, 0.2)) : withLightness(color, Math.max(lch.l, 0.2))
const y = luminance(clamped) const y = luminance(clamped)
if ( if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
) {
return clamped return clamped
} }
@@ -130,10 +125,7 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
} }
function prefersLightText(background: Rgb) { function prefersLightText(background: Rgb) {
return ( return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
contrastRatio([255, 255, 255], background) >=
contrastRatio([0, 0, 0], background)
)
} }
/** Moves `color`'s lightness away from `background` until it reaches `min`. */ /** Moves `color`'s lightness away from `background` until it reaches `min`. */
@@ -188,10 +180,7 @@ function withLuminance(color: Rgb, target: number): Rgb {
high = mid high = mid
} }
} }
return withLightness( return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
color,
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
)
} }
/** `amount` of `color` over `base`. */ /** `amount` of `color` over `base`. */
@@ -217,8 +206,7 @@ function toLinear(channel: number) {
} }
function fromLinear(value: number) { function fromLinear(value: number) {
const c = const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
return c * 255 return c * 255
} }
+38 -7
View File
@@ -1,9 +1,40 @@
import type { MediaShareTarget } from "@otunes/convex/client/media-links" export type MediaShareContext = (
| { type: "album"; albumId: string }
| { type: "song"; albumId: string; songId: string }
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
| { type: "artist"; artistId: string }
) & { title: string }
export { export function shouldShowShare(
mediaShareUrl, share: MediaShareContext | undefined,
shouldShowShare, selectedCount: number
} from "@otunes/convex/client/media-links" ) {
if (!share) {
return false
}
if (share.type === "song") {
return selectedCount === 1
}
return true
}
/** A share target plus the title shown in the native share sheet. */ export function mediaShareUrl(
export type MediaShareContext = MediaShareTarget & { title: string } serverUrl: string,
share: MediaShareContext
): string {
const origin = serverUrl.replace(/\/+$/, "")
switch (share.type) {
case "album":
return `${origin}/album/${share.albumId}`
case "song":
return `${origin}/album/${share.albumId}?s=${share.songId}`
case "playlist":
if (share.isFavorites) {
return `${origin}/playlist/favorites`
}
return `${origin}/playlist/${share.playlistId}`
case "artist":
return `${origin}/artist/${share.artistId}`
}
}
+1 -3
View File
@@ -13,8 +13,6 @@ export const tabStackScreenTitles: Record<string, string> = {
"recently-played": "Recently Played", "recently-played": "Recently Played",
"recently-added": "Recently Added", "recently-added": "Recently Added",
settings: "Settings", settings: "Settings",
"downloads/index": "Downloads",
"downloads/other": "Other Downloaded Songs",
} }
export function useStackScreenOptions( export function useStackScreenOptions(
@@ -30,7 +28,7 @@ export function useStackScreenOptions(
headerBackButtonDisplayMode: "minimal", headerBackButtonDisplayMode: "minimal",
...(Platform.OS === "android" ...(Platform.OS === "android"
? { ? {
animation: "fade", animation: "slide_from_right",
headerLargeTitle: false, headerLargeTitle: false,
headerTransparent: false, headerTransparent: false,
headerStyle: { backgroundColor: theme.background }, headerStyle: { backgroundColor: theme.background },
-5
View File
@@ -2,8 +2,3 @@ import { Platform } from "react-native"
// Android Dolby decoder reports do not reliably indicate working Atmos playback. // Android Dolby decoder reports do not reliably indicate working Atmos playback.
export const dolbyAtmosSupported = Platform.OS === "ios" export const dolbyAtmosSupported = Platform.OS === "ios"
/** Whether to stream Atmos for this user: they opted in and the device can play it. */
export function atmosEnabled(user: { preferAtmos?: boolean }) {
return dolbyAtmosSupported && (user.preferAtmos ?? false)
}
+1 -4
View File
@@ -13,10 +13,7 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config" const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
function normalizeHostnameInput(input: string): string { function normalizeHostnameInput(input: string): string {
return input return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
.trim()
.replace(/^https?:\/\//i, "")
.replace(/\/+$/, "")
} }
function buildServerUrl(hostname: string): string { function buildServerUrl(hostname: string): string {
+4 -4
View File
@@ -5,10 +5,8 @@ import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import { import {
getCachedSong, getCachedSong,
getSongSnapshot,
getSongsVersion, getSongsVersion,
requestSongs, requestSongs,
songFromSnapshot,
subscribeSongs, subscribeSongs,
} from "@otunes/convex/client/song-cache" } from "@otunes/convex/client/song-cache"
import { isPersistentCacheLoaded } from "@/lib/persistent-cache" import { isPersistentCacheLoaded } from "@/lib/persistent-cache"
@@ -52,10 +50,12 @@ export function useSongs(songIds: readonly Id<"songs">[]) {
*/ */
export function useSong(songId: Id<"songs"> | null): BrowseSong | null { export function useSong(songId: Id<"songs"> | null): BrowseSong | null {
const convex = useConvex() const convex = useConvex()
// While the song is missing the snapshot is the cache version, so every
// cache change re-renders and retries the fetch below.
const snapshot = useSyncExternalStore(subscribeSongs, () => const snapshot = useSyncExternalStore(subscribeSongs, () =>
getSongSnapshot(songId) songId ? (getCachedSong(songId) ?? getSongsVersion()) : null
) )
const song = songFromSnapshot(snapshot) const song = typeof snapshot === "object" ? snapshot : null
useEffect(() => { useEffect(() => {
if (songId && !song && isPersistentCacheLoaded()) { if (songId && !song && isPersistentCacheLoaded()) {
-1
View File
@@ -7,7 +7,6 @@ export const tabletSections = [
{ name: "playlists", group: "(playlists)", title: "All Playlists" }, { name: "playlists", group: "(playlists)", title: "All Playlists" },
{ name: "favorites", group: "(favorites)", title: "Favorites" }, { name: "favorites", group: "(favorites)", title: "Favorites" },
{ name: "recent", group: "(recent)", title: "Recently Played" }, { name: "recent", group: "(recent)", title: "Recently Played" },
{ name: "downloads", group: "(downloads)", title: "Downloads" },
] as const ] as const
export const TabletSectionContext = createContext< export const TabletSectionContext = createContext<
+34 -15
View File
@@ -1,11 +1,9 @@
import { import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
type PlaybackQuality,
songHlsPlaylistPath,
songPlayPath,
} from "@otunes/convex/playback-stream"
import { Platform } from "react-native" import { Platform } from "react-native"
import type { AudioSource } from "expo-audio" import type { AudioSource } from "expo-audio"
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
export const coverImageSizes = [64, 128, 192, 256, 384, 512, 768, 1024] as const export const coverImageSizes = [64, 128, 192, 256, 384, 512, 768, 1024] as const
export type CoverImageSize = (typeof coverImageSizes)[number] export type CoverImageSize = (typeof coverImageSizes)[number]
@@ -39,15 +37,39 @@ export function albumCoverUrl(
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size) return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
} }
/** `version` is the summary's `cover`; it changes with the artwork. */
export function playlistCoverUrl( export function playlistCoverUrl(
serverUrl: string, serverUrl: string,
playlistId: string, playlistId: string,
version: string | null,
size?: CoverImageSize size?: CoverImageSize
) { ) {
const uri = `${serverUrl}/api/playlist/${playlistId}/cover` return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
return sizedCoverUrl(version ? `${uri}?v=${version}` : uri, size) }
export function songPlayUrl(
serverUrl: string,
songId: string,
quality: PlaybackQuality | undefined,
preferAtmos: boolean | undefined
) {
const params = new URLSearchParams()
if (Platform.OS === "ios") params.set("losslessFormat", "alac")
if (quality) params.set("quality", quality)
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
const query = params.toString()
return `${serverUrl}/api/song/${songId}/play${query ? `?${query}` : ""}`
}
export function songHlsPlaylistUrl(
serverUrl: string,
songId: string,
quality: PlaybackQuality | undefined,
preferAtmos: boolean | undefined
) {
const params = new URLSearchParams()
if (quality) params.set("quality", quality)
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
const query = params.toString()
return `${serverUrl}/api/song/${songId}/play/hls${query ? `?${query}` : ""}`
} }
export function songAudioSource( export function songAudioSource(
@@ -58,12 +80,9 @@ export function songAudioSource(
useHls: boolean, useHls: boolean,
options?: { cookieHeader?: string | null; songTitle?: string } options?: { cookieHeader?: string | null; songTitle?: string }
): AudioSource { ): AudioSource {
const path = useHls const uri = useHls
? songHlsPlaylistPath(songId, quality, preferAtmos) ? songHlsPlaylistUrl(serverUrl, songId, quality, preferAtmos)
: songPlayPath(songId, quality, preferAtmos, { : songPlayUrl(serverUrl, songId, quality, preferAtmos)
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
})
const uri = `${serverUrl}${path}`
const headers = options?.cookieHeader const headers = options?.cookieHeader
? { Cookie: options.cookieHeader } ? { Cookie: options.cookieHeader }
@@ -7,15 +7,11 @@ private enum HandoffState {
static var pending: [String: String]? static var pending: [String: String]?
static var notify: (() -> Void)? static var notify: (() -> Void)?
// app.config.ts declares the one `.media` type per build profile; iOS and static var activityType: String {
// Catalyst must publish the same string for Handoff to pair them. Other "\(Bundle.main.bundleIdentifier!).media"
// plugins (expo-router) append their own types, so match by suffix. }
static let activityType =
(Bundle.main.object(forInfoDictionaryKey: "NSUserActivityTypes") as! [String])
.first { $0.hasSuffix(".media") }!
} }
// ExpoAppSceneDelegate forwards scene(_:continue:) and cold-start activities here.
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber { public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
public func application( public func application(
_ application: UIApplication, _ application: UIApplication,
+1 -119
View File
@@ -5,11 +5,7 @@ final class TabletSidebar: Module {
public func definition() -> ExpoModulesCore.ModuleDefinition { public func definition() -> ExpoModulesCore.ModuleDefinition {
Name("TabletSidebar") Name("TabletSidebar")
View(TabletSidebarView.self) { View(TabletSidebarView.self) {
Events("onProfilePress", "onPlaylistPress") Events("onProfilePress")
Prop("playlists") { (view: TabletSidebarView, value: [SidebarPlaylist]) in
view.playlists = value
view.configure()
}
Prop("accountName") { (view: TabletSidebarView, value: String) in Prop("accountName") { (view: TabletSidebarView, value: String) in
view.accountName = value view.accountName = value
view.configure() view.configure()
@@ -30,25 +26,9 @@ final class TabletSidebar: Module {
} }
} }
/// A playlist row under the sidebar's Playlists section.
struct SidebarPlaylist: Record {
@Field var id: String = ""
@Field var title: String = ""
/// Cover URL; changes whenever the artwork does. `nil` shows a list icon.
@Field var imageURL: String?
}
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs. /// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
final class TabletSidebarView: ExpoView { final class TabletSidebarView: ExpoView {
let onProfilePress = EventDispatcher() let onProfilePress = EventDispatcher()
let onPlaylistPress = EventDispatcher()
var playlists: [SidebarPlaylist] = []
private let selectionProxy = SidebarSelectionProxy()
/// Playlist rows by identifier. Typed loosely because stored properties
/// can't be gated to iOS 18, where `UITab` arrives; values are always `UITab`.
private var playlistTabs: [String: NSObject] = [:]
private var coverImages: [String: UIImage] = [:]
private var coverTasks: [String: URLSessionDataTask] = [:]
var accountName = "" var accountName = ""
var initials = "" var initials = ""
var imageURL: String? var imageURL: String?
@@ -102,13 +82,11 @@ final class TabletSidebarView: ExpoView {
deinit { deinit {
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) } if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
coverTasks.values.forEach { $0.cancel() }
} }
@available(iOS 18.0, *) @available(iOS 18.0, *)
private func configure(_ controller: UITabBarController) { private func configure(_ controller: UITabBarController) {
configureGroups(controller) configureGroups(controller)
configurePlaylists(controller)
let footer: SidebarAccountButton let footer: SidebarAccountButton
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton { if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
@@ -125,7 +103,6 @@ final class TabletSidebarView: ExpoView {
@available(iOS 18.0, *) @available(iOS 18.0, *)
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) { private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children } let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let selected = destinations.first { $0 === controller.selectedTab } let selected = destinations.first { $0 === controller.selectedTab }
let contextualTab = selected ?? footer.contextualTab ?? destinations.first let contextualTab = selected ?? footer.contextualTab ?? destinations.first
footer.contextualTab = contextualTab footer.contextualTab = contextualTab
@@ -183,101 +160,6 @@ final class TabletSidebarView: ExpoView {
} }
} }
private let playlistTabPrefix = "otunes.playlist."
private let playlistIconSize: CGFloat = 24
extension TabletSidebarView {
/// Lists each playlist under Playlists with its cover. Rows are never
/// selected natively: a tap opens the playlist in the All Playlists stack.
@available(iOS 18.0, *)
fileprivate func configurePlaylists(_ controller: UITabBarController) {
guard let group = controller.tabs.first(where: { $0.identifier == "otunes.playlists" })
as? UITabGroup else { return }
if !(controller.delegate is SidebarSelectionProxy) {
selectionProxy.original = controller.delegate
controller.delegate = selectionProxy
}
selectionProxy.onPlaylist = { [weak self] id in self?.onPlaylistPress(["id": id]) }
var rows: [UITab] = []
for playlist in playlists {
let identifier = playlistTabPrefix + playlist.id
let tab = playlistTabs[identifier] as? UITab ?? UITab(
title: playlist.title, image: nil, identifier: identifier,
viewControllerProvider: { _ in UIViewController() })
playlistTabs[identifier] = tab
if tab.title != playlist.title { tab.title = playlist.title }
tab.preferredPlacement = .sidebarOnly
tab.image = playlistImage(identifier: identifier, url: playlist.imageURL)
rows.append(tab)
}
let ids = Set(rows.map(\.identifier))
playlistTabs = playlistTabs.filter { ids.contains($0.key) }
let fixed = group.children.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let children = fixed + rows
if group.children.map(\.identifier) != children.map(\.identifier) {
group.children = children
}
}
/// The cached cover for `url`, starting a download on a miss.
@available(iOS 18.0, *)
private func playlistImage(identifier: String, url: String?) -> UIImage? {
let placeholder = UIImage(systemName: "music.note.list")
guard let url, let remote = URL(string: url) else { return placeholder }
if let image = coverImages[url] { return image }
if coverTasks[url] == nil {
let task = URLSession.shared.dataTask(with: remote) { [weak self] data, _, _ in
guard let data, let image = UIImage(data: data) else { return }
DispatchQueue.main.async {
guard let self else { return }
self.coverTasks[url] = nil
self.coverImages[url] = roundedIcon(image)
if let tab = self.playlistTabs[identifier] as? UITab { tab.image = self.coverImages[url] }
}
}
coverTasks[url] = task
task.resume()
}
return placeholder
}
}
/// Square cover shrunk to sidebar icon size with rounded corners, drawn as is
/// rather than tinted like a symbol.
private func roundedIcon(_ image: UIImage) -> UIImage {
let size = CGSize(width: playlistIconSize, height: playlistIconSize)
let rendered = UIGraphicsImageRenderer(size: size).image { _ in
UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 4).addClip()
image.draw(in: CGRect(origin: .zero, size: size))
}
return rendered.withRenderingMode(.alwaysOriginal)
}
/// Sits in front of the router's tab controller delegate. Taps on playlist
/// rows go to JS; everything else is forwarded untouched.
private final class SidebarSelectionProxy: NSObject, UITabBarControllerDelegate {
weak var original: UITabBarControllerDelegate?
var onPlaylist: ((String) -> Void)?
override func responds(to aSelector: Selector!) -> Bool {
super.responds(to: aSelector) || (original?.responds(to: aSelector) ?? false)
}
override func forwardingTarget(for aSelector: Selector!) -> Any? { original }
@available(iOS 18.0, *)
func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
if tab.identifier.hasPrefix(playlistTabPrefix) {
onPlaylist?(String(tab.identifier.dropFirst(playlistTabPrefix.count)))
return false
}
return original?.tabBarController?(tabBarController, shouldSelectTab: tab) ?? true
}
}
@available(iOS 18.0, *) @available(iOS 18.0, *)
private final class SidebarAccountButton: UIView { private final class SidebarAccountButton: UIView {
var onPress: (() -> Void)? var onPress: (() -> Void)?
-2
View File
@@ -29,7 +29,6 @@
"expo-blur": "~58.0.5", "expo-blur": "~58.0.5",
"expo-constants": "~58.0.13", "expo-constants": "~58.0.13",
"expo-dev-client": "~58.0.14", "expo-dev-client": "~58.0.14",
"expo-file-system": "~58.0.10",
"expo-font": "~58.0.9", "expo-font": "~58.0.9",
"expo-glass-effect": "~58.0.5", "expo-glass-effect": "~58.0.5",
"expo-haptics": "~58.0.7", "expo-haptics": "~58.0.7",
@@ -37,7 +36,6 @@
"expo-image-picker": "~58.0.10", "expo-image-picker": "~58.0.10",
"expo-linking": "~58.0.14", "expo-linking": "~58.0.14",
"expo-navigation-bar": "~58.0.4", "expo-navigation-bar": "~58.0.4",
"expo-network": "~58.0.5",
"expo-router": "~58.0.25", "expo-router": "~58.0.25",
"expo-secure-store": "~58.0.2", "expo-secure-store": "~58.0.2",
"expo-sharing": "~58.0.20", "expo-sharing": "~58.0.20",
@@ -1,36 +0,0 @@
const fs = require("fs")
const path = require("path")
const { withDangerousMod } = require("expo/config-plugins")
// Overrides react-native-screens' 150ms crossfade for `animation: "fade"`.
// App resources win over library resources with the same name, so the stack
// fades through black in 100ms: the old page out, then the new page in.
const anims = {
"rns_fade_out.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:duration="50" />
`,
"rns_fade_in.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:startOffset="50"
android:duration="50" />
`,
}
module.exports = (config) =>
withDangerousMod(config, [
"android",
(config) => {
const dir = path.join(
config.modRequest.platformProjectRoot,
"app/src/main/res/anim"
)
fs.mkdirSync(dir, { recursive: true })
for (const [name, xml] of Object.entries(anims)) {
fs.writeFileSync(path.join(dir, name), `<?xml version="1.0" encoding="utf-8"?>\n${xml}`)
}
return config
},
])
+7 -23
View File
@@ -4,20 +4,6 @@ const {
withXcodeProject, withXcodeProject,
} = require("expo/config-plugins") } = require("expo/config-plugins")
// Pods left at React Native's iOS 15.1 minimum map to a macOS target below what
// current Xcode accepts for Catalyst, so raise them to the app's own target.
const raisePodDeploymentTargets = `
app_target = installer.aggregate_targets.first.platform.deployment_target
installer.pods_project.targets.each do |target|
target.build_configurations.each do |build|
current = build.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
if current.nil? || Pod::Version.new(current) < app_target
build.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = app_target.to_s
end
end
end
`
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies. // Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
module.exports = (config) => { module.exports = (config) => {
config = withPodfileProperties(config, (config) => { config = withPodfileProperties(config, (config) => {
@@ -27,15 +13,14 @@ module.exports = (config) => {
}) })
config = withPodfile(config, (config) => { config = withPodfile(config, (config) => {
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/ const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/ if (!pattern.test(config.modResults.contents)) {
let contents = config.modResults.contents
if (!flag.test(contents) || !postInstall.test(contents)) {
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed") throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
} }
contents = contents.replace(flag, ":mac_catalyst_enabled => true") config.modResults.contents = config.modResults.contents.replace(
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`) pattern,
config.modResults.contents = contents ":mac_catalyst_enabled => true"
)
return config return config
}) })
@@ -47,8 +32,7 @@ module.exports = (config) => {
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) { for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
const settings = configurations[value].buildSettings const settings = configurations[value].buildSettings
settings.SUPPORTS_MACCATALYST = "YES" settings.SUPPORTS_MACCATALYST = "YES"
// Share the iOS bundle ID so Handoff and the App ID match across devices. settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
settings.TARGETED_DEVICE_FAMILY = '"1,2"' settings.TARGETED_DEVICE_FAMILY = '"1,2"'
} }
return config return config
+1 -1
View File
@@ -32,7 +32,7 @@ export default function Page() {
<ContentCarousel <ContentCarousel
title="Recently Added" title="Recently Added"
href="/recently-added" href="/recently-added"
content={recentlyAdded.flat()} content={recentlyAdded}
/> />
</div> </div>
</div> </div>
+12 -18
View File
@@ -1,7 +1,5 @@
import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider" import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider"
import { DownloadsProvider } from "@/components/downloads-provider"
import { FavoritesProvider } from "@/components/favorites-provider" import { FavoritesProvider } from "@/components/favorites-provider"
import { OfflineGate } from "@/components/offline-gate"
import { PlaybackProvider } from "@/components/playback-provider" import { PlaybackProvider } from "@/components/playback-provider"
import { PlayerBar } from "@/components/player-bar" import { PlayerBar } from "@/components/player-bar"
import { LazyQueuePanel } from "@/components/lazy-queue-panel" import { LazyQueuePanel } from "@/components/lazy-queue-panel"
@@ -19,22 +17,18 @@ export default function AppLayout({
<SidebarProvider> <SidebarProvider>
<PlaybackProvider> <PlaybackProvider>
<AddToPlaylistProvider> <AddToPlaylistProvider>
<DownloadsProvider> <FavoritesProvider>
<FavoritesProvider> <AppSidebar />
<AppSidebar /> <div className="flex min-h-svh min-w-0 flex-1">
<div className="flex min-h-svh min-w-0 flex-1"> <SidebarInset className="min-w-0 flex-1">
<SidebarInset className="min-w-0 flex-1"> <Suspense>
<Suspense> <ScrollRestoration>{children}</ScrollRestoration>
<ScrollRestoration> </Suspense>
<OfflineGate>{children}</OfflineGate> </SidebarInset>
</ScrollRestoration> <LazyQueuePanel />
</Suspense> </div>
</SidebarInset> <PlayerBar />
<LazyQueuePanel /> </FavoritesProvider>
</div>
<PlayerBar />
</FavoritesProvider>
</DownloadsProvider>
</AddToPlaylistProvider> </AddToPlaylistProvider>
</PlaybackProvider> </PlaybackProvider>
</SidebarProvider> </SidebarProvider>
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : ( ) : (
<div className="flex-1 overflow-y-auto p-6 pb-28"> <div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}> <div className={albumGridClassName}>
{albums.flat().map((album) => ( {albums.map((album) => (
<AlbumCard key={album.id} album={album} /> <AlbumCard key={album.id} album={album} />
))} ))}
</div> </div>
@@ -1,7 +0,0 @@
"use client"
import { OtherDownloadsView } from "@/components/other-downloads-view"
export default function Page() {
return <OtherDownloadsView />
}
Loaded 100 of 227 files, more files were not shown because too many files have changed in this diff. Show more