Compare commits
48
Commits
No files matched your search
+6
-1
@@ -41,4 +41,9 @@ apps/web/next-env.d.ts
|
||||
/.convex
|
||||
/.cursor
|
||||
/database
|
||||
docker-compose.yml
|
||||
docker-compose.yml
|
||||
|
||||
**/credentials.json
|
||||
**/credentials/
|
||||
**/*.ipa
|
||||
**/*.apk
|
||||
+9
-17
@@ -25,20 +25,16 @@ FROM node:${NODE_VERSION} AS dependencies
|
||||
WORKDIR /app
|
||||
|
||||
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
|
||||
# Mobile is intentionally omitted so its deps are never installed.
|
||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
||||
# Mobile's manifest is never copied, so the workspace globs cannot discover it.
|
||||
# The workspace file must be the real one: its overrides and patches are
|
||||
# checked against the lockfile.
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
|
||||
# pnpm validates patches even when their packages are outside the install filter.
|
||||
COPY patches ./patches
|
||||
COPY apps/web/package.json ./apps/web/
|
||||
COPY packages/convex/package.json ./packages/convex/
|
||||
|
||||
# Explicit workspace — do not use apps/* so mobile cannot be discovered.
|
||||
RUN printf '%s\n' \
|
||||
'packages:' \
|
||||
' - "apps/web"' \
|
||||
' - "packages/convex"' \
|
||||
>> pnpm-workspace.yaml \
|
||||
&& printf '\n%s\n' \
|
||||
RUN printf '\n%s\n' \
|
||||
'supportedArchitectures.os=current' \
|
||||
'supportedArchitectures.cpu=current' \
|
||||
'supportedArchitectures.libc=current' \
|
||||
@@ -82,15 +78,11 @@ FROM node:${NODE_VERSION} AS convex-functions
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
|
||||
COPY patches ./patches
|
||||
COPY packages/convex/package.json ./packages/convex/
|
||||
|
||||
RUN printf '%s\n' \
|
||||
'packages:' \
|
||||
' - "packages/convex"' \
|
||||
> pnpm-workspace.yaml \
|
||||
&& printf '\n%s\n' \
|
||||
RUN printf '\n%s\n' \
|
||||
'supportedArchitectures.os=current' \
|
||||
'supportedArchitectures.cpu=current' \
|
||||
'supportedArchitectures.libc=current' \
|
||||
@@ -129,7 +121,7 @@ RUN curl -fsSL -o ffmpeg.tar.xz "https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VER
|
||||
|
||||
# Decoders cover the library formats (FLAC, ALAC/AAC in m4a, MP3, Opus,
|
||||
# Vorbis, WavPack, WMA, E-AC-3/TrueHD for Atmos). Encoders are only the two
|
||||
# the app writes: AAC (HLS and ADTS) and FLAC.
|
||||
# the app writes: AAC (HLS, ADTS and .m4a downloads) and FLAC.
|
||||
RUN ./configure \
|
||||
--prefix=/opt/ffmpeg \
|
||||
--disable-shared \
|
||||
@@ -146,7 +138,7 @@ RUN ./configure \
|
||||
--enable-demuxer=aac,ac3,aiff,ape,asf,au,caf,dsf,flac,matroska,mov,mp3,ogg,wav,wv \
|
||||
--enable-decoder=aac,aac_latm,ac3,alac,ape,dsd_lsbf,dsd_msbf,eac3,flac,mlp,mp3,opus,pcm_f32le,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32be,pcm_s32le,pcm_u8,truehd,vorbis,wavpack,wmav1,wmav2 \
|
||||
--enable-encoder=aac,flac \
|
||||
--enable-muxer=adts,flac,hls,mpegts \
|
||||
--enable-muxer=adts,flac,hls,ipod,mpegts \
|
||||
--enable-parser=aac,aac_latm,ac3,flac,mpegaudio,opus,vorbis \
|
||||
--enable-bsf=aac_adtstoasc \
|
||||
--enable-filter=aresample,aformat \
|
||||
|
||||
@@ -73,10 +73,15 @@ select your signing team, then build and run. For a Release build, use Xcode's
|
||||
Archive action with the Catalyst destination. EAS's existing iOS profiles still
|
||||
build iPhone/iPad apps.
|
||||
|
||||
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
|
||||
patches. It disables precompiled React Native and Expo modules so dependencies
|
||||
can compile for Catalyst. The Mac app derives a separate bundle identifier with
|
||||
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
|
||||
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
|
||||
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
|
||||
raises pod deployment targets to the app's, and disables precompiled React
|
||||
Native and Expo modules so dependencies can compile for Catalyst. System volume
|
||||
stays under macOS control.
|
||||
|
||||
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
|
||||
same team. Handoff only pairs apps with a matching team and activity type, which
|
||||
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
|
||||
|
||||
To return a checkout to ordinary iOS builds, rerun prebuild without
|
||||
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
|
||||
@@ -26,10 +26,19 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
production: "oTunes",
|
||||
}[variant]
|
||||
|
||||
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
|
||||
|
||||
return {
|
||||
...config,
|
||||
plugins: [
|
||||
...(config.plugins ?? []),
|
||||
[
|
||||
"react-native-continued-task",
|
||||
{
|
||||
// Matches TASK_PREFIX in hooks/use-background-downloads.ts.
|
||||
identifierPrefixes: [`${bundleIdentifier}.downloads`],
|
||||
},
|
||||
],
|
||||
...(process.env.MAC_CATALYST === "1"
|
||||
? ["./plugins/with-mac-catalyst"]
|
||||
: []),
|
||||
@@ -40,11 +49,12 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
icon: `./assets/icon${iconSuffix}.png`,
|
||||
ios: {
|
||||
...config.ios,
|
||||
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
||||
bundleIdentifier,
|
||||
icon: `./assets/${composer}.icon`,
|
||||
infoPlist: {
|
||||
...config.ios?.infoPlist,
|
||||
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
|
||||
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
|
||||
NSUserActivityTypes: [`${bundleIdentifier}.media`],
|
||||
},
|
||||
},
|
||||
android: {
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
"expo-status-bar",
|
||||
"expo-app-intents",
|
||||
"./plugins/with-android-colors",
|
||||
"./plugins/with-android-fast-fade",
|
||||
[
|
||||
"expo-navigation-bar",
|
||||
{
|
||||
|
||||
+13
-10
@@ -1,5 +1,6 @@
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
|
||||
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
@@ -10,16 +11,18 @@ export default function TabletSectionLayout({ segment }: { segment: string }) {
|
||||
|
||||
return (
|
||||
<TabletSectionContext value={section}>
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...options,
|
||||
title:
|
||||
route.name === "index"
|
||||
? section?.title
|
||||
: tabStackScreenTitles[route.name],
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value={section?.group}>
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...options,
|
||||
title:
|
||||
route.name === "index"
|
||||
? section?.title
|
||||
: tabStackScreenTitles[route.name],
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
</TabletSectionContext>
|
||||
)
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+1
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads"
|
||||
+1
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
+2
@@ -5,6 +5,7 @@ import Songs from "../home/browse/songs"
|
||||
import Playlists from "../home/browse/playlists"
|
||||
import Favorites from "../home/playlist/favorites"
|
||||
import RecentlyPlayed from "../home/recently-played"
|
||||
import Downloads from "../home/downloads"
|
||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
|
||||
const screens = {
|
||||
@@ -14,6 +15,7 @@ const screens = {
|
||||
playlists: Playlists,
|
||||
favorites: Favorites,
|
||||
recent: RecentlyPlayed,
|
||||
downloads: Downloads,
|
||||
}
|
||||
|
||||
export default function TabletSectionScreen() {
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
|
||||
import {
|
||||
ScreenPaletteProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidNativeTabColors,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
useTabletBackgroundStyle,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
@@ -46,12 +46,13 @@ function useRouterTheme() {
|
||||
}
|
||||
|
||||
function useNativeTabColors() {
|
||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||
const selectedColor = colors.dark.primary
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = colors.dark
|
||||
const artworkPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const selectedColor = hasArtworkPalette
|
||||
? androidPalette.foreground
|
||||
: androidPalette.accentText
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -61,14 +62,14 @@ function useNativeTabColors() {
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
: {
|
||||
default: androidPalette.mutedForeground,
|
||||
default: androidPalette.secondaryForeground,
|
||||
selected: selectedColor,
|
||||
}
|
||||
|
||||
const labelColor =
|
||||
Platform.OS === "ios"
|
||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||
: androidPalette.mutedForeground
|
||||
: androidPalette.secondaryForeground
|
||||
|
||||
return {
|
||||
isDark,
|
||||
@@ -85,20 +86,17 @@ function useNativeTabColors() {
|
||||
blurEffect: isDark
|
||||
? "systemChromeMaterialDark"
|
||||
: "systemChromeMaterialLight",
|
||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
||||
backgroundColor:
|
||||
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||
}
|
||||
}
|
||||
|
||||
function TabsContent() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const homeColors = useAndroidNativeTabColors()
|
||||
const libraryColors = useAndroidNativeTabColors()
|
||||
const searchColors = useAndroidNativeTabColors()
|
||||
const keyboardVisible = useAndroidKeyboardVisible()
|
||||
const routerTheme = useRouterTheme()
|
||||
const tabColors = useNativeTabColors()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||
|
||||
@@ -129,7 +127,9 @@ function TabsContent() {
|
||||
tintColor={tabColors.tintColor}
|
||||
minimizeBehavior="onScrollDown"
|
||||
{...(Platform.OS === "android"
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
? // A new ripple color rebuilds Material's item backgrounds and
|
||||
// cuts off the in-flight ripple, so it must not follow the palette.
|
||||
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||
@@ -140,9 +140,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? homeColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -152,9 +149,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? libraryColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -169,9 +163,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? searchColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -202,6 +193,14 @@ function TabsContent() {
|
||||
<NativeTabs.Trigger.Icon sf="music.note" />
|
||||
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(downloads)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="arrow.down.circle" />
|
||||
<NativeTabs.Trigger.Label>Downloads</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(playlists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
@@ -12,24 +13,26 @@ export default function HomeLayout() {
|
||||
const baseOptions = useStackScreenOptions({ title: "Home" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value="home">
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
)
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import {
|
||||
useSwipeRowGroup,
|
||||
@@ -7,21 +8,13 @@ import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
@@ -29,6 +22,18 @@ import {
|
||||
DiscHeader,
|
||||
} from "@/components/collection-list"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import {
|
||||
CollectionDownloadButton,
|
||||
DownloadedQuality,
|
||||
} from "@/components/collection-download-button"
|
||||
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import {
|
||||
useDownloads,
|
||||
useIsCollectionDownloaded,
|
||||
useSongDownloadState,
|
||||
useToggleSongDownload,
|
||||
} from "@/contexts/downloads"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import {
|
||||
@@ -65,9 +70,18 @@ export default function AlbumScreen() {
|
||||
api.library.browseAlbumDetail,
|
||||
typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
|
||||
)
|
||||
const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
|
||||
useFavorites()
|
||||
const {
|
||||
playAlbum,
|
||||
playAlbumShuffled,
|
||||
playFromSong,
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
} = usePlaybackActions()
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`album:${id}`)
|
||||
: `album:${id}`
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const {
|
||||
handleAlbumDetailAction,
|
||||
handleAlbumTrackAction,
|
||||
@@ -88,6 +102,17 @@ export default function AlbumScreen() {
|
||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||
[album]
|
||||
)
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const downloadTarget = useMemo(
|
||||
() => ({
|
||||
kind: "album" as const,
|
||||
id: typeof id === "string" ? id : "",
|
||||
title: album?.title ?? "",
|
||||
songIds,
|
||||
}),
|
||||
[album?.title, id, songIds]
|
||||
)
|
||||
const albumDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
@@ -97,6 +122,12 @@ export default function AlbumScreen() {
|
||||
|
||||
const listItems = useMemo(() => albumListItems(album?.tracks ?? []), [album])
|
||||
|
||||
const playTrack = useCallback(
|
||||
(songId: Id<"songs">, ids: Id<"songs">[]) =>
|
||||
playFromSong(songId, ids, playOrigin),
|
||||
[playOrigin, playFromSong]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
({ item }: { item: AlbumListItem }) => {
|
||||
if (item.type === "disc") {
|
||||
@@ -111,9 +142,7 @@ export default function AlbumScreen() {
|
||||
songIds={songIds}
|
||||
palette={palette}
|
||||
favorited={isSongFavorite(item.track.id)}
|
||||
onPlay={(songId, ids) =>
|
||||
playFromSong(songId, ids, `album:${album.id}`)
|
||||
}
|
||||
onPlay={playTrack}
|
||||
onAction={handleAlbumTrackAction}
|
||||
/>
|
||||
) : null
|
||||
@@ -123,7 +152,7 @@ export default function AlbumScreen() {
|
||||
handleAlbumTrackAction,
|
||||
isSongFavorite,
|
||||
palette,
|
||||
playFromSong,
|
||||
playTrack,
|
||||
songIds,
|
||||
swipeGroup,
|
||||
]
|
||||
@@ -138,17 +167,14 @@ export default function AlbumScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={220}
|
||||
variant="album"
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -169,16 +195,15 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Album not found.
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const metadata = formatMetadata(album.genre, album.year)
|
||||
const favorited = isAlbumFavorite(album.id)
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -192,10 +217,7 @@ export default function AlbumScreen() {
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -206,22 +228,28 @@ export default function AlbumScreen() {
|
||||
stationArtistId={album.artist.id}
|
||||
selectedCount={album.tracks.length}
|
||||
favorited={isAlbumFav(album.id)}
|
||||
downloaded={albumDownloaded}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
onAction={(action) =>
|
||||
void handleAlbumDetailAction(
|
||||
album.id as Id<"albums">,
|
||||
songIds,
|
||||
action,
|
||||
album.artist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
onAction={(action) => {
|
||||
if (action === "download") {
|
||||
void requestDownload(downloadTarget)
|
||||
} else if (action === "remove-download") {
|
||||
void removeDownload(downloadTarget)
|
||||
} else {
|
||||
void handleAlbumDetailAction(
|
||||
album.id as Id<"albums">,
|
||||
songIds,
|
||||
action,
|
||||
album.artist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
}}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -272,52 +300,51 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() =>
|
||||
void (fromDownloads
|
||||
? playShuffled(songIds, playOrigin)
|
||||
: playAlbumShuffled(album.id, songIds))
|
||||
}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={favorited ? "accent" : "foreground"}
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
<Ionicons
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
onPress={() =>
|
||||
void (fromDownloads
|
||||
? playInOrder(songIds, playOrigin)
|
||||
: playAlbum(album.id, songIds))
|
||||
}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||
<CollectionDownloadButton
|
||||
target={downloadTarget}
|
||||
color={palette.foreground}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
/>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -325,13 +352,12 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<PaletteText
|
||||
tone="accentText"
|
||||
<Text
|
||||
style={[
|
||||
styles.artist,
|
||||
heroLayout.landscape && styles.artistLandscape,
|
||||
@@ -339,7 +365,7 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.artist.name}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
@@ -353,25 +379,18 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
{album.hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
@@ -381,15 +400,11 @@ export default function AlbumScreen() {
|
||||
{album.hasAtmos ? (
|
||||
<>
|
||||
{metadata || album.hasLossless ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
@@ -397,6 +412,11 @@ export default function AlbumScreen() {
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
<DownloadedQuality
|
||||
collection={downloadTarget}
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</CollectionHero>
|
||||
</MusicEntityView>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
@@ -476,6 +496,13 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
}) {
|
||||
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
const downloadRef = useMemo(
|
||||
() => ({ kind: "album" as const, id: album.id }),
|
||||
[album.id]
|
||||
)
|
||||
const downloadState = useSongDownloadState(track.id, downloadRef)
|
||||
const downloaded = downloadState === "here"
|
||||
const toggleDownload = useToggleSongDownload()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={
|
||||
@@ -492,6 +519,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
}
|
||||
stationArtistId={album.artist.id}
|
||||
favorited={favorited}
|
||||
downloaded={downloaded}
|
||||
navigation={{
|
||||
artist: { id: album.artist.id },
|
||||
album: { id: album.id },
|
||||
@@ -510,15 +538,16 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
backgroundColor={palette.background}
|
||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||
onAddToQueue={() => void onAction(track, album, "play-last")}
|
||||
downloaded={downloaded}
|
||||
onDownload={() => toggleDownload(track, downloaded, downloadRef)}
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||
>
|
||||
{number}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
<View
|
||||
style={[
|
||||
styles.trackContent,
|
||||
@@ -526,29 +555,32 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
]}
|
||||
>
|
||||
<View style={styles.trackMeta}>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{track.artists ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{downloaded || downloadState === "device" ? (
|
||||
<Ionicons
|
||||
name="arrow-down-circle"
|
||||
size={14}
|
||||
color={palette.secondaryForeground}
|
||||
accessibilityLabel="Downloaded"
|
||||
/>
|
||||
) : null}
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</Row>
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
|
||||
headerLargeTitle: false,
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton round />
|
||||
<CollectionDetailSkeleton variant="artist" />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,176 @@
|
||||
import { useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { tabContentBottomInset } from "@/components/player"
|
||||
import {
|
||||
FAVORITES_DOWNLOAD_ID,
|
||||
useDownloads,
|
||||
useDownloadsVersion,
|
||||
} from "@/contexts/downloads"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import {
|
||||
FROM_DOWNLOADS_PARAM,
|
||||
OTHER_DOWNLOADS_TITLE,
|
||||
} from "@/lib/downloads-navigation"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||
import type { DownloadedCollection } from "@otunes/convex/client/download-queue"
|
||||
import { formatBytes } from "@otunes/convex/download-quality"
|
||||
|
||||
type Card =
|
||||
| { kind: "other"; songCount: number; bytes: number }
|
||||
| { kind: "collection"; collection: DownloadedCollection; bytes: number }
|
||||
|
||||
function songCount(count: number) {
|
||||
return count === 1 ? "1 song" : `${count} songs`
|
||||
}
|
||||
|
||||
function collectionPath({ kind, id }: DownloadedCollection) {
|
||||
if (kind === "album") return `/album/${id}?${FROM_DOWNLOADS_PARAM}`
|
||||
if (id === FAVORITES_DOWNLOAD_ID) {
|
||||
return `/playlist/favorites?${FROM_DOWNLOADS_PARAM}`
|
||||
}
|
||||
return `/playlist/${id}?${FROM_DOWNLOADS_PARAM}`
|
||||
}
|
||||
|
||||
/** Downloaded albums and playlists, newest first, after Other Downloaded Songs. */
|
||||
export default function DownloadsScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const { queue } = useDownloads()
|
||||
const version = useDownloadsVersion()
|
||||
const { push } = useAppNavigation()
|
||||
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
|
||||
useMediaGridLayout()
|
||||
|
||||
const cards = useMemo<Card[]>(() => {
|
||||
if (!queue) return []
|
||||
const breakdown = queue.breakdown()
|
||||
const bytesByCollection = new Map(
|
||||
breakdown.collections.map((row) => [row.collection, row.bytes])
|
||||
)
|
||||
const other: Card[] =
|
||||
breakdown.otherSongs.songIds.length > 0
|
||||
? [
|
||||
{
|
||||
kind: "other",
|
||||
songCount: breakdown.otherSongs.songIds.length,
|
||||
bytes: breakdown.otherSongs.bytes,
|
||||
},
|
||||
]
|
||||
: []
|
||||
return [
|
||||
...other,
|
||||
...queue
|
||||
.collections()
|
||||
.reverse()
|
||||
.map((collection): Card => ({
|
||||
kind: "collection",
|
||||
collection,
|
||||
bytes: bytesByCollection.get(collection) ?? 0,
|
||||
})),
|
||||
]
|
||||
// version invalidates the lookup when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [queue, version])
|
||||
|
||||
function renderItem({ item }: ListRenderItemInfo<Card>) {
|
||||
if (!config) return null
|
||||
const isOther = item.kind === "other"
|
||||
const collection = isOther ? null : item.collection
|
||||
const isFavorites = collection?.id === FAVORITES_DOWNLOAD_ID
|
||||
const title = collection?.title ?? OTHER_DOWNLOADS_TITLE
|
||||
const subtitle = isOther
|
||||
? `${songCount(item.songCount)} · ${formatBytes(item.bytes)}`
|
||||
: `${collection!.kind === "album" ? "Album" : "Playlist"} · ${formatBytes(item.bytes)}`
|
||||
const coverUri = !collection
|
||||
? ""
|
||||
: collection.kind === "album"
|
||||
? albumCoverUrl(config.serverUrl, collection.id)
|
||||
: playlistCoverUrl(config.serverUrl, collection.id, null)
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
style={[styles.card, { width: cardWidth }]}
|
||||
onPress={() =>
|
||||
push(collection ? collectionPath(collection) : "/downloads/other")
|
||||
}
|
||||
>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={collection !== null && !isFavorites}
|
||||
placeholderIcon={isOther ? "arrow-down" : "star"}
|
||||
style={{
|
||||
width: cardWidth,
|
||||
height: cardWidth,
|
||||
borderRadius: radius.md,
|
||||
}}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{subtitle}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={{ title: "Downloads", headerLargeTitle: true }} />
|
||||
<FlatList
|
||||
key={columns}
|
||||
onLayout={onLayout}
|
||||
data={cards}
|
||||
keyExtractor={(card) =>
|
||||
card.kind === "other"
|
||||
? "other"
|
||||
: `${card.collection.kind}:${card.collection.id}`
|
||||
}
|
||||
renderItem={renderItem}
|
||||
numColumns={columns}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: spacing.lg,
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingBottom: tabContentBottomInset,
|
||||
gap,
|
||||
}}
|
||||
columnWrapperStyle={columns > 1 ? { gap } : undefined}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListEmptyComponent={
|
||||
<View style={styles.empty}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Nothing downloaded on this device.
|
||||
</Text>
|
||||
</View>
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
card: { gap: spacing.xs },
|
||||
title: { fontSize: 14, fontWeight: "600" },
|
||||
subtitle: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||
empty: { alignItems: "center", paddingTop: spacing.xl },
|
||||
})
|
||||
@@ -0,0 +1,153 @@
|
||||
import { useCallback, useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { useSwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
import type { MediaAction } from "@/components/media-context-menu"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { OTHER_DOWNLOADS_TITLE } from "@/lib/downloads-navigation"
|
||||
import { longListProps } from "@/lib/list"
|
||||
import { useSongs } from "@/lib/song-cache"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
const PLAY_ORIGIN = downloadsQueueOrigin("other")
|
||||
|
||||
/** Songs downloaded on their own. Playback here always uses the downloads. */
|
||||
export default function OtherDownloadsScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { queue } = useDownloads()
|
||||
const version = useDownloadsVersion()
|
||||
const songIds = useMemo(
|
||||
() =>
|
||||
(queue?.otherSongIds() ?? [])
|
||||
.filter((songId) => queue?.getDownloaded(songId))
|
||||
.reverse() as Id<"songs">[],
|
||||
// version invalidates the lookup when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[queue, version]
|
||||
)
|
||||
const cachedSongs = useSongs(songIds)
|
||||
const songs = useMemo(
|
||||
() => cachedSongs.filter((song): song is BrowseSong => song != null),
|
||||
[cachedSongs]
|
||||
)
|
||||
const playableIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { playFromSong, playInOrder, playShuffled } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, playableIds, PLAY_ORIGIN),
|
||||
[playFromSong, playableIds]
|
||||
)
|
||||
const handleAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action, "other"),
|
||||
[handleSongAction]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
({ item: song }: ListRenderItemInfo<BrowseSong>) => (
|
||||
<SongListRow
|
||||
song={song}
|
||||
favorited={isSongFavorite(song.id)}
|
||||
downloadFrom="other"
|
||||
swipe={{
|
||||
group: swipeGroup,
|
||||
backgroundColor: colors.background,
|
||||
onPlayNext: () => handleAction(song, "play-next"),
|
||||
onAddToQueue: () => handleAction(song, "play-last"),
|
||||
}}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleAction}
|
||||
/>
|
||||
),
|
||||
[
|
||||
colors.background,
|
||||
handleAction,
|
||||
handlePlaySong,
|
||||
isSongFavorite,
|
||||
swipeGroup,
|
||||
]
|
||||
)
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{ title: OTHER_DOWNLOADS_TITLE, headerLargeTitle: false }}
|
||||
/>
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
data={songs}
|
||||
keyExtractor={(song) => song.id}
|
||||
renderItem={renderItem}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListHeaderComponent={
|
||||
songs.length > 0 ? (
|
||||
<View style={styles.actions}>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
|
||||
style={[styles.iconAction, { backgroundColor: colors.muted }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
|
||||
style={styles.playButton}
|
||||
/>
|
||||
</View>
|
||||
) : undefined
|
||||
}
|
||||
ListEmptyComponent={
|
||||
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
|
||||
Songs you download on their own appear here.
|
||||
</Text>
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
playButton: { borderRadius: 999, minWidth: 160 },
|
||||
iconAction: {
|
||||
width: 44,
|
||||
height: 44,
|
||||
borderRadius: 22,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
empty: { padding: spacing.lg, textAlign: "center" },
|
||||
})
|
||||
@@ -62,7 +62,10 @@ export default function HomeScreen() {
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
|
||||
contentContainerStyle={[
|
||||
styles.content,
|
||||
{ paddingBottom: tabContentBottomInset },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
>
|
||||
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
|
||||
|
||||
@@ -1,21 +1,14 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
@@ -31,6 +24,7 @@ import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
@@ -50,6 +44,19 @@ import {
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import {
|
||||
CollectionDownloadButton,
|
||||
type CollectionDownloadTarget,
|
||||
DownloadedQuality,
|
||||
} from "@/components/collection-download-button"
|
||||
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import type { CollectionRef } from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
FAVORITES_DOWNLOAD_ID,
|
||||
useDownloads,
|
||||
useIsCollectionDownloaded,
|
||||
} from "@/contexts/downloads"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
@@ -74,6 +81,7 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
|
||||
"play-last",
|
||||
"shuffle",
|
||||
"favorite",
|
||||
"change-cover",
|
||||
"delete-playlist",
|
||||
]
|
||||
|
||||
@@ -89,7 +97,11 @@ export default function PlaylistScreen() {
|
||||
const songs = playlist?.songs
|
||||
const coverUri =
|
||||
config && playlistId
|
||||
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
|
||||
? playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist?.id ?? playlistId,
|
||||
playlist?.cover ?? null
|
||||
)
|
||||
: ""
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
@@ -111,17 +123,14 @@ export default function PlaylistScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={200}
|
||||
variant="playlist"
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -142,9 +151,9 @@ export default function PlaylistScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Playlist not found.
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -179,10 +188,18 @@ function PlaylistContent({
|
||||
}) {
|
||||
const router = useRouter()
|
||||
const isFocused = useIsFocused()
|
||||
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
||||
usePlaybackActions()
|
||||
const colors = useThemeColors()
|
||||
const {
|
||||
playPlaylist,
|
||||
playPlaylistShuffled,
|
||||
playFromSong,
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
} = usePlaybackActions()
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
const subscribe = useMutation(api.playlists.subscribeToPlaylist)
|
||||
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
|
||||
const deletePlaylist = useMutation(api.playlists.deletePlaylist)
|
||||
@@ -195,17 +212,25 @@ function PlaylistContent({
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const downloadRef = useMemo(
|
||||
() => ({
|
||||
kind: "playlist" as const,
|
||||
id: playlistId ?? FAVORITES_DOWNLOAD_ID,
|
||||
}),
|
||||
[playlistId]
|
||||
)
|
||||
const downloadTarget = useMemo(
|
||||
() => ({ ...downloadRef, title: playlist.title, songIds }),
|
||||
[downloadRef, playlist.title, songIds]
|
||||
)
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
|
||||
: `playlist:${playlistId}`
|
||||
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) =>
|
||||
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
|
||||
[playFromSong, songIds, playlistId]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action),
|
||||
[handleSongAction]
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||
[playFromSong, songIds, playOrigin]
|
||||
)
|
||||
|
||||
const handleRemoveSong = useCallback(
|
||||
@@ -226,13 +251,37 @@ function PlaylistContent({
|
||||
[playlistId, removeSongs]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) => {
|
||||
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
|
||||
else void handleSongAction(song, action, downloadRef)
|
||||
},
|
||||
[downloadRef, handleRemoveSong, handleSongAction]
|
||||
)
|
||||
|
||||
const handlePlay = useCallback(() => {
|
||||
if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [playPlaylist, playlistId, songIds])
|
||||
if (fromDownloads) void playInOrder(songIds, playOrigin)
|
||||
else if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [
|
||||
fromDownloads,
|
||||
playInOrder,
|
||||
playOrigin,
|
||||
playPlaylist,
|
||||
playlistId,
|
||||
songIds,
|
||||
])
|
||||
|
||||
const handleShuffle = useCallback(() => {
|
||||
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||
}, [playPlaylistShuffled, playlistId, songIds])
|
||||
if (fromDownloads) void playShuffled(songIds, playOrigin)
|
||||
else if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||
}, [
|
||||
fromDownloads,
|
||||
playShuffled,
|
||||
playOrigin,
|
||||
playPlaylistShuffled,
|
||||
playlistId,
|
||||
songIds,
|
||||
])
|
||||
|
||||
const handleSubscribeToggle = useCallback(async () => {
|
||||
if (!playlistId) return
|
||||
@@ -267,6 +316,23 @@ function PlaylistContent({
|
||||
void handleDelete()
|
||||
return
|
||||
}
|
||||
if (action === "change-cover") {
|
||||
if (playlistId) {
|
||||
router.push({
|
||||
pathname: "/playlist-cover",
|
||||
params: { id: playlistId },
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
if (action === "download") {
|
||||
void requestDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
if (action === "remove-download") {
|
||||
void removeDownload(downloadTarget)
|
||||
return
|
||||
}
|
||||
|
||||
void handlePlaylistDetailAction(songIds, action)
|
||||
}
|
||||
@@ -277,10 +343,7 @@ function PlaylistContent({
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -290,6 +353,7 @@ function PlaylistContent({
|
||||
<MediaActionMenu
|
||||
selectedCount={songIds.length}
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
downloaded={playlistDownloaded}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlistId ?? "favorites",
|
||||
@@ -299,11 +363,10 @@ function PlaylistContent({
|
||||
onAction={handlePlaylistMenuAction}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -311,7 +374,12 @@ function PlaylistContent({
|
||||
}
|
||||
}, [
|
||||
canEdit,
|
||||
colors.foreground,
|
||||
deletePlaylist,
|
||||
downloadTarget,
|
||||
playlistDownloaded,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.isDark,
|
||||
@@ -329,6 +397,7 @@ function PlaylistContent({
|
||||
removable={canEdit}
|
||||
palette={palette}
|
||||
swipeGroup={swipeGroup}
|
||||
downloadRef={downloadRef}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleSongMenuAction}
|
||||
onRemove={handleRemoveSong}
|
||||
@@ -336,6 +405,7 @@ function PlaylistContent({
|
||||
),
|
||||
[
|
||||
canEdit,
|
||||
downloadRef,
|
||||
handlePlaySong,
|
||||
handleRemoveSong,
|
||||
handleSongMenuAction,
|
||||
@@ -370,15 +440,14 @@ function PlaylistContent({
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListEmptyComponent={
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={[
|
||||
styles.emptyResults,
|
||||
{ color: palette.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<PlaylistHero
|
||||
@@ -391,6 +460,7 @@ function PlaylistContent({
|
||||
isSubscribed={isSubscribed}
|
||||
showSubscribe={!playlist.isOwner && playlistId !== null}
|
||||
onSubscribeToggle={handleSubscribeToggle}
|
||||
downloadTarget={downloadTarget}
|
||||
onPlay={handlePlay}
|
||||
onShuffle={handleShuffle}
|
||||
/>
|
||||
@@ -410,6 +480,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
removable,
|
||||
palette,
|
||||
swipeGroup,
|
||||
downloadRef,
|
||||
onPlay,
|
||||
onAction,
|
||||
onRemove,
|
||||
@@ -419,6 +490,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
removable: boolean
|
||||
palette: CoverPalette
|
||||
swipeGroup: SwipeRowGroup
|
||||
downloadRef: CollectionRef
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
onRemove: (songId: Id<"songs">) => Promise<boolean>
|
||||
@@ -432,6 +504,8 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
palette={palette}
|
||||
inset
|
||||
removable={removable}
|
||||
downloadFrom={downloadRef}
|
||||
swipe={
|
||||
Platform.OS !== "web"
|
||||
? {
|
||||
@@ -439,12 +513,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
backgroundColor: palette.background,
|
||||
onPlayNext: () => onAction(song, "play-next"),
|
||||
onAddToQueue: () => onAction(song, "play-last"),
|
||||
onRemove:
|
||||
Platform.OS === "android" && removable
|
||||
? () => {
|
||||
void onRemove(song.id)
|
||||
}
|
||||
: undefined,
|
||||
onRemove: removable ? () => void handleRemove() : undefined,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
@@ -475,19 +544,15 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
}}
|
||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||
>
|
||||
<PaletteIcon
|
||||
name="trash"
|
||||
size={22}
|
||||
color={colors.primaryForeground}
|
||||
/>
|
||||
<PaletteText
|
||||
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||
<Text
|
||||
style={[
|
||||
styles.removeActionText,
|
||||
{ color: colors.primaryForeground },
|
||||
]}
|
||||
>
|
||||
Remove
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</Pressable>
|
||||
)}
|
||||
>
|
||||
@@ -506,9 +571,11 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
isSubscribed,
|
||||
showSubscribe = false,
|
||||
onSubscribeToggle,
|
||||
downloadTarget,
|
||||
onPlay,
|
||||
onShuffle,
|
||||
}: {
|
||||
downloadTarget: CollectionDownloadTarget
|
||||
entityId: string
|
||||
coverUri: string
|
||||
hasCover: boolean
|
||||
@@ -567,8 +634,7 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||
<Ionicons
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={
|
||||
@@ -577,6 +643,15 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
@@ -587,25 +662,15 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
<CollectionDownloadButton
|
||||
target={downloadTarget}
|
||||
color={palette.foreground}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
/>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -613,16 +678,20 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
</Text>
|
||||
<Text
|
||||
style={{
|
||||
color: palette.foreground,
|
||||
fontSize: heroLayout.landscape ? 22 : 16,
|
||||
}}
|
||||
>
|
||||
{ownerName}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
<DownloadedQuality
|
||||
collection={downloadTarget}
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</CollectionHero>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -16,6 +16,14 @@ import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import {
|
||||
CollectionDownloadButton,
|
||||
type CollectionDownloadTarget,
|
||||
DownloadedQuality,
|
||||
} from "@/components/collection-download-button"
|
||||
import { useOpenedFromDownloads } from "@/lib/downloads-navigation"
|
||||
import { downloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import { FAVORITES_DOWNLOAD_ID } from "@/contexts/downloads"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
@@ -31,39 +39,52 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
|
||||
const DOWNLOAD_REF = { kind: "playlist", id: FAVORITES_DOWNLOAD_ID } as const
|
||||
|
||||
export default function FavoritesScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
|
||||
const songs = favorites?.songs ?? []
|
||||
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
|
||||
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const fromDownloads = useOpenedFromDownloads()
|
||||
const playOrigin = fromDownloads
|
||||
? downloadsQueueOrigin("playlist:favorites")
|
||||
: undefined
|
||||
const downloadTarget = useMemo(
|
||||
() => ({
|
||||
...DOWNLOAD_REF,
|
||||
title: favorites?.title ?? "Favorites",
|
||||
songIds,
|
||||
}),
|
||||
[favorites?.title, songIds]
|
||||
)
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
|
||||
useEffect(() => {
|
||||
if (favorites) rememberSongs(favorites.songs)
|
||||
}, [favorites])
|
||||
rememberSongs(songs)
|
||||
}, [songs])
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
[playFromSong, songIds]
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||
[playFromSong, playOrigin, songIds]
|
||||
)
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action),
|
||||
void handleSongAction(song, action, DOWNLOAD_REF),
|
||||
[handleSongAction]
|
||||
)
|
||||
const handlePlay = useCallback(
|
||||
() => void playInOrder(songIds),
|
||||
[playInOrder, songIds]
|
||||
() => void playInOrder(songIds, playOrigin),
|
||||
[playInOrder, playOrigin, songIds]
|
||||
)
|
||||
const handleShuffle = useCallback(
|
||||
() => void playShuffled(songIds),
|
||||
[playShuffled, songIds]
|
||||
() => void playShuffled(songIds, playOrigin),
|
||||
[playShuffled, playOrigin, songIds]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
@@ -73,6 +94,7 @@ export default function FavoritesScreen() {
|
||||
favorited={isSongFavorite(song.id)}
|
||||
playlistLabel="Add to Another Playlist"
|
||||
inset
|
||||
downloadFrom={DOWNLOAD_REF}
|
||||
onPlay={handlePlaySong}
|
||||
onAction={handleSongMenuAction}
|
||||
/>
|
||||
@@ -84,7 +106,7 @@ export default function FavoritesScreen() {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<CollectionDetailSkeleton />
|
||||
<CollectionDetailSkeleton variant="favorites" />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -127,6 +149,7 @@ export default function FavoritesScreen() {
|
||||
ListHeaderComponent={
|
||||
<FavoritesHero
|
||||
title={favorites.title}
|
||||
downloadTarget={downloadTarget}
|
||||
onPlay={handlePlay}
|
||||
onShuffle={handleShuffle}
|
||||
/>
|
||||
@@ -142,10 +165,12 @@ function songKey(song: BrowseSong) {
|
||||
|
||||
const FavoritesHero = memo(function FavoritesHero({
|
||||
title,
|
||||
downloadTarget,
|
||||
onPlay,
|
||||
onShuffle,
|
||||
}: {
|
||||
title: string
|
||||
downloadTarget: CollectionDownloadTarget
|
||||
onPlay: () => void
|
||||
onShuffle: () => void
|
||||
}) {
|
||||
@@ -166,13 +191,12 @@ const FavoritesHero = memo(function FavoritesHero({
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
{title}
|
||||
</Text>
|
||||
<DownloadedQuality
|
||||
collection={DOWNLOAD_REF}
|
||||
color={colors.mutedForeground}
|
||||
backgroundColor={colors.background}
|
||||
/>
|
||||
<View style={styles.actions}>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
@@ -182,6 +206,17 @@ const FavoritesHero = memo(function FavoritesHero({
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
/>
|
||||
<CollectionDownloadButton
|
||||
target={downloadTarget}
|
||||
color={colors.foreground}
|
||||
style={[styles.iconAction, { backgroundColor: colors.muted }]}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
<CollectionDivider />
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
import { atmosEnabled, dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import {
|
||||
atmosEnabled,
|
||||
deviceDownloadQualities,
|
||||
dolbyAtmosSupported,
|
||||
} from "@/lib/playback-capabilities"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { useState } from "react"
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import { router } from "expo-router"
|
||||
import {
|
||||
Alert,
|
||||
Platform,
|
||||
Pressable,
|
||||
ScrollView,
|
||||
@@ -16,7 +21,19 @@ import {
|
||||
} from "react-native"
|
||||
import type { StyleProp, ViewStyle } from "react-native"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
|
||||
import {
|
||||
readRememberedDownloadQuality,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import {
|
||||
DOWNLOAD_QUALITY_DETAILS,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
@@ -26,6 +43,7 @@ import {
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { changeServer, signOut } from "@/lib/session"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
@@ -34,7 +52,7 @@ import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
type Section = "profile" | "quality" | "library" | "users"
|
||||
type Section = "profile" | "quality" | "downloads" | "library" | "users"
|
||||
|
||||
type CurrentUser = {
|
||||
_id: Id<"users">
|
||||
@@ -74,6 +92,7 @@ const QUALITY_OPTIONS: {
|
||||
const SECTIONS: SectionConfig[] = [
|
||||
{ id: "profile", label: "Profile", icon: "person-circle-outline" },
|
||||
{ id: "quality", label: "Playback", icon: "volume-high-outline" },
|
||||
{ id: "downloads", label: "Downloads", icon: "arrow-down-circle-outline" },
|
||||
{ id: "library", label: "Library", icon: "library-outline", admin: true },
|
||||
{ id: "users", label: "Users", icon: "people-outline", admin: true },
|
||||
]
|
||||
@@ -155,6 +174,7 @@ export default function SettingsScreen() {
|
||||
</>
|
||||
) : null}
|
||||
{section === "quality" ? <QualitySection user={user} /> : null}
|
||||
{section === "downloads" ? <DownloadsSection /> : null}
|
||||
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
||||
{section === "users" && isAdmin && allUsers ? (
|
||||
<UsersSection users={allUsers} currentUserId={user._id} />
|
||||
@@ -185,6 +205,7 @@ function AppearanceSection() {
|
||||
setSaving(true)
|
||||
try {
|
||||
await setArtworkColorsEnabled(checked)
|
||||
clearCoverPaletteCache()
|
||||
} catch {
|
||||
showError("Could not save artwork colors preference.")
|
||||
} finally {
|
||||
@@ -430,6 +451,299 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Shades of the text color, faintest for the smallest files. */
|
||||
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
|
||||
low: 0.2,
|
||||
medium: 0.35,
|
||||
high: 0.5,
|
||||
lossless: 0.75,
|
||||
atmos: 1,
|
||||
}
|
||||
|
||||
function songCount(count: number) {
|
||||
return count === 1 ? "1 song" : `${count} songs`
|
||||
}
|
||||
|
||||
function QualityName({
|
||||
quality,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
quality: DownloadQuality
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
if (quality === "lossless" || quality === "atmos") {
|
||||
return (
|
||||
<AudioFormatBadge
|
||||
format={quality}
|
||||
color={color}
|
||||
backgroundColor={backgroundColor}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<Text style={{ color, fontSize: 13, fontWeight: "500" }}>
|
||||
{DOWNLOAD_QUALITY_LABELS[quality]}
|
||||
</Text>
|
||||
)
|
||||
}
|
||||
|
||||
function confirm(title: string, onConfirm: () => void) {
|
||||
Alert.alert(title, undefined, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{ text: "Remove", style: "destructive", onPress: onConfirm },
|
||||
])
|
||||
}
|
||||
|
||||
function RememberedQualityCard() {
|
||||
const colors = useThemeColors()
|
||||
// undefined until read; null means ask every time.
|
||||
const [remembered, setRemembered] = useState<DownloadQuality | null>()
|
||||
useEffect(() => {
|
||||
void readRememberedDownloadQuality().then((quality) =>
|
||||
setRemembered(quality ?? null)
|
||||
)
|
||||
}, [])
|
||||
const options: {
|
||||
value: DownloadQuality | null
|
||||
label: string
|
||||
detail: string
|
||||
}[] = [
|
||||
{ value: null, label: "Ask every time", detail: "Choose when downloading" },
|
||||
...deviceDownloadQualities.map((quality) => ({
|
||||
value: quality,
|
||||
label: DOWNLOAD_QUALITY_LABELS[quality],
|
||||
detail: DOWNLOAD_QUALITY_DETAILS[quality],
|
||||
})),
|
||||
]
|
||||
|
||||
return (
|
||||
<SettingsCard title="Download Quality">
|
||||
{options.map((option) => {
|
||||
const selected = remembered === option.value
|
||||
return (
|
||||
<Pressable
|
||||
key={option.value ?? "ask"}
|
||||
accessibilityRole="button"
|
||||
accessibilityState={{ selected }}
|
||||
onPress={() => {
|
||||
setRemembered(option.value)
|
||||
void writeRememberedDownloadQuality(option.value ?? undefined)
|
||||
}}
|
||||
style={[
|
||||
styles.optionRow,
|
||||
{
|
||||
borderColor: selected ? colors.primary : colors.border,
|
||||
backgroundColor: selected ? colors.muted : colors.card,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text style={[styles.optionTitle, { color: colors.foreground }]}>
|
||||
{option.label}
|
||||
</Text>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
{option.detail}
|
||||
</Text>
|
||||
</View>
|
||||
{selected ? (
|
||||
<Ionicons
|
||||
name="checkmark-circle"
|
||||
size={22}
|
||||
color={colors.primary}
|
||||
/>
|
||||
) : null}
|
||||
</Pressable>
|
||||
)
|
||||
})}
|
||||
</SettingsCard>
|
||||
)
|
||||
}
|
||||
|
||||
function DownloadsSection() {
|
||||
const colors = useThemeColors()
|
||||
const { queue } = useDownloads()
|
||||
const version = useDownloadsVersion()
|
||||
const breakdown = useMemo(
|
||||
() => queue?.breakdown(),
|
||||
// version invalidates the breakdown when downloads change.
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
[queue, version]
|
||||
)
|
||||
if (!queue || !breakdown) return null
|
||||
const qualities = breakdown.byQuality.filter((entry) => entry.songs > 0)
|
||||
|
||||
return (
|
||||
<>
|
||||
<SettingsCard title="Storage">
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
{formatBytes(breakdown.bytes)} · {songCount(breakdown.songs)}
|
||||
{breakdown.queued > 0 ? ` · ${breakdown.queued} downloading` : ""}
|
||||
</Text>
|
||||
{breakdown.songs > 0 ? (
|
||||
<>
|
||||
<View
|
||||
style={[styles.storageBar, { backgroundColor: colors.muted }]}
|
||||
>
|
||||
{qualities.map((entry) => (
|
||||
<View
|
||||
key={entry.quality}
|
||||
style={{
|
||||
flex: entry.bytes,
|
||||
backgroundColor: colors.foreground,
|
||||
opacity: QUALITY_OPACITY[entry.quality],
|
||||
}}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
{qualities.map((entry) => (
|
||||
<View key={entry.quality} style={styles.storageRow}>
|
||||
<View
|
||||
style={[
|
||||
styles.storageDot,
|
||||
{
|
||||
backgroundColor: colors.foreground,
|
||||
opacity: QUALITY_OPACITY[entry.quality],
|
||||
},
|
||||
]}
|
||||
/>
|
||||
<View style={{ flex: 1 }}>
|
||||
<QualityName
|
||||
quality={entry.quality}
|
||||
color={colors.foreground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
</View>
|
||||
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
|
||||
{songCount(entry.songs)}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.storageSize, { color: colors.foreground }]}
|
||||
>
|
||||
{formatBytes(entry.bytes)}
|
||||
</Text>
|
||||
</View>
|
||||
))}
|
||||
</>
|
||||
) : null}
|
||||
</SettingsCard>
|
||||
|
||||
<RememberedQualityCard />
|
||||
|
||||
{breakdown.collections.length > 0 ||
|
||||
breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<SettingsCard title="Downloaded">
|
||||
{breakdown.collections.map(
|
||||
({ collection, bytes, status, fallbackCount }) => (
|
||||
<View
|
||||
key={`${collection.kind}:${collection.id}`}
|
||||
style={styles.storageRow}
|
||||
>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text
|
||||
style={{ color: colors.foreground, fontSize: 15 }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{collection.title}
|
||||
</Text>
|
||||
<View style={styles.collectionMeta}>
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
{collection.kind === "album" ? "Album" : "Playlist"} ·
|
||||
</Text>
|
||||
<QualityName
|
||||
quality={collection.quality}
|
||||
color={colors.mutedForeground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
{fallbackCount > 0 ? (
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
({fallbackCount} in High)
|
||||
</Text>
|
||||
) : null}
|
||||
{status.downloaded < status.total ? (
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 13 }}
|
||||
>
|
||||
· {status.downloaded} of {status.total}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
</View>
|
||||
<Text
|
||||
style={[styles.storageSize, { color: colors.foreground }]}
|
||||
>
|
||||
{formatBytes(bytes)}
|
||||
</Text>
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={`Remove download of ${collection.title}`}
|
||||
onPress={() =>
|
||||
confirm(
|
||||
`Remove ${collection.title}?`,
|
||||
() => void queue.removeCollection(collection)
|
||||
)
|
||||
}
|
||||
>
|
||||
<Ionicons
|
||||
name="trash-outline"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
)}
|
||||
{breakdown.otherSongs.songIds.length > 0 ? (
|
||||
<View style={styles.storageRow}>
|
||||
<View style={styles.optionCopy}>
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
Other Downloaded Songs
|
||||
</Text>
|
||||
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
|
||||
{songCount(breakdown.otherSongs.songIds.length)}
|
||||
</Text>
|
||||
</View>
|
||||
<Text style={[styles.storageSize, { color: colors.foreground }]}>
|
||||
{formatBytes(breakdown.otherSongs.bytes)}
|
||||
</Text>
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Remove Other Downloaded Songs"
|
||||
onPress={() =>
|
||||
confirm(
|
||||
"Remove Other Downloaded Songs?",
|
||||
() => void queue.removeOtherSongs()
|
||||
)
|
||||
}
|
||||
>
|
||||
<Ionicons
|
||||
name="trash-outline"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
) : null}
|
||||
<Button
|
||||
title="Remove All Downloads"
|
||||
variant="destructive"
|
||||
onPress={() =>
|
||||
confirm("Remove all downloads?", () => void queue.removeAll())
|
||||
}
|
||||
/>
|
||||
</SettingsCard>
|
||||
) : null}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
function LibrarySection() {
|
||||
const updateLibrary = useAction(api.actions.updateLibrary)
|
||||
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
|
||||
@@ -872,6 +1186,31 @@ const styles = StyleSheet.create({
|
||||
divider: {
|
||||
height: StyleSheet.hairlineWidth,
|
||||
},
|
||||
storageBar: {
|
||||
height: 8,
|
||||
borderRadius: 4,
|
||||
overflow: "hidden",
|
||||
flexDirection: "row",
|
||||
},
|
||||
storageRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
minHeight: 36,
|
||||
},
|
||||
storageDot: { width: 8, height: 8, borderRadius: 4 },
|
||||
storageSize: {
|
||||
minWidth: 56,
|
||||
textAlign: "right",
|
||||
fontSize: 13,
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
collectionMeta: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 4,
|
||||
},
|
||||
optionRow: {
|
||||
borderWidth: 1,
|
||||
borderRadius: radius.lg,
|
||||
|
||||
@@ -2,6 +2,7 @@ import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
@@ -14,26 +15,28 @@ export default function LibraryLayout() {
|
||||
const baseOptions = useStackScreenOptions({ title: "Library" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value="library">
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
@@ -24,6 +24,11 @@ const links = [
|
||||
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
|
||||
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
|
||||
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
|
||||
{
|
||||
title: "Downloads",
|
||||
href: "/downloads",
|
||||
icon: "arrow.down.circle" as const,
|
||||
},
|
||||
{
|
||||
title: "Recently Played",
|
||||
href: "/recently-played",
|
||||
@@ -51,6 +56,7 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
||||
clock: "time",
|
||||
sparkles: "sparkles",
|
||||
star: "star",
|
||||
"arrow.down.circle": "arrow-down-circle",
|
||||
}
|
||||
return (
|
||||
<Ionicons
|
||||
@@ -118,12 +124,7 @@ export default function LibraryScreen() {
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
return (
|
||||
<View style={{ flex: 1, backgroundColor: colors.background }}>
|
||||
{listHeader}
|
||||
<MediaGridSkeleton contentInset={false} />
|
||||
</View>
|
||||
)
|
||||
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { TabStackContext } from "@/lib/app-navigation"
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
@@ -12,24 +13,26 @@ export default function SearchLayout() {
|
||||
const baseOptions = useStackScreenOptions({ title: "Search" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
<TabStackContext value="search">
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
route.name === "index"
|
||||
? () => [
|
||||
{
|
||||
type: "custom",
|
||||
element: <ProfileHeaderButton />,
|
||||
hidesSharedBackground: true,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
})}
|
||||
/>
|
||||
</TabStackContext>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../home/downloads/other"
|
||||
@@ -17,6 +17,7 @@ import { useEffect, useSyncExternalStore } from "react"
|
||||
import { AppIntentBridge } from "@/components/app-intent-bridge"
|
||||
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
||||
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
|
||||
import { DownloadsProvider } from "@/contexts/downloads"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { FavoritesProvider } from "@/contexts/favorites"
|
||||
import { PlaybackProvider } from "@/contexts/playback"
|
||||
@@ -75,52 +76,70 @@ export default function AppLayout() {
|
||||
<PlaybackProvider>
|
||||
<AppNavigationSync />
|
||||
<AddToPlaylistProvider>
|
||||
<FavoritesProvider>
|
||||
<AppIntentBridge />
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
options={{ headerShown: false, animation: "none" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
fullScreenGestureEnabled: true,
|
||||
}}
|
||||
/>
|
||||
</Stack>
|
||||
</FavoritesProvider>
|
||||
<DownloadsProvider>
|
||||
<FavoritesProvider>
|
||||
<AppIntentBridge />
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
options={{ headerShown: false, animation: "none" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="playlist-cover"
|
||||
options={{
|
||||
title: "Cover",
|
||||
headerTitleAlign: "center",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerShadowVisible: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
fullScreenGestureEnabled: true,
|
||||
}}
|
||||
/>
|
||||
</Stack>
|
||||
</FavoritesProvider>
|
||||
</DownloadsProvider>
|
||||
</AddToPlaylistProvider>
|
||||
</PlaybackProvider>
|
||||
</ConvexAuthRecovery>
|
||||
|
||||
+167
-153
@@ -1,12 +1,15 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { TabletNowPlaying } from "@/components/tablet-now-playing"
|
||||
import {
|
||||
TabletNowPlaying,
|
||||
type PlayerPanel,
|
||||
} from "@/components/tablet-now-playing"
|
||||
import { atmosEnabled } from "@/lib/playback-capabilities"
|
||||
import { NavigationBar } from "expo-navigation-bar"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Stack, useRouter, useLocalSearchParams } from "expo-router"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
import {
|
||||
Platform,
|
||||
@@ -45,16 +48,18 @@ import {
|
||||
QUEUE_HORIZONTAL_INSET,
|
||||
} from "@/components/now-playing-queue"
|
||||
import { PlayerArtistMenu } from "@/components/player-artist-menu"
|
||||
import { PlayerProgress } from "@/components/player-progress"
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { LyricsView } from "@/components/lyrics-view"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useLyrics } from "@/hooks/use-lyrics"
|
||||
import { useCoverPalette } from "@/hooks/use-cover-palette"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import {
|
||||
nowPlayingColors,
|
||||
type NowPlayingColors,
|
||||
@@ -90,20 +95,19 @@ export default function PlayerScreen() {
|
||||
isPlaying,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
currentTime,
|
||||
duration,
|
||||
queueSongIds,
|
||||
setIsPlaying,
|
||||
seekTo,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
} = usePlayback()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const { queue } = useLocalSearchParams<{ queue?: string }>()
|
||||
const [showQueue, setShowQueue] = useState(queue === "1")
|
||||
} = usePlaybackQueue()
|
||||
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
|
||||
const params = useLocalSearchParams<{ queue?: string; lyrics?: string }>()
|
||||
// The queue or lyrics, shown in place of the artwork.
|
||||
const [panel, setPanel] = useState<PlayerPanel | null>(
|
||||
params.queue === "1" ? "queue" : params.lyrics === "1" ? "lyrics" : null
|
||||
)
|
||||
const showQueue = panel === "queue"
|
||||
const showLyrics = panel === "lyrics"
|
||||
const lyrics = useLyrics(currentSong?.id ?? null)
|
||||
const [isDismissing, setIsDismissing] = useState(false)
|
||||
const [stageHeight, setStageHeight] = useState(0)
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const playbackInfo = useCachedQuery(
|
||||
api.library.getSongPlaybackInfo,
|
||||
@@ -126,7 +130,7 @@ export default function PlayerScreen() {
|
||||
coverUri,
|
||||
currentSong ? currentSong.album.cover != null : undefined
|
||||
)
|
||||
const colors = nowPlayingColors(palette)
|
||||
const colors = useMemo(() => nowPlayingColors(palette), [palette])
|
||||
|
||||
const background = useSharedValue(colors.background)
|
||||
useEffect(() => {
|
||||
@@ -159,33 +163,65 @@ export default function PlayerScreen() {
|
||||
}))
|
||||
|
||||
// The player covers the status bar, so it can't use the native sheet's
|
||||
// swipe to dismiss.
|
||||
function dismissGesture() {
|
||||
return Gesture.Pan()
|
||||
.activeOffsetY(12)
|
||||
.failOffsetY(-12)
|
||||
.failOffsetX([-20, 20])
|
||||
.onUpdate((event) => {
|
||||
dismissY.value = Math.max(0, event.translationY)
|
||||
})
|
||||
.onEnd((event) => {
|
||||
if (
|
||||
event.translationY > DISMISS_DISTANCE ||
|
||||
event.velocityY > DISMISS_VELOCITY
|
||||
) {
|
||||
scheduleOnRN(setIsDismissing, true)
|
||||
dismissY.value = withTiming(
|
||||
windowHeight,
|
||||
{ duration: 220 },
|
||||
(finished) => {
|
||||
if (finished) scheduleOnRN(router.back)
|
||||
}
|
||||
)
|
||||
} else {
|
||||
dismissY.value = withSpring(0, { duration: 350, dampingRatio: 0.85 })
|
||||
}
|
||||
})
|
||||
}
|
||||
// swipe to dismiss. Each GestureDetector needs its own gesture instance.
|
||||
const makeDismissGesture = useCallback(
|
||||
() =>
|
||||
Gesture.Pan()
|
||||
.activeOffsetY(12)
|
||||
.failOffsetY(-12)
|
||||
.failOffsetX([-20, 20])
|
||||
.onUpdate((event) => {
|
||||
dismissY.value = Math.max(0, event.translationY)
|
||||
})
|
||||
.onEnd((event) => {
|
||||
if (
|
||||
event.translationY > DISMISS_DISTANCE ||
|
||||
event.velocityY > DISMISS_VELOCITY
|
||||
) {
|
||||
scheduleOnRN(setIsDismissing, true)
|
||||
dismissY.value = withTiming(
|
||||
windowHeight,
|
||||
{ duration: 220 },
|
||||
(finished) => {
|
||||
if (finished) scheduleOnRN(router.back)
|
||||
}
|
||||
)
|
||||
} else {
|
||||
dismissY.value = withSpring(0, {
|
||||
duration: 350,
|
||||
dampingRatio: 0.85,
|
||||
})
|
||||
}
|
||||
}),
|
||||
[dismissY, router, windowHeight]
|
||||
)
|
||||
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||
const stageGesture = useMemo(
|
||||
() => makeDismissGesture().enabled(panel === null),
|
||||
[makeDismissGesture, panel]
|
||||
)
|
||||
|
||||
const hasCover = currentSong ? currentSong.album.cover != null : false
|
||||
const queueHeader = useMemo(
|
||||
() =>
|
||||
currentSong ? (
|
||||
<View style={styles.queueHeader}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={styles.queueArtwork}
|
||||
/>
|
||||
<SongMeta song={currentSong} colors={colors} compact />
|
||||
</View>
|
||||
) : null,
|
||||
[colors, coverUri, currentSong, hasCover]
|
||||
)
|
||||
const songMeta = useMemo(
|
||||
() =>
|
||||
currentSong ? <SongMeta song={currentSong} colors={colors} /> : null,
|
||||
[colors, currentSong]
|
||||
)
|
||||
|
||||
const hasQueue = queueSongIds.length > 0
|
||||
|
||||
@@ -204,7 +240,6 @@ export default function PlayerScreen() {
|
||||
return null
|
||||
}
|
||||
|
||||
const hasCover = currentSong.album.cover != null
|
||||
const bottomInset = Math.max(insets.bottom, spacing.md)
|
||||
const artworkSize = Math.max(
|
||||
0,
|
||||
@@ -213,18 +248,15 @@ export default function PlayerScreen() {
|
||||
stageHeight > 0 ? stageHeight - META_HEIGHT - spacing.xl : Infinity
|
||||
)
|
||||
)
|
||||
const displayedTime = scrubTime ?? currentTime
|
||||
const timeColor =
|
||||
scrubTime === null ? colors.secondaryForeground : colors.foreground
|
||||
|
||||
function togglePlayback() {
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light)
|
||||
setIsPlaying(!isPlaying)
|
||||
}
|
||||
|
||||
function toggleQueue() {
|
||||
function togglePanel(next: PlayerPanel) {
|
||||
void Haptics.selectionAsync()
|
||||
setShowQueue((value) => !value)
|
||||
setPanel((value) => (value === next ? null : next))
|
||||
}
|
||||
|
||||
if (isTablet) {
|
||||
@@ -234,10 +266,11 @@ export default function PlayerScreen() {
|
||||
colors={colors}
|
||||
backgroundStyle={backgroundStyle}
|
||||
dismissStyle={dismissStyle}
|
||||
dismissGesture={dismissGesture}
|
||||
showQueue={showQueue}
|
||||
toggleQueue={toggleQueue}
|
||||
metadata={<SongMeta song={currentSong} colors={colors} />}
|
||||
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
|
||||
panel={panel}
|
||||
togglePanel={togglePanel}
|
||||
lyrics={lyrics}
|
||||
metadata={songMeta}
|
||||
/>
|
||||
</MusicEntityView>
|
||||
)
|
||||
@@ -264,7 +297,7 @@ export default function PlayerScreen() {
|
||||
id={currentSong.id}
|
||||
style={[styles.safe, { paddingTop: insets.top }]}
|
||||
>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={handleGesture}>
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
hitSlop={12}
|
||||
@@ -278,7 +311,7 @@ export default function PlayerScreen() {
|
||||
</Pressable>
|
||||
</GestureDetector>
|
||||
|
||||
<GestureDetector gesture={dismissGesture().enabled(!showQueue)}>
|
||||
<GestureDetector gesture={stageGesture}>
|
||||
<View
|
||||
style={styles.stage}
|
||||
onLayout={(event) =>
|
||||
@@ -297,23 +330,24 @@ export default function PlayerScreen() {
|
||||
<NowPlayingQueue
|
||||
colors={colors}
|
||||
viewportHeight={stageHeight}
|
||||
currentHeader={
|
||||
<View style={styles.queueHeader}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={styles.queueArtwork}
|
||||
/>
|
||||
<SongMeta
|
||||
song={currentSong}
|
||||
colors={colors}
|
||||
compact
|
||||
/>
|
||||
</View>
|
||||
}
|
||||
currentHeader={queueHeader}
|
||||
/>
|
||||
</Animated.View>
|
||||
) : null
|
||||
) : showLyrics ? (
|
||||
<Animated.View
|
||||
key="lyrics"
|
||||
entering={MODE_FADE_IN}
|
||||
exiting={MODE_FADE_OUT}
|
||||
style={[styles.fill, styles.artworkMode]}
|
||||
>
|
||||
{queueHeader}
|
||||
<LyricsView
|
||||
key={currentSong.id}
|
||||
lyrics={lyrics}
|
||||
colors={colors}
|
||||
/>
|
||||
</Animated.View>
|
||||
) : (
|
||||
<Animated.View
|
||||
key="artwork"
|
||||
@@ -334,50 +368,28 @@ export default function PlayerScreen() {
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
<View style={styles.meta}>
|
||||
<SongMeta song={currentSong} colors={colors} />
|
||||
</View>
|
||||
<View style={styles.meta}>{songMeta}</View>
|
||||
</Animated.View>
|
||||
)}
|
||||
</LayoutAnimationConfig>
|
||||
</View>
|
||||
</GestureDetector>
|
||||
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={controlsGesture}>
|
||||
<View style={[styles.controls, { paddingBottom: bottomInset }]}>
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={displayedTime}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.timeRow}>
|
||||
<Text style={[styles.time, { color: timeColor }]}>
|
||||
{formatDuration(displayedTime)}
|
||||
</Text>
|
||||
{format ? (
|
||||
<View style={styles.format} pointerEvents="none">
|
||||
<PlayerProgress
|
||||
colors={colors}
|
||||
timeStyle={styles.time}
|
||||
center={
|
||||
format ? (
|
||||
<AudioFormatBadge
|
||||
format={format}
|
||||
color={colors.secondaryForeground}
|
||||
backgroundColor={colors.background}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
<Text style={[styles.time, { color: timeColor }]}>
|
||||
{formatRemainingDuration(displayedTime, duration).replace(
|
||||
"-",
|
||||
"\u2212"
|
||||
)}
|
||||
</Text>
|
||||
</View>
|
||||
) : null
|
||||
}
|
||||
/>
|
||||
|
||||
<View style={styles.transport}>
|
||||
<TransportButton
|
||||
@@ -419,50 +431,33 @@ export default function PlayerScreen() {
|
||||
</TransportButton>
|
||||
</View>
|
||||
|
||||
{volumeAvailable ? (
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
commitHoldMs={0}
|
||||
animateValueChanges
|
||||
value={volume}
|
||||
maximumValue={1}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setVolume}
|
||||
leading={
|
||||
<PlayerSymbol
|
||||
name="speaker.fill"
|
||||
fallback="volume-low"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
trailing={
|
||||
<PlayerSymbol
|
||||
name="speaker.wave.3.fill"
|
||||
fallback="volume-high"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
) : null}
|
||||
<VolumeSlider colors={colors} />
|
||||
|
||||
<View style={styles.footer}>
|
||||
<Pressable
|
||||
disabled
|
||||
onPress={() => togglePanel("lyrics")}
|
||||
disabled={!lyrics && !showLyrics}
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
style={[styles.queueButton, styles.unavailable]}
|
||||
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
|
||||
accessibilityState={{
|
||||
selected: showLyrics,
|
||||
disabled: !lyrics && !showLyrics,
|
||||
}}
|
||||
style={[
|
||||
styles.queueButton,
|
||||
!lyrics && !showLyrics && styles.unavailable,
|
||||
showLyrics && { backgroundColor: colors.selected },
|
||||
]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback={{ material: "lyrics" }}
|
||||
size={27}
|
||||
weight="semibold"
|
||||
color={colors.foreground}
|
||||
color={
|
||||
showLyrics ? colors.selectedForeground : colors.foreground
|
||||
}
|
||||
/>
|
||||
</Pressable>
|
||||
<AudioOutputButton
|
||||
@@ -470,7 +465,7 @@ export default function PlayerScreen() {
|
||||
style={styles.queueButton}
|
||||
/>
|
||||
<Pressable
|
||||
onPress={toggleQueue}
|
||||
onPress={() => togglePanel("queue")}
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||
@@ -517,6 +512,41 @@ export default function PlayerScreen() {
|
||||
)
|
||||
}
|
||||
|
||||
/** Phone volume slider. Owns the volume listener so volume changes stay local. */
|
||||
function VolumeSlider({ colors }: { colors: NowPlayingColors }) {
|
||||
const { volume, setVolume, available } = useSystemVolume()
|
||||
if (!available) return null
|
||||
return (
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
commitHoldMs={0}
|
||||
animateValueChanges
|
||||
value={volume}
|
||||
maximumValue={1}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setVolume}
|
||||
leading={
|
||||
<PlayerSymbol
|
||||
name="speaker.fill"
|
||||
fallback="volume-low"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
trailing={
|
||||
<PlayerSymbol
|
||||
name="speaker.wave.3.fill"
|
||||
fallback="volume-high"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/** Title and artist with the favorite and more buttons. */
|
||||
function SongMeta({
|
||||
song,
|
||||
@@ -739,23 +769,7 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: HORIZONTAL_INSET,
|
||||
paddingTop: spacing.md,
|
||||
},
|
||||
timeRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
format: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
alignItems: "center",
|
||||
},
|
||||
time: {
|
||||
fontSize: 12,
|
||||
fontWeight: "600",
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
time: { fontWeight: "600" },
|
||||
transport: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -0,0 +1,391 @@
|
||||
import { useMutation } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { router, Stack, useLocalSearchParams } from "expo-router"
|
||||
import { useMemo, useState, type ReactNode } from "react"
|
||||
import {
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
useWindowDimensions,
|
||||
View,
|
||||
} from "react-native"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { Button, LoadingView } from "@/components/ui/primitives"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import {
|
||||
COVER_GRID_ALBUMS,
|
||||
playlistCoverAlbums,
|
||||
randomPlaylistCovers,
|
||||
} from "@otunes/convex/client/playlist-cover"
|
||||
|
||||
type Choice =
|
||||
| { kind: "current" }
|
||||
| { kind: "albums"; albumIds: Id<"albums">[] }
|
||||
| { kind: "upload"; uri: string; image: string }
|
||||
|
||||
const STRIP_GAP = spacing.sm
|
||||
/** Selection border and padding around each thumb, both sides. */
|
||||
const THUMB_CHROME = 6
|
||||
|
||||
/**
|
||||
* Full screen cover editor for a playlist owner: a large preview of the
|
||||
* selected cover, the current cover pinned apart from four random album
|
||||
* grids, and Save in the header. Opened from the playlist's menu.
|
||||
*/
|
||||
export default function PlaylistCoverScreen() {
|
||||
const { id } = useLocalSearchParams<{ id: string }>()
|
||||
const playlistId = id as Id<"playlists">
|
||||
const playlist = useCachedQuery(api.playlists.browsePlaylistDetail, {
|
||||
id: playlistId,
|
||||
})
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { width } = useWindowDimensions()
|
||||
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
|
||||
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
|
||||
|
||||
const albums = useMemo(
|
||||
() => (playlist ? playlistCoverAlbums(playlist.songs) : []),
|
||||
[playlist]
|
||||
)
|
||||
const [options, setOptions] = useState<Id<"albums">[][] | null>(null)
|
||||
const [selected, setSelected] = useState<Choice | null>(null)
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
// Draw options once the songs arrive.
|
||||
if (options === null && playlist) {
|
||||
setOptions(randomPlaylistCovers(albums))
|
||||
}
|
||||
|
||||
const hasCurrent = playlist?.cover != null
|
||||
const choice: Choice | null =
|
||||
selected ??
|
||||
(hasCurrent
|
||||
? { kind: "current" }
|
||||
: options?.[0]
|
||||
? { kind: "albums", albumIds: options[0] }
|
||||
: null)
|
||||
|
||||
async function pickImage() {
|
||||
const result = await ImagePicker.launchImageLibraryAsync({
|
||||
mediaTypes: ["images"],
|
||||
allowsEditing: true,
|
||||
aspect: [1, 1],
|
||||
quality: 0.7,
|
||||
base64: true,
|
||||
})
|
||||
const asset = result.canceled ? undefined : result.assets[0]
|
||||
if (!asset?.base64) return
|
||||
setSelected({
|
||||
kind: "upload",
|
||||
uri: asset.uri,
|
||||
image: `data:${asset.mimeType ?? "image/jpeg"};base64,${asset.base64}`,
|
||||
})
|
||||
}
|
||||
|
||||
async function save() {
|
||||
if (!choice || choice.kind === "current") {
|
||||
router.back()
|
||||
return
|
||||
}
|
||||
setSaving(true)
|
||||
try {
|
||||
if (choice.kind === "albums") {
|
||||
await setCoverAlbums({ playlistId, albumIds: choice.albumIds })
|
||||
} else {
|
||||
await uploadCover({ playlistId, image: choice.image })
|
||||
}
|
||||
router.back()
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to change cover"
|
||||
)
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
const header = (
|
||||
<Stack.Screen
|
||||
options={{
|
||||
headerLeft: () => (
|
||||
<HeaderButton label="Cancel" onPress={() => router.back()} />
|
||||
),
|
||||
headerRight: () => (
|
||||
<HeaderButton
|
||||
label="Save"
|
||||
bold
|
||||
disabled={saving || !choice}
|
||||
onPress={() => void save()}
|
||||
/>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
)
|
||||
|
||||
if (!playlist || !config || !options) {
|
||||
return (
|
||||
<>
|
||||
{header}
|
||||
<LoadingView />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const serverUrl = config.serverUrl
|
||||
const currentUri = playlistCoverUrl(serverUrl, playlistId, playlist.cover)
|
||||
const previewSize = Math.min(width - spacing.lg * 2, 360)
|
||||
// One row: current | uploaded? | options, thumbs at most 72pt.
|
||||
const thumbCount =
|
||||
options.length + (hasCurrent ? 1 : 0) + (choice?.kind === "upload" ? 1 : 0)
|
||||
const rowItems = thumbCount + (hasCurrent ? 1 : 0)
|
||||
const thumbSize = Math.min(
|
||||
72,
|
||||
Math.floor(
|
||||
(width - spacing.lg * 2 - STRIP_GAP * (rowItems - 1) - 1) /
|
||||
Math.max(thumbCount, 1)
|
||||
) - THUMB_CHROME
|
||||
)
|
||||
|
||||
function renderChoice(item: Choice, size: number) {
|
||||
if (item.kind === "current") {
|
||||
return (
|
||||
<CoverImage
|
||||
uri={currentUri}
|
||||
hasCover
|
||||
style={{ width: size, height: size }}
|
||||
/>
|
||||
)
|
||||
}
|
||||
if (item.kind === "upload") {
|
||||
return (
|
||||
<Image
|
||||
source={{ uri: item.uri }}
|
||||
style={{ width: size, height: size }}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<AlbumGrid serverUrl={serverUrl} albumIds={item.albumIds} size={size} />
|
||||
)
|
||||
}
|
||||
|
||||
const isSelected = (item: Choice) =>
|
||||
choice?.kind === item.kind &&
|
||||
(item.kind !== "albums" ||
|
||||
(choice.kind === "albums" && choice.albumIds === item.albumIds))
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ backgroundColor: colors.background }}
|
||||
contentContainerStyle={styles.content}
|
||||
>
|
||||
{header}
|
||||
<View
|
||||
style={[
|
||||
styles.preview,
|
||||
{
|
||||
width: previewSize,
|
||||
height: previewSize,
|
||||
backgroundColor: colors.coverPlaceholder,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{choice ? renderChoice(choice, previewSize) : null}
|
||||
</View>
|
||||
|
||||
<View style={styles.strip}>
|
||||
{hasCurrent ? (
|
||||
<>
|
||||
<Thumb
|
||||
size={thumbSize}
|
||||
selected={isSelected({ kind: "current" })}
|
||||
label="Current cover"
|
||||
onPress={() => setSelected({ kind: "current" })}
|
||||
>
|
||||
{renderChoice({ kind: "current" }, thumbSize)}
|
||||
</Thumb>
|
||||
<View
|
||||
style={[styles.separator, { backgroundColor: colors.border }]}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{choice?.kind === "upload" ? (
|
||||
<Thumb size={thumbSize} selected label="Uploaded image">
|
||||
{renderChoice(choice, thumbSize)}
|
||||
</Thumb>
|
||||
) : null}
|
||||
{options.map((albumIds) => {
|
||||
const item: Choice = { kind: "albums", albumIds }
|
||||
return (
|
||||
<Thumb
|
||||
key={albumIds.join(",")}
|
||||
size={thumbSize}
|
||||
selected={isSelected(item)}
|
||||
label="Album cover option"
|
||||
onPress={() => setSelected(item)}
|
||||
>
|
||||
{renderChoice(item, thumbSize)}
|
||||
</Thumb>
|
||||
)
|
||||
})}
|
||||
</View>
|
||||
|
||||
{albums.length === 0 ? (
|
||||
<Text style={{ color: colors.mutedForeground, textAlign: "center" }}>
|
||||
No album artwork in this playlist yet.
|
||||
</Text>
|
||||
) : null}
|
||||
|
||||
<View style={styles.actions}>
|
||||
{albums.length >= COVER_GRID_ALBUMS ? (
|
||||
<Button
|
||||
title="Shuffle"
|
||||
icon="shuffle"
|
||||
variant="secondary"
|
||||
onPress={() => {
|
||||
setOptions(randomPlaylistCovers(albums))
|
||||
if (selected?.kind === "albums") setSelected(null)
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<Button
|
||||
title="Upload"
|
||||
icon="arrow-up"
|
||||
variant="secondary"
|
||||
onPress={() => void pickImage()}
|
||||
/>
|
||||
</View>
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
function HeaderButton({
|
||||
label,
|
||||
bold = false,
|
||||
disabled = false,
|
||||
onPress,
|
||||
}: {
|
||||
label: string
|
||||
bold?: boolean
|
||||
disabled?: boolean
|
||||
onPress: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
hitSlop={8}
|
||||
disabled={disabled}
|
||||
onPress={onPress}
|
||||
style={{ opacity: disabled ? 0.4 : 1, paddingHorizontal: spacing.xs }}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
color: colors.foreground,
|
||||
fontSize: 17,
|
||||
fontWeight: bold ? "600" : "400",
|
||||
}}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
function Thumb({
|
||||
size,
|
||||
selected,
|
||||
label,
|
||||
onPress,
|
||||
children,
|
||||
}: {
|
||||
size: number
|
||||
selected: boolean
|
||||
label: string
|
||||
onPress?: () => void
|
||||
children: ReactNode
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={label}
|
||||
accessibilityState={{ selected }}
|
||||
onPress={onPress}
|
||||
style={[
|
||||
styles.thumb,
|
||||
{
|
||||
width: size + THUMB_CHROME,
|
||||
height: size + THUMB_CHROME,
|
||||
borderColor: selected ? colors.foreground : "transparent",
|
||||
},
|
||||
]}
|
||||
>
|
||||
<View style={styles.thumbInner}>{children}</View>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
/** A generated cover option: one album alone, or four tiled 2x2. */
|
||||
function AlbumGrid({
|
||||
serverUrl,
|
||||
albumIds,
|
||||
size,
|
||||
}: {
|
||||
serverUrl: string
|
||||
albumIds: Id<"albums">[]
|
||||
size: number
|
||||
}) {
|
||||
const tile = albumIds.length > 1 ? size / 2 : size
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
width: size,
|
||||
height: size,
|
||||
flexDirection: "row",
|
||||
flexWrap: "wrap",
|
||||
}}
|
||||
>
|
||||
{albumIds.map((albumId) => (
|
||||
<CoverImage
|
||||
key={albumId}
|
||||
uri={albumCoverUrl(serverUrl, albumId)}
|
||||
hasCover
|
||||
style={{ width: tile, height: tile }}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
content: {
|
||||
alignItems: "center",
|
||||
gap: spacing.xl,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
preview: { borderRadius: radius.lg, overflow: "hidden" },
|
||||
strip: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: STRIP_GAP,
|
||||
},
|
||||
separator: { width: StyleSheet.hairlineWidth, alignSelf: "stretch" },
|
||||
thumb: {
|
||||
borderWidth: 2,
|
||||
borderRadius: radius.sm + 2,
|
||||
padding: 1,
|
||||
},
|
||||
thumbInner: { flex: 1, borderRadius: radius.sm, overflow: "hidden" },
|
||||
actions: { flexDirection: "row", gap: spacing.sm },
|
||||
})
|
||||
@@ -23,19 +23,16 @@ type LibraryKind = (typeof LIBRARY_KINDS)[number]
|
||||
const PAGE_SIZE = 500
|
||||
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
|
||||
|
||||
type Favorites = {
|
||||
favoriteSongs: string[]
|
||||
favoriteAlbums: string[]
|
||||
favoriteArtists: string[]
|
||||
}
|
||||
type Favorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
|
||||
|
||||
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
|
||||
return new Set<string>(
|
||||
kind === "song"
|
||||
(kind === "song"
|
||||
? favorites.favoriteSongs
|
||||
: kind === "album"
|
||||
? favorites.favoriteAlbums
|
||||
: favorites.favoriteArtists
|
||||
).flat()
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
useCacheScope,
|
||||
} from "@/contexts/persistent-cache"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import {
|
||||
FAVORITES_PLAYLIST_ID,
|
||||
loadHandledIntentIds,
|
||||
@@ -113,7 +113,7 @@ function isTransient(error: unknown) {
|
||||
export function useIntentDispatch() {
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const playback = usePlayback()
|
||||
const playback = { ...usePlaybackQueue(), ...usePlaybackActions() }
|
||||
const favorites = useFavorites()
|
||||
const navigation = useAppNavigation()
|
||||
const store = useMemo(
|
||||
@@ -214,12 +214,13 @@ export function useIntentDispatch() {
|
||||
)
|
||||
}
|
||||
if (kind === "artist") {
|
||||
return fetchCachedQuery(
|
||||
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) {
|
||||
@@ -229,7 +230,7 @@ export function useIntentDispatch() {
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs
|
||||
return favorites.favoriteSongs.flat()
|
||||
}
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
@@ -391,17 +392,18 @@ export function useIntentDispatch() {
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
if (favorites.favoriteSongs.length === 0) {
|
||||
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(favorites.favoriteSongs)
|
||||
await actions.playShuffled(favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(favorites.favoriteSongs)
|
||||
await actions.playInOrder(favoriteSongs)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -2,10 +2,12 @@ import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentEntity } from "expo-app-intents"
|
||||
import { useEffect } from "react"
|
||||
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackQueue } from "@/contexts/playback"
|
||||
import { publishMusicCatalog } from "@/lib/app-intents"
|
||||
|
||||
type CurrentSong = NonNullable<ReturnType<typeof usePlayback>["currentSong"]>
|
||||
type CurrentSong = NonNullable<
|
||||
ReturnType<typeof usePlaybackQueue>["currentSong"]
|
||||
>
|
||||
|
||||
function nowPlayingEntity(song: CurrentSong): AppIntentEntity {
|
||||
const artistName = song.artist.name
|
||||
@@ -44,7 +46,7 @@ export async function publishNowPlaying(
|
||||
|
||||
/** Keeps the "nowPlaying" catalog in step with the playback queue. */
|
||||
export function useNowPlayingCatalog() {
|
||||
const playback = usePlayback()
|
||||
const playback = usePlaybackQueue()
|
||||
const queueHeadId = playback.queueSongIds[0] ?? null
|
||||
const song = playback.currentSong
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import Svg, { G, Path } from "react-native-svg"
|
||||
|
||||
import {
|
||||
@@ -69,12 +68,10 @@ function LosslessMark({
|
||||
|
||||
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
||||
export function AudioFormatBadge({
|
||||
artwork = false,
|
||||
format,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
artwork?: boolean
|
||||
format: PlaybackFormat
|
||||
color: string
|
||||
backgroundColor: string
|
||||
@@ -87,12 +84,7 @@ export function AudioFormatBadge({
|
||||
) : (
|
||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||
)}
|
||||
<PaletteText
|
||||
tone={artwork ? "secondaryForeground" : undefined}
|
||||
style={[styles.label, { color }]}
|
||||
>
|
||||
{label}
|
||||
</PaletteText>
|
||||
<Text style={[styles.label, { color }]}>{label}</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,172 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
Alert,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
import Svg, { Circle, Rect } from "react-native-svg"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import {
|
||||
useDownloads,
|
||||
useDownloadsVersion,
|
||||
useIsCollectionDownloaded,
|
||||
type DownloadTarget,
|
||||
} from "@/contexts/downloads"
|
||||
import type { CollectionRef } from "@otunes/convex/client/download-queue"
|
||||
import { DOWNLOAD_QUALITY_LABELS } from "@otunes/convex/download-quality"
|
||||
|
||||
const SIZE = 22
|
||||
const RADIUS = 9
|
||||
const RING_LENGTH = 2 * Math.PI * RADIUS
|
||||
|
||||
/** Static ring that fills as songs finish; the square means "tap to stop". */
|
||||
function ProgressRing({
|
||||
fraction,
|
||||
color,
|
||||
}: {
|
||||
fraction: number
|
||||
color: string
|
||||
}) {
|
||||
return (
|
||||
<Svg width={SIZE} height={SIZE} viewBox="0 0 22 22">
|
||||
<Circle
|
||||
cx={11}
|
||||
cy={11}
|
||||
r={RADIUS}
|
||||
fill="none"
|
||||
stroke={color}
|
||||
strokeOpacity={0.3}
|
||||
strokeWidth={2}
|
||||
/>
|
||||
<Circle
|
||||
cx={11}
|
||||
cy={11}
|
||||
r={RADIUS}
|
||||
fill="none"
|
||||
stroke={color}
|
||||
strokeWidth={2}
|
||||
strokeDasharray={RING_LENGTH}
|
||||
strokeDashoffset={RING_LENGTH * (1 - fraction)}
|
||||
transform="rotate(-90 11 11)"
|
||||
/>
|
||||
<Rect x={8} y={8} width={6} height={6} fill={color} />
|
||||
</Svg>
|
||||
)
|
||||
}
|
||||
|
||||
export type CollectionDownloadTarget = Exclude<
|
||||
DownloadTarget,
|
||||
{ kind: "songs" }
|
||||
>
|
||||
|
||||
/** Download, progress, and downloaded states for an album or playlist hero, beside Play. */
|
||||
export function CollectionDownloadButton({
|
||||
target,
|
||||
color,
|
||||
style,
|
||||
}: {
|
||||
target: CollectionDownloadTarget
|
||||
color: string
|
||||
style?: StyleProp<ViewStyle>
|
||||
}) {
|
||||
const { queue, requestDownload, removeDownload } = useDownloads()
|
||||
useDownloadsVersion()
|
||||
const collection = queue?.getCollection(target)
|
||||
const status = queue?.status(target.songIds)
|
||||
const inProgress = collection !== undefined && (status?.queued ?? 0) > 0
|
||||
const done = collection !== undefined && !inProgress
|
||||
|
||||
function handlePress() {
|
||||
if (inProgress) {
|
||||
void removeDownload(target)
|
||||
} else if (done) {
|
||||
Alert.alert("Remove download?", undefined, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{
|
||||
text: "Remove",
|
||||
style: "destructive",
|
||||
onPress: () => void removeDownload(target),
|
||||
},
|
||||
])
|
||||
} else {
|
||||
void requestDownload(target)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Pressable
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={
|
||||
inProgress
|
||||
? "Stop downloading"
|
||||
: done
|
||||
? `Remove download of ${target.title}`
|
||||
: `Download ${target.title}`
|
||||
}
|
||||
disabled={target.songIds.length === 0}
|
||||
onPress={handlePress}
|
||||
style={style}
|
||||
>
|
||||
{inProgress && status ? (
|
||||
<ProgressRing
|
||||
fraction={status.downloaded / status.total}
|
||||
color={color}
|
||||
/>
|
||||
) : (
|
||||
<Ionicons
|
||||
name={done ? "checkmark" : "arrow-down"}
|
||||
size={24}
|
||||
color={color}
|
||||
/>
|
||||
)}
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
/** The quality an album or playlist was downloaded in, once downloaded. */
|
||||
export function DownloadedQuality({
|
||||
collection,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
collection: CollectionRef
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
const { queue } = useDownloads()
|
||||
const downloaded = useIsCollectionDownloaded(collection)
|
||||
const quality = downloaded
|
||||
? queue?.getCollection(collection)?.quality
|
||||
: undefined
|
||||
if (!quality) return null
|
||||
return (
|
||||
<View
|
||||
style={styles.quality}
|
||||
accessible
|
||||
accessibilityLabel={`Downloaded in ${DOWNLOAD_QUALITY_LABELS[quality]}`}
|
||||
>
|
||||
<Ionicons name="arrow-down-circle" size={14} color={color} />
|
||||
{quality === "lossless" || quality === "atmos" ? (
|
||||
<AudioFormatBadge
|
||||
format={quality}
|
||||
color={color}
|
||||
backgroundColor={backgroundColor}
|
||||
/>
|
||||
) : (
|
||||
<Text style={{ color, fontSize: 13 }}>
|
||||
{DOWNLOAD_QUALITY_LABELS[quality]}
|
||||
</Text>
|
||||
)}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
quality: { flexDirection: "row", alignItems: "center", gap: 4 },
|
||||
})
|
||||
@@ -1,6 +1,5 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { memo } from "react"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
@@ -26,12 +25,9 @@ export const DiscHeader = memo(function DiscHeader({
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<PaletteText
|
||||
tone={color ? "foreground" : undefined}
|
||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
||||
>
|
||||
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||
{label}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@@ -71,7 +71,10 @@ class ConvexAuthErrorBoundary extends Component<
|
||||
}
|
||||
}
|
||||
|
||||
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
|
||||
export function ConvexAuthRecovery({
|
||||
children,
|
||||
onInvalidate,
|
||||
}: ConvexAuthRecoveryProps) {
|
||||
const localAuth = useLocalConvexAuth()
|
||||
const serverAuth = useServerConvexAuth()
|
||||
const hadServerAuthRef = useRef(false)
|
||||
@@ -113,9 +116,9 @@ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecover
|
||||
|
||||
const sessionEstablished = Boolean(
|
||||
serverAuth &&
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
)
|
||||
|
||||
return (
|
||||
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
} from "react-native"
|
||||
|
||||
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||
import { downloadedCoverUri } from "@/lib/downloads"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
@@ -66,6 +67,7 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit = "cover",
|
||||
blurRadius,
|
||||
placeholderVariant = "icon",
|
||||
placeholderIcon = "musical-note",
|
||||
}: {
|
||||
uri: string
|
||||
hasCover: boolean
|
||||
@@ -73,6 +75,7 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit?: ImageContentFit
|
||||
blurRadius?: number
|
||||
placeholderVariant?: "icon" | "solid"
|
||||
placeholderIcon?: keyof typeof Ionicons.glyphMap
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
|
||||
@@ -81,6 +84,12 @@ export const CoverImage = memo(function CoverImage({
|
||||
[flatStyle, hasCover, uri]
|
||||
)
|
||||
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri])
|
||||
// A downloaded cover shows while the network copy loads, and offline.
|
||||
const savedUri = hasCover ? downloadedCoverUri(uri) : null
|
||||
const placeholder = useMemo(
|
||||
() => (savedUri ? { uri: savedUri } : undefined),
|
||||
[savedUri]
|
||||
)
|
||||
|
||||
if (!hasCover) {
|
||||
return (
|
||||
@@ -93,7 +102,7 @@ export const CoverImage = memo(function CoverImage({
|
||||
>
|
||||
{placeholderVariant === "icon" ? (
|
||||
<Ionicons
|
||||
name="musical-note"
|
||||
name={placeholderIcon}
|
||||
size={placeholderIconSize(flatStyle)}
|
||||
color={colors.coverPlaceholderIcon}
|
||||
/>
|
||||
@@ -107,6 +116,8 @@ export const CoverImage = memo(function CoverImage({
|
||||
source={source}
|
||||
style={[style, { backgroundColor: colors.coverPlaceholder }]}
|
||||
contentFit={contentFit}
|
||||
placeholder={placeholder}
|
||||
placeholderContentFit={contentFit}
|
||||
transition={150}
|
||||
blurRadius={blurRadius}
|
||||
onLoad={
|
||||
|
||||
@@ -35,7 +35,11 @@ export function HandoffBridge() {
|
||||
if (!active || !activity) return
|
||||
try {
|
||||
const source = new URL(activity.server)
|
||||
if (!config || source.origin !== new URL(config.serverUrl).origin) {
|
||||
if (!config) {
|
||||
showError("Connect to an oTunes server to continue this activity.")
|
||||
return
|
||||
}
|
||||
if (source.origin !== new URL(config.serverUrl).origin) {
|
||||
showError("This activity belongs to a different oTunes server.")
|
||||
return
|
||||
}
|
||||
|
||||
@@ -112,7 +112,10 @@ function SwipeRowBody({
|
||||
setIsOpen(false)
|
||||
}, [removing, translateX])
|
||||
|
||||
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
|
||||
const handleSwipeStart = useCallback(
|
||||
() => group.setOpen(close),
|
||||
[close, group]
|
||||
)
|
||||
|
||||
const handleSettle = useCallback(
|
||||
(open: boolean) => {
|
||||
@@ -251,8 +254,7 @@ function SwipeRowBody({
|
||||
const pillWidth = Math.max(
|
||||
0,
|
||||
resting +
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
|
||||
commitProgress.value
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
|
||||
)
|
||||
const restingHeight = interpolate(
|
||||
pillWidth,
|
||||
|
||||
@@ -0,0 +1,351 @@
|
||||
import {
|
||||
memo,
|
||||
type ComponentType,
|
||||
type ReactElement,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
} from "react"
|
||||
import {
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ScrollViewInstance,
|
||||
type ViewProps,
|
||||
} from "react-native"
|
||||
import MaskedViewClass from "@react-native-masked-view/masked-view"
|
||||
import Animated, {
|
||||
useAnimatedStyle,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
|
||||
import {
|
||||
usePlaybackActions,
|
||||
usePlaybackProgress,
|
||||
usePlaybackQueue,
|
||||
} from "@/contexts/playback"
|
||||
import { useLyricsTime, usePlaybackClock } from "@/hooks/use-lyrics"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
import {
|
||||
activeLineIndex,
|
||||
type LyricLine,
|
||||
type LyricWord,
|
||||
type Lyrics,
|
||||
} from "@otunes/convex/client/lyrics"
|
||||
|
||||
// The package's class typings predate React 19's; this is its documented API.
|
||||
const MaskedView = MaskedViewClass as unknown as ComponentType<
|
||||
ViewProps & { maskElement: ReactElement }
|
||||
>
|
||||
|
||||
/** How long a manual scroll keeps the view from following the song. */
|
||||
const MANUAL_SCROLL_HOLD_MS = 3000
|
||||
/** Where the playing line sits, as a share of the view's height from the top. */
|
||||
const ACTIVE_LINE_POSITION = 0.12
|
||||
/** Blur radius by distance from the playing line; farther lines share the last. */
|
||||
const LINE_BLUR = [0, 1, 2, 3]
|
||||
/** Opacity of lines other than the one playing. */
|
||||
const INACTIVE_LINE_OPACITY = 0.35
|
||||
/** How long a line takes to brighten, dim, or change blur. */
|
||||
const LINE_FADE_MS = 300
|
||||
|
||||
/**
|
||||
* Lyrics in the player's own colors. Synced lines follow playback and seek
|
||||
* when tapped; `null` lyrics show a short note instead.
|
||||
*/
|
||||
export function LyricsView({
|
||||
lyrics,
|
||||
colors,
|
||||
fontSize = 30,
|
||||
}: {
|
||||
lyrics: Lyrics | null | undefined
|
||||
colors: NowPlayingColors
|
||||
fontSize?: number
|
||||
}) {
|
||||
if (lyrics === undefined) return null
|
||||
if (lyrics === null) {
|
||||
return (
|
||||
<View style={styles.empty}>
|
||||
<Text style={[styles.emptyText, { color: colors.secondaryForeground }]}>
|
||||
No lyrics
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
return <LyricsLines lyrics={lyrics} colors={colors} fontSize={fontSize} />
|
||||
}
|
||||
|
||||
function LyricsLines({
|
||||
lyrics,
|
||||
colors,
|
||||
fontSize,
|
||||
}: {
|
||||
lyrics: Lyrics
|
||||
colors: NowPlayingColors
|
||||
fontSize: number
|
||||
}) {
|
||||
const { currentTime } = usePlaybackProgress()
|
||||
const { isPlaying } = usePlaybackQueue()
|
||||
const { seekTo, setIsPlaying } = usePlaybackActions()
|
||||
const time = useLyricsTime(lyrics, currentTime, isPlaying)
|
||||
const clock = usePlaybackClock(currentTime, isPlaying)
|
||||
const active = activeLineIndex(lyrics, time)
|
||||
const synced = lyrics.synced !== "none"
|
||||
const scrollRef = useRef<ScrollViewInstance>(null)
|
||||
const lineOffsets = useRef<number[]>([])
|
||||
const [height, setHeight] = useState(0)
|
||||
// While the listener scrolls, lines stay sharp and the view stays put.
|
||||
const [browsing, setBrowsing] = useState(false)
|
||||
const browseTimer = useRef<ReturnType<typeof setTimeout>>(undefined)
|
||||
|
||||
useEffect(() => () => clearTimeout(browseTimer.current), [])
|
||||
|
||||
const scrollToLine = useCallback(
|
||||
(index: number) => {
|
||||
const y = lineOffsets.current[Math.max(index, 0)]
|
||||
if (y === undefined || !synced || height === 0 || browsing) return
|
||||
scrollRef.current?.scrollTo({
|
||||
y: Math.max(0, y - height * ACTIVE_LINE_POSITION),
|
||||
animated: true,
|
||||
})
|
||||
},
|
||||
[height, synced, browsing]
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
scrollToLine(active)
|
||||
}, [active, scrollToLine])
|
||||
|
||||
const activeRef = useRef(active)
|
||||
useEffect(() => {
|
||||
activeRef.current = active
|
||||
}, [active])
|
||||
const handleLineLayout = useCallback(
|
||||
(index: number, y: number) => {
|
||||
lineOffsets.current[index] = y
|
||||
// Opening mid-song: jump once the playing line has been measured.
|
||||
if (index === Math.max(activeRef.current, 0)) scrollToLine(index)
|
||||
},
|
||||
[scrollToLine]
|
||||
)
|
||||
|
||||
const playFrom = useCallback(
|
||||
(seconds: number) => {
|
||||
seekTo(seconds)
|
||||
setIsPlaying(true)
|
||||
clearTimeout(browseTimer.current)
|
||||
setBrowsing(false)
|
||||
},
|
||||
[seekTo, setIsPlaying]
|
||||
)
|
||||
|
||||
const releaseScroll = () => {
|
||||
clearTimeout(browseTimer.current)
|
||||
browseTimer.current = setTimeout(
|
||||
() => setBrowsing(false),
|
||||
MANUAL_SCROLL_HOLD_MS
|
||||
)
|
||||
}
|
||||
|
||||
const lineStyle = useMemo(
|
||||
() => ({ fontSize, lineHeight: Math.round(fontSize * 1.18) }),
|
||||
[fontSize]
|
||||
)
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
ref={scrollRef}
|
||||
style={styles.fill}
|
||||
contentContainerStyle={{
|
||||
paddingTop: height * ACTIVE_LINE_POSITION,
|
||||
paddingBottom: height * 0.7,
|
||||
}}
|
||||
showsVerticalScrollIndicator={false}
|
||||
onLayout={(event) => setHeight(event.nativeEvent.layout.height)}
|
||||
onScrollBeginDrag={() => {
|
||||
clearTimeout(browseTimer.current)
|
||||
setBrowsing(true)
|
||||
}}
|
||||
// Hold from when the scroll settles, not when the finger lifted.
|
||||
onScrollEndDrag={releaseScroll}
|
||||
onMomentumScrollEnd={releaseScroll}
|
||||
>
|
||||
{lyrics.lines.map((line, index) =>
|
||||
synced ? (
|
||||
<SyncedLine
|
||||
key={index}
|
||||
index={index}
|
||||
line={line}
|
||||
distance={
|
||||
browsing
|
||||
? 0
|
||||
: Math.min(Math.abs(index - active), LINE_BLUR.length - 1)
|
||||
}
|
||||
active={index === active}
|
||||
clock={clock}
|
||||
colors={colors}
|
||||
textStyle={lineStyle}
|
||||
onSelect={playFrom}
|
||||
onLayoutY={handleLineLayout}
|
||||
/>
|
||||
) : (
|
||||
<Text
|
||||
key={index}
|
||||
style={[
|
||||
styles.plainLine,
|
||||
{
|
||||
color: colors.foreground,
|
||||
fontSize: fontSize * 0.75,
|
||||
lineHeight: Math.round(fontSize * 0.75 * 1.25),
|
||||
},
|
||||
line.text === "" && styles.stanzaGap,
|
||||
]}
|
||||
>
|
||||
{line.text}
|
||||
</Text>
|
||||
)
|
||||
)}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* One timed line, laid out word by word whether or not it is playing, so it
|
||||
* never re-wraps. It fades and blurs by its `distance` from the playing line,
|
||||
* and only the playing line's words fill.
|
||||
*/
|
||||
const SyncedLine = memo(function SyncedLine({
|
||||
index,
|
||||
line,
|
||||
distance,
|
||||
active,
|
||||
clock,
|
||||
colors,
|
||||
textStyle,
|
||||
onSelect,
|
||||
onLayoutY,
|
||||
}: {
|
||||
index: number
|
||||
line: LyricLine
|
||||
distance: number
|
||||
active: boolean
|
||||
clock: SharedValue<number>
|
||||
colors: NowPlayingColors
|
||||
textStyle: { fontSize: number; lineHeight: number }
|
||||
onSelect: (seconds: number) => void
|
||||
onLayoutY: (index: number, y: number) => void
|
||||
}) {
|
||||
const wordStyle = [styles.lineText, textStyle, { color: colors.foreground }]
|
||||
return (
|
||||
<Pressable
|
||||
onPress={() => onSelect(line.start ?? 0)}
|
||||
onLayout={(event) => onLayoutY(index, event.nativeEvent.layout.y)}
|
||||
accessibilityRole="button"
|
||||
accessibilityHint="Plays from this line"
|
||||
style={styles.line}
|
||||
>
|
||||
<Animated.View
|
||||
style={{
|
||||
opacity: active ? 1 : INACTIVE_LINE_OPACITY,
|
||||
filter: [{ blur: LINE_BLUR[distance] }],
|
||||
transitionProperty: ["opacity", "filter"],
|
||||
transitionDuration: LINE_FADE_MS,
|
||||
}}
|
||||
>
|
||||
{line.words ? (
|
||||
<View
|
||||
style={[styles.words, { columnGap: textStyle.fontSize * 0.25 }]}
|
||||
>
|
||||
{line.words.map((word, wordIndex) =>
|
||||
active ? (
|
||||
<FilledWord
|
||||
key={wordIndex}
|
||||
word={word}
|
||||
clock={clock}
|
||||
colors={colors}
|
||||
textStyle={textStyle}
|
||||
/>
|
||||
) : (
|
||||
<Text key={wordIndex} style={wordStyle}>
|
||||
{word.text.trim()}
|
||||
</Text>
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
) : (
|
||||
<Text style={wordStyle}>{line.text}</Text>
|
||||
)}
|
||||
</Animated.View>
|
||||
</Pressable>
|
||||
)
|
||||
})
|
||||
|
||||
/**
|
||||
* A word of the playing line, filled from dim to bright with a soft edge as
|
||||
* it is sung: a gradient 2.5 times its width slides under the word's
|
||||
* shape, like the web panel's.
|
||||
*/
|
||||
function FilledWord({
|
||||
word,
|
||||
clock,
|
||||
colors,
|
||||
textStyle,
|
||||
}: {
|
||||
word: LyricWord
|
||||
clock: SharedValue<number>
|
||||
colors: NowPlayingColors
|
||||
textStyle: { fontSize: number; lineHeight: number }
|
||||
}) {
|
||||
const text = word.text.trim()
|
||||
const slide = useAnimatedStyle(() => {
|
||||
const progress =
|
||||
(clock.value - word.start) / Math.max(word.end - word.start, 0.05)
|
||||
const sung = Math.min(Math.max(progress, 0), 1)
|
||||
// -60% of the gradient's width shows its dim end; 0% its bright one.
|
||||
return { transform: [{ translateX: `${-60 * (1 - sung)}%` }] }
|
||||
})
|
||||
|
||||
return (
|
||||
<MaskedView
|
||||
maskElement={
|
||||
<Text style={[styles.lineText, textStyle, styles.mask]}>{text}</Text>
|
||||
}
|
||||
>
|
||||
{/* Sizes the word; the mask draws it. */}
|
||||
<Text style={[styles.lineText, textStyle, styles.hidden]}>{text}</Text>
|
||||
<Animated.View
|
||||
style={[
|
||||
styles.fillGradient,
|
||||
{
|
||||
backgroundImage: `linear-gradient(90deg, ${colors.foreground} 40%, ${colors.lyricsUnsung} 60%)`,
|
||||
},
|
||||
slide,
|
||||
]}
|
||||
/>
|
||||
</MaskedView>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
fill: { flex: 1 },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
emptyText: { fontSize: 17, fontWeight: "600" },
|
||||
line: { paddingVertical: 9 },
|
||||
lineText: { fontWeight: "800" },
|
||||
words: { flexDirection: "row", flexWrap: "wrap" },
|
||||
mask: { color: "black" },
|
||||
hidden: { opacity: 0 },
|
||||
fillGradient: {
|
||||
position: "absolute",
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
width: "250%",
|
||||
},
|
||||
plainLine: { fontWeight: "700", paddingVertical: 2 },
|
||||
stanzaGap: { height: 18 },
|
||||
})
|
||||
@@ -20,6 +20,7 @@ import {
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { MediaContextMenu } from "@/components/media-context-menu"
|
||||
import { useIsCollectionDownloaded } from "@/contexts/downloads"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
@@ -51,6 +52,7 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||
const downloaded = useIsCollectionDownloaded({ kind: "album", id: album.id })
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
@@ -102,6 +104,7 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
hasArtwork: album.cover != null,
|
||||
}}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
downloaded={downloaded}
|
||||
stationArtistId={album.artist.id}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
@@ -187,6 +190,10 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handlePlaylistAction } = useMediaMenuActions()
|
||||
const downloaded = useIsCollectionDownloaded({
|
||||
kind: "playlist",
|
||||
id: playlist.id,
|
||||
})
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
@@ -200,7 +207,11 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
uri={playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist.id,
|
||||
playlist.cover
|
||||
)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={
|
||||
fluid
|
||||
@@ -231,6 +242,7 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
showFavorite={false}
|
||||
downloaded={downloaded}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlist.id,
|
||||
|
||||
@@ -32,7 +32,11 @@ export type MediaAction =
|
||||
| "favorite"
|
||||
| "go-artist"
|
||||
| "go-album"
|
||||
| "remove-from-playlist"
|
||||
| "change-cover"
|
||||
| "delete-playlist"
|
||||
| "download"
|
||||
| "remove-download"
|
||||
|
||||
export type MediaNavigation = {
|
||||
artist?: { id: string }
|
||||
@@ -54,9 +58,12 @@ export type MediaMenuConfig = {
|
||||
playlistLabel?: string
|
||||
favorited?: boolean
|
||||
showFavorite?: boolean
|
||||
showRemoveFromPlaylist?: boolean
|
||||
stationArtistId?: string
|
||||
navigation?: MediaNavigation
|
||||
share?: MediaShareContext
|
||||
/** Shows Download, or Remove Download when true. Omit to hide both. */
|
||||
downloaded?: boolean
|
||||
includeActions?: MediaAction[]
|
||||
onAction: (action: MediaAction) => void
|
||||
}
|
||||
@@ -70,32 +77,39 @@ const QUEUE_ACTIONS: MediaAction[] = ["play-next", "play-last", "shuffle"]
|
||||
|
||||
const MEDIA_ACTION_ITEMS: {
|
||||
action: MediaAction
|
||||
label: (
|
||||
countSuffix: string,
|
||||
favorited: boolean | undefined,
|
||||
playlistLabel: string
|
||||
) => string
|
||||
label: (favorited: boolean | undefined, playlistLabel: string) => string
|
||||
image: NonNullable<MenuAction["image"]> & string
|
||||
destructive?: boolean
|
||||
}[] = [
|
||||
{
|
||||
action: "playlist",
|
||||
label: (countSuffix, _favorited, playlistLabel) =>
|
||||
`${playlistLabel}${countSuffix}`,
|
||||
label: (_favorited, playlistLabel) => playlistLabel,
|
||||
image: "text.badge.plus",
|
||||
},
|
||||
{
|
||||
action: "download",
|
||||
label: () => "Download",
|
||||
image: "arrow.down.circle",
|
||||
},
|
||||
{
|
||||
action: "remove-download",
|
||||
label: () => "Remove Download",
|
||||
image: "xmark.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "play-next",
|
||||
label: (countSuffix) => `Play Next${countSuffix}`,
|
||||
label: () => "Play Next",
|
||||
image: "text.line.first.and.arrowtriangle.forward",
|
||||
},
|
||||
{
|
||||
action: "play-last",
|
||||
label: (countSuffix) => `Play Last${countSuffix}`,
|
||||
label: () => "Play Last",
|
||||
image: "text.line.last.and.arrowtriangle.forward",
|
||||
},
|
||||
{
|
||||
action: "shuffle",
|
||||
label: (countSuffix) => `Shuffle${countSuffix}`,
|
||||
label: () => "Shuffle",
|
||||
image: "shuffle",
|
||||
},
|
||||
{
|
||||
@@ -115,10 +129,20 @@ const MEDIA_ACTION_ITEMS: {
|
||||
},
|
||||
{
|
||||
action: "favorite",
|
||||
label: (countSuffix, favorited) =>
|
||||
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
|
||||
label: (favorited) => (favorited ? "Unfavorite" : "Favorite"),
|
||||
image: "star",
|
||||
},
|
||||
{
|
||||
action: "remove-from-playlist",
|
||||
label: () => "Remove from Playlist",
|
||||
image: "minus.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "change-cover",
|
||||
label: () => "Change Cover",
|
||||
image: "photo",
|
||||
},
|
||||
{
|
||||
action: "delete-playlist",
|
||||
label: () => "Delete Playlist",
|
||||
@@ -134,11 +158,23 @@ function isActionIncluded(
|
||||
return false
|
||||
}
|
||||
|
||||
if (action === "remove-from-playlist") {
|
||||
return config.showRemoveFromPlaylist === true
|
||||
}
|
||||
|
||||
if (action === "download") {
|
||||
return config.downloaded === false
|
||||
}
|
||||
|
||||
if (action === "remove-download") {
|
||||
return config.downloaded === true
|
||||
}
|
||||
|
||||
if (config.includeActions) {
|
||||
return config.includeActions.includes(action)
|
||||
}
|
||||
|
||||
if (action === "delete-playlist") {
|
||||
if (action === "delete-playlist" || action === "change-cover") {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -164,12 +200,7 @@ function isActionIncluded(
|
||||
export function buildMediaMenuActions(
|
||||
config: Omit<MediaMenuConfig, "onAction">
|
||||
): MenuAction[] {
|
||||
const {
|
||||
selectedCount = 1,
|
||||
favorited,
|
||||
playlistLabel = "Add to Playlist",
|
||||
} = config
|
||||
const countSuffix = selectedCount > 1 ? ` (${selectedCount})` : ""
|
||||
const { favorited, playlistLabel = "Add to Playlist" } = config
|
||||
|
||||
const actions: MenuAction[] = []
|
||||
|
||||
@@ -188,8 +219,9 @@ export function buildMediaMenuActions(
|
||||
|
||||
actions.push({
|
||||
id: item.action,
|
||||
title: item.label(countSuffix, favorited, playlistLabel),
|
||||
title: item.label(favorited, playlistLabel),
|
||||
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||
...(item.destructive ? { attributes: { destructive: true } } : {}),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -324,6 +356,7 @@ const NativeContextMenuAction: ComponentType<{
|
||||
identifier: string
|
||||
title: string
|
||||
icon?: string
|
||||
destructive?: boolean
|
||||
onSelected: () => void
|
||||
}> | null =
|
||||
Platform.OS === "ios"
|
||||
@@ -377,6 +410,7 @@ function NativeMediaContextMenu({
|
||||
identifier={action.id ?? action.title}
|
||||
title={action.title}
|
||||
icon={typeof action.image === "string" ? action.image : undefined}
|
||||
destructive={action.attributes?.destructive}
|
||||
onSelected={() => handleAction(action.id as MediaAction)}
|
||||
/>
|
||||
))}
|
||||
|
||||
@@ -25,7 +25,11 @@ const actionIcons = {
|
||||
favorite: "star-outline",
|
||||
"go-artist": "person-outline",
|
||||
"go-album": "disc-outline",
|
||||
"remove-from-playlist": "remove-circle-outline",
|
||||
"change-cover": "image-outline",
|
||||
"delete-playlist": "trash-outline",
|
||||
download: "arrow-down-circle-outline",
|
||||
"remove-download": "close-circle-outline",
|
||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||
|
||||
// The community MenuView creates a dynamic-color Host internally. Own this
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { useAndroidTabPalette } from "@/contexts/android-tab-theme"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { useRouter } from "expo-router"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
@@ -67,8 +62,7 @@ function MiniPlayerContent({
|
||||
<View
|
||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -76,7 +70,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
@@ -86,8 +80,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={20}
|
||||
color={colors.foreground}
|
||||
@@ -105,8 +98,7 @@ function MiniPlayerContent({
|
||||
style={artworkStyle}
|
||||
/>
|
||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -114,9 +106,8 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||
{ color: colors.mutedForeground },
|
||||
@@ -124,7 +115,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
@@ -138,12 +129,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-back"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
@@ -154,8 +140,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
@@ -169,12 +154,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-forward"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
</Pressable>
|
||||
@@ -183,21 +163,10 @@ function MiniPlayerContent({
|
||||
|
||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
const palette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
return (
|
||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||
{children}
|
||||
{hasArtworkPalette ? (
|
||||
<View
|
||||
style={[
|
||||
styles.separator,
|
||||
styles.topBorder,
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
) : null}
|
||||
<View
|
||||
style={[
|
||||
styles.separator,
|
||||
@@ -205,7 +174,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -285,7 +254,6 @@ const styles = StyleSheet.create({
|
||||
height: 1,
|
||||
zIndex: 1,
|
||||
},
|
||||
topBorder: { top: 0 },
|
||||
bottomBorder: { bottom: 0 },
|
||||
content: {
|
||||
flexDirection: "row",
|
||||
|
||||
@@ -38,7 +38,7 @@ import {
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
@@ -110,18 +110,16 @@ export function NowPlayingQueue({
|
||||
tablet?: boolean
|
||||
fadeColor?: string
|
||||
}) {
|
||||
const { queueSongIds, queueHistorySongIds, shuffleEnabled, repeatEnabled } =
|
||||
usePlaybackQueue()
|
||||
const {
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
clearHistory,
|
||||
reorderQueue,
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
} = usePlayback()
|
||||
} = usePlaybackActions()
|
||||
const [viewportWidth, setViewportWidth] = useState(0)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const [scrollEnabled, setScrollEnabled] = useState(true)
|
||||
@@ -307,100 +305,126 @@ export function NowPlayingQueue({
|
||||
[drag]
|
||||
)
|
||||
|
||||
const renderItem = ({ item }: { item: QueueListItem }) => {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return (
|
||||
<View style={styles.historyHeader}>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
History
|
||||
</Text>
|
||||
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||
<Text
|
||||
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Clear
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
case "history":
|
||||
return (
|
||||
<HistoryRow
|
||||
songId={item.songId}
|
||||
historyIndex={item.historyIndex}
|
||||
colors={colors}
|
||||
onPress={skipToHistoryIndex}
|
||||
/>
|
||||
)
|
||||
case "current":
|
||||
return <View style={styles.current}>{currentHeader}</View>
|
||||
case "controls":
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{!tablet ? (
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
{item.showTitle ? (
|
||||
const lastIndex = queueSongIds.length - 1
|
||||
const renderItem = useCallback(
|
||||
({ item }: { item: QueueListItem }) => {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return (
|
||||
<View style={styles.historyHeader}>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Continue Playing
|
||||
History
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
case "upcoming":
|
||||
return (
|
||||
<UpcomingRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={queueSongIds.length - 1}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
onPress={skipToQueueIndex}
|
||||
onRemove={handleRemove}
|
||||
onDragStart={handleDragStart}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
)
|
||||
case "empty":
|
||||
return (
|
||||
<View style={[styles.empty, { height: item.height }]}>
|
||||
<Text
|
||||
style={[styles.emptyText, { color: colors.secondaryForeground }]}
|
||||
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||
<Text
|
||||
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Clear
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
case "history":
|
||||
return (
|
||||
<HistoryRow
|
||||
songId={item.songId}
|
||||
historyIndex={item.historyIndex}
|
||||
colors={colors}
|
||||
onPress={skipToHistoryIndex}
|
||||
/>
|
||||
)
|
||||
case "current":
|
||||
return <View style={styles.current}>{currentHeader}</View>
|
||||
case "controls":
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
Nothing else is queued.
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
}
|
||||
{!tablet ? (
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
{item.showTitle ? (
|
||||
<Text
|
||||
style={[styles.sectionTitle, { color: colors.foreground }]}
|
||||
>
|
||||
Continue Playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
case "upcoming":
|
||||
return (
|
||||
<UpcomingRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={lastIndex}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
onPress={skipToQueueIndex}
|
||||
onRemove={handleRemove}
|
||||
onDragStart={handleDragStart}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
)
|
||||
case "empty":
|
||||
return (
|
||||
<View style={[styles.empty, { height: item.height }]}>
|
||||
<Text
|
||||
style={[
|
||||
styles.emptyText,
|
||||
{ color: colors.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
Nothing else is queued.
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
},
|
||||
[
|
||||
clearHistory,
|
||||
colors,
|
||||
currentHeader,
|
||||
cycleRepeat,
|
||||
drag,
|
||||
handleDragStart,
|
||||
handleDrop,
|
||||
handleRemove,
|
||||
lastIndex,
|
||||
repeatEnabled,
|
||||
shuffleEnabled,
|
||||
skipToHistoryIndex,
|
||||
skipToQueueIndex,
|
||||
swipeGroup,
|
||||
tablet,
|
||||
toggleShuffle,
|
||||
]
|
||||
)
|
||||
|
||||
return (
|
||||
<View
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
connectivityStore,
|
||||
type PlatformNetwork,
|
||||
} from "@otunes/convex/client/connectivity"
|
||||
import { useConvex } from "convex/react"
|
||||
import {
|
||||
addNetworkStateListener,
|
||||
getNetworkStateAsync,
|
||||
type NetworkState,
|
||||
} from "expo-network"
|
||||
import { useTheme } from "expo-router"
|
||||
import { useContext, useSyncExternalStore } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
let deviceOnline = true
|
||||
|
||||
/** The device's network state. Unknown reachability counts as online. */
|
||||
const deviceNetwork: PlatformNetwork = {
|
||||
isOnline: () => deviceOnline,
|
||||
subscribe(onChange) {
|
||||
const apply = (state: NetworkState) => {
|
||||
deviceOnline =
|
||||
state.isConnected !== false && state.isInternetReachable !== false
|
||||
onChange()
|
||||
}
|
||||
const subscription = addNetworkStateListener(apply)
|
||||
void getNetworkStateAsync().then(apply)
|
||||
return () => subscription.remove()
|
||||
},
|
||||
}
|
||||
|
||||
/** True while the device has no network or the server can't be reached. */
|
||||
export function useIsOffline() {
|
||||
const store = connectivityStore(useConvex(), deviceNetwork)
|
||||
return useSyncExternalStore(store.subscribe, store.getSnapshot)
|
||||
}
|
||||
|
||||
type ScreenRoute = { name: string; params?: object }
|
||||
|
||||
/** Downloads screens, and albums and playlists opened from them, stay usable offline. */
|
||||
function worksOffline(route: ScreenRoute, tabletSection: string | undefined) {
|
||||
if (route.name.startsWith("downloads/")) return true
|
||||
if (route.name === "index" && tabletSection === "downloads") return true
|
||||
// Settings stays reachable so an unreachable server can be changed.
|
||||
if (route.name === "settings") return true
|
||||
return (route.params as { from?: string } | undefined)?.from === "downloads"
|
||||
}
|
||||
|
||||
/**
|
||||
* Covers a tab screen with a no-connection message while offline. The screen
|
||||
* stays mounted underneath so it picks up where it was once the server is back.
|
||||
*/
|
||||
export function OfflineOverlay({ route }: { route: ScreenRoute }) {
|
||||
const offline = useIsOffline()
|
||||
const tabletSection = useContext(TabletSectionContext)?.name
|
||||
const { push } = useAppNavigation()
|
||||
const { colors: routerColors } = useTheme()
|
||||
const colors = useThemeColors()
|
||||
|
||||
if (!offline || worksOffline(route, tabletSection)) return null
|
||||
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
StyleSheet.absoluteFill,
|
||||
styles.overlay,
|
||||
{ backgroundColor: routerColors.background },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
name="cloud-offline-outline"
|
||||
size={28}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
<Text style={[styles.title, { color: routerColors.text }]}>
|
||||
No connection
|
||||
</Text>
|
||||
<Text style={[styles.body, { color: colors.mutedForeground }]}>
|
||||
Your downloads still play.
|
||||
</Text>
|
||||
<Pressable
|
||||
accessibilityRole="link"
|
||||
hitSlop={spacing.sm}
|
||||
onPress={() => push("/downloads")}
|
||||
>
|
||||
<Text style={[styles.link, { color: colors.primary }]}>
|
||||
Go to Downloads
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
overlay: {
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
padding: spacing.lg,
|
||||
},
|
||||
title: { fontSize: 17, fontWeight: "600", marginTop: spacing.xs },
|
||||
body: { fontSize: 15, textAlign: "center" },
|
||||
link: { fontSize: 15, fontWeight: "600", marginTop: spacing.xs },
|
||||
})
|
||||
@@ -1,49 +0,0 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import type { ComponentProps } from "react"
|
||||
import { Pressable, type TextProps } from "react-native"
|
||||
import { useRouter } from "expo-router"
|
||||
import Animated from "react-native-reanimated"
|
||||
|
||||
import {
|
||||
useAnimatedPaletteColor,
|
||||
type PaletteColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
|
||||
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
|
||||
|
||||
/** Keep artwork text colors on the same UI-thread animation as the background. */
|
||||
export function PaletteText({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: TextProps & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <Animated.Text {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
export function PaletteIcon({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <AnimatedIcon {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
function ArtworkBackButton() {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Navigate up"
|
||||
hitSlop={8}
|
||||
onPress={() => router.back()}
|
||||
>
|
||||
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
export function renderArtworkBackButton() {
|
||||
return <ArtworkBackButton />
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
import { useState, type ReactNode } from "react"
|
||||
import {
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type StyleProp,
|
||||
type TextStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { usePlaybackActions, usePlaybackProgress } from "@/contexts/playback"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
|
||||
/**
|
||||
* Position slider with elapsed and remaining labels. The only player piece
|
||||
* subscribed to the playback clock, so the rest of the player stays still
|
||||
* while audio plays.
|
||||
*/
|
||||
export function PlayerProgress({
|
||||
colors,
|
||||
center,
|
||||
timeStyle,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
/** Shown centered between the time labels. */
|
||||
center?: ReactNode
|
||||
timeStyle?: StyleProp<TextStyle>
|
||||
}) {
|
||||
const { currentTime, duration } = usePlaybackProgress()
|
||||
const { seekTo } = usePlaybackActions()
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const time = scrubTime ?? currentTime
|
||||
const timeColor =
|
||||
scrubTime === null ? colors.secondaryForeground : colors.foreground
|
||||
|
||||
return (
|
||||
<>
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={time}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.row}>
|
||||
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
|
||||
{formatDuration(time)}
|
||||
</Text>
|
||||
{center ? (
|
||||
<View style={styles.center} pointerEvents="none">
|
||||
{center}
|
||||
</View>
|
||||
) : null}
|
||||
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
|
||||
{formatRemainingDuration(time, duration).replace("-", "−")}
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
center: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
alignItems: "center",
|
||||
},
|
||||
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||
})
|
||||
@@ -1,11 +1,16 @@
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { collectionInset } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
useSongDownloadState,
|
||||
useToggleSongDownload,
|
||||
} from "@/contexts/downloads"
|
||||
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
|
||||
import type { CoverPalette } from "@/lib/cover-palette"
|
||||
import { formatDuration } from "@/lib/format"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
@@ -16,7 +21,7 @@ import {
|
||||
useThemeColors,
|
||||
} from "@/lib/theme"
|
||||
import { memo, useCallback } from "react"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -34,8 +39,10 @@ export const SongRow = memo(function SongRow({
|
||||
palette,
|
||||
inset = false,
|
||||
swipe,
|
||||
downloadFrom,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
/** Search results also show the lyrics line they matched. */
|
||||
song: SearchSong
|
||||
onPress?: () => void
|
||||
contextMenu?: Omit<MediaMenuConfig, "onAction"> & {
|
||||
onAction: MediaMenuConfig["onAction"]
|
||||
@@ -51,9 +58,14 @@ export const SongRow = memo(function SongRow({
|
||||
}
|
||||
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
||||
inset?: boolean
|
||||
/** The download this row belongs to; removing only takes it out of that. */
|
||||
downloadFrom?: DownloadSource
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const downloadState = useSongDownloadState(song.id, downloadFrom)
|
||||
const downloaded = downloadState === "here"
|
||||
const toggleDownload = useToggleSongDownload()
|
||||
if (!config) return null
|
||||
|
||||
const foreground = palette?.foreground ?? colors.foreground
|
||||
@@ -64,27 +76,38 @@ export const SongRow = memo(function SongRow({
|
||||
const content = (
|
||||
<>
|
||||
<View style={styles.rowMeta}>
|
||||
<PaletteText
|
||||
tone={palette ? "foreground" : undefined}
|
||||
<Text
|
||||
style={[styles.rowTitle, { color: foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.artist.name} · {song.album.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{song.lyricsSnippet ? (
|
||||
<Text
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
Lyrics: “{song.lyricsSnippet}”
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.duration, { color: secondaryForeground }]}
|
||||
>
|
||||
{downloaded || downloadState === "device" ? (
|
||||
<Ionicons
|
||||
name="arrow-down-circle"
|
||||
size={14}
|
||||
color={secondaryForeground}
|
||||
accessibilityLabel="Downloaded"
|
||||
/>
|
||||
) : null}
|
||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{trailing}
|
||||
</>
|
||||
)
|
||||
@@ -115,6 +138,8 @@ export const SongRow = memo(function SongRow({
|
||||
onPlayNext={swipe.onPlayNext}
|
||||
onAddToQueue={swipe.onAddToQueue}
|
||||
onRemove={swipe.onRemove}
|
||||
downloaded={downloaded}
|
||||
onDownload={() => toggleDownload(song, downloaded, downloadFrom)}
|
||||
backgroundColor={swipe.backgroundColor}
|
||||
onPress={onPress}
|
||||
style={rowStyle}
|
||||
@@ -160,10 +185,12 @@ export const SongListRow = memo(function SongListRow({
|
||||
palette,
|
||||
inset,
|
||||
swipe,
|
||||
removable,
|
||||
downloadFrom,
|
||||
onPlay,
|
||||
onAction,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
song: SearchSong
|
||||
favorited: boolean
|
||||
playlistLabel?: string
|
||||
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
||||
@@ -175,10 +202,15 @@ export const SongListRow = memo(function SongListRow({
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Shows "Remove from Playlist" in the context menu. */
|
||||
removable?: boolean
|
||||
/** The download this row belongs to; removing only takes it out of that. */
|
||||
downloadFrom?: DownloadSource
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const downloaded = useSongDownloadState(song.id, downloadFrom) === "here"
|
||||
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
||||
|
||||
return (
|
||||
@@ -187,6 +219,7 @@ export const SongListRow = memo(function SongListRow({
|
||||
palette={palette}
|
||||
inset={inset}
|
||||
swipe={swipe}
|
||||
downloadFrom={downloadFrom}
|
||||
onPress={handlePress}
|
||||
contextMenu={{
|
||||
preview: config
|
||||
@@ -201,7 +234,9 @@ export const SongListRow = memo(function SongListRow({
|
||||
: undefined,
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
downloaded,
|
||||
playlistLabel,
|
||||
showRemoveFromPlaylist: removable,
|
||||
navigation: {
|
||||
artist: { id: song.artist.id },
|
||||
album: { id: song.album.id },
|
||||
|
||||
@@ -2,16 +2,23 @@ import { useCallback, useMemo } from "react"
|
||||
import { Platform } from "react-native"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { useQuery } from "convex/react"
|
||||
|
||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { filterSongs } from "@otunes/convex/client/song-search"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
export function usePlaylistSearch(songs: BrowseSong[]) {
|
||||
const search = useDebouncedSearch()
|
||||
const lyricsMatches = useQuery(
|
||||
api.lyrics.matchingSongIds,
|
||||
search.searchQuery.trim() ? { query: search.searchQuery } : "skip"
|
||||
)
|
||||
const filteredSongs = useMemo(
|
||||
() => filterSongs(songs, search.searchQuery),
|
||||
[songs, search.searchQuery]
|
||||
() => filterSongs(songs, search.searchQuery, lyricsMatches),
|
||||
[songs, search.searchQuery, lyricsMatches]
|
||||
)
|
||||
|
||||
return { ...search, filteredSongs }
|
||||
|
||||
@@ -16,7 +16,7 @@ import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
|
||||
@@ -64,7 +64,7 @@ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
|
||||
[handleSongAction]
|
||||
)
|
||||
const renderItem = useCallback(
|
||||
({ item: song }: ListRenderItemInfo<BrowseSong>) => (
|
||||
({ item: song }: ListRenderItemInfo<SearchSong>) => (
|
||||
<SongListRow
|
||||
song={song}
|
||||
favorited={isSongFavorite(song.id)}
|
||||
|
||||
@@ -1,15 +1,20 @@
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
CollectionDivider,
|
||||
collectionInset,
|
||||
} from "@/components/collection-list"
|
||||
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
|
||||
import { Link } from "expo-router"
|
||||
import { useHeaderHeight } from "expo-router/react-navigation"
|
||||
import Reanimated from "react-native-reanimated"
|
||||
import { type ReactNode, type ComponentProps } from "react"
|
||||
import { type ComponentProps, type ReactNode } from "react"
|
||||
import {
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
View,
|
||||
type DimensionValue,
|
||||
@@ -17,34 +22,42 @@ import {
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
||||
function SkeletonContent({
|
||||
/**
|
||||
* Loading screens never scroll, so they cannot rely on scroll-view inset
|
||||
* adjustment. iOS headers are transparent and overlap the screen; Android
|
||||
* headers are opaque and already sit above it.
|
||||
*/
|
||||
function SkeletonScreen({
|
||||
children,
|
||||
embedded = false,
|
||||
style,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
children: ReactNode
|
||||
embedded?: boolean
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
if (embedded) return <>{children}</>
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
<Reanimated.View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.screen,
|
||||
{
|
||||
backgroundColor: backgroundColor ?? colors.background,
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
},
|
||||
style,
|
||||
]}
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
</Reanimated.View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -61,56 +74,103 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
|
||||
function TextLine({
|
||||
width,
|
||||
height = 14,
|
||||
fontSize,
|
||||
}: {
|
||||
width: DimensionValue
|
||||
height?: number
|
||||
fontSize: number
|
||||
}) {
|
||||
return <Skeleton style={{ width, height, borderRadius: 4 }} />
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
width,
|
||||
height: Math.round(fontSize * 1.2),
|
||||
justifyContent: "center",
|
||||
}}
|
||||
>
|
||||
<Skeleton
|
||||
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
|
||||
/>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
export function SongRowSkeleton() {
|
||||
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
|
||||
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
|
||||
const colors = useThemeColors()
|
||||
const meta = (
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" fontSize={16} />
|
||||
<View style={styles.songSubtitle}>
|
||||
<TextLine width="40%" fontSize={14} />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
if (inset) {
|
||||
return (
|
||||
<View style={styles.insetRow}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
<View
|
||||
style={[
|
||||
styles.insetSongContent,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
>
|
||||
{meta}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<View style={[styles.songRow, { borderBottomColor: colors.border }]}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" height={16} />
|
||||
<TextLine width="40%" />
|
||||
{meta}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function TrackRowSkeleton() {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<View style={styles.trackRow}>
|
||||
<View style={styles.trackNumber}>
|
||||
<TextLine width={12} fontSize={16} />
|
||||
</View>
|
||||
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
|
||||
<TextLine width="55%" fontSize={16} />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
embedded = false,
|
||||
}: {
|
||||
rows?: number
|
||||
embedded?: boolean
|
||||
}) {
|
||||
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
||||
return Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} inset={inset} />
|
||||
))
|
||||
}
|
||||
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<SkeletonScreen>
|
||||
<SongRows rows={rows} />
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
|
||||
function CardSkeleton({
|
||||
width,
|
||||
minHeight,
|
||||
round = false,
|
||||
}: {
|
||||
width: number
|
||||
minHeight?: number
|
||||
round?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.card, { width }]}>
|
||||
<View style={[styles.card, { width, minHeight }]}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width,
|
||||
@@ -118,35 +178,37 @@ function CardSkeleton({
|
||||
borderRadius: round ? width / 2 : radius.md,
|
||||
}}
|
||||
/>
|
||||
<TextLine width="80%" />
|
||||
{round ? null : <TextLine width="50%" height={12} />}
|
||||
<TextLine width="80%" fontSize={14} />
|
||||
{round ? null : <TextLine width="50%" fontSize={12} />}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
embedded = false,
|
||||
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
|
||||
function MediaGridContent({
|
||||
items,
|
||||
contentInset,
|
||||
header,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
items: number
|
||||
contentInset: boolean
|
||||
header?: ReactNode
|
||||
}) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||
useMediaGridLayout()
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<>
|
||||
{header}
|
||||
<View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
{
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
// FlatList applies its content gap after the list header as well.
|
||||
marginTop: header && !tabletLayout ? gap : 0,
|
||||
gap,
|
||||
},
|
||||
]}
|
||||
@@ -154,20 +216,47 @@ export function MediaGridSkeleton({
|
||||
{Array.from(
|
||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||
(_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
<CardSkeleton
|
||||
key={index}
|
||||
width={cardWidth}
|
||||
minHeight={
|
||||
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
|
||||
}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
header,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
|
||||
header?: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<MediaGridContent
|
||||
items={items}
|
||||
contentInset={contentInset}
|
||||
header={header}
|
||||
/>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
export function CarouselSkeleton() {
|
||||
return (
|
||||
<View style={styles.carousel}>
|
||||
<TextLine width={160} height={22} />
|
||||
<TextLine width={160} fontSize={22} />
|
||||
<View style={styles.carouselRow}>
|
||||
{Array.from({ length: 3 }, (_, index) => (
|
||||
{Array.from({ length: 8 }, (_, index) => (
|
||||
<CardSkeleton key={index} width={carouselCardWidth} />
|
||||
))}
|
||||
</View>
|
||||
@@ -176,140 +265,148 @@ export function CarouselSkeleton() {
|
||||
}
|
||||
|
||||
export function HomeSkeleton() {
|
||||
const headerHeight = useHeaderHeight()
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.home,
|
||||
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</ScrollView>
|
||||
<SkeletonScreen>
|
||||
<View style={styles.home}>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</View>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
function HeroActions({
|
||||
favorite = true,
|
||||
reverse = false,
|
||||
}: {
|
||||
favorite?: boolean
|
||||
reverse?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.actions, reverse && styles.actionsReverse]}>
|
||||
{favorite ? <Skeleton style={styles.iconAction} /> : null}
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
||||
export function CollectionDetailSkeleton({
|
||||
zoomCoverSize,
|
||||
variant,
|
||||
style,
|
||||
round = false,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
zoomCoverSize?: number
|
||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
||||
round?: boolean
|
||||
variant: "album" | "playlist" | "favorites" | "artist"
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
||||
const coverSize =
|
||||
!round && landscape
|
||||
? tabletCoverSize!
|
||||
: (zoomCoverSize ?? (round ? 180 : 210))
|
||||
const actions = (
|
||||
<View style={styles.actions}>
|
||||
<Skeleton style={styles.iconAction} />
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
)
|
||||
const artwork = (
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
)
|
||||
|
||||
if (variant === "artist" || variant === "favorites") {
|
||||
const artist = variant === "artist"
|
||||
const coverSize = artist ? 180 : 200
|
||||
const hero = (
|
||||
<View style={styles.centeredHero}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: artist ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
<TextLine width={200} fontSize={artist ? 28 : 24} />
|
||||
<HeroActions favorite={artist} />
|
||||
</View>
|
||||
)
|
||||
return (
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
onLayout={onLayout}
|
||||
>
|
||||
{artist ? (
|
||||
<MediaGridContent items={4} contentInset={false} header={hero} />
|
||||
) : (
|
||||
<>
|
||||
{hero}
|
||||
<CollectionDivider />
|
||||
<SongRows rows={8} inset />
|
||||
</>
|
||||
)}
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
const album = variant === "album"
|
||||
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
|
||||
return (
|
||||
<Reanimated.ScrollView
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
onLayout={onLayout}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
|
||||
style,
|
||||
]}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
{round ? (
|
||||
<View style={styles.artistHero}>
|
||||
{zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)}
|
||||
<TextLine width={200} height={24} />
|
||||
<TextLine width={120} height={16} />
|
||||
{actions}
|
||||
</View>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: radius.lg,
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={<HeroActions favorite={album} reverse={landscape} />}
|
||||
>
|
||||
<TextLine
|
||||
width={landscape ? "85%" : 200}
|
||||
fontSize={landscape ? 22 : 24}
|
||||
/>
|
||||
<TextLine
|
||||
width={landscape ? "60%" : 120}
|
||||
fontSize={landscape ? 22 : 16}
|
||||
/>
|
||||
{album ? (
|
||||
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
|
||||
) : null}
|
||||
</CollectionHero>
|
||||
<CollectionDivider />
|
||||
{album ? (
|
||||
Array.from({ length: 10 }, (_, index) => (
|
||||
<TrackRowSkeleton key={index} />
|
||||
))
|
||||
) : (
|
||||
<CollectionHero
|
||||
artwork={
|
||||
zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)
|
||||
}
|
||||
actions={actions}
|
||||
>
|
||||
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
|
||||
<TextLine
|
||||
width={landscape && !round ? "60%" : 120}
|
||||
height={landscape && !round ? 22 : 16}
|
||||
/>
|
||||
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
|
||||
</CollectionHero>
|
||||
<SongRows rows={8} inset />
|
||||
)}
|
||||
{round ? (
|
||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||
) : (
|
||||
<SongListSkeleton rows={8} embedded />
|
||||
)}
|
||||
</Reanimated.ScrollView>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" height={16} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<SkeletonScreen>
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" fontSize={16} />
|
||||
</View>
|
||||
))}
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
screen: { flex: 1, overflow: "hidden" },
|
||||
songRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
@@ -319,22 +416,55 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: spacing.lg,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
insetRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
paddingLeft: collectionInset,
|
||||
},
|
||||
insetSongContent: {
|
||||
flex: 1,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
alignSelf: "stretch",
|
||||
minHeight: 64,
|
||||
paddingVertical: 10,
|
||||
marginRight: collectionInset,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
songArtwork: { width: 44, height: 44, borderRadius: 6 },
|
||||
songMeta: { flex: 1, gap: 6 },
|
||||
card: { gap: spacing.xs },
|
||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
||||
gridInset: { padding: spacing.lg },
|
||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
actions: {
|
||||
songMeta: { flex: 1 },
|
||||
songSubtitle: { marginTop: 3 },
|
||||
trackRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.sm,
|
||||
paddingLeft: collectionInset,
|
||||
},
|
||||
trackNumber: { width: 24, alignItems: "center" },
|
||||
trackContent: {
|
||||
flex: 1,
|
||||
justifyContent: "center",
|
||||
alignSelf: "stretch",
|
||||
minHeight: 52,
|
||||
paddingVertical: 12,
|
||||
marginRight: collectionInset,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
card: { gap: spacing.xs },
|
||||
grid: { flexDirection: "row", flexWrap: "wrap" },
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
marginTop: spacing.sm,
|
||||
},
|
||||
actionsReverse: { flexDirection: "row-reverse" },
|
||||
iconAction: { width: 44, height: 44, borderRadius: 22 },
|
||||
playButton: { width: 160, height: 44, borderRadius: 999 },
|
||||
artistRow: {
|
||||
|
||||
@@ -31,14 +31,20 @@ import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
const IS_ANDROID = Platform.OS === "android"
|
||||
|
||||
const ACTION_WIDTH = 82
|
||||
const LEADING_ACTION_WIDTH = 72
|
||||
/** Width of each action when two share a side. */
|
||||
const PAIRED_ACTION_WIDTH = 72
|
||||
const SPRING = { duration: 450, dampingRatio: 1 }
|
||||
|
||||
function impact() {
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium)
|
||||
}
|
||||
|
||||
/** A tap competes with the swipe so dragging a moving row never starts playback. */
|
||||
/**
|
||||
* A tap competes with the swipe so dragging a moving row never starts playback.
|
||||
* A full swipe commits the outer action: Add to Queue on the leading side, and
|
||||
* Remove on the trailing side when `onRemove` is set, else Download. Download
|
||||
* turns into a red Remove Download once `downloaded`.
|
||||
*/
|
||||
export function SongSwipeRow({
|
||||
children,
|
||||
style,
|
||||
@@ -48,6 +54,8 @@ export function SongSwipeRow({
|
||||
onPlayNext,
|
||||
onAddToQueue,
|
||||
onRemove,
|
||||
onDownload,
|
||||
downloaded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
@@ -57,8 +65,11 @@ export function SongSwipeRow({
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
onDownload?: () => void
|
||||
downloaded?: boolean
|
||||
}) {
|
||||
const hasRemove = IS_ANDROID && !!onRemove
|
||||
const hasRemove = !!onRemove
|
||||
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
|
||||
const x = useSharedValue(0)
|
||||
const startX = useSharedValue(0)
|
||||
const width = useSharedValue(0)
|
||||
@@ -89,9 +100,10 @@ export function SongSwipeRow({
|
||||
(side: number) => {
|
||||
close()
|
||||
if (side > 0) onAddToQueue()
|
||||
// Download is intentionally a placeholder.
|
||||
else if (onRemove) onRemove()
|
||||
else onDownload?.()
|
||||
},
|
||||
[close, onAddToQueue]
|
||||
[close, onAddToQueue, onRemove, onDownload]
|
||||
)
|
||||
const tapRow = useCallback(() => {
|
||||
if (open) close()
|
||||
@@ -117,9 +129,7 @@ export function SongSwipeRow({
|
||||
const commit =
|
||||
Math.abs(x.value) >
|
||||
Math.max(
|
||||
x.value > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1),
|
||||
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth,
|
||||
width.value * 0.55
|
||||
)
|
||||
if (commit !== committed.value) {
|
||||
@@ -141,10 +151,7 @@ export function SongSwipeRow({
|
||||
? side
|
||||
: 0
|
||||
x.value = withSpring(
|
||||
target *
|
||||
(target > 0
|
||||
? LEADING_ACTION_WIDTH * 2
|
||||
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
|
||||
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth),
|
||||
{
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
@@ -167,7 +174,6 @@ export function SongSwipeRow({
|
||||
return Gesture.Exclusive(pan, tap)
|
||||
}, [
|
||||
activate,
|
||||
hasRemove,
|
||||
begin,
|
||||
close,
|
||||
commitProgress,
|
||||
@@ -175,6 +181,7 @@ export function SongSwipeRow({
|
||||
settle,
|
||||
startX,
|
||||
tapRow,
|
||||
trailingWidth,
|
||||
width,
|
||||
x,
|
||||
])
|
||||
@@ -227,31 +234,33 @@ export function SongSwipeRow({
|
||||
onPlayNext()
|
||||
}}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
remove
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onRemove?.()
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
paired={hasRemove}
|
||||
remove={hasRemove}
|
||||
downloaded={downloaded}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => activate(-1)}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
downloaded={downloaded}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onDownload?.()
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<GestureDetector gesture={gesture}>
|
||||
<Animated.View
|
||||
accessible
|
||||
@@ -260,17 +269,21 @@ export function SongSwipeRow({
|
||||
accessibilityActions={[
|
||||
{ name: "addToQueue", label: "Add to Queue" },
|
||||
{ name: "playNext", label: "Play Next" },
|
||||
{ name: "download", label: "Download" },
|
||||
{
|
||||
name: "download",
|
||||
label: downloaded ? "Remove Download" : "Download",
|
||||
},
|
||||
...(hasRemove
|
||||
? [{ name: "remove", label: "Remove from Playlist" }]
|
||||
: []),
|
||||
]}
|
||||
onAccessibilityAction={(event) => {
|
||||
if (event.nativeEvent.actionName === "remove" && hasRemove) {
|
||||
close()
|
||||
onRemove?.()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "remove") activate(-1)
|
||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||
if (event.nativeEvent.actionName === "download") {
|
||||
close()
|
||||
onDownload?.()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "playNext") {
|
||||
close()
|
||||
onPlayNext()
|
||||
@@ -294,6 +307,7 @@ function SwipeAction({
|
||||
secondary = false,
|
||||
paired = side > 0,
|
||||
remove = false,
|
||||
downloaded = false,
|
||||
x,
|
||||
height,
|
||||
progress,
|
||||
@@ -304,6 +318,8 @@ function SwipeAction({
|
||||
secondary?: boolean
|
||||
paired?: boolean
|
||||
remove?: boolean
|
||||
/** Shows the download action as Remove Download. */
|
||||
downloaded?: boolean
|
||||
x: SharedValue<number>
|
||||
height: SharedValue<number>
|
||||
progress: SharedValue<number>
|
||||
@@ -337,10 +353,10 @@ function SwipeAction({
|
||||
const resting = Math.max(
|
||||
0,
|
||||
Math.min(
|
||||
revealed - (side > 0 ? 10 : 20),
|
||||
revealed - (paired ? 10 : 20),
|
||||
interpolate(
|
||||
revealed,
|
||||
[24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[0, 62, 200]
|
||||
)
|
||||
)
|
||||
@@ -374,6 +390,8 @@ function SwipeAction({
|
||||
},
|
||||
],
|
||||
}))
|
||||
const removesDownload = side < 0 && !remove && downloaded
|
||||
const destructive = remove || removesDownload
|
||||
return (
|
||||
<Animated.View
|
||||
pointerEvents={open ? "auto" : "none"}
|
||||
@@ -390,11 +408,13 @@ function SwipeAction({
|
||||
accessibilityLabel={
|
||||
remove
|
||||
? "Remove from Playlist"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
: removesDownload
|
||||
? "Remove Download"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
}
|
||||
onPress={onPress}
|
||||
style={styles.actionButton}
|
||||
@@ -403,8 +423,10 @@ function SwipeAction({
|
||||
style={[
|
||||
styles.pill,
|
||||
{
|
||||
backgroundColor: remove
|
||||
? "#d32f2f"
|
||||
backgroundColor: destructive
|
||||
? IS_ANDROID
|
||||
? "#d32f2f"
|
||||
: "#ff3b30"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "#6b5bff"
|
||||
@@ -418,7 +440,7 @@ function SwipeAction({
|
||||
{IS_ANDROID ? (
|
||||
<Ionicons
|
||||
name={
|
||||
remove
|
||||
destructive
|
||||
? "trash-outline"
|
||||
: side < 0
|
||||
? "arrow-down"
|
||||
@@ -432,11 +454,13 @@ function SwipeAction({
|
||||
) : (
|
||||
<SymbolView
|
||||
name={
|
||||
side > 0
|
||||
? secondary
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "text.line.last.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
destructive
|
||||
? "trash"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "text.line.last.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
|
||||
@@ -3,18 +3,48 @@ import { SafeAreaView } from "react-native-safe-area-context"
|
||||
import { Platform } from "react-native"
|
||||
import type { ReactNode } from "react"
|
||||
|
||||
import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||
import { OfflineOverlay } from "@/components/offline-overlay"
|
||||
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||
|
||||
type ScreenRoute = { name: string; params?: object }
|
||||
|
||||
/**
|
||||
* Screen content with the no-connection overlay layered on top. A fragment
|
||||
* keeps the scroll view as the screen's first subview for large titles.
|
||||
*/
|
||||
function ScreenBody({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<>
|
||||
{children}
|
||||
<OfflineOverlay route={route} />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
||||
export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
||||
export function TabScreenContent({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
if (Platform.OS !== "ios" || !Platform.isPad) {
|
||||
return <ScreenBody route={route}>{children}</ScreenBody>
|
||||
}
|
||||
return (
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
|
||||
{children}
|
||||
<ScreenBody route={route}>{children}</ScreenBody>
|
||||
</SafeAreaView>
|
||||
<TabletSidebar />
|
||||
<TabletPlayerLayoutSync />
|
||||
@@ -22,6 +52,13 @@ export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||
)
|
||||
}
|
||||
|
||||
export function renderTabScreenContent({ children }: { children: ReactNode }) {
|
||||
return <TabScreenContent>{children}</TabScreenContent>
|
||||
/** `screenLayout` for every tab stack. */
|
||||
export function renderTabScreenContent({
|
||||
route,
|
||||
children,
|
||||
}: {
|
||||
route: ScreenRoute
|
||||
children: ReactNode
|
||||
}) {
|
||||
return <TabScreenContent route={route}>{children}</TabScreenContent>
|
||||
}
|
||||
@@ -19,6 +19,9 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** Height reserved under each tablet card's artwork for its title and subtitle. */
|
||||
export const tabletCardTextHeight = 48
|
||||
|
||||
type GridProps = {
|
||||
content: MediaItem[]
|
||||
paddingBottom: number
|
||||
@@ -48,7 +51,7 @@ export function TabletMediaGrid({
|
||||
const [headerHeight, setHeaderHeight] = useState(0)
|
||||
const [scrollY, setScrollY] = useState(0)
|
||||
const lastRequestedLength = useRef(-1)
|
||||
const rowHeight = cardWidth + 48 + gap
|
||||
const rowHeight = cardWidth + tabletCardTextHeight + gap
|
||||
const firstRow = Math.max(
|
||||
0,
|
||||
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||
|
||||
@@ -23,6 +23,7 @@ import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useLyrics } from "@/hooks/use-lyrics"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { tabletMiniPlayerHeight } from "@/lib/theme"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
@@ -58,6 +59,7 @@ export function TabletMiniPlayer() {
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const roomy = width - insets.left - insets.right >= 650
|
||||
const lyrics = useLyrics(roomy ? (currentSong?.id ?? null) : null)
|
||||
|
||||
if (!focused || !config || !currentSong || queueSongIds.length === 0)
|
||||
return null
|
||||
@@ -166,16 +168,22 @@ export function TabletMiniPlayer() {
|
||||
{roomy ? (
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
disabled
|
||||
disabled={!lyrics}
|
||||
onPress={() =>
|
||||
router.push({
|
||||
pathname: "/(app)/player",
|
||||
params: { lyrics: "1" },
|
||||
})
|
||||
}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
accessibilityLabel="Show lyrics"
|
||||
accessibilityState={{ disabled: !lyrics }}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback="chatbox-outline"
|
||||
size={23}
|
||||
color={inactive}
|
||||
color={lyrics ? color : inactive}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
|
||||
import {
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
useWindowDimensions,
|
||||
} from "react-native"
|
||||
import { Pressable, StyleSheet, View, useWindowDimensions } from "react-native"
|
||||
import Animated, {
|
||||
Easing,
|
||||
ReduceMotion,
|
||||
@@ -14,22 +8,27 @@ import Animated, {
|
||||
useSharedValue,
|
||||
withTiming,
|
||||
} from "react-native-reanimated"
|
||||
import { GestureDetector, Gesture } from "react-native-gesture-handler"
|
||||
import { GestureDetector, type Gesture } from "react-native-gesture-handler"
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
import { useRouter } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
|
||||
import { AudioOutputButton } from "@/components/audio-output-button"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { LyricsView } from "@/components/lyrics-view"
|
||||
import { NowPlayingQueue } from "@/components/now-playing-queue"
|
||||
import { PlayerProgress } from "@/components/player-progress"
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
import type { Lyrics } from "@otunes/convex/client/lyrics"
|
||||
|
||||
/** What the Now Playing screen shows beside or instead of the artwork. */
|
||||
export type PlayerPanel = "queue" | "lyrics"
|
||||
|
||||
const queueMotion = {
|
||||
duration: 420,
|
||||
@@ -37,47 +36,46 @@ const queueMotion = {
|
||||
reduceMotion: ReduceMotion.System,
|
||||
}
|
||||
|
||||
/** Tablet player keeps transport controls visible while the queue opens beside them. */
|
||||
/**
|
||||
* Tablet player keeps transport controls visible while the queue or lyrics
|
||||
* open beside them.
|
||||
*/
|
||||
export function TabletNowPlaying({
|
||||
colors,
|
||||
backgroundStyle,
|
||||
dismissStyle,
|
||||
dismissGesture,
|
||||
showQueue,
|
||||
toggleQueue,
|
||||
dismissGestures,
|
||||
panel,
|
||||
togglePanel,
|
||||
lyrics,
|
||||
metadata,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
backgroundStyle: ComponentProps<typeof Animated.View>["style"]
|
||||
dismissStyle: ComponentProps<typeof Animated.View>["style"]
|
||||
dismissGesture: () => ReturnType<typeof Gesture.Pan>
|
||||
showQueue: boolean
|
||||
toggleQueue: () => void
|
||||
dismissGestures: {
|
||||
handle: ReturnType<typeof Gesture.Pan>
|
||||
artwork: ReturnType<typeof Gesture.Pan>
|
||||
}
|
||||
panel: PlayerPanel | null
|
||||
togglePanel: (panel: PlayerPanel) => void
|
||||
lyrics: Lyrics | null | undefined
|
||||
metadata: ReactNode
|
||||
}) {
|
||||
const router = useRouter()
|
||||
const insets = useSafeAreaInsets()
|
||||
const { width, height } = useWindowDimensions()
|
||||
const { config } = useServerConfig()
|
||||
const {
|
||||
currentSong,
|
||||
currentTime,
|
||||
duration,
|
||||
isPlaying,
|
||||
setIsPlaying,
|
||||
seekTo,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
} = usePlayback()
|
||||
const { currentSong, isPlaying, shuffleEnabled, repeatEnabled } =
|
||||
usePlaybackQueue()
|
||||
const { setIsPlaying, skipNext, skipPrevious, toggleShuffle, cycleRepeat } =
|
||||
usePlaybackActions()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const [queueHeight, setQueueHeight] = useState(0)
|
||||
const wideLayout = width >= 700
|
||||
const sideBySide = showQueue && wideLayout
|
||||
const showQueue = panel === "queue"
|
||||
const showLyrics = panel === "lyrics"
|
||||
const sideBySide = panel !== null && wideLayout
|
||||
const progress = useSharedValue(sideBySide ? 1 : 0)
|
||||
useEffect(() => {
|
||||
progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
|
||||
@@ -113,7 +111,6 @@ export function TabletNowPlaying({
|
||||
opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
|
||||
transform: [{ translateX: (1 - progress.value) * 48 }],
|
||||
}))
|
||||
const time = scrubTime ?? currentTime
|
||||
if (!currentSong || !config) return null
|
||||
const control = (
|
||||
label: string,
|
||||
@@ -139,7 +136,14 @@ export function TabletNowPlaying({
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
const queue = (
|
||||
const panelContent = showLyrics ? (
|
||||
<LyricsView
|
||||
key={currentSong.id}
|
||||
lyrics={lyrics}
|
||||
colors={colors}
|
||||
fontSize={34}
|
||||
/>
|
||||
) : (
|
||||
<NowPlayingQueue
|
||||
tablet
|
||||
colors={colors}
|
||||
@@ -150,7 +154,7 @@ export function TabletNowPlaying({
|
||||
return (
|
||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={dismissGestures.handle}>
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
accessibilityRole="button"
|
||||
@@ -164,7 +168,7 @@ export function TabletNowPlaying({
|
||||
</GestureDetector>
|
||||
<View style={styles.body}>
|
||||
<Animated.View style={[styles.main, mainMotion]}>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<GestureDetector gesture={dismissGestures.artwork}>
|
||||
<View style={styles.artworkArea}>
|
||||
<Animated.View style={artworkMotion}>
|
||||
<CoverImage
|
||||
@@ -177,31 +181,7 @@ export function TabletNowPlaying({
|
||||
</GestureDetector>
|
||||
<Animated.View style={[styles.controls, controlsMotion]}>
|
||||
<View style={styles.meta}>{metadata}</View>
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={time}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.times}>
|
||||
<Text
|
||||
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
{formatDuration(time)}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
{formatRemainingDuration(time, duration).replace("-", "−")}
|
||||
</Text>
|
||||
</View>
|
||||
<PlayerProgress colors={colors} />
|
||||
<View style={styles.transport}>
|
||||
{control(
|
||||
"Shuffle",
|
||||
@@ -280,20 +260,18 @@ export function TabletNowPlaying({
|
||||
</Animated.View>
|
||||
{wideLayout ? (
|
||||
<Animated.View
|
||||
pointerEvents={showQueue ? "auto" : "none"}
|
||||
accessibilityElementsHidden={!showQueue}
|
||||
importantForAccessibility={
|
||||
showQueue ? "auto" : "no-hide-descendants"
|
||||
}
|
||||
pointerEvents={panel ? "auto" : "none"}
|
||||
accessibilityElementsHidden={!panel}
|
||||
importantForAccessibility={panel ? "auto" : "no-hide-descendants"}
|
||||
style={[styles.queue, queueStyle]}
|
||||
onLayout={(event) =>
|
||||
setQueueHeight(event.nativeEvent.layout.height)
|
||||
}
|
||||
>
|
||||
{queueHeight > 0 ? queue : null}
|
||||
{queueHeight > 0 ? panelContent : null}
|
||||
</Animated.View>
|
||||
) : null}
|
||||
{showQueue && !sideBySide ? (
|
||||
{panel && !sideBySide ? (
|
||||
<View
|
||||
style={[
|
||||
styles.portraitQueue,
|
||||
@@ -303,7 +281,7 @@ export function TabletNowPlaying({
|
||||
setQueueHeight(event.nativeEvent.layout.height)
|
||||
}
|
||||
>
|
||||
{queueHeight > 0 ? queue : null}
|
||||
{queueHeight > 0 ? panelContent : null}
|
||||
</View>
|
||||
) : null}
|
||||
</View>
|
||||
@@ -319,21 +297,29 @@ export function TabletNowPlaying({
|
||||
/>
|
||||
<View style={styles.footerActions}>
|
||||
<Pressable
|
||||
disabled
|
||||
onPress={() => togglePanel("lyrics")}
|
||||
disabled={!lyrics && !showLyrics}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
style={[styles.footerButton, { opacity: 0.4 }]}
|
||||
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
|
||||
accessibilityState={{
|
||||
selected: showLyrics,
|
||||
disabled: !lyrics && !showLyrics,
|
||||
}}
|
||||
style={[
|
||||
styles.footerButton,
|
||||
!lyrics && !showLyrics && { opacity: 0.4 },
|
||||
showLyrics && { backgroundColor: colors.selected },
|
||||
]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback="chatbox-outline"
|
||||
size={25}
|
||||
color={colors.foreground}
|
||||
color={showLyrics ? colors.selectedForeground : colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Pressable
|
||||
onPress={toggleQueue}
|
||||
onPress={() => togglePanel("queue")}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||
accessibilityState={{ selected: showQueue }}
|
||||
@@ -376,12 +362,6 @@ const styles = StyleSheet.create({
|
||||
},
|
||||
controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
|
||||
meta: { height: 48 },
|
||||
times: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||
transport: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,13 +1,19 @@
|
||||
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||
import { requireNativeView } from "expo"
|
||||
import { useIsFocused } from "expo-router"
|
||||
import { useIsFocused, useRouter } from "expo-router"
|
||||
import { useMemo } from "react"
|
||||
import { Platform, type ViewProps } from "react-native"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { tabPath } from "@/lib/app-navigation"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { playlistCoverUrl } from "@/lib/urls"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
|
||||
|
||||
const NativeSidebar =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
@@ -16,16 +22,39 @@ const NativeSidebar =
|
||||
initials: string
|
||||
imageURL?: string
|
||||
active: boolean
|
||||
playlists: SidebarPlaylist[]
|
||||
onProfilePress: () => void
|
||||
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
|
||||
}
|
||||
>("TabletSidebar")
|
||||
: null
|
||||
|
||||
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
|
||||
export function TabletSidebar() {
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
|
||||
const { config } = useServerConfig()
|
||||
const imageUrl = useProfileImageUrl(user?.image)
|
||||
const openSettings = useOpenSettings()
|
||||
const router = useRouter()
|
||||
const active = useIsFocused()
|
||||
const serverUrl = config?.serverUrl
|
||||
|
||||
const playlists = useMemo(
|
||||
() =>
|
||||
[
|
||||
...(sidebarPlaylists?.owned ?? []),
|
||||
...(sidebarPlaylists?.subscribed ?? []),
|
||||
].map((playlist): SidebarPlaylist => ({
|
||||
id: playlist.id,
|
||||
title: playlist.title,
|
||||
imageURL:
|
||||
serverUrl && playlist.cover
|
||||
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
|
||||
: undefined,
|
||||
})),
|
||||
[serverUrl, sidebarPlaylists]
|
||||
)
|
||||
|
||||
if (!NativeSidebar) return null
|
||||
return (
|
||||
@@ -35,7 +64,11 @@ export function TabletSidebar() {
|
||||
initials={initialsFromName(user?.name ?? "Me")}
|
||||
imageURL={imageUrl}
|
||||
active={active}
|
||||
playlists={playlists}
|
||||
onProfilePress={openSettings}
|
||||
onPlaylistPress={({ nativeEvent }) =>
|
||||
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Platform,
|
||||
@@ -74,20 +73,8 @@ export function Button({
|
||||
<ActivityIndicator color={textColor} />
|
||||
) : (
|
||||
<View style={styles.buttonContent}>
|
||||
{icon ? (
|
||||
<PaletteIcon
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
name={icon}
|
||||
size={18}
|
||||
color={textColor}
|
||||
/>
|
||||
) : null}
|
||||
<PaletteText
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
style={[styles.buttonText, { color: textColor }]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
||||
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
||||
</View>
|
||||
)}
|
||||
</Pressable>
|
||||
|
||||
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
|
||||
{ artistId }
|
||||
)
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
setPendingSongIds(songIds)
|
||||
setPendingSongIds(songIds.flat())
|
||||
setOpen(true)
|
||||
} catch (error) {
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
|
||||
@@ -14,14 +14,10 @@ import {
|
||||
useState,
|
||||
type PropsWithChildren,
|
||||
} from "react"
|
||||
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
||||
import Reanimated, {
|
||||
import { Platform } from "react-native"
|
||||
import {
|
||||
useSharedValue,
|
||||
useAnimatedStyle,
|
||||
useAnimatedReaction,
|
||||
useAnimatedRef,
|
||||
setNativeProps,
|
||||
processColor,
|
||||
withTiming,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
@@ -29,19 +25,17 @@ import Reanimated, {
|
||||
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
|
||||
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
|
||||
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
|
||||
selectedColor: string
|
||||
}
|
||||
|
||||
type TabTheme = {
|
||||
palette: CoverPalette
|
||||
colors: SharedValue<PaletteColors>
|
||||
hasArtworkPalette: boolean
|
||||
tabletBackground: SharedValue<string>
|
||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||
}
|
||||
const AndroidTabTheme = createContext<TabTheme | null>(null)
|
||||
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette = Platform.OS === "android" || isTablet
|
||||
|
||||
function useDefaultPalette() {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
@@ -60,52 +54,37 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
palette.foreground !== defaultPalette.foreground ||
|
||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||
palette.accent !== defaultPalette.accent
|
||||
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
|
||||
const animatedColors = useSharedValue<PaletteColors>({
|
||||
...defaultColors,
|
||||
selectedColor: defaultPalette.accentText,
|
||||
})
|
||||
const tabletBackground = useSharedValue(defaultPalette.background)
|
||||
useLayoutEffect(() => {
|
||||
const { isDark: _isDark, ...colors } = palette
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: hasArtwork
|
||||
? palette.foreground
|
||||
: defaultPalette.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
}, [animatedColors, palette, defaultPalette, hasArtwork])
|
||||
if (!isTablet) return
|
||||
tabletBackground.value = withTiming(palette.background, {
|
||||
duration: TABLET_FADE_MS,
|
||||
})
|
||||
}, [tabletBackground, palette.background])
|
||||
const paletteOwner = useRef<string | null>(null)
|
||||
const setPalette = useCallback(
|
||||
(palette: CoverPalette | null, owner: string) => {
|
||||
if (!palette && paletteOwner.current !== owner) return
|
||||
paletteOwner.current = palette ? owner : null
|
||||
// Start on the UI thread immediately. React may defer commits while
|
||||
// the native stack is animating, including transitionStart state updates.
|
||||
const target = palette ?? defaultPalette
|
||||
const { isDark: _isDark, ...colors } = target
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: palette ? target.foreground : target.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
if (isTablet) {
|
||||
// React may defer commits while the iPad stack is animating.
|
||||
tabletBackground.value = withTiming(
|
||||
(palette ?? defaultPalette).background,
|
||||
{ duration: TABLET_FADE_MS }
|
||||
)
|
||||
}
|
||||
setScreen(palette ? { palette, owner } : null)
|
||||
},
|
||||
[animatedColors, defaultPalette]
|
||||
[tabletBackground, defaultPalette]
|
||||
)
|
||||
const artworkPalette = hasArtwork ? palette : null
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
palette: artworkPalette ?? defaultPalette,
|
||||
colors: animatedColors,
|
||||
hasArtworkPalette: artworkPalette !== null,
|
||||
palette: hasArtwork ? palette : defaultPalette,
|
||||
hasArtworkPalette: hasArtwork,
|
||||
tabletBackground,
|
||||
setPalette,
|
||||
}),
|
||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
||||
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground]
|
||||
)
|
||||
return (
|
||||
<AndroidTabTheme.Provider value={value}>
|
||||
@@ -114,50 +93,6 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
|
||||
* directly so appearance updates stay on the UI thread with the page colors.
|
||||
*/
|
||||
export function useAndroidNativeTabColors() {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
const ref = useAnimatedRef<HostInstance>()
|
||||
const mounted = useSharedValue(false)
|
||||
const attach = useCallback(
|
||||
(host: HostInstance | null) => {
|
||||
if (host) ref(host)
|
||||
mounted.value = host !== null
|
||||
},
|
||||
[ref, mounted]
|
||||
)
|
||||
|
||||
useAnimatedReaction(
|
||||
() => ({ colors: colors?.value, mounted: mounted.value }),
|
||||
({ colors: palette, mounted: ready }) => {
|
||||
if (Platform.OS !== "android" || !ready || !palette) return
|
||||
const normal = processColor(palette.secondaryForeground)
|
||||
const selected = processColor(palette.selectedColor)
|
||||
setNativeProps(ref, {
|
||||
standardAppearance: {
|
||||
tabBarBackgroundColor: processColor("transparent"),
|
||||
tabBarItemRippleColor: selected,
|
||||
tabBarItemActiveIndicatorEnabled: false,
|
||||
tabBarItemTitleSmallLabelFontSize: 10,
|
||||
tabBarItemTitleLargeLabelFontSize: 10,
|
||||
normal: {
|
||||
tabBarItemTitleFontColor: normal,
|
||||
tabBarItemIconColor: normal,
|
||||
},
|
||||
selected: {
|
||||
tabBarItemTitleFontColor: selected,
|
||||
tabBarItemIconColor: selected,
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
)
|
||||
return { ref: attach, style: { backgroundColor: "transparent" } }
|
||||
}
|
||||
|
||||
export function useAndroidTabPalette() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
@@ -168,53 +103,29 @@ export function useAndroidTabHasArtworkPalette() {
|
||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||
}
|
||||
|
||||
export function useAndroidTabBackgroundStyle() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const fallback = useDefaultPalette().background
|
||||
const colors = theme?.colors
|
||||
/** iPad fades the sidebar and content pane together; other layouts skip it. */
|
||||
export function useTabletBackgroundStyle() {
|
||||
const background = useContext(AndroidTabTheme)?.tabletBackground
|
||||
return useAnimatedStyle(() =>
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
? { backgroundColor: colors?.value.background ?? fallback }
|
||||
: {}
|
||||
isTablet && background ? { backgroundColor: background.value } : {}
|
||||
)
|
||||
}
|
||||
|
||||
/** Color tokens share the background's UI-thread timing. */
|
||||
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
return useAnimatedStyle(() =>
|
||||
Platform.OS === "android" && tone && colors
|
||||
? { color: colors.value[tone] }
|
||||
: {}
|
||||
)
|
||||
}
|
||||
const TABLET_FADE_MS = 400
|
||||
|
||||
/** Native headers draw this same UI-thread background as the page and bars. */
|
||||
function AndroidArtworkBackground() {
|
||||
const style = useAndroidTabBackgroundStyle()
|
||||
return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
|
||||
}
|
||||
|
||||
export function renderAndroidArtworkBackground() {
|
||||
return <AndroidArtworkBackground />
|
||||
}
|
||||
|
||||
const PALETTE_FADE_MS = 400
|
||||
|
||||
/** The focused artwork screen selects the shared background for page and bars. */
|
||||
/**
|
||||
* Artwork screens always paint their own palette so it slides with the page.
|
||||
* Shared chrome (tab bar, mini player) switches when the transition starts.
|
||||
*/
|
||||
export function useScreenPalette(palette: CoverPalette) {
|
||||
const isFocused = useIsFocused()
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette =
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
const owner = useRoute().key
|
||||
const navigation =
|
||||
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
|
||||
const [laidOut, setLaidOut] = useState(false)
|
||||
const [closing, setClosing] = useState(false)
|
||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const setPalette = theme?.setPalette
|
||||
const setPalette = useContext(AndroidTabTheme)?.setPalette
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette) return
|
||||
const start = navigation.addListener("transitionStart", ({ data }) => {
|
||||
@@ -230,20 +141,18 @@ export function useScreenPalette(palette: CoverPalette) {
|
||||
start()
|
||||
cancel()
|
||||
}
|
||||
}, [navigation, sharesPalette, setPalette, owner, palette])
|
||||
const defaultPalette = useDefaultPalette()
|
||||
}, [navigation, setPalette, owner, palette])
|
||||
const ready = laidOut || isTablet
|
||||
const target = isFocused && ready && !closing ? palette : defaultPalette
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
||||
setPalette(palette, owner)
|
||||
return () => setPalette(null, owner)
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette])
|
||||
|
||||
return {
|
||||
palette: Platform.OS === "android" ? target : palette,
|
||||
palette,
|
||||
backgroundStyle,
|
||||
onLayout: sharesPalette ? onLayout : undefined,
|
||||
}
|
||||
|
||||
@@ -0,0 +1,493 @@
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import {
|
||||
createContext,
|
||||
useCallback,
|
||||
useContext,
|
||||
useEffect,
|
||||
useMemo,
|
||||
useState,
|
||||
useSyncExternalStore,
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
Alert,
|
||||
Modal,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Switch,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { toast } from "sonner-native"
|
||||
|
||||
import { AndroidSheet } from "@/components/android-sheet"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useBackgroundDownloads } from "@/hooks/use-background-downloads"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import {
|
||||
downloadQueueFor,
|
||||
readRememberedDownloadQuality,
|
||||
writeRememberedDownloadQuality,
|
||||
} from "@/lib/downloads"
|
||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||
import { downloadQualitySupported } from "@/lib/playback-capabilities"
|
||||
import type { ServerConfig } from "@/lib/server-config"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type {
|
||||
CollectionRef,
|
||||
DownloadableSong,
|
||||
DownloadSource,
|
||||
DownloadQueue,
|
||||
SongDownloadState,
|
||||
} from "@otunes/convex/client/download-queue"
|
||||
import { FAVORITES_ID } from "@otunes/convex/client/download-queue"
|
||||
import {
|
||||
DOWNLOAD_OPTIONS_PATH,
|
||||
DOWNLOAD_QUALITY_DETAILS,
|
||||
DOWNLOAD_QUALITY_LABELS,
|
||||
formatBytes,
|
||||
type DownloadOptionsResponse,
|
||||
type DownloadQuality,
|
||||
type SizedDownloadOption,
|
||||
} from "@otunes/convex/download-quality"
|
||||
|
||||
/** Songs on their own, or an album or playlist that stays downloaded as a whole. */
|
||||
export type DownloadTarget =
|
||||
| {
|
||||
kind: "songs"
|
||||
songIds: string[]
|
||||
title: string
|
||||
/** Removing takes the songs out of only this download. */
|
||||
from?: DownloadSource
|
||||
}
|
||||
| (CollectionRef & { title: string; songIds: string[] })
|
||||
|
||||
/** The Favorites playlist has no ID, so downloads use this one. */
|
||||
export const FAVORITES_DOWNLOAD_ID = FAVORITES_ID
|
||||
|
||||
type DownloadsContextValue = {
|
||||
queue: DownloadQueue | null
|
||||
/** Asks for a quality (unless remembered) and starts downloading. */
|
||||
requestDownload: (target: DownloadTarget) => Promise<void>
|
||||
removeDownload: (target: DownloadTarget) => Promise<void>
|
||||
}
|
||||
|
||||
const DownloadsContext = createContext<DownloadsContextValue | null>(null)
|
||||
|
||||
export function useDownloads() {
|
||||
const context = useContext(DownloadsContext)
|
||||
if (!context) {
|
||||
throw new Error("useDownloads must be used within DownloadsProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
|
||||
const noopSubscribe = () => () => {}
|
||||
|
||||
/** Re-renders on every download change. Prefer the narrower hooks in lists. */
|
||||
export function useDownloadsVersion() {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.getVersion() ?? 0
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A song's download state as seen from `from` (see `downloadState`). Only
|
||||
* re-renders when that state changes.
|
||||
*/
|
||||
export function useSongDownloadState(
|
||||
songId: string,
|
||||
from?: DownloadSource
|
||||
): SongDownloadState {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.downloadState(songId, from) ?? "none"
|
||||
)
|
||||
}
|
||||
|
||||
/** Whether an album or playlist is downloaded. */
|
||||
export function useIsCollectionDownloaded(ref: CollectionRef) {
|
||||
const { queue } = useDownloads()
|
||||
return useSyncExternalStore(
|
||||
queue?.subscribe ?? noopSubscribe,
|
||||
() => queue?.getCollection(ref) !== undefined
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* For swipe actions: downloads a song, or asks before removing its download
|
||||
* (from `from` only, when given).
|
||||
*/
|
||||
export function useToggleSongDownload() {
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
return useCallback(
|
||||
(
|
||||
song: { id: string; title: string },
|
||||
downloaded: boolean,
|
||||
from?: DownloadSource
|
||||
) => {
|
||||
const target = {
|
||||
kind: "songs" as const,
|
||||
songIds: [song.id],
|
||||
title: song.title,
|
||||
from,
|
||||
}
|
||||
if (!downloaded) {
|
||||
void requestDownload(target)
|
||||
return
|
||||
}
|
||||
Alert.alert("Remove download?", song.title, [
|
||||
{ text: "Cancel", style: "cancel" },
|
||||
{
|
||||
text: "Remove",
|
||||
style: "destructive",
|
||||
onPress: () => void removeDownload(target),
|
||||
},
|
||||
])
|
||||
},
|
||||
[requestDownload, removeDownload]
|
||||
)
|
||||
}
|
||||
|
||||
async function fetchDownloadOptions(config: ServerConfig, songIds: string[]) {
|
||||
const cookieHeader = await getAuthCookieHeader(
|
||||
config.serverUrl,
|
||||
config.convexUrl
|
||||
)
|
||||
if (!cookieHeader) throw new Error("Sign in to download")
|
||||
const response = await fetch(`${config.serverUrl}${DOWNLOAD_OPTIONS_PATH}`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json", Cookie: cookieHeader },
|
||||
body: JSON.stringify({
|
||||
songIds,
|
||||
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
|
||||
}),
|
||||
})
|
||||
if (!response.ok) {
|
||||
throw new Error("Could not reach the server to download")
|
||||
}
|
||||
return (await response.json()) as DownloadOptionsResponse
|
||||
}
|
||||
|
||||
function startDownload(
|
||||
queue: DownloadQueue,
|
||||
target: DownloadTarget,
|
||||
songs: DownloadableSong[],
|
||||
quality: DownloadQuality
|
||||
) {
|
||||
if (target.kind === "songs") return queue.enqueue(songs, quality)
|
||||
return queue.downloadCollection(
|
||||
{ kind: target.kind, id: target.id, title: target.title, quality },
|
||||
songs
|
||||
)
|
||||
}
|
||||
|
||||
function optionDetail(option: SizedDownloadOption, songCount: number) {
|
||||
if (option.fallbackCount === 0) {
|
||||
return DOWNLOAD_QUALITY_DETAILS[option.quality]
|
||||
}
|
||||
const included = songCount - option.fallbackCount
|
||||
return `${included} of ${songCount} songs, ${option.fallbackCount} in High`
|
||||
}
|
||||
|
||||
/** Centered popup asking which quality to download a target at. */
|
||||
function DownloadQualityPopup({
|
||||
pending,
|
||||
onClose,
|
||||
onPick,
|
||||
}: {
|
||||
pending: { target: DownloadTarget; response: DownloadOptionsResponse } | null
|
||||
onClose: () => void
|
||||
onPick: (quality: DownloadQuality, remember: boolean) => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const [remember, setRemember] = useState(false)
|
||||
const songCount = pending?.response.songs.length ?? 0
|
||||
|
||||
return (
|
||||
<Modal
|
||||
visible={pending !== null}
|
||||
animationType="fade"
|
||||
transparent
|
||||
onRequestClose={onClose}
|
||||
>
|
||||
<AndroidSheet>
|
||||
<Pressable style={styles.overlay} onPress={onClose}>
|
||||
<Pressable
|
||||
style={[
|
||||
styles.popup,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={(event) => event.stopPropagation()}
|
||||
>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
Download Quality
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{pending?.target.title}
|
||||
</Text>
|
||||
{pending?.response.options
|
||||
.filter((option) => downloadQualitySupported(option.quality))
|
||||
.map((option) => (
|
||||
<Pressable
|
||||
key={option.quality}
|
||||
accessibilityRole="button"
|
||||
style={[styles.row, { borderBottomColor: colors.border }]}
|
||||
onPress={() => onPick(option.quality, remember)}
|
||||
>
|
||||
<View style={styles.rowText}>
|
||||
{option.quality === "lossless" ||
|
||||
option.quality === "atmos" ? (
|
||||
<AudioFormatBadge
|
||||
format={option.quality}
|
||||
color={colors.foreground}
|
||||
backgroundColor={colors.card}
|
||||
/>
|
||||
) : (
|
||||
<Text
|
||||
style={[styles.label, { color: colors.foreground }]}
|
||||
>
|
||||
{DOWNLOAD_QUALITY_LABELS[option.quality]}
|
||||
</Text>
|
||||
)}
|
||||
<Text
|
||||
style={{ color: colors.mutedForeground, fontSize: 12 }}
|
||||
>
|
||||
{optionDetail(option, songCount)}
|
||||
</Text>
|
||||
</View>
|
||||
<Text
|
||||
style={[styles.size, { color: colors.mutedForeground }]}
|
||||
>
|
||||
{option.estimated ? "~" : ""}
|
||||
{formatBytes(option.bytes)}
|
||||
</Text>
|
||||
</Pressable>
|
||||
))}
|
||||
<View style={styles.rememberRow}>
|
||||
<Text style={{ color: colors.foreground, fontSize: 15 }}>
|
||||
Remember my choice
|
||||
</Text>
|
||||
<Switch value={remember} onValueChange={setRemember} />
|
||||
</View>
|
||||
</Pressable>
|
||||
</Pressable>
|
||||
</AndroidSheet>
|
||||
</Modal>
|
||||
)
|
||||
}
|
||||
|
||||
/** Keeps a downloaded playlist's songs in step with the playlist. */
|
||||
function useSyncDownloadedPlaylist(
|
||||
queue: DownloadQueue,
|
||||
id: string,
|
||||
songIds: readonly string[] | undefined
|
||||
) {
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
useEffect(() => {
|
||||
if (!songIds) return
|
||||
void queue
|
||||
.syncCollection({ kind: "playlist", id }, songIds, async (added) => {
|
||||
const songs = await loadPlaybackSongs(
|
||||
convex,
|
||||
cacheScope,
|
||||
added as Id<"songs">[]
|
||||
)
|
||||
return songs.filter((song) => song !== null)
|
||||
})
|
||||
.catch(() => {})
|
||||
}, [cacheScope, convex, id, queue, songIds])
|
||||
}
|
||||
|
||||
function PlaylistSync({ queue, id }: { queue: DownloadQueue; id: string }) {
|
||||
const songIds = useQuery(api.playlists.getPlaylistSongIds, {
|
||||
playlistId: id as Id<"playlists">,
|
||||
})
|
||||
useSyncDownloadedPlaylist(queue, id, songIds)
|
||||
return null
|
||||
}
|
||||
|
||||
function FavoritesSync({ queue }: { queue: DownloadQueue }) {
|
||||
const favorites = useCachedQuery(api.favorites.getUserFavorites)
|
||||
const songIds = useMemo(() => favorites?.favoriteSongs.flat(), [favorites])
|
||||
useSyncDownloadedPlaylist(queue, FAVORITES_DOWNLOAD_ID, songIds)
|
||||
return null
|
||||
}
|
||||
|
||||
function DownloadSync({ queue }: { queue: DownloadQueue }) {
|
||||
useSyncExternalStore(queue.subscribe, queue.getVersion)
|
||||
return queue
|
||||
.collections()
|
||||
.filter((collection) => collection.kind === "playlist")
|
||||
.map((collection) =>
|
||||
collection.id === FAVORITES_DOWNLOAD_ID ? (
|
||||
<FavoritesSync key={collection.id} queue={queue} />
|
||||
) : (
|
||||
<PlaylistSync key={collection.id} queue={queue} id={collection.id} />
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
export function DownloadsProvider({ children }: { children: ReactNode }) {
|
||||
const { config } = useServerConfig()
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const queue = useMemo(
|
||||
() => (config ? downloadQueueFor(config) : null),
|
||||
[config]
|
||||
)
|
||||
const [pending, setPending] = useState<{
|
||||
target: DownloadTarget
|
||||
response: DownloadOptionsResponse
|
||||
} | null>(null)
|
||||
const keepDownloading = useBackgroundDownloads(queue)
|
||||
|
||||
useEffect(() => {
|
||||
if (!queue) return
|
||||
void queue.load().catch(() => {})
|
||||
// Reports failed songs once per burst instead of once per song.
|
||||
let failed = 0
|
||||
let timer: ReturnType<typeof setTimeout> | null = null
|
||||
const unsubscribe = queue.onFailure(() => {
|
||||
failed += 1
|
||||
timer ??= setTimeout(() => {
|
||||
showError(
|
||||
failed === 1
|
||||
? "A song could not be downloaded"
|
||||
: `${failed} songs could not be downloaded`
|
||||
)
|
||||
failed = 0
|
||||
timer = null
|
||||
}, 1000)
|
||||
})
|
||||
return () => {
|
||||
unsubscribe()
|
||||
if (timer) clearTimeout(timer)
|
||||
}
|
||||
}, [queue])
|
||||
|
||||
const requestDownload = useCallback(
|
||||
async (target: DownloadTarget) => {
|
||||
if (!config || !queue || target.songIds.length === 0) return
|
||||
if (target.songIds.every((id) => queue.getDownloaded(id))) {
|
||||
// Already on this device: just give them back to their downloads.
|
||||
await queue.enqueue(
|
||||
target.songIds.map((id) => ({ id, files: {} })),
|
||||
"high"
|
||||
)
|
||||
return
|
||||
}
|
||||
try {
|
||||
// Caches titles and formats so downloads can be queued offline.
|
||||
void loadPlaybackSongs(
|
||||
convex,
|
||||
cacheScope,
|
||||
target.songIds as Id<"songs">[]
|
||||
).catch(() => {})
|
||||
const response = await fetchDownloadOptions(config, target.songIds)
|
||||
const remembered = await readRememberedDownloadQuality()
|
||||
if (remembered) {
|
||||
await startDownload(queue, target, response.songs, remembered)
|
||||
keepDownloading()
|
||||
toast(`Downloading ${target.title}`)
|
||||
} else {
|
||||
setPending({ target, response })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(error instanceof Error ? error.message : "Download failed")
|
||||
}
|
||||
},
|
||||
[cacheScope, config, convex, keepDownloading, queue]
|
||||
)
|
||||
|
||||
const removeDownload = useCallback(
|
||||
async (target: DownloadTarget) => {
|
||||
if (!queue) return
|
||||
if (target.kind === "songs") {
|
||||
await queue.removeSongs(target.songIds, target.from)
|
||||
} else await queue.removeCollection(target)
|
||||
},
|
||||
[queue]
|
||||
)
|
||||
|
||||
const handlePick = useCallback(
|
||||
(quality: DownloadQuality, remember: boolean) => {
|
||||
if (!pending || !queue) return
|
||||
setPending(null)
|
||||
if (remember) void writeRememberedDownloadQuality(quality)
|
||||
void startDownload(
|
||||
queue,
|
||||
pending.target,
|
||||
pending.response.songs,
|
||||
quality
|
||||
).then(keepDownloading)
|
||||
},
|
||||
[keepDownloading, pending, queue]
|
||||
)
|
||||
|
||||
const value = useMemo(
|
||||
() => ({ queue, requestDownload, removeDownload }),
|
||||
[queue, requestDownload, removeDownload]
|
||||
)
|
||||
|
||||
return (
|
||||
<DownloadsContext.Provider value={value}>
|
||||
{children}
|
||||
{queue ? <DownloadSync queue={queue} /> : null}
|
||||
<DownloadQualityPopup
|
||||
pending={pending}
|
||||
onClose={() => setPending(null)}
|
||||
onPick={handlePick}
|
||||
/>
|
||||
</DownloadsContext.Provider>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
overlay: {
|
||||
flex: 1,
|
||||
backgroundColor: "rgba(0,0,0,0.6)",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
padding: 24,
|
||||
},
|
||||
popup: {
|
||||
width: "100%",
|
||||
maxWidth: 420,
|
||||
borderRadius: 16,
|
||||
borderWidth: 1,
|
||||
padding: 16,
|
||||
},
|
||||
title: { fontSize: 18, fontWeight: "700" },
|
||||
subtitle: { fontSize: 13, marginBottom: 4 },
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 12,
|
||||
paddingVertical: 12,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
rowText: { flex: 1, minWidth: 0, gap: 2 },
|
||||
label: { fontSize: 15, fontWeight: "500" },
|
||||
size: { fontSize: 13, fontVariant: ["tabular-nums"] },
|
||||
rememberRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
paddingTop: 12,
|
||||
},
|
||||
})
|
||||
@@ -100,15 +100,15 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const songIds = useMemo(
|
||||
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
|
||||
() => new Set<string>(favorites?.favoriteSongs.flat()),
|
||||
[favorites?.favoriteSongs]
|
||||
)
|
||||
const albumIds = useMemo(
|
||||
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
|
||||
() => new Set<string>(favorites?.favoriteAlbums.flat()),
|
||||
[favorites?.favoriteAlbums]
|
||||
)
|
||||
const artistIds = useMemo(
|
||||
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
|
||||
() => new Set<string>(favorites?.favoriteArtists.flat()),
|
||||
[favorites?.favoriteArtists]
|
||||
)
|
||||
const idsRef = useRef({ songIds, albumIds, artistIds })
|
||||
|
||||
@@ -24,6 +24,7 @@ import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { isDownloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||
import { rememberSongs, useSong, useSongs } from "@/lib/song-cache"
|
||||
import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents"
|
||||
import { showError } from "@/lib/toast"
|
||||
@@ -43,8 +44,9 @@ type PlaybackContextValue = {
|
||||
seekTo: (seconds: number) => void
|
||||
waitForPlaybackReady: (playing?: boolean) => Promise<void>
|
||||
setIsPlaying: (playing: boolean) => void
|
||||
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
|
||||
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */
|
||||
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromSong: (
|
||||
@@ -97,6 +99,8 @@ type PlaybackContextValue = {
|
||||
|
||||
type PlaybackActionsValue = Pick<
|
||||
PlaybackContextValue,
|
||||
| "seekTo"
|
||||
| "waitForPlaybackReady"
|
||||
| "setIsPlaying"
|
||||
| "playInOrder"
|
||||
| "playShuffled"
|
||||
@@ -136,6 +140,11 @@ type PlaybackQueueValue = Pick<
|
||||
| "repeatEnabled"
|
||||
>
|
||||
|
||||
type PlaybackProgressValue = Pick<
|
||||
PlaybackContextValue,
|
||||
"currentTime" | "duration"
|
||||
>
|
||||
|
||||
type CollectionPlayers = Pick<
|
||||
PlaybackActionsValue,
|
||||
| "playAlbum"
|
||||
@@ -157,14 +166,17 @@ type CollectionPlay = {
|
||||
recorded: RecordedPlay
|
||||
}
|
||||
|
||||
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
|
||||
const PlaybackActionsContext = createContext<PlaybackActionsValue | null>(null)
|
||||
const PlaybackQueueContext = createContext<PlaybackQueueValue | null>(null)
|
||||
const PlaybackProgressContext = createContext<PlaybackProgressValue | null>(
|
||||
null
|
||||
)
|
||||
|
||||
export function usePlayback() {
|
||||
const context = useContext(PlaybackContext)
|
||||
/** Ticks while audio plays. Keep consumers small (slider and time labels). */
|
||||
export function usePlaybackProgress() {
|
||||
const context = useContext(PlaybackProgressContext)
|
||||
if (!context) {
|
||||
throw new Error("usePlayback must be used within PlaybackProvider")
|
||||
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -235,6 +247,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
const queueOriginRef = useRef<string | undefined>(undefined)
|
||||
const playRequestRef = useRef(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 queueHistorySongIds = playback.history
|
||||
@@ -270,6 +284,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
repeatEnabled,
|
||||
currentSong,
|
||||
queueStartVersion,
|
||||
fromDownloads,
|
||||
})
|
||||
|
||||
const { resetProgress } = useProgressPersistence({
|
||||
@@ -300,6 +315,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
queueOriginRef.current =
|
||||
recorded.origin ??
|
||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
|
||||
resetQueuePlayback()
|
||||
store.update(playbackQueue.clearQueue)
|
||||
store.update(recipe)
|
||||
@@ -353,10 +369,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const playSongs = useCallback(
|
||||
(shuffled: boolean) => async (songIds: Id<"songs">[]) => {
|
||||
(shuffled: boolean) => async (songIds: Id<"songs">[], origin?: string) => {
|
||||
if (songIds.length === 0) return
|
||||
startPlayback((state) =>
|
||||
playbackQueue.startQueue(state, songIds, shuffled)
|
||||
startPlayback(
|
||||
(state) => playbackQueue.startQueue(state, songIds, shuffled),
|
||||
{ origin }
|
||||
)
|
||||
},
|
||||
[startPlayback]
|
||||
@@ -391,7 +408,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId }
|
||||
),
|
||||
).then((chunks) => chunks.flat()),
|
||||
recorded: { entity: { kind: "artist", id: artistId } },
|
||||
}))
|
||||
const playlist = collection(
|
||||
@@ -472,12 +489,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
|
||||
let songIds: Id<"songs">[]
|
||||
try {
|
||||
songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.browseSortedSongIds,
|
||||
sort
|
||||
)
|
||||
songIds = (
|
||||
await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.browseSortedSongIds,
|
||||
sort
|
||||
)
|
||||
).flat()
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
@@ -631,6 +650,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
|
||||
const actionsValue = useMemo<PlaybackActionsValue>(
|
||||
() => ({
|
||||
seekTo,
|
||||
waitForPlaybackReady,
|
||||
...collectionPlayers,
|
||||
setIsPlaying,
|
||||
playInOrder,
|
||||
@@ -671,12 +692,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
playInOrder,
|
||||
playShuffled,
|
||||
reorderQueue,
|
||||
seekTo,
|
||||
setIsPlaying,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
skipToHistoryIndex,
|
||||
skipToQueueIndex,
|
||||
toggleShuffle,
|
||||
waitForPlaybackReady,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -701,41 +724,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
]
|
||||
)
|
||||
|
||||
const value = useMemo<PlaybackContextValue>(
|
||||
() => ({
|
||||
...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,
|
||||
]
|
||||
const progressValue = useMemo<PlaybackProgressValue>(
|
||||
() => ({ currentTime, duration }),
|
||||
[currentTime, duration]
|
||||
)
|
||||
|
||||
return (
|
||||
<PlaybackActionsContext.Provider value={actionsValue}>
|
||||
<PlaybackQueueContext.Provider value={queueValue}>
|
||||
<PlaybackContext.Provider value={value}>
|
||||
<PlaybackProgressContext.Provider value={progressValue}>
|
||||
{children}
|
||||
</PlaybackContext.Provider>
|
||||
</PlaybackProgressContext.Provider>
|
||||
</PlaybackQueueContext.Provider>
|
||||
</PlaybackActionsContext.Provider>
|
||||
)
|
||||
|
||||
@@ -83,7 +83,11 @@ export function createCoverPaletteSource<Swatches>({
|
||||
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||
|
||||
const swatches =
|
||||
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
|
||||
resolved.key === key
|
||||
? resolved.swatches
|
||||
: key
|
||||
? cachedSwatches(key)
|
||||
: null
|
||||
|
||||
useEffect(() => {
|
||||
if (!key || hasCover === false) return
|
||||
@@ -134,7 +138,13 @@ export function createCoverPaletteSource<Swatches>({
|
||||
}
|
||||
}
|
||||
|
||||
return { prefetch, usePalette }
|
||||
/** Forget in-memory swatches so covers are re-extracted. */
|
||||
function clear() {
|
||||
swatchesByKey.clear()
|
||||
pending.clear()
|
||||
}
|
||||
|
||||
return { prefetch, usePalette, clear }
|
||||
}
|
||||
|
||||
function sameSwatches(a: unknown, b: unknown) {
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
import { requireOptionalNativeModule } from "expo"
|
||||
import Constants from "expo-constants"
|
||||
import { useCallback, useEffect, useRef } from "react"
|
||||
import { AppState, Platform } from "react-native"
|
||||
import {
|
||||
ContinuedTasks,
|
||||
type ContinuedTask,
|
||||
} from "react-native-continued-task"
|
||||
|
||||
import { setKeptRunning } from "@/lib/downloads"
|
||||
import type { DownloadQueue } from "@otunes/convex/client/download-queue"
|
||||
|
||||
const downloadService = requireOptionalNativeModule<{
|
||||
update: (remaining: number) => void
|
||||
}>("DownloadService")
|
||||
|
||||
/** Songs downloading at once while the app runs, as the queue defaults to. */
|
||||
const RUNNING_CONCURRENCY = 2
|
||||
|
||||
// Stopping right after starting can beat the service to `startForeground`,
|
||||
// which Android treats as a crash.
|
||||
const STOP_DELAY_MS = 2000
|
||||
|
||||
// Must match `identifierPrefixes` in app.config.ts.
|
||||
const TASK_PREFIX = `${Constants.expoConfig?.ios?.bundleIdentifier}.downloads`
|
||||
|
||||
function songsLeft(count: number) {
|
||||
return count === 1 ? "1 song left" : `${count} songs left`
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps downloads going while the app is in the background. Call the returned
|
||||
* function right after the person starts a download.
|
||||
*
|
||||
* iOS 26+: a continued processing task keeps the app running, with progress
|
||||
* in a Live Activity, so songs keep downloading a few at a time with fresh
|
||||
* sign-in tokens. It must start from the person's action, so it covers
|
||||
* downloads they start, not playlist syncs.
|
||||
*
|
||||
* iOS otherwise (and once that task ends): songs download in a background URL
|
||||
* session. Songs started while suspended may wait for Wi-Fi and power, so
|
||||
* every waiting song is handed over as the app leaves the screen.
|
||||
*
|
||||
* Android: a foreground service keeps the app running while songs are queued.
|
||||
*/
|
||||
export function useBackgroundDownloads(queue: DownloadQueue | null) {
|
||||
const startTask = useRef<() => void>(() => {})
|
||||
|
||||
useEffect(() => {
|
||||
if (!queue) return
|
||||
|
||||
if (Platform.OS === "ios") {
|
||||
let active = AppState.currentState === "active"
|
||||
let task: ContinuedTask | null = null
|
||||
let submitting = false
|
||||
let total = 0
|
||||
let lastPending = 0
|
||||
|
||||
const updateConcurrency = () =>
|
||||
queue.setConcurrency(
|
||||
active || task?.state === "running" ? RUNNING_CONCURRENCY : Infinity
|
||||
)
|
||||
|
||||
const end = () => {
|
||||
task = null
|
||||
setKeptRunning(false)
|
||||
updateConcurrency()
|
||||
}
|
||||
|
||||
const report = () => {
|
||||
const pending = queue.pendingCount()
|
||||
if (pending > lastPending) total += pending - lastPending
|
||||
lastPending = pending
|
||||
if (task?.state !== "running") return
|
||||
if (pending === 0) {
|
||||
task.complete(true)
|
||||
end()
|
||||
return
|
||||
}
|
||||
task.setProgress(total - pending, total)
|
||||
task.updateTitle("Downloading", songsLeft(pending))
|
||||
}
|
||||
|
||||
startTask.current = () => {
|
||||
if (!ContinuedTasks.isSupported || task || submitting) return
|
||||
const pending = queue.pendingCount()
|
||||
if (pending === 0) return
|
||||
submitting = true
|
||||
total = pending
|
||||
lastPending = pending
|
||||
ContinuedTasks.submit({
|
||||
identifierPrefix: TASK_PREFIX,
|
||||
title: "Downloading",
|
||||
subtitle: songsLeft(pending),
|
||||
totalUnitCount: total,
|
||||
// A task that cannot start now is no use once the app is closed.
|
||||
ios: { submissionStrategy: "fail" },
|
||||
})
|
||||
.then((submitted) => {
|
||||
task = submitted
|
||||
submitted.addOnStartListener(() => {
|
||||
setKeptRunning(true)
|
||||
updateConcurrency()
|
||||
report()
|
||||
})
|
||||
// iOS reports a cancel from the Live Activity as expiry too, so
|
||||
// either way the songs carry on in the background session.
|
||||
submitted.addOnStopListener(() => {
|
||||
if (task === submitted) end()
|
||||
})
|
||||
})
|
||||
.catch(() => {
|
||||
// Not permitted or unavailable: the background session covers it.
|
||||
})
|
||||
.finally(() => {
|
||||
submitting = false
|
||||
})
|
||||
}
|
||||
|
||||
updateConcurrency()
|
||||
const unsubscribe = queue.subscribe(report)
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
active = state === "active"
|
||||
updateConcurrency()
|
||||
})
|
||||
return () => {
|
||||
startTask.current = () => {}
|
||||
unsubscribe()
|
||||
subscription.remove()
|
||||
task?.cancel()
|
||||
end()
|
||||
}
|
||||
}
|
||||
|
||||
if (!downloadService) return
|
||||
const service = downloadService
|
||||
let shown = 0
|
||||
let stopTimer: ReturnType<typeof setTimeout> | null = null
|
||||
const update = () => {
|
||||
const remaining = queue.pendingCount()
|
||||
if (remaining === shown) return
|
||||
if (stopTimer) clearTimeout(stopTimer)
|
||||
stopTimer = null
|
||||
if (remaining > 0) {
|
||||
shown = remaining
|
||||
service.update(remaining)
|
||||
} else {
|
||||
stopTimer = setTimeout(() => {
|
||||
shown = 0
|
||||
service.update(0)
|
||||
}, STOP_DELAY_MS)
|
||||
}
|
||||
}
|
||||
update()
|
||||
const unsubscribe = queue.subscribe(update)
|
||||
return () => {
|
||||
unsubscribe()
|
||||
if (stopTimer) clearTimeout(stopTimer)
|
||||
service.update(0)
|
||||
}
|
||||
}, [queue])
|
||||
|
||||
return useCallback(() => startTask.current(), [])
|
||||
}
|
||||
@@ -3,6 +3,7 @@ import {
|
||||
type CoverPaletteResult,
|
||||
} from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
clearLegacyCoverPaletteCache,
|
||||
prefetchLegacyCoverPalette,
|
||||
useLegacyCoverPalette,
|
||||
} from "@/hooks/use-legacy-cover-palette"
|
||||
@@ -12,6 +13,7 @@ import {
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
||||
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
|
||||
import { clearCachePrefix } from "@/lib/persistent-cache"
|
||||
|
||||
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
|
||||
|
||||
@@ -21,6 +23,16 @@ const region = createCoverPaletteSource<CoverSwatches>({
|
||||
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. */
|
||||
export function prefetchCoverPalette(uri: string) {
|
||||
void loadArtworkColorsEnabled().then((enabled) =>
|
||||
|
||||
@@ -65,3 +65,5 @@ export const prefetchLegacyCoverPalette = legacy.prefetch
|
||||
|
||||
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
|
||||
export const useLegacyCoverPalette = legacy.usePalette
|
||||
|
||||
export const clearLegacyCoverPaletteCache = legacy.clear
|
||||
@@ -0,0 +1,158 @@
|
||||
import { File } from "expo-file-system"
|
||||
import {
|
||||
useEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
useSyncExternalStore,
|
||||
} from "react"
|
||||
import {
|
||||
cancelAnimation,
|
||||
Easing,
|
||||
useSharedValue,
|
||||
withSequence,
|
||||
withTiming,
|
||||
} from "react-native-reanimated"
|
||||
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import {
|
||||
followLyrics,
|
||||
parseLyrics,
|
||||
type Lyrics,
|
||||
} from "@otunes/convex/client/lyrics"
|
||||
import { readLyricsTag } from "@otunes/convex/client/lyrics-tags"
|
||||
import { useDownloads } from "@/contexts/downloads"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { downloadedAudioUri } from "@/lib/downloads"
|
||||
|
||||
// Lyrics read from downloaded files, by file. Files do not change once saved.
|
||||
const localLyrics = new Map<string, Promise<string | null>>()
|
||||
|
||||
async function readFileLyrics(uri: string) {
|
||||
const handle = new File(uri).open()
|
||||
try {
|
||||
const text = await readLyricsTag({
|
||||
size: handle.size ?? 0,
|
||||
read: (offset, length) => {
|
||||
handle.offset = offset
|
||||
return handle.readBytes(length)
|
||||
},
|
||||
})
|
||||
return text?.trim() || null
|
||||
} finally {
|
||||
handle.close()
|
||||
}
|
||||
}
|
||||
|
||||
function readLocalLyrics(uri: string) {
|
||||
let lyrics = localLyrics.get(uri)
|
||||
if (!lyrics) {
|
||||
lyrics = readFileLyrics(uri).catch(() => null)
|
||||
localLyrics.set(uri, lyrics)
|
||||
}
|
||||
return lyrics
|
||||
}
|
||||
|
||||
const noopSubscribe = () => () => {}
|
||||
|
||||
/**
|
||||
* A song's lyrics: from its downloaded file when there is one, otherwise from
|
||||
* the server. `undefined` while loading, `null` when the song has none.
|
||||
*/
|
||||
export function useLyrics(songId: Id<"songs"> | null) {
|
||||
const { config } = useServerConfig()
|
||||
const { queue } = useDownloads()
|
||||
const fileUri = useSyncExternalStore(queue?.subscribe ?? noopSubscribe, () =>
|
||||
songId && config && queue?.getDownloaded(songId)
|
||||
? downloadedAudioUri(config, songId)
|
||||
: null
|
||||
)
|
||||
const [local, setLocal] = useState<{ uri: string; text: string | null }>()
|
||||
|
||||
useEffect(() => {
|
||||
if (!fileUri) return
|
||||
let current = true
|
||||
void readLocalLyrics(fileUri).then((text) => {
|
||||
if (current) setLocal({ uri: fileUri, text })
|
||||
})
|
||||
return () => {
|
||||
current = false
|
||||
}
|
||||
}, [fileUri])
|
||||
|
||||
const localText = fileUri && local?.uri === fileUri ? local.text : undefined
|
||||
// Songs without a downloaded copy, or whose copy has no lyrics tag.
|
||||
const remote = useCachedQuery(
|
||||
api.lyrics.forSong,
|
||||
songId && (!fileUri || localText === null) ? { id: songId } : "skip"
|
||||
)
|
||||
const text = localText || remote
|
||||
|
||||
return useMemo<Lyrics | null | undefined>(() => {
|
||||
if (!songId) return null
|
||||
if (text === undefined) return undefined
|
||||
return text ? parseLyrics(text) : null
|
||||
}, [songId, text])
|
||||
}
|
||||
|
||||
/**
|
||||
* The playback time for highlighting lyrics: the player's `currentTime`,
|
||||
* advanced by `followLyrics` between its progress updates.
|
||||
*/
|
||||
export function useLyricsTime(
|
||||
lyrics: Lyrics | null | undefined,
|
||||
currentTime: number,
|
||||
isPlaying: boolean
|
||||
) {
|
||||
// Time reached since the player last reported `from`.
|
||||
const [advanced, setAdvanced] = useState<{ from: number; time: number }>()
|
||||
|
||||
useEffect(() => {
|
||||
if (!lyrics || !isPlaying) return
|
||||
return followLyrics(lyrics, currentTime, (time) =>
|
||||
setAdvanced({ from: currentTime, time })
|
||||
)
|
||||
}, [lyrics, currentTime, isPlaying])
|
||||
|
||||
return isPlaying && advanced?.from === currentTime
|
||||
? advanced.time
|
||||
: currentTime
|
||||
}
|
||||
|
||||
/** How far the clock may drift from the player before it is reset. */
|
||||
const CLOCK_DRIFT_SECONDS = 0.15
|
||||
/** How far ahead the clock runs on its own; progress updates come long before. */
|
||||
const CLOCK_RUN_SECONDS = 3600
|
||||
|
||||
/**
|
||||
* Playback time in seconds on the UI thread, running smoothly between the
|
||||
* player's progress updates. It is reset only when it drifts, so animations
|
||||
* driven by it never restart mid-word.
|
||||
*/
|
||||
export function usePlaybackClock(currentTime: number, isPlaying: boolean) {
|
||||
const clock = useSharedValue(currentTime)
|
||||
const running = useRef(false)
|
||||
|
||||
useEffect(() => {
|
||||
if (!isPlaying) {
|
||||
running.current = false
|
||||
cancelAnimation(clock)
|
||||
clock.value = currentTime
|
||||
return
|
||||
}
|
||||
const drift = Math.abs(clock.value - currentTime)
|
||||
if (running.current && drift < CLOCK_DRIFT_SECONDS) return
|
||||
running.current = true
|
||||
clock.value = withSequence(
|
||||
withTiming(currentTime, { duration: 0 }),
|
||||
withTiming(currentTime + CLOCK_RUN_SECONDS, {
|
||||
duration: CLOCK_RUN_SECONDS * 1000,
|
||||
easing: Easing.linear,
|
||||
})
|
||||
)
|
||||
}, [clock, currentTime, isPlaying])
|
||||
|
||||
return clock
|
||||
}
|
||||
@@ -2,7 +2,9 @@ import { useConvex } from "convex/react"
|
||||
import { useCallback } from "react"
|
||||
|
||||
import type { MediaAction } from "@/components/media-context-menu"
|
||||
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
|
||||
import { useDownloads } from "@/contexts/downloads"
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
@@ -48,6 +50,7 @@ export function useMediaMenuActions() {
|
||||
} = useFavorites()
|
||||
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
|
||||
usePlaybackActions()
|
||||
const { requestDownload, removeDownload } = useDownloads()
|
||||
|
||||
const runQueueAction = useCallback(
|
||||
async (action: MediaAction, songIds: Id<"songs">[]) => {
|
||||
@@ -71,8 +74,9 @@ export function useMediaMenuActions() {
|
||||
[addToQueueLast, addToQueueNext, playShuffled]
|
||||
)
|
||||
|
||||
/** `from` limits removing a download to that album, playlist, or Other. */
|
||||
const handleSongAction = useCallback(
|
||||
async (song: BrowseSong, action: MediaAction) => {
|
||||
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => {
|
||||
const songIds = [song.id as Id<"songs">]
|
||||
switch (action) {
|
||||
case "create-station":
|
||||
@@ -97,6 +101,19 @@ export function useMediaMenuActions() {
|
||||
case "go-album":
|
||||
push(`/album/${song.album.id}`)
|
||||
break
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const target = {
|
||||
kind: "songs" as const,
|
||||
songIds,
|
||||
title: song.title,
|
||||
from,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
@@ -107,6 +124,8 @@ export function useMediaMenuActions() {
|
||||
runQueueAction,
|
||||
toggleSongFavorite,
|
||||
playArtistShuffled,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -138,6 +157,25 @@ export function useMediaMenuActions() {
|
||||
case "go-artist":
|
||||
push(`/artist/${album.artist.id}`)
|
||||
break
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: album.id as Id<"albums"> }
|
||||
)
|
||||
const target = {
|
||||
kind: "album" as const,
|
||||
id: album.id,
|
||||
title: album.title,
|
||||
songIds,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
@@ -151,6 +189,8 @@ export function useMediaMenuActions() {
|
||||
push,
|
||||
runQueueAction,
|
||||
toggleAlbumFavorite,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -173,7 +213,7 @@ export function useMediaMenuActions() {
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: artist.id as Id<"artists"> }
|
||||
)
|
||||
await runQueueAction(action, songIds)
|
||||
await runQueueAction(action, songIds.flat())
|
||||
break
|
||||
}
|
||||
default:
|
||||
@@ -211,12 +251,38 @@ export function useMediaMenuActions() {
|
||||
await runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
case "download":
|
||||
case "remove-download": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: playlist.id as Id<"playlists"> }
|
||||
)
|
||||
const target = {
|
||||
kind: "playlist" as const,
|
||||
id: playlist.id,
|
||||
title: playlist.title,
|
||||
songIds,
|
||||
}
|
||||
await (action === "download"
|
||||
? requestDownload(target)
|
||||
: removeDownload(target))
|
||||
break
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
})
|
||||
},
|
||||
[convex, cacheScope, openAddPlaylistToPlaylist, runQueueAction]
|
||||
[
|
||||
convex,
|
||||
cacheScope,
|
||||
openAddPlaylistToPlaylist,
|
||||
runQueueAction,
|
||||
requestDownload,
|
||||
removeDownload,
|
||||
]
|
||||
)
|
||||
|
||||
const handleAlbumDetailAction = useCallback(
|
||||
@@ -265,7 +331,7 @@ export function useMediaMenuActions() {
|
||||
cover: album.cover,
|
||||
},
|
||||
}
|
||||
await handleSongAction(song, action)
|
||||
await handleSongAction(song, action, { kind: "album", id: album.id })
|
||||
},
|
||||
[handleSongAction]
|
||||
)
|
||||
|
||||
@@ -18,10 +18,12 @@ import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
|
||||
import { streamDownloadQuality } from "@otunes/convex/download-quality"
|
||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import { downloadedAudioUri, downloadQueueFor } from "@/lib/downloads"
|
||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { albumCoverUrl, songAudioSource } from "@/lib/urls"
|
||||
@@ -71,6 +73,7 @@ export function useNativePlaylistSync({
|
||||
repeatEnabled,
|
||||
currentSong,
|
||||
queueStartVersion,
|
||||
fromDownloads,
|
||||
}: {
|
||||
store: PlaybackStore
|
||||
queueSongIds: Id<"songs">[]
|
||||
@@ -78,6 +81,8 @@ export function useNativePlaylistSync({
|
||||
repeatEnabled: RepeatMode
|
||||
currentSong: BrowseSong | null
|
||||
queueStartVersion: number
|
||||
/** Plays downloads in any quality, for queues started from Downloads. */
|
||||
fromDownloads: boolean
|
||||
}) {
|
||||
const convex = useConvex()
|
||||
const { config } = useServerConfig()
|
||||
@@ -113,6 +118,8 @@ export function useNativePlaylistSync({
|
||||
measuredDuration > 0
|
||||
? measuredDuration
|
||||
: (currentSong?.durationSeconds ?? 0)
|
||||
const durationRef = useRef(duration)
|
||||
durationRef.current = duration
|
||||
const queueSyncKey = useMemo(
|
||||
() => JSON.stringify(queueSongIds),
|
||||
[queueSongIds]
|
||||
@@ -409,18 +416,17 @@ export function useNativePlaylistSync({
|
||||
[startPlayer]
|
||||
)
|
||||
|
||||
const seekTo = useCallback(
|
||||
async (seconds: number) => {
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
const maxDuration = playlist.duration || duration || 0
|
||||
const clamped = Math.max(0, Math.min(seconds, maxDuration))
|
||||
await playlist.seekTo(clamped)
|
||||
currentTimeRef.current = clamped
|
||||
setCurrentTime(clamped)
|
||||
},
|
||||
[duration]
|
||||
)
|
||||
// Reads duration from a ref so seekTo, and every action built on it, stays
|
||||
// stable across track changes.
|
||||
const seekTo = useCallback(async (seconds: number) => {
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
const maxDuration = playlist.duration || durationRef.current || 0
|
||||
const clamped = Math.max(0, Math.min(seconds, maxDuration))
|
||||
await playlist.seekTo(clamped)
|
||||
currentTimeRef.current = clamped
|
||||
setCurrentTime(clamped)
|
||||
}, [])
|
||||
|
||||
const handlePlaybackLoadFailure = useCallback(() => {
|
||||
autoPlayNextRef.current = false
|
||||
@@ -458,7 +464,7 @@ export function useNativePlaylistSync({
|
||||
}
|
||||
if (!isCurrentLoad()) return
|
||||
|
||||
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
|
||||
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${fromDownloads}:${cookieHeader}`
|
||||
const needsRebuild =
|
||||
loadedLoadKeyRef.current !== loadKey ||
|
||||
nativePlaylistNeedsRebuild(
|
||||
@@ -492,7 +498,12 @@ export function useNativePlaylistSync({
|
||||
}
|
||||
|
||||
const buildSources = async (songIds: Id<"songs">[]) => {
|
||||
const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
|
||||
const [songs] = await Promise.all([
|
||||
loadPlaybackSongs(convex, cacheScope, songIds),
|
||||
downloadQueueFor(config)
|
||||
.load()
|
||||
.catch(() => {}),
|
||||
])
|
||||
const sources = new Map<Id<"songs">, AudioSource>()
|
||||
for (const song of songs) {
|
||||
if (!song) return null
|
||||
@@ -501,6 +512,18 @@ export function useNativePlaylistSync({
|
||||
user.playbackQuality,
|
||||
atmosEnabled(user)
|
||||
)
|
||||
// Downloads stand in for streams in the same quality, and always
|
||||
// play in queues started from Downloads.
|
||||
const download = downloadQueueFor(config).getDownloaded(song.id)
|
||||
const localUri =
|
||||
download &&
|
||||
(fromDownloads || download.quality === streamDownloadQuality(plan))
|
||||
? downloadedAudioUri(config, song.id)
|
||||
: null
|
||||
if (localUri) {
|
||||
sources.set(song.id, { uri: localUri, name: song.title })
|
||||
continue
|
||||
}
|
||||
sources.set(
|
||||
song.id,
|
||||
songAudioSource(
|
||||
@@ -627,6 +650,7 @@ export function useNativePlaylistSync({
|
||||
currentSongId,
|
||||
currentSongSyncKey,
|
||||
destroyPlaylist,
|
||||
fromDownloads,
|
||||
ensurePlaylist,
|
||||
handlePlaybackLoadFailure,
|
||||
historySyncKey,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useRouter, useSegments, type Href } from "expo-router"
|
||||
import { useCallback } from "react"
|
||||
import { createContext, use, useCallback } from "react"
|
||||
|
||||
import { tabletSections } from "@/lib/tablet-navigation"
|
||||
|
||||
@@ -30,6 +30,13 @@ export function tabPath(tab: AppTab, path: string): Href {
|
||||
return `/(app)/(tabs)/${tab}${normalized}` as Href
|
||||
}
|
||||
|
||||
/**
|
||||
* The tab whose stack a screen lives in. Each tab stack layout provides it so
|
||||
* links resolve against the screen's own tab, even when the global segments
|
||||
* ref has not caught up with a tab switch yet.
|
||||
*/
|
||||
export const TabStackContext = createContext<AppTab | undefined>(undefined)
|
||||
|
||||
function getActiveTabFromRef(): AppTab {
|
||||
return getActiveTab(activeSegmentsRef.current)
|
||||
}
|
||||
@@ -41,8 +48,15 @@ export function AppNavigationSync() {
|
||||
return null
|
||||
}
|
||||
|
||||
/** Tab-aware navigation: paths resolve inside the caller's tab stack, falling back to the active tab outside one. */
|
||||
export function useAppNavigation() {
|
||||
const router = useRouter()
|
||||
const stackTab = use(TabStackContext)
|
||||
|
||||
const currentTab = useCallback(
|
||||
() => stackTab ?? getActiveTabFromRef(),
|
||||
[stackTab]
|
||||
)
|
||||
|
||||
const push = useCallback(
|
||||
(path: string) => {
|
||||
@@ -53,26 +67,26 @@ export function useAppNavigation() {
|
||||
return
|
||||
}
|
||||
|
||||
router.push(tabPath(getActiveTabFromRef(), path))
|
||||
router.push(tabPath(currentTab(), path))
|
||||
},
|
||||
[router]
|
||||
[router, currentTab]
|
||||
)
|
||||
|
||||
const replace = useCallback(
|
||||
(path: string) => {
|
||||
router.replace(tabPath(getActiveTabFromRef(), path))
|
||||
router.replace(tabPath(currentTab(), path))
|
||||
},
|
||||
[router]
|
||||
[router, currentTab]
|
||||
)
|
||||
|
||||
const href = useCallback(
|
||||
(path: string) => tabPath(getActiveTabFromRef(), path),
|
||||
[]
|
||||
(path: string) => tabPath(currentTab(), path),
|
||||
[currentTab]
|
||||
)
|
||||
|
||||
return {
|
||||
get tab() {
|
||||
return getActiveTabFromRef()
|
||||
return currentTab()
|
||||
},
|
||||
href,
|
||||
push,
|
||||
|
||||
@@ -16,9 +16,16 @@ function authCookieNames(serverUrl: string) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Cookies that sign a request to the server in. Pass `refresh: false` for
|
||||
* requests that may run after the JWT expires (iOS background downloads): the
|
||||
* server would spend the refresh token, and the app's next refresh of the same
|
||||
* token would then end the session.
|
||||
*/
|
||||
export async function getAuthCookieHeader(
|
||||
serverUrl: string,
|
||||
convexUrl: string
|
||||
convexUrl: string,
|
||||
{ refresh = true }: { refresh?: boolean } = {}
|
||||
): Promise<string | null> {
|
||||
const [jwt, refreshToken] = await Promise.all([
|
||||
secureGetItem(authStorageKey(JWT_STORAGE_KEY, convexUrl)),
|
||||
@@ -31,7 +38,7 @@ export async function getAuthCookieHeader(
|
||||
|
||||
const names = authCookieNames(serverUrl)
|
||||
const parts = [`${names.jwt}=${jwt}`]
|
||||
if (refreshToken) {
|
||||
if (refresh && refreshToken) {
|
||||
parts.push(`${names.refresh}=${refreshToken}`)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
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 {
|
||||
if (AUTH_ERROR_MESSAGES.has(message)) {
|
||||
|
||||
@@ -12,19 +12,28 @@ const secureStoreOptions: SecureStore.SecureStoreOptions = {
|
||||
keychainAccessible: SecureStore.AFTER_FIRST_UNLOCK,
|
||||
}
|
||||
|
||||
// The last value read or written per key, for when the keychain refuses a
|
||||
// read (say, while the phone is locked and downloads continue).
|
||||
const remembered = new Map<string, string>()
|
||||
|
||||
export async function secureGetItem(key: string): Promise<string | null> {
|
||||
try {
|
||||
return await SecureStore.getItemAsync(key, secureStoreOptions)
|
||||
const value = await SecureStore.getItemAsync(key, secureStoreOptions)
|
||||
if (value === null) remembered.delete(key)
|
||||
else remembered.set(key, value)
|
||||
return value
|
||||
} catch {
|
||||
return null
|
||||
return remembered.get(key) ?? null
|
||||
}
|
||||
}
|
||||
|
||||
export async function secureSetItem(key: string, value: string): Promise<void> {
|
||||
remembered.set(key, value)
|
||||
await SecureStore.setItemAsync(key, value, secureStoreOptions)
|
||||
}
|
||||
|
||||
export async function secureRemoveItem(key: string): Promise<void> {
|
||||
remembered.delete(key)
|
||||
try {
|
||||
await SecureStore.deleteItemAsync(key, secureStoreOptions)
|
||||
} catch {
|
||||
@@ -37,7 +46,9 @@ export function authStorageKey(key: string, storageNamespace: string): string {
|
||||
return `${key}_${escapedNamespace}`
|
||||
}
|
||||
|
||||
export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
|
||||
export async function clearStoredAuthTokens(
|
||||
storageNamespace: string
|
||||
): Promise<void> {
|
||||
await Promise.all(
|
||||
AUTH_STORAGE_KEYS.map((key) =>
|
||||
secureRemoveItem(authStorageKey(key, storageNamespace))
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
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"
|
||||
}
|
||||
@@ -0,0 +1,317 @@
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage"
|
||||
import { Directory, DownloadTask, 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 { downloadQualitySupported } from "@/lib/playback-capabilities"
|
||||
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)
|
||||
}
|
||||
|
||||
type SongDownload = {
|
||||
url: string
|
||||
destination: Directory
|
||||
headers: Record<string, string>
|
||||
signal: AbortSignal
|
||||
/** Checks and keeps the downloaded file, returning its size. */
|
||||
finish: (file: File) => number
|
||||
}
|
||||
|
||||
// Whether a continued processing task keeps the app running in the
|
||||
// background (iOS 26+, see `useBackgroundDownloads`).
|
||||
let keptRunning = false
|
||||
const regularSessionDownloads = new Set<() => void>()
|
||||
|
||||
/**
|
||||
* While a continued task keeps the app running, songs download through the
|
||||
* regular session: iOS treats background session downloads started from the
|
||||
* background as deferrable until Wi-Fi and power. When the task ends, running
|
||||
* songs restart in the background session before iOS suspends the app.
|
||||
*/
|
||||
export function setKeptRunning(running: boolean) {
|
||||
keptRunning = running
|
||||
if (!running) for (const handOff of regularSessionDownloads) handOff()
|
||||
}
|
||||
|
||||
/**
|
||||
* Downloads through an iOS URL session. The background one keeps going while
|
||||
* the app is suspended and wakes it when done; iOS keeps the app awake until
|
||||
* `finish` returns (up to 25 seconds). Downloads still running when iOS
|
||||
* terminates the app are lost.
|
||||
*/
|
||||
async function runDownloadTask(
|
||||
{ url, destination, headers, signal, finish }: SongDownload,
|
||||
sessionType: "foreground" | "background"
|
||||
) {
|
||||
const task = new DownloadTask(url, destination, {
|
||||
headers,
|
||||
signal,
|
||||
sessionType,
|
||||
deferBackgroundSessionCompletion: sessionType === "background",
|
||||
})
|
||||
const handOff = () => task.cancel()
|
||||
if (sessionType === "foreground") regularSessionDownloads.add(handOff)
|
||||
try {
|
||||
const file = await task.downloadAsync()
|
||||
if (!file) throw new Error("Download paused")
|
||||
return finish(file)
|
||||
} finally {
|
||||
regularSessionDownloads.delete(handOff)
|
||||
if (task.state === "completed") {
|
||||
await task.acknowledgeBackgroundCompletionAsync().catch(() => {})
|
||||
}
|
||||
task.release()
|
||||
}
|
||||
}
|
||||
|
||||
async function downloadOnIOS(download: SongDownload) {
|
||||
if (keptRunning) {
|
||||
try {
|
||||
return await runDownloadTask(download, "foreground")
|
||||
} catch (error) {
|
||||
// Still running means a real failure; otherwise it was handed off.
|
||||
if (keptRunning || download.signal.aborted) throw error
|
||||
}
|
||||
}
|
||||
return runDownloadTask(download, "background")
|
||||
}
|
||||
|
||||
/** Android keeps the app running with a foreground service instead. */
|
||||
async function downloadInForeground(download: SongDownload) {
|
||||
const { url, destination, headers, signal, finish } = download
|
||||
return finish(
|
||||
await File.downloadFileAsync(url, destination, { headers, signal })
|
||||
)
|
||||
}
|
||||
|
||||
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,
|
||||
{ refresh: Platform.OS !== "ios" }
|
||||
)
|
||||
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 url = `${config.serverUrl}${songDownloadPath(songId, requested, {
|
||||
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
|
||||
})}`
|
||||
const download =
|
||||
Platform.OS === "ios" ? downloadOnIOS : downloadInForeground
|
||||
return await download({
|
||||
url,
|
||||
destination: partial,
|
||||
headers: { Cookie: cookieHeader },
|
||||
signal,
|
||||
finish(file) {
|
||||
signal.throwIfAborted()
|
||||
// A lapsed sign-in redirects to the sign-in page instead of failing.
|
||||
if (file.extension === ".html") {
|
||||
throw new Error("Sign in to download")
|
||||
}
|
||||
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 {
|
||||
const quality = parseDownloadQuality(
|
||||
await AsyncStorage.getItem(REMEMBERED_QUALITY_KEY)
|
||||
)
|
||||
return quality && downloadQualitySupported(quality) ? quality : undefined
|
||||
} 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)
|
||||
}
|
||||
@@ -5,7 +5,10 @@ export function formatDuration(seconds: number): string {
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
|
||||
export function formatRemainingDuration(current: number, total: number): string {
|
||||
export function formatRemainingDuration(
|
||||
current: number,
|
||||
total: number
|
||||
): string {
|
||||
const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
|
||||
return `-${formatDuration(remaining)}`
|
||||
}
|
||||
|
||||
@@ -79,7 +79,9 @@ export function deriveCoverPalette(
|
||||
secondaryForeground: toHex(secondaryForeground),
|
||||
accent: toHex(accent),
|
||||
accentForeground: toHex(accentForeground),
|
||||
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
|
||||
accentText: toHex(
|
||||
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
|
||||
),
|
||||
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
|
||||
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
|
||||
isDark: lightText,
|
||||
@@ -94,7 +96,10 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
|
||||
? withLightness(color, Math.min(lch.l, 0.86))
|
||||
: withLightness(color, Math.max(lch.l, 0.2))
|
||||
const y = luminance(clamped)
|
||||
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
|
||||
if (
|
||||
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
|
||||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
|
||||
) {
|
||||
return clamped
|
||||
}
|
||||
|
||||
@@ -125,7 +130,10 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
|
||||
}
|
||||
|
||||
function prefersLightText(background: Rgb) {
|
||||
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
|
||||
return (
|
||||
contrastRatio([255, 255, 255], background) >=
|
||||
contrastRatio([0, 0, 0], background)
|
||||
)
|
||||
}
|
||||
|
||||
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
|
||||
@@ -180,7 +188,10 @@ function withLuminance(color: Rgb, target: number): Rgb {
|
||||
high = mid
|
||||
}
|
||||
}
|
||||
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
|
||||
return withLightness(
|
||||
color,
|
||||
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
|
||||
)
|
||||
}
|
||||
|
||||
/** `amount` of `color` over `base`. */
|
||||
@@ -206,7 +217,8 @@ function toLinear(channel: number) {
|
||||
}
|
||||
|
||||
function fromLinear(value: number) {
|
||||
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
||||
const c =
|
||||
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
||||
return c * 255
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@ export const tabStackScreenTitles: Record<string, string> = {
|
||||
"recently-played": "Recently Played",
|
||||
"recently-added": "Recently Added",
|
||||
settings: "Settings",
|
||||
"downloads/index": "Downloads",
|
||||
"downloads/other": "Other Downloaded Songs",
|
||||
}
|
||||
|
||||
export function useStackScreenOptions(
|
||||
@@ -28,7 +30,7 @@ export function useStackScreenOptions(
|
||||
headerBackButtonDisplayMode: "minimal",
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
animation: "slide_from_right",
|
||||
animation: "fade",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: theme.background },
|
||||
|
||||
@@ -12,6 +12,8 @@ export type NowPlayingColors = {
|
||||
selected: string
|
||||
selectedForeground: string
|
||||
highlight: string
|
||||
/** Words of the playing line not yet sung. */
|
||||
lyricsUnsung: string
|
||||
isDark: boolean
|
||||
}
|
||||
|
||||
@@ -28,6 +30,7 @@ export function nowPlayingColors(palette: CoverPalette): NowPlayingColors {
|
||||
selected: withAlpha(foreground, 0.8),
|
||||
selectedForeground: palette.background,
|
||||
highlight: withAlpha(foreground, 0.1),
|
||||
lyricsUnsung: withAlpha(foreground, 0.55),
|
||||
isDark: palette.isDark,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import {
|
||||
DOWNLOAD_QUALITIES,
|
||||
type DownloadQuality,
|
||||
} from "@otunes/convex/download-quality"
|
||||
|
||||
// Android Dolby decoder reports do not reliably indicate working Atmos playback.
|
||||
export const dolbyAtmosSupported = Platform.OS === "ios"
|
||||
|
||||
@@ -7,3 +12,13 @@ export const dolbyAtmosSupported = Platform.OS === "ios"
|
||||
export function atmosEnabled(user: { preferAtmos?: boolean }) {
|
||||
return dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
}
|
||||
|
||||
/** Whether this device may download in a quality. Android cannot download Atmos. */
|
||||
export function downloadQualitySupported(quality: DownloadQuality) {
|
||||
return quality !== "atmos" || dolbyAtmosSupported
|
||||
}
|
||||
|
||||
/** Download qualities this device offers, lowest first. */
|
||||
export const deviceDownloadQualities = DOWNLOAD_QUALITIES.filter(
|
||||
downloadQualitySupported
|
||||
)
|
||||
@@ -13,7 +13,10 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
|
||||
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
|
||||
|
||||
function normalizeHostnameInput(input: string): string {
|
||||
return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
|
||||
return input
|
||||
.trim()
|
||||
.replace(/^https?:\/\//i, "")
|
||||
.replace(/\/+$/, "")
|
||||
}
|
||||
|
||||
function buildServerUrl(hostname: string): string {
|
||||
|
||||
@@ -4,6 +4,7 @@ export const tabletSections = [
|
||||
{ name: "albums", group: "(albums)", title: "Albums" },
|
||||
{ name: "artists", group: "(artists)", title: "Artists" },
|
||||
{ name: "songs", group: "(songs)", title: "Songs" },
|
||||
{ name: "downloads", group: "(downloads)", title: "Downloads" },
|
||||
{ name: "playlists", group: "(playlists)", title: "All Playlists" },
|
||||
{ name: "favorites", group: "(favorites)", title: "Favorites" },
|
||||
{ name: "recent", group: "(recent)", title: "Recently Played" },
|
||||
|
||||
@@ -39,12 +39,15 @@ export function albumCoverUrl(
|
||||
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
|
||||
}
|
||||
|
||||
/** `version` is the summary's `cover`; it changes with the artwork. */
|
||||
export function playlistCoverUrl(
|
||||
serverUrl: string,
|
||||
playlistId: string,
|
||||
version: string | null,
|
||||
size?: CoverImageSize
|
||||
) {
|
||||
return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
|
||||
const uri = `${serverUrl}/api/playlist/${playlistId}/cover`
|
||||
return sizedCoverUrl(version ? `${uri}?v=${version}` : uri, size)
|
||||
}
|
||||
|
||||
export function songAudioSource(
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
plugins {
|
||||
id 'com.android.library'
|
||||
id 'expo-module-gradle-plugin'
|
||||
}
|
||||
|
||||
group = 'expo.modules.downloadservice'
|
||||
version = '1.0.0'
|
||||
|
||||
android {
|
||||
namespace 'expo.modules.downloadservice'
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
|
||||
|
||||
<application>
|
||||
<service
|
||||
android:name="expo.modules.downloadservice.DownloadService"
|
||||
android:exported="false"
|
||||
android:foregroundServiceType="dataSync" />
|
||||
</application>
|
||||
</manifest>
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package expo.modules.downloadservice
|
||||
|
||||
import android.app.Notification
|
||||
import android.app.NotificationChannel
|
||||
import android.app.NotificationManager
|
||||
import android.app.PendingIntent
|
||||
import android.app.Service
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.content.pm.ServiceInfo
|
||||
import android.os.Build
|
||||
import android.os.IBinder
|
||||
|
||||
/**
|
||||
* Keeps the app running while songs download, so Android does not freeze the
|
||||
* JS downloads when the app leaves the screen. Started with the number of
|
||||
* songs left, and stopped by the module once none are.
|
||||
*/
|
||||
class DownloadService : Service() {
|
||||
override fun onBind(intent: Intent?): IBinder? = null
|
||||
|
||||
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
|
||||
val remaining = intent?.getIntExtra(EXTRA_REMAINING, 0) ?: 0
|
||||
val notification = notification(remaining)
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
|
||||
} else {
|
||||
startForeground(NOTIFICATION_ID, notification)
|
||||
}
|
||||
// A restarted service would have no downloads to keep alive.
|
||||
return START_NOT_STICKY
|
||||
}
|
||||
|
||||
// Android 15 limits data sync services to six hours a day.
|
||||
override fun onTimeout(startId: Int, fgsType: Int) {
|
||||
stopSelf()
|
||||
}
|
||||
|
||||
private fun notification(remaining: Int): Notification {
|
||||
val manager = getSystemService(NotificationManager::class.java)
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
manager.createNotificationChannel(
|
||||
NotificationChannel(CHANNEL_ID, "Downloads", NotificationManager.IMPORTANCE_LOW)
|
||||
)
|
||||
}
|
||||
val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
Notification.Builder(this, CHANNEL_ID)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
Notification.Builder(this)
|
||||
}
|
||||
val launch = packageManager.getLaunchIntentForPackage(packageName)?.let {
|
||||
PendingIntent.getActivity(this, 0, it, PendingIntent.FLAG_IMMUTABLE)
|
||||
}
|
||||
return builder
|
||||
.setSmallIcon(android.R.drawable.stat_sys_download)
|
||||
.setContentTitle(if (remaining == 1) "Downloading 1 song" else "Downloading $remaining songs")
|
||||
.setContentIntent(launch)
|
||||
.setOngoing(true)
|
||||
.setOnlyAlertOnce(true)
|
||||
.build()
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val CHANNEL_ID = "downloads"
|
||||
private const val NOTIFICATION_ID = 7301
|
||||
private const val EXTRA_REMAINING = "remaining"
|
||||
|
||||
fun update(context: Context, remaining: Int) {
|
||||
val intent = Intent(context, DownloadService::class.java)
|
||||
if (remaining == 0) {
|
||||
context.stopService(intent)
|
||||
return
|
||||
}
|
||||
intent.putExtra(EXTRA_REMAINING, remaining)
|
||||
try {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
context.startForegroundService(intent)
|
||||
} else {
|
||||
context.startService(intent)
|
||||
}
|
||||
} catch (_: IllegalStateException) {
|
||||
// Android 12+ refuses to start one from the background (say, a
|
||||
// playlist syncing); downloads then run only while the app does.
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package expo.modules.downloadservice
|
||||
|
||||
import expo.modules.kotlin.modules.Module
|
||||
import expo.modules.kotlin.modules.ModuleDefinition
|
||||
|
||||
class DownloadServiceModule : Module() {
|
||||
override fun definition() = ModuleDefinition {
|
||||
Name("DownloadService")
|
||||
|
||||
/** Shows how many songs are left, or stops the service at zero. */
|
||||
Function("update") { remaining: Int ->
|
||||
DownloadService.update(requireNotNull(appContext.reactContext), remaining)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loaded 100 of 235 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user