Compare commits
41
Commits
No files matched your search
+6
-1
@@ -41,4 +41,9 @@ apps/web/next-env.d.ts
|
|||||||
/.convex
|
/.convex
|
||||||
/.cursor
|
/.cursor
|
||||||
/database
|
/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
|
WORKDIR /app
|
||||||
|
|
||||||
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
|
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
|
||||||
# Mobile is intentionally omitted so its deps are never installed.
|
# Mobile's manifest is never copied, so the workspace globs cannot discover it.
|
||||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
# 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.
|
# pnpm validates patches even when their packages are outside the install filter.
|
||||||
COPY patches ./patches
|
COPY patches ./patches
|
||||||
COPY apps/web/package.json ./apps/web/
|
COPY apps/web/package.json ./apps/web/
|
||||||
COPY packages/convex/package.json ./packages/convex/
|
COPY packages/convex/package.json ./packages/convex/
|
||||||
|
|
||||||
# Explicit workspace — do not use apps/* so mobile cannot be discovered.
|
RUN printf '\n%s\n' \
|
||||||
RUN printf '%s\n' \
|
|
||||||
'packages:' \
|
|
||||||
' - "apps/web"' \
|
|
||||||
' - "packages/convex"' \
|
|
||||||
>> pnpm-workspace.yaml \
|
|
||||||
&& printf '\n%s\n' \
|
|
||||||
'supportedArchitectures.os=current' \
|
'supportedArchitectures.os=current' \
|
||||||
'supportedArchitectures.cpu=current' \
|
'supportedArchitectures.cpu=current' \
|
||||||
'supportedArchitectures.libc=current' \
|
'supportedArchitectures.libc=current' \
|
||||||
@@ -82,15 +78,11 @@ FROM node:${NODE_VERSION} AS convex-functions
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
|
||||||
COPY patches ./patches
|
COPY patches ./patches
|
||||||
COPY packages/convex/package.json ./packages/convex/
|
COPY packages/convex/package.json ./packages/convex/
|
||||||
|
|
||||||
RUN printf '%s\n' \
|
RUN printf '\n%s\n' \
|
||||||
'packages:' \
|
|
||||||
' - "packages/convex"' \
|
|
||||||
> pnpm-workspace.yaml \
|
|
||||||
&& printf '\n%s\n' \
|
|
||||||
'supportedArchitectures.os=current' \
|
'supportedArchitectures.os=current' \
|
||||||
'supportedArchitectures.cpu=current' \
|
'supportedArchitectures.cpu=current' \
|
||||||
'supportedArchitectures.libc=current' \
|
'supportedArchitectures.libc=current' \
|
||||||
@@ -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,
|
# 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
|
# 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 \
|
RUN ./configure \
|
||||||
--prefix=/opt/ffmpeg \
|
--prefix=/opt/ffmpeg \
|
||||||
--disable-shared \
|
--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-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-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-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-parser=aac,aac_latm,ac3,flac,mpegaudio,opus,vorbis \
|
||||||
--enable-bsf=aac_adtstoasc \
|
--enable-bsf=aac_adtstoasc \
|
||||||
--enable-filter=aresample,aformat \
|
--enable-filter=aresample,aformat \
|
||||||
|
|||||||
@@ -32,6 +32,13 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
...config,
|
...config,
|
||||||
plugins: [
|
plugins: [
|
||||||
...(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"
|
...(process.env.MAC_CATALYST === "1"
|
||||||
? ["./plugins/with-mac-catalyst"]
|
? ["./plugins/with-mac-catalyst"]
|
||||||
: []),
|
: []),
|
||||||
|
|||||||
+13
-10
@@ -1,5 +1,6 @@
|
|||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
|
|
||||||
|
import { TabStackContext } from "@/lib/app-navigation"
|
||||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
|
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
|
||||||
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
|
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
|
||||||
@@ -10,16 +11,18 @@ export default function TabletSectionLayout({ segment }: { segment: string }) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<TabletSectionContext value={section}>
|
<TabletSectionContext value={section}>
|
||||||
<Stack
|
<TabStackContext value={section?.group}>
|
||||||
screenLayout={renderTabScreenContent}
|
<Stack
|
||||||
screenOptions={({ route }) => ({
|
screenLayout={renderTabScreenContent}
|
||||||
...options,
|
screenOptions={({ route }) => ({
|
||||||
title:
|
...options,
|
||||||
route.name === "index"
|
title:
|
||||||
? section?.title
|
route.name === "index"
|
||||||
: tabStackScreenTitles[route.name],
|
? section?.title
|
||||||
})}
|
: tabStackScreenTitles[route.name],
|
||||||
/>
|
})}
|
||||||
|
/>
|
||||||
|
</TabStackContext>
|
||||||
</TabletSectionContext>
|
</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 Playlists from "../home/browse/playlists"
|
||||||
import Favorites from "../home/playlist/favorites"
|
import Favorites from "../home/playlist/favorites"
|
||||||
import RecentlyPlayed from "../home/recently-played"
|
import RecentlyPlayed from "../home/recently-played"
|
||||||
|
import Downloads from "../home/downloads"
|
||||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||||
|
|
||||||
const screens = {
|
const screens = {
|
||||||
@@ -14,6 +15,7 @@ const screens = {
|
|||||||
playlists: Playlists,
|
playlists: Playlists,
|
||||||
favorites: Favorites,
|
favorites: Favorites,
|
||||||
recent: RecentlyPlayed,
|
recent: RecentlyPlayed,
|
||||||
|
downloads: Downloads,
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function TabletSectionScreen() {
|
export default function TabletSectionScreen() {
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -127,7 +127,9 @@ function TabsContent() {
|
|||||||
tintColor={tabColors.tintColor}
|
tintColor={tabColors.tintColor}
|
||||||
minimizeBehavior="onScrollDown"
|
minimizeBehavior="onScrollDown"
|
||||||
{...(Platform.OS === "android"
|
{...(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 ? (
|
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||||
@@ -191,6 +193,14 @@ function TabsContent() {
|
|||||||
<NativeTabs.Trigger.Icon sf="music.note" />
|
<NativeTabs.Trigger.Icon sf="music.note" />
|
||||||
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
|
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
|
||||||
</NativeTabs.Trigger>
|
</NativeTabs.Trigger>
|
||||||
|
<NativeTabs.Trigger
|
||||||
|
name="(downloads)"
|
||||||
|
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||||
|
disableTransparentOnScrollEdge
|
||||||
|
>
|
||||||
|
<NativeTabs.Trigger.Icon sf="arrow.down.circle" />
|
||||||
|
<NativeTabs.Trigger.Label>Downloads</NativeTabs.Trigger.Label>
|
||||||
|
</NativeTabs.Trigger>
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="(playlists)"
|
name="(playlists)"
|
||||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
|
|
||||||
|
import { TabStackContext } from "@/lib/app-navigation"
|
||||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||||
|
|
||||||
@@ -12,24 +13,26 @@ export default function HomeLayout() {
|
|||||||
const baseOptions = useStackScreenOptions({ title: "Home" })
|
const baseOptions = useStackScreenOptions({ title: "Home" })
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<TabStackContext value="home">
|
||||||
screenLayout={renderTabScreenContent}
|
<Stack
|
||||||
screenOptions={({ route }) => ({
|
screenLayout={renderTabScreenContent}
|
||||||
...baseOptions,
|
screenOptions={({ route }) => ({
|
||||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
...baseOptions,
|
||||||
headerRight:
|
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
headerRight:
|
||||||
unstable_headerRightItems:
|
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||||
route.name === "index"
|
unstable_headerRightItems:
|
||||||
? () => [
|
route.name === "index"
|
||||||
{
|
? () => [
|
||||||
type: "custom",
|
{
|
||||||
element: <ProfileHeaderButton />,
|
type: "custom",
|
||||||
hidesSharedBackground: true,
|
element: <ProfileHeaderButton />,
|
||||||
},
|
hidesSharedBackground: true,
|
||||||
]
|
},
|
||||||
: undefined,
|
]
|
||||||
})}
|
: undefined,
|
||||||
/>
|
})}
|
||||||
|
/>
|
||||||
|
</TabStackContext>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -22,6 +22,18 @@ import {
|
|||||||
DiscHeader,
|
DiscHeader,
|
||||||
} from "@/components/collection-list"
|
} from "@/components/collection-list"
|
||||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||||
|
import {
|
||||||
|
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 { CoverImage } from "@/components/cover-image"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -58,9 +70,18 @@ export default function AlbumScreen() {
|
|||||||
api.library.browseAlbumDetail,
|
api.library.browseAlbumDetail,
|
||||||
typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
|
typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
|
||||||
)
|
)
|
||||||
const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
|
const {
|
||||||
const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
|
playAlbum,
|
||||||
useFavorites()
|
playAlbumShuffled,
|
||||||
|
playFromSong,
|
||||||
|
playInOrder,
|
||||||
|
playShuffled,
|
||||||
|
} = usePlaybackActions()
|
||||||
|
const fromDownloads = useOpenedFromDownloads()
|
||||||
|
const playOrigin = fromDownloads
|
||||||
|
? downloadsQueueOrigin(`album:${id}`)
|
||||||
|
: `album:${id}`
|
||||||
|
const { isSongFavorite } = useFavorites()
|
||||||
const {
|
const {
|
||||||
handleAlbumDetailAction,
|
handleAlbumDetailAction,
|
||||||
handleAlbumTrackAction,
|
handleAlbumTrackAction,
|
||||||
@@ -81,6 +102,17 @@ export default function AlbumScreen() {
|
|||||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||||
[album]
|
[album]
|
||||||
)
|
)
|
||||||
|
const { requestDownload, removeDownload } = useDownloads()
|
||||||
|
const downloadTarget = useMemo(
|
||||||
|
() => ({
|
||||||
|
kind: "album" as const,
|
||||||
|
id: typeof id === "string" ? id : "",
|
||||||
|
title: album?.title ?? "",
|
||||||
|
songIds,
|
||||||
|
}),
|
||||||
|
[album?.title, id, songIds]
|
||||||
|
)
|
||||||
|
const albumDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (album) {
|
if (album) {
|
||||||
@@ -92,8 +124,8 @@ export default function AlbumScreen() {
|
|||||||
|
|
||||||
const playTrack = useCallback(
|
const playTrack = useCallback(
|
||||||
(songId: Id<"songs">, ids: Id<"songs">[]) =>
|
(songId: Id<"songs">, ids: Id<"songs">[]) =>
|
||||||
playFromSong(songId, ids, `album:${id}`),
|
playFromSong(songId, ids, playOrigin),
|
||||||
[id, playFromSong]
|
[playOrigin, playFromSong]
|
||||||
)
|
)
|
||||||
|
|
||||||
const renderItem = useCallback(
|
const renderItem = useCallback(
|
||||||
@@ -172,7 +204,6 @@ export default function AlbumScreen() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const metadata = formatMetadata(album.genre, album.year)
|
const metadata = formatMetadata(album.genre, album.year)
|
||||||
const favorited = isAlbumFavorite(album.id)
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -197,15 +228,22 @@ export default function AlbumScreen() {
|
|||||||
stationArtistId={album.artist.id}
|
stationArtistId={album.artist.id}
|
||||||
selectedCount={album.tracks.length}
|
selectedCount={album.tracks.length}
|
||||||
favorited={isAlbumFav(album.id)}
|
favorited={isAlbumFav(album.id)}
|
||||||
|
downloaded={albumDownloaded}
|
||||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||||
onAction={(action) =>
|
onAction={(action) => {
|
||||||
void handleAlbumDetailAction(
|
if (action === "download") {
|
||||||
album.id as Id<"albums">,
|
void requestDownload(downloadTarget)
|
||||||
songIds,
|
} else if (action === "remove-download") {
|
||||||
action,
|
void removeDownload(downloadTarget)
|
||||||
album.artist.id as Id<"artists">
|
} else {
|
||||||
)
|
void handleAlbumDetailAction(
|
||||||
}
|
album.id as Id<"albums">,
|
||||||
|
songIds,
|
||||||
|
action,
|
||||||
|
album.artist.id as Id<"artists">
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Pressable hitSlop={8}>
|
<Pressable hitSlop={8}>
|
||||||
<Ionicons
|
<Ionicons
|
||||||
@@ -261,35 +299,15 @@ export default function AlbumScreen() {
|
|||||||
heroLayout.landscape && { flexDirection: "row-reverse" },
|
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<Pressable
|
|
||||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
|
||||||
hitSlop={8}
|
|
||||||
style={[
|
|
||||||
styles.iconAction,
|
|
||||||
{ backgroundColor: palette.surface },
|
|
||||||
]}
|
|
||||||
>
|
|
||||||
<Ionicons
|
|
||||||
name={favorited ? "star" : "star-outline"}
|
|
||||||
size={24}
|
|
||||||
color={favorited ? palette.accent : palette.foreground}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
|
||||||
<Button
|
|
||||||
title="Play"
|
|
||||||
icon="play"
|
|
||||||
onPress={() => void playAlbum(album.id, songIds)}
|
|
||||||
style={styles.playButton}
|
|
||||||
tint={{
|
|
||||||
background: palette.accent,
|
|
||||||
foreground: palette.accentForeground,
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<Pressable
|
<Pressable
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel="Shuffle"
|
accessibilityLabel="Shuffle"
|
||||||
hitSlop={8}
|
hitSlop={8}
|
||||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
onPress={() =>
|
||||||
|
void (fromDownloads
|
||||||
|
? playShuffled(songIds, playOrigin)
|
||||||
|
: playAlbumShuffled(album.id, songIds))
|
||||||
|
}
|
||||||
style={[
|
style={[
|
||||||
styles.iconAction,
|
styles.iconAction,
|
||||||
{ backgroundColor: palette.surface },
|
{ backgroundColor: palette.surface },
|
||||||
@@ -301,6 +319,28 @@ export default function AlbumScreen() {
|
|||||||
color={palette.foreground}
|
color={palette.foreground}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
|
<Button
|
||||||
|
title="Play"
|
||||||
|
icon="play"
|
||||||
|
onPress={() =>
|
||||||
|
void (fromDownloads
|
||||||
|
? playInOrder(songIds, playOrigin)
|
||||||
|
: playAlbum(album.id, songIds))
|
||||||
|
}
|
||||||
|
style={styles.playButton}
|
||||||
|
tint={{
|
||||||
|
background: palette.accent,
|
||||||
|
foreground: palette.accentForeground,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<CollectionDownloadButton
|
||||||
|
target={downloadTarget}
|
||||||
|
color={palette.foreground}
|
||||||
|
style={[
|
||||||
|
styles.iconAction,
|
||||||
|
{ backgroundColor: palette.surface },
|
||||||
|
]}
|
||||||
|
/>
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
@@ -372,6 +412,11 @@ export default function AlbumScreen() {
|
|||||||
</>
|
</>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
|
<DownloadedQuality
|
||||||
|
collection={downloadTarget}
|
||||||
|
color={palette.secondaryForeground}
|
||||||
|
backgroundColor={palette.background}
|
||||||
|
/>
|
||||||
</CollectionHero>
|
</CollectionHero>
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
<CollectionDivider color={palette.divider} />
|
<CollectionDivider color={palette.divider} />
|
||||||
@@ -451,6 +496,13 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
}) {
|
}) {
|
||||||
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
|
const downloadRef = useMemo(
|
||||||
|
() => ({ kind: "album" as const, id: album.id }),
|
||||||
|
[album.id]
|
||||||
|
)
|
||||||
|
const downloadState = useSongDownloadState(track.id, downloadRef)
|
||||||
|
const downloaded = downloadState === "here"
|
||||||
|
const toggleDownload = useToggleSongDownload()
|
||||||
return (
|
return (
|
||||||
<MediaContextMenu
|
<MediaContextMenu
|
||||||
preview={
|
preview={
|
||||||
@@ -467,6 +519,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
}
|
}
|
||||||
stationArtistId={album.artist.id}
|
stationArtistId={album.artist.id}
|
||||||
favorited={favorited}
|
favorited={favorited}
|
||||||
|
downloaded={downloaded}
|
||||||
navigation={{
|
navigation={{
|
||||||
artist: { id: album.artist.id },
|
artist: { id: album.artist.id },
|
||||||
album: { id: album.id },
|
album: { id: album.id },
|
||||||
@@ -485,6 +538,8 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
backgroundColor={palette.background}
|
backgroundColor={palette.background}
|
||||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||||
onAddToQueue={() => void onAction(track, album, "play-last")}
|
onAddToQueue={() => void onAction(track, album, "play-last")}
|
||||||
|
downloaded={downloaded}
|
||||||
|
onDownload={() => toggleDownload(track, downloaded, downloadRef)}
|
||||||
style={styles.trackRow}
|
style={styles.trackRow}
|
||||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||||
>
|
>
|
||||||
@@ -515,6 +570,14 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
</Text>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
|
{downloaded || downloadState === "device" ? (
|
||||||
|
<Ionicons
|
||||||
|
name="arrow-down-circle"
|
||||||
|
size={14}
|
||||||
|
color={palette.secondaryForeground}
|
||||||
|
accessibilityLabel="Downloaded"
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
<Text style={{ color: palette.secondaryForeground }}>
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
{formatDuration(track.durationSeconds)}
|
{formatDuration(track.durationSeconds)}
|
||||||
</Text>
|
</Text>
|
||||||
|
|||||||
@@ -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 (
|
return (
|
||||||
<ScrollView
|
<ScrollView
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
style={{ flex: 1, backgroundColor: colors.background }}
|
||||||
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
|
contentContainerStyle={[
|
||||||
|
styles.content,
|
||||||
|
{ paddingBottom: tabContentBottomInset },
|
||||||
|
]}
|
||||||
contentInsetAdjustmentBehavior="automatic"
|
contentInsetAdjustmentBehavior="automatic"
|
||||||
>
|
>
|
||||||
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
|
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
|
||||||
|
|||||||
@@ -44,6 +44,19 @@ import {
|
|||||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||||
import { Button } from "@/components/ui/primitives"
|
import { Button } from "@/components/ui/primitives"
|
||||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||||
|
import {
|
||||||
|
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 { useFavorites } from "@/contexts/favorites"
|
||||||
import { usePlaybackActions } from "@/contexts/playback"
|
import { usePlaybackActions } from "@/contexts/playback"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
@@ -68,6 +81,7 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
|
|||||||
"play-last",
|
"play-last",
|
||||||
"shuffle",
|
"shuffle",
|
||||||
"favorite",
|
"favorite",
|
||||||
|
"change-cover",
|
||||||
"delete-playlist",
|
"delete-playlist",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -83,7 +97,11 @@ export default function PlaylistScreen() {
|
|||||||
const songs = playlist?.songs
|
const songs = playlist?.songs
|
||||||
const coverUri =
|
const coverUri =
|
||||||
config && playlistId
|
config && playlistId
|
||||||
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
|
? playlistCoverUrl(
|
||||||
|
config.serverUrl,
|
||||||
|
playlist?.id ?? playlistId,
|
||||||
|
playlist?.cover ?? null
|
||||||
|
)
|
||||||
: ""
|
: ""
|
||||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||||
coverUri,
|
coverUri,
|
||||||
@@ -171,10 +189,17 @@ function PlaylistContent({
|
|||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const isFocused = useIsFocused()
|
const isFocused = useIsFocused()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
const {
|
||||||
usePlaybackActions()
|
playPlaylist,
|
||||||
|
playPlaylistShuffled,
|
||||||
|
playFromSong,
|
||||||
|
playInOrder,
|
||||||
|
playShuffled,
|
||||||
|
} = usePlaybackActions()
|
||||||
|
const fromDownloads = useOpenedFromDownloads()
|
||||||
const { isSongFavorite } = useFavorites()
|
const { isSongFavorite } = useFavorites()
|
||||||
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
|
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
|
||||||
|
const { requestDownload, removeDownload } = useDownloads()
|
||||||
const subscribe = useMutation(api.playlists.subscribeToPlaylist)
|
const subscribe = useMutation(api.playlists.subscribeToPlaylist)
|
||||||
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
|
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
|
||||||
const deletePlaylist = useMutation(api.playlists.deletePlaylist)
|
const deletePlaylist = useMutation(api.playlists.deletePlaylist)
|
||||||
@@ -187,11 +212,25 @@ function PlaylistContent({
|
|||||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||||
usePlaylistSearch(songs)
|
usePlaylistSearch(songs)
|
||||||
const swipeGroup = useSwipeRowGroup()
|
const swipeGroup = useSwipeRowGroup()
|
||||||
|
const downloadRef = useMemo(
|
||||||
|
() => ({
|
||||||
|
kind: "playlist" as const,
|
||||||
|
id: playlistId ?? FAVORITES_DOWNLOAD_ID,
|
||||||
|
}),
|
||||||
|
[playlistId]
|
||||||
|
)
|
||||||
|
const downloadTarget = useMemo(
|
||||||
|
() => ({ ...downloadRef, title: playlist.title, songIds }),
|
||||||
|
[downloadRef, playlist.title, songIds]
|
||||||
|
)
|
||||||
|
const playOrigin = fromDownloads
|
||||||
|
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
|
||||||
|
: `playlist:${playlistId}`
|
||||||
|
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
|
||||||
|
|
||||||
const handlePlaySong = useCallback(
|
const handlePlaySong = useCallback(
|
||||||
(song: BrowseSong) =>
|
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||||
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
|
[playFromSong, songIds, playOrigin]
|
||||||
[playFromSong, songIds, playlistId]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const handleRemoveSong = useCallback(
|
const handleRemoveSong = useCallback(
|
||||||
@@ -215,18 +254,34 @@ function PlaylistContent({
|
|||||||
const handleSongMenuAction = useCallback(
|
const handleSongMenuAction = useCallback(
|
||||||
(song: BrowseSong, action: MediaAction) => {
|
(song: BrowseSong, action: MediaAction) => {
|
||||||
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
|
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
|
||||||
else void handleSongAction(song, action)
|
else void handleSongAction(song, action, downloadRef)
|
||||||
},
|
},
|
||||||
[handleRemoveSong, handleSongAction]
|
[downloadRef, handleRemoveSong, handleSongAction]
|
||||||
)
|
)
|
||||||
|
|
||||||
const handlePlay = useCallback(() => {
|
const handlePlay = useCallback(() => {
|
||||||
if (playlistId) void playPlaylist(playlistId, songIds)
|
if (fromDownloads) void playInOrder(songIds, playOrigin)
|
||||||
}, [playPlaylist, playlistId, songIds])
|
else if (playlistId) void playPlaylist(playlistId, songIds)
|
||||||
|
}, [
|
||||||
|
fromDownloads,
|
||||||
|
playInOrder,
|
||||||
|
playOrigin,
|
||||||
|
playPlaylist,
|
||||||
|
playlistId,
|
||||||
|
songIds,
|
||||||
|
])
|
||||||
|
|
||||||
const handleShuffle = useCallback(() => {
|
const handleShuffle = useCallback(() => {
|
||||||
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
if (fromDownloads) void playShuffled(songIds, playOrigin)
|
||||||
}, [playPlaylistShuffled, playlistId, songIds])
|
else if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||||
|
}, [
|
||||||
|
fromDownloads,
|
||||||
|
playShuffled,
|
||||||
|
playOrigin,
|
||||||
|
playPlaylistShuffled,
|
||||||
|
playlistId,
|
||||||
|
songIds,
|
||||||
|
])
|
||||||
|
|
||||||
const handleSubscribeToggle = useCallback(async () => {
|
const handleSubscribeToggle = useCallback(async () => {
|
||||||
if (!playlistId) return
|
if (!playlistId) return
|
||||||
@@ -261,6 +316,23 @@ function PlaylistContent({
|
|||||||
void handleDelete()
|
void handleDelete()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (action === "change-cover") {
|
||||||
|
if (playlistId) {
|
||||||
|
router.push({
|
||||||
|
pathname: "/playlist-cover",
|
||||||
|
params: { id: playlistId },
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (action === "download") {
|
||||||
|
void requestDownload(downloadTarget)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (action === "remove-download") {
|
||||||
|
void removeDownload(downloadTarget)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
void handlePlaylistDetailAction(songIds, action)
|
void handlePlaylistDetailAction(songIds, action)
|
||||||
}
|
}
|
||||||
@@ -281,6 +353,7 @@ function PlaylistContent({
|
|||||||
<MediaActionMenu
|
<MediaActionMenu
|
||||||
selectedCount={songIds.length}
|
selectedCount={songIds.length}
|
||||||
playlistLabel={PLAYLIST_LABEL}
|
playlistLabel={PLAYLIST_LABEL}
|
||||||
|
downloaded={playlistDownloaded}
|
||||||
share={{
|
share={{
|
||||||
type: "playlist",
|
type: "playlist",
|
||||||
playlistId: playlistId ?? "favorites",
|
playlistId: playlistId ?? "favorites",
|
||||||
@@ -303,6 +376,10 @@ function PlaylistContent({
|
|||||||
canEdit,
|
canEdit,
|
||||||
colors.foreground,
|
colors.foreground,
|
||||||
deletePlaylist,
|
deletePlaylist,
|
||||||
|
downloadTarget,
|
||||||
|
playlistDownloaded,
|
||||||
|
requestDownload,
|
||||||
|
removeDownload,
|
||||||
handlePlaylistDetailAction,
|
handlePlaylistDetailAction,
|
||||||
palette.foreground,
|
palette.foreground,
|
||||||
palette.isDark,
|
palette.isDark,
|
||||||
@@ -320,6 +397,7 @@ function PlaylistContent({
|
|||||||
removable={canEdit}
|
removable={canEdit}
|
||||||
palette={palette}
|
palette={palette}
|
||||||
swipeGroup={swipeGroup}
|
swipeGroup={swipeGroup}
|
||||||
|
downloadRef={downloadRef}
|
||||||
onPlay={handlePlaySong}
|
onPlay={handlePlaySong}
|
||||||
onAction={handleSongMenuAction}
|
onAction={handleSongMenuAction}
|
||||||
onRemove={handleRemoveSong}
|
onRemove={handleRemoveSong}
|
||||||
@@ -327,6 +405,7 @@ function PlaylistContent({
|
|||||||
),
|
),
|
||||||
[
|
[
|
||||||
canEdit,
|
canEdit,
|
||||||
|
downloadRef,
|
||||||
handlePlaySong,
|
handlePlaySong,
|
||||||
handleRemoveSong,
|
handleRemoveSong,
|
||||||
handleSongMenuAction,
|
handleSongMenuAction,
|
||||||
@@ -381,6 +460,7 @@ function PlaylistContent({
|
|||||||
isSubscribed={isSubscribed}
|
isSubscribed={isSubscribed}
|
||||||
showSubscribe={!playlist.isOwner && playlistId !== null}
|
showSubscribe={!playlist.isOwner && playlistId !== null}
|
||||||
onSubscribeToggle={handleSubscribeToggle}
|
onSubscribeToggle={handleSubscribeToggle}
|
||||||
|
downloadTarget={downloadTarget}
|
||||||
onPlay={handlePlay}
|
onPlay={handlePlay}
|
||||||
onShuffle={handleShuffle}
|
onShuffle={handleShuffle}
|
||||||
/>
|
/>
|
||||||
@@ -400,6 +480,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
|||||||
removable,
|
removable,
|
||||||
palette,
|
palette,
|
||||||
swipeGroup,
|
swipeGroup,
|
||||||
|
downloadRef,
|
||||||
onPlay,
|
onPlay,
|
||||||
onAction,
|
onAction,
|
||||||
onRemove,
|
onRemove,
|
||||||
@@ -409,6 +490,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
|||||||
removable: boolean
|
removable: boolean
|
||||||
palette: CoverPalette
|
palette: CoverPalette
|
||||||
swipeGroup: SwipeRowGroup
|
swipeGroup: SwipeRowGroup
|
||||||
|
downloadRef: CollectionRef
|
||||||
onPlay: (song: BrowseSong) => void
|
onPlay: (song: BrowseSong) => void
|
||||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||||
onRemove: (songId: Id<"songs">) => Promise<boolean>
|
onRemove: (songId: Id<"songs">) => Promise<boolean>
|
||||||
@@ -423,6 +505,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
|||||||
palette={palette}
|
palette={palette}
|
||||||
inset
|
inset
|
||||||
removable={removable}
|
removable={removable}
|
||||||
|
downloadFrom={downloadRef}
|
||||||
swipe={
|
swipe={
|
||||||
Platform.OS !== "web"
|
Platform.OS !== "web"
|
||||||
? {
|
? {
|
||||||
@@ -488,9 +571,11 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
isSubscribed,
|
isSubscribed,
|
||||||
showSubscribe = false,
|
showSubscribe = false,
|
||||||
onSubscribeToggle,
|
onSubscribeToggle,
|
||||||
|
downloadTarget,
|
||||||
onPlay,
|
onPlay,
|
||||||
onShuffle,
|
onShuffle,
|
||||||
}: {
|
}: {
|
||||||
|
downloadTarget: CollectionDownloadTarget
|
||||||
entityId: string
|
entityId: string
|
||||||
coverUri: string
|
coverUri: string
|
||||||
hasCover: boolean
|
hasCover: boolean
|
||||||
@@ -558,6 +643,15 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
) : null}
|
) : 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
|
<Button
|
||||||
title="Play"
|
title="Play"
|
||||||
icon="play"
|
icon="play"
|
||||||
@@ -568,15 +662,11 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
foreground: palette.accentForeground,
|
foreground: palette.accentForeground,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Pressable
|
<CollectionDownloadButton
|
||||||
accessibilityRole="button"
|
target={downloadTarget}
|
||||||
accessibilityLabel="Shuffle"
|
color={palette.foreground}
|
||||||
hitSlop={8}
|
|
||||||
onPress={onShuffle}
|
|
||||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||||
>
|
/>
|
||||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
|
||||||
</Pressable>
|
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
@@ -597,6 +687,11 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
>
|
>
|
||||||
{ownerName}
|
{ownerName}
|
||||||
</Text>
|
</Text>
|
||||||
|
<DownloadedQuality
|
||||||
|
collection={downloadTarget}
|
||||||
|
color={palette.secondaryForeground}
|
||||||
|
backgroundColor={palette.background}
|
||||||
|
/>
|
||||||
</CollectionHero>
|
</CollectionHero>
|
||||||
<CollectionDivider color={palette.divider} />
|
<CollectionDivider color={palette.divider} />
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
|
|||||||
@@ -16,6 +16,14 @@ import { CollectionDivider } from "@/components/collection-list"
|
|||||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||||
import { Button } from "@/components/ui/primitives"
|
import { Button } from "@/components/ui/primitives"
|
||||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||||
|
import {
|
||||||
|
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 { useFavorites } from "@/contexts/favorites"
|
||||||
import { usePlaybackActions } from "@/contexts/playback"
|
import { usePlaybackActions } from "@/contexts/playback"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
@@ -31,39 +39,52 @@ import { Ionicons } from "@expo/vector-icons"
|
|||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
|
|
||||||
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
|
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
|
||||||
|
const DOWNLOAD_REF = { kind: "playlist", id: FAVORITES_DOWNLOAD_ID } as const
|
||||||
|
|
||||||
export default function FavoritesScreen() {
|
export default function FavoritesScreen() {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
|
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
|
||||||
const songs = favorites?.songs ?? []
|
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
|
||||||
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
|
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
|
||||||
const { isSongFavorite } = useFavorites()
|
const { isSongFavorite } = useFavorites()
|
||||||
const { handleSongAction } = useMediaMenuActions()
|
const { handleSongAction } = useMediaMenuActions()
|
||||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||||
|
const fromDownloads = useOpenedFromDownloads()
|
||||||
|
const playOrigin = fromDownloads
|
||||||
|
? downloadsQueueOrigin("playlist:favorites")
|
||||||
|
: undefined
|
||||||
|
const downloadTarget = useMemo(
|
||||||
|
() => ({
|
||||||
|
...DOWNLOAD_REF,
|
||||||
|
title: favorites?.title ?? "Favorites",
|
||||||
|
songIds,
|
||||||
|
}),
|
||||||
|
[favorites?.title, songIds]
|
||||||
|
)
|
||||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||||
usePlaylistSearch(songs)
|
usePlaylistSearch(songs)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (favorites) rememberSongs(favorites.songs)
|
rememberSongs(songs)
|
||||||
}, [favorites])
|
}, [songs])
|
||||||
|
|
||||||
const handlePlaySong = useCallback(
|
const handlePlaySong = useCallback(
|
||||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin),
|
||||||
[playFromSong, songIds]
|
[playFromSong, playOrigin, songIds]
|
||||||
)
|
)
|
||||||
const handleSongMenuAction = useCallback(
|
const handleSongMenuAction = useCallback(
|
||||||
(song: BrowseSong, action: MediaAction) =>
|
(song: BrowseSong, action: MediaAction) =>
|
||||||
void handleSongAction(song, action),
|
void handleSongAction(song, action, DOWNLOAD_REF),
|
||||||
[handleSongAction]
|
[handleSongAction]
|
||||||
)
|
)
|
||||||
const handlePlay = useCallback(
|
const handlePlay = useCallback(
|
||||||
() => void playInOrder(songIds),
|
() => void playInOrder(songIds, playOrigin),
|
||||||
[playInOrder, songIds]
|
[playInOrder, playOrigin, songIds]
|
||||||
)
|
)
|
||||||
const handleShuffle = useCallback(
|
const handleShuffle = useCallback(
|
||||||
() => void playShuffled(songIds),
|
() => void playShuffled(songIds, playOrigin),
|
||||||
[playShuffled, songIds]
|
[playShuffled, playOrigin, songIds]
|
||||||
)
|
)
|
||||||
|
|
||||||
const renderItem = useCallback(
|
const renderItem = useCallback(
|
||||||
@@ -73,6 +94,7 @@ export default function FavoritesScreen() {
|
|||||||
favorited={isSongFavorite(song.id)}
|
favorited={isSongFavorite(song.id)}
|
||||||
playlistLabel="Add to Another Playlist"
|
playlistLabel="Add to Another Playlist"
|
||||||
inset
|
inset
|
||||||
|
downloadFrom={DOWNLOAD_REF}
|
||||||
onPlay={handlePlaySong}
|
onPlay={handlePlaySong}
|
||||||
onAction={handleSongMenuAction}
|
onAction={handleSongMenuAction}
|
||||||
/>
|
/>
|
||||||
@@ -127,6 +149,7 @@ export default function FavoritesScreen() {
|
|||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<FavoritesHero
|
<FavoritesHero
|
||||||
title={favorites.title}
|
title={favorites.title}
|
||||||
|
downloadTarget={downloadTarget}
|
||||||
onPlay={handlePlay}
|
onPlay={handlePlay}
|
||||||
onShuffle={handleShuffle}
|
onShuffle={handleShuffle}
|
||||||
/>
|
/>
|
||||||
@@ -142,10 +165,12 @@ function songKey(song: BrowseSong) {
|
|||||||
|
|
||||||
const FavoritesHero = memo(function FavoritesHero({
|
const FavoritesHero = memo(function FavoritesHero({
|
||||||
title,
|
title,
|
||||||
|
downloadTarget,
|
||||||
onPlay,
|
onPlay,
|
||||||
onShuffle,
|
onShuffle,
|
||||||
}: {
|
}: {
|
||||||
title: string
|
title: string
|
||||||
|
downloadTarget: CollectionDownloadTarget
|
||||||
onPlay: () => void
|
onPlay: () => void
|
||||||
onShuffle: () => void
|
onShuffle: () => void
|
||||||
}) {
|
}) {
|
||||||
@@ -166,13 +191,12 @@ const FavoritesHero = memo(function FavoritesHero({
|
|||||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||||
{title}
|
{title}
|
||||||
</Text>
|
</Text>
|
||||||
|
<DownloadedQuality
|
||||||
|
collection={DOWNLOAD_REF}
|
||||||
|
color={colors.mutedForeground}
|
||||||
|
backgroundColor={colors.background}
|
||||||
|
/>
|
||||||
<View style={styles.actions}>
|
<View style={styles.actions}>
|
||||||
<Button
|
|
||||||
title="Play"
|
|
||||||
icon="play"
|
|
||||||
onPress={onPlay}
|
|
||||||
style={styles.playButton}
|
|
||||||
/>
|
|
||||||
<Pressable
|
<Pressable
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel="Shuffle"
|
accessibilityLabel="Shuffle"
|
||||||
@@ -182,6 +206,17 @@ const FavoritesHero = memo(function FavoritesHero({
|
|||||||
>
|
>
|
||||||
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
||||||
</Pressable>
|
</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>
|
||||||
</View>
|
</View>
|
||||||
<CollectionDivider />
|
<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 { Ionicons } from "@expo/vector-icons"
|
||||||
import { useAction, useMutation, useQuery } from "convex/react"
|
import { useAction, useMutation, useQuery } from "convex/react"
|
||||||
import { Image } from "expo-image"
|
import { Image } from "expo-image"
|
||||||
import * as ImagePicker from "expo-image-picker"
|
import * as ImagePicker from "expo-image-picker"
|
||||||
import { useState } from "react"
|
import { useEffect, useMemo, useState } from "react"
|
||||||
import { router } from "expo-router"
|
import { router } from "expo-router"
|
||||||
import {
|
import {
|
||||||
|
Alert,
|
||||||
Platform,
|
Platform,
|
||||||
Pressable,
|
Pressable,
|
||||||
ScrollView,
|
ScrollView,
|
||||||
@@ -16,7 +21,19 @@ import {
|
|||||||
} from "react-native"
|
} from "react-native"
|
||||||
import type { StyleProp, ViewStyle } from "react-native"
|
import type { StyleProp, ViewStyle } from "react-native"
|
||||||
|
|
||||||
|
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||||
import { contentBottomInset } from "@/components/player"
|
import { contentBottomInset } from "@/components/player"
|
||||||
|
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
|
||||||
|
import {
|
||||||
|
readRememberedDownloadQuality,
|
||||||
|
writeRememberedDownloadQuality,
|
||||||
|
} from "@/lib/downloads"
|
||||||
|
import {
|
||||||
|
DOWNLOAD_QUALITY_DETAILS,
|
||||||
|
DOWNLOAD_QUALITY_LABELS,
|
||||||
|
formatBytes,
|
||||||
|
type DownloadQuality,
|
||||||
|
} from "@otunes/convex/download-quality"
|
||||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
@@ -35,7 +52,7 @@ import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
|||||||
import { api } from "@otunes/convex/_generated/api"
|
import { api } from "@otunes/convex/_generated/api"
|
||||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||||
|
|
||||||
type Section = "profile" | "quality" | "library" | "users"
|
type Section = "profile" | "quality" | "downloads" | "library" | "users"
|
||||||
|
|
||||||
type CurrentUser = {
|
type CurrentUser = {
|
||||||
_id: Id<"users">
|
_id: Id<"users">
|
||||||
@@ -75,6 +92,7 @@ const QUALITY_OPTIONS: {
|
|||||||
const SECTIONS: SectionConfig[] = [
|
const SECTIONS: SectionConfig[] = [
|
||||||
{ id: "profile", label: "Profile", icon: "person-circle-outline" },
|
{ id: "profile", label: "Profile", icon: "person-circle-outline" },
|
||||||
{ id: "quality", label: "Playback", icon: "volume-high-outline" },
|
{ id: "quality", label: "Playback", icon: "volume-high-outline" },
|
||||||
|
{ id: "downloads", label: "Downloads", icon: "arrow-down-circle-outline" },
|
||||||
{ id: "library", label: "Library", icon: "library-outline", admin: true },
|
{ id: "library", label: "Library", icon: "library-outline", admin: true },
|
||||||
{ id: "users", label: "Users", icon: "people-outline", admin: true },
|
{ id: "users", label: "Users", icon: "people-outline", admin: true },
|
||||||
]
|
]
|
||||||
@@ -156,6 +174,7 @@ export default function SettingsScreen() {
|
|||||||
</>
|
</>
|
||||||
) : null}
|
) : null}
|
||||||
{section === "quality" ? <QualitySection user={user} /> : null}
|
{section === "quality" ? <QualitySection user={user} /> : null}
|
||||||
|
{section === "downloads" ? <DownloadsSection /> : null}
|
||||||
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
||||||
{section === "users" && isAdmin && allUsers ? (
|
{section === "users" && isAdmin && allUsers ? (
|
||||||
<UsersSection users={allUsers} currentUserId={user._id} />
|
<UsersSection users={allUsers} currentUserId={user._id} />
|
||||||
@@ -432,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() {
|
function LibrarySection() {
|
||||||
const updateLibrary = useAction(api.actions.updateLibrary)
|
const updateLibrary = useAction(api.actions.updateLibrary)
|
||||||
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
|
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
|
||||||
@@ -874,6 +1186,31 @@ const styles = StyleSheet.create({
|
|||||||
divider: {
|
divider: {
|
||||||
height: StyleSheet.hairlineWidth,
|
height: StyleSheet.hairlineWidth,
|
||||||
},
|
},
|
||||||
|
storageBar: {
|
||||||
|
height: 8,
|
||||||
|
borderRadius: 4,
|
||||||
|
overflow: "hidden",
|
||||||
|
flexDirection: "row",
|
||||||
|
},
|
||||||
|
storageRow: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
gap: spacing.md,
|
||||||
|
minHeight: 36,
|
||||||
|
},
|
||||||
|
storageDot: { width: 8, height: 8, borderRadius: 4 },
|
||||||
|
storageSize: {
|
||||||
|
minWidth: 56,
|
||||||
|
textAlign: "right",
|
||||||
|
fontSize: 13,
|
||||||
|
fontVariant: ["tabular-nums"],
|
||||||
|
},
|
||||||
|
collectionMeta: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
flexWrap: "wrap",
|
||||||
|
gap: 4,
|
||||||
|
},
|
||||||
optionRow: {
|
optionRow: {
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
borderRadius: radius.lg,
|
borderRadius: radius.lg,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
|||||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
|
|
||||||
|
import { TabStackContext } from "@/lib/app-navigation"
|
||||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||||
|
|
||||||
@@ -14,26 +15,28 @@ export default function LibraryLayout() {
|
|||||||
const baseOptions = useStackScreenOptions({ title: "Library" })
|
const baseOptions = useStackScreenOptions({ title: "Library" })
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<TabStackContext value="library">
|
||||||
screenLayout={renderTabScreenContent}
|
<Stack
|
||||||
screenOptions={({ route }) => ({
|
screenLayout={renderTabScreenContent}
|
||||||
...baseOptions,
|
screenOptions={({ route }) => ({
|
||||||
title:
|
...baseOptions,
|
||||||
tabStackScreenTitles[route.name] ??
|
title:
|
||||||
(tabletLayout ? "Recently Added" : "Library"),
|
tabStackScreenTitles[route.name] ??
|
||||||
headerRight:
|
(tabletLayout ? "Recently Added" : "Library"),
|
||||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
headerRight:
|
||||||
unstable_headerRightItems:
|
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||||
route.name === "index"
|
unstable_headerRightItems:
|
||||||
? () => [
|
route.name === "index"
|
||||||
{
|
? () => [
|
||||||
type: "custom",
|
{
|
||||||
element: <ProfileHeaderButton />,
|
type: "custom",
|
||||||
hidesSharedBackground: true,
|
element: <ProfileHeaderButton />,
|
||||||
},
|
hidesSharedBackground: true,
|
||||||
]
|
},
|
||||||
: undefined,
|
]
|
||||||
})}
|
: 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: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
|
||||||
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
|
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
|
||||||
{ title: "Songs", href: "/browse/songs", icon: "music.note" 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",
|
title: "Recently Played",
|
||||||
href: "/recently-played",
|
href: "/recently-played",
|
||||||
@@ -51,6 +56,7 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
|||||||
clock: "time",
|
clock: "time",
|
||||||
sparkles: "sparkles",
|
sparkles: "sparkles",
|
||||||
star: "star",
|
star: "star",
|
||||||
|
"arrow.down.circle": "arrow-down-circle",
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<Ionicons
|
<Ionicons
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
|
|
||||||
|
import { TabStackContext } from "@/lib/app-navigation"
|
||||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||||
|
|
||||||
@@ -12,24 +13,26 @@ export default function SearchLayout() {
|
|||||||
const baseOptions = useStackScreenOptions({ title: "Search" })
|
const baseOptions = useStackScreenOptions({ title: "Search" })
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<TabStackContext value="search">
|
||||||
screenLayout={renderTabScreenContent}
|
<Stack
|
||||||
screenOptions={({ route }) => ({
|
screenLayout={renderTabScreenContent}
|
||||||
...baseOptions,
|
screenOptions={({ route }) => ({
|
||||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
...baseOptions,
|
||||||
headerRight:
|
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
headerRight:
|
||||||
unstable_headerRightItems:
|
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||||
route.name === "index"
|
unstable_headerRightItems:
|
||||||
? () => [
|
route.name === "index"
|
||||||
{
|
? () => [
|
||||||
type: "custom",
|
{
|
||||||
element: <ProfileHeaderButton />,
|
type: "custom",
|
||||||
hidesSharedBackground: true,
|
element: <ProfileHeaderButton />,
|
||||||
},
|
hidesSharedBackground: true,
|
||||||
]
|
},
|
||||||
: undefined,
|
]
|
||||||
})}
|
: 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 { AppIntentBridge } from "@/components/app-intent-bridge"
|
||||||
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
||||||
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
|
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
|
||||||
|
import { DownloadsProvider } from "@/contexts/downloads"
|
||||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||||
import { FavoritesProvider } from "@/contexts/favorites"
|
import { FavoritesProvider } from "@/contexts/favorites"
|
||||||
import { PlaybackProvider } from "@/contexts/playback"
|
import { PlaybackProvider } from "@/contexts/playback"
|
||||||
@@ -75,52 +76,70 @@ export default function AppLayout() {
|
|||||||
<PlaybackProvider>
|
<PlaybackProvider>
|
||||||
<AppNavigationSync />
|
<AppNavigationSync />
|
||||||
<AddToPlaylistProvider>
|
<AddToPlaylistProvider>
|
||||||
<FavoritesProvider>
|
<DownloadsProvider>
|
||||||
<AppIntentBridge />
|
<FavoritesProvider>
|
||||||
<Stack screenOptions={stackOptions}>
|
<AppIntentBridge />
|
||||||
<Stack.Screen
|
<Stack screenOptions={stackOptions}>
|
||||||
name="(tabs)"
|
<Stack.Screen
|
||||||
options={{ headerShown: false, animation: "none" }}
|
name="(tabs)"
|
||||||
/>
|
options={{ headerShown: false, animation: "none" }}
|
||||||
<Stack.Screen
|
/>
|
||||||
name="settings"
|
<Stack.Screen
|
||||||
options={{
|
name="settings"
|
||||||
headerShown: Platform.OS === "android",
|
options={{
|
||||||
title: "Settings",
|
headerShown: Platform.OS === "android",
|
||||||
presentation:
|
title: "Settings",
|
||||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
presentation:
|
||||||
animation: "slide_from_bottom",
|
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||||
gestureEnabled: true,
|
animation: "slide_from_bottom",
|
||||||
gestureDirection: "vertical",
|
gestureEnabled: true,
|
||||||
}}
|
gestureDirection: "vertical",
|
||||||
/>
|
}}
|
||||||
<Stack.Screen
|
/>
|
||||||
name="create-account"
|
<Stack.Screen
|
||||||
options={{
|
name="create-account"
|
||||||
title: "Create account",
|
options={{
|
||||||
presentation: "modal",
|
title: "Create account",
|
||||||
headerLargeTitle: false,
|
presentation: "modal",
|
||||||
headerTransparent: false,
|
headerLargeTitle: false,
|
||||||
headerStyle: { backgroundColor: "#000" },
|
headerTransparent: false,
|
||||||
headerTintColor: "#fff",
|
headerStyle: { backgroundColor: "#000" },
|
||||||
contentStyle: { backgroundColor: "#000" },
|
headerTintColor: "#fff",
|
||||||
}}
|
contentStyle: { backgroundColor: "#000" },
|
||||||
/>
|
}}
|
||||||
<Stack.Screen
|
/>
|
||||||
name="player"
|
<Stack.Screen
|
||||||
options={{
|
name="playlist-cover"
|
||||||
headerShown: false,
|
options={{
|
||||||
// Keep the library visible behind the custom swipe animation.
|
title: "Cover",
|
||||||
presentation: "transparentModal",
|
headerTitleAlign: "center",
|
||||||
contentStyle: { backgroundColor: "transparent" },
|
presentation:
|
||||||
animation: "slide_from_bottom",
|
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||||
gestureEnabled: true,
|
animation: "slide_from_bottom",
|
||||||
gestureDirection: "vertical",
|
headerLargeTitle: false,
|
||||||
fullScreenGestureEnabled: true,
|
headerTransparent: false,
|
||||||
}}
|
headerShadowVisible: false,
|
||||||
/>
|
headerStyle: { backgroundColor: "#000" },
|
||||||
</Stack>
|
headerTintColor: "#fff",
|
||||||
</FavoritesProvider>
|
contentStyle: { backgroundColor: "#000" },
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Stack.Screen
|
||||||
|
name="player"
|
||||||
|
options={{
|
||||||
|
headerShown: false,
|
||||||
|
// Keep the library visible behind the custom swipe animation.
|
||||||
|
presentation: "transparentModal",
|
||||||
|
contentStyle: { backgroundColor: "transparent" },
|
||||||
|
animation: "slide_from_bottom",
|
||||||
|
gestureEnabled: true,
|
||||||
|
gestureDirection: "vertical",
|
||||||
|
fullScreenGestureEnabled: true,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
</FavoritesProvider>
|
||||||
|
</DownloadsProvider>
|
||||||
</AddToPlaylistProvider>
|
</AddToPlaylistProvider>
|
||||||
</PlaybackProvider>
|
</PlaybackProvider>
|
||||||
</ConvexAuthRecovery>
|
</ConvexAuthRecovery>
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
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 { atmosEnabled } from "@/lib/playback-capabilities"
|
||||||
import { NavigationBar } from "expo-navigation-bar"
|
import { NavigationBar } from "expo-navigation-bar"
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
@@ -51,7 +54,9 @@ import { PlayerSymbol } from "@/components/player-symbol"
|
|||||||
import { useFavorites } from "@/contexts/favorites"
|
import { useFavorites } from "@/contexts/favorites"
|
||||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
|
import { LyricsView } from "@/components/lyrics-view"
|
||||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||||
|
import { useLyrics } from "@/hooks/use-lyrics"
|
||||||
import { useCoverPalette } from "@/hooks/use-cover-palette"
|
import { useCoverPalette } from "@/hooks/use-cover-palette"
|
||||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||||
import { useSystemVolume } from "@/hooks/use-system-volume"
|
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||||
@@ -93,8 +98,14 @@ export default function PlayerScreen() {
|
|||||||
queueSongIds,
|
queueSongIds,
|
||||||
} = usePlaybackQueue()
|
} = usePlaybackQueue()
|
||||||
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
|
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
|
||||||
const { queue } = useLocalSearchParams<{ queue?: string }>()
|
const params = useLocalSearchParams<{ queue?: string; lyrics?: string }>()
|
||||||
const [showQueue, setShowQueue] = useState(queue === "1")
|
// 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 [isDismissing, setIsDismissing] = useState(false)
|
||||||
const [stageHeight, setStageHeight] = useState(0)
|
const [stageHeight, setStageHeight] = useState(0)
|
||||||
const user = useCachedQuery(api.auth.currentUser)
|
const user = useCachedQuery(api.auth.currentUser)
|
||||||
@@ -187,8 +198,8 @@ export default function PlayerScreen() {
|
|||||||
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||||
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||||
const stageGesture = useMemo(
|
const stageGesture = useMemo(
|
||||||
() => makeDismissGesture().enabled(!showQueue),
|
() => makeDismissGesture().enabled(panel === null),
|
||||||
[makeDismissGesture, showQueue]
|
[makeDismissGesture, panel]
|
||||||
)
|
)
|
||||||
|
|
||||||
const hasCover = currentSong ? currentSong.album.cover != null : false
|
const hasCover = currentSong ? currentSong.album.cover != null : false
|
||||||
@@ -243,9 +254,9 @@ export default function PlayerScreen() {
|
|||||||
setIsPlaying(!isPlaying)
|
setIsPlaying(!isPlaying)
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleQueue() {
|
function togglePanel(next: PlayerPanel) {
|
||||||
void Haptics.selectionAsync()
|
void Haptics.selectionAsync()
|
||||||
setShowQueue((value) => !value)
|
setPanel((value) => (value === next ? null : next))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isTablet) {
|
if (isTablet) {
|
||||||
@@ -256,8 +267,9 @@ export default function PlayerScreen() {
|
|||||||
backgroundStyle={backgroundStyle}
|
backgroundStyle={backgroundStyle}
|
||||||
dismissStyle={dismissStyle}
|
dismissStyle={dismissStyle}
|
||||||
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
|
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
|
||||||
showQueue={showQueue}
|
panel={panel}
|
||||||
toggleQueue={toggleQueue}
|
togglePanel={togglePanel}
|
||||||
|
lyrics={lyrics}
|
||||||
metadata={songMeta}
|
metadata={songMeta}
|
||||||
/>
|
/>
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
@@ -322,6 +334,20 @@ export default function PlayerScreen() {
|
|||||||
/>
|
/>
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
) : null
|
) : 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
|
<Animated.View
|
||||||
key="artwork"
|
key="artwork"
|
||||||
@@ -409,18 +435,29 @@ export default function PlayerScreen() {
|
|||||||
|
|
||||||
<View style={styles.footer}>
|
<View style={styles.footer}>
|
||||||
<Pressable
|
<Pressable
|
||||||
disabled
|
onPress={() => togglePanel("lyrics")}
|
||||||
|
disabled={!lyrics && !showLyrics}
|
||||||
|
hitSlop={8}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel="Lyrics"
|
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
|
||||||
accessibilityState={{ disabled: true }}
|
accessibilityState={{
|
||||||
style={[styles.queueButton, styles.unavailable]}
|
selected: showLyrics,
|
||||||
|
disabled: !lyrics && !showLyrics,
|
||||||
|
}}
|
||||||
|
style={[
|
||||||
|
styles.queueButton,
|
||||||
|
!lyrics && !showLyrics && styles.unavailable,
|
||||||
|
showLyrics && { backgroundColor: colors.selected },
|
||||||
|
]}
|
||||||
>
|
>
|
||||||
<PlayerSymbol
|
<PlayerSymbol
|
||||||
name="quote.bubble"
|
name="quote.bubble"
|
||||||
fallback={{ material: "lyrics" }}
|
fallback={{ material: "lyrics" }}
|
||||||
size={27}
|
size={27}
|
||||||
weight="semibold"
|
weight="semibold"
|
||||||
color={colors.foreground}
|
color={
|
||||||
|
showLyrics ? colors.selectedForeground : colors.foreground
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
<AudioOutputButton
|
<AudioOutputButton
|
||||||
@@ -428,7 +465,7 @@ export default function PlayerScreen() {
|
|||||||
style={styles.queueButton}
|
style={styles.queueButton}
|
||||||
/>
|
/>
|
||||||
<Pressable
|
<Pressable
|
||||||
onPress={toggleQueue}
|
onPress={() => togglePanel("queue")}
|
||||||
hitSlop={8}
|
hitSlop={8}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||||
|
|||||||
@@ -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
|
const PAGE_SIZE = 500
|
||||||
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
|
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
|
||||||
|
|
||||||
type Favorites = {
|
type Favorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
|
||||||
favoriteSongs: string[]
|
|
||||||
favoriteAlbums: string[]
|
|
||||||
favoriteArtists: string[]
|
|
||||||
}
|
|
||||||
|
|
||||||
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
|
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
|
||||||
return new Set<string>(
|
return new Set<string>(
|
||||||
kind === "song"
|
(kind === "song"
|
||||||
? favorites.favoriteSongs
|
? favorites.favoriteSongs
|
||||||
: kind === "album"
|
: kind === "album"
|
||||||
? favorites.favoriteAlbums
|
? favorites.favoriteAlbums
|
||||||
: favorites.favoriteArtists
|
: favorites.favoriteArtists
|
||||||
|
).flat()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -214,12 +214,13 @@ export function useIntentDispatch() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (kind === "artist") {
|
if (kind === "artist") {
|
||||||
return fetchCachedQuery(
|
const chunks = await fetchCachedQuery(
|
||||||
convex,
|
convex,
|
||||||
cacheScope,
|
cacheScope,
|
||||||
api.playlists.getOrderedArtistSongIds,
|
api.playlists.getOrderedArtistSongIds,
|
||||||
{ artistId: id as Id<"artists"> }
|
{ artistId: id as Id<"artists"> }
|
||||||
)
|
)
|
||||||
|
return chunks.flat()
|
||||||
}
|
}
|
||||||
if (kind === "playlist") {
|
if (kind === "playlist") {
|
||||||
if (id === FAVORITES_PLAYLIST_ID) {
|
if (id === FAVORITES_PLAYLIST_ID) {
|
||||||
@@ -229,7 +230,7 @@ export function useIntentDispatch() {
|
|||||||
api.favorites.getUserFavorites,
|
api.favorites.getUserFavorites,
|
||||||
{}
|
{}
|
||||||
)
|
)
|
||||||
return favorites.favoriteSongs
|
return favorites.favoriteSongs.flat()
|
||||||
}
|
}
|
||||||
return fetchCachedQuery(
|
return fetchCachedQuery(
|
||||||
convex,
|
convex,
|
||||||
@@ -391,17 +392,18 @@ export function useIntentDispatch() {
|
|||||||
api.favorites.getUserFavorites,
|
api.favorites.getUserFavorites,
|
||||||
{}
|
{}
|
||||||
)
|
)
|
||||||
if (favorites.favoriteSongs.length === 0) {
|
const favoriteSongs = favorites.favoriteSongs.flat()
|
||||||
|
if (favoriteSongs.length === 0) {
|
||||||
throw new IntentRejected(
|
throw new IntentRejected(
|
||||||
"Nothing is queued, and your favorites are empty."
|
"Nothing is queued, and your favorites are empty."
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (shuffled) {
|
if (shuffled) {
|
||||||
ensureActive(invocation)
|
ensureActive(invocation)
|
||||||
await actions.playShuffled(favorites.favoriteSongs)
|
await actions.playShuffled(favoriteSongs)
|
||||||
} else {
|
} else {
|
||||||
ensureActive(invocation)
|
ensureActive(invocation)
|
||||||
await actions.playInOrder(favorites.favoriteSongs)
|
await actions.playInOrder(favoriteSongs)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 },
|
||||||
|
})
|
||||||
@@ -71,7 +71,10 @@ class ConvexAuthErrorBoundary extends Component<
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
|
export function ConvexAuthRecovery({
|
||||||
|
children,
|
||||||
|
onInvalidate,
|
||||||
|
}: ConvexAuthRecoveryProps) {
|
||||||
const localAuth = useLocalConvexAuth()
|
const localAuth = useLocalConvexAuth()
|
||||||
const serverAuth = useServerConvexAuth()
|
const serverAuth = useServerConvexAuth()
|
||||||
const hadServerAuthRef = useRef(false)
|
const hadServerAuthRef = useRef(false)
|
||||||
@@ -113,9 +116,9 @@ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecover
|
|||||||
|
|
||||||
const sessionEstablished = Boolean(
|
const sessionEstablished = Boolean(
|
||||||
serverAuth &&
|
serverAuth &&
|
||||||
!serverAuth.isLoading &&
|
!serverAuth.isLoading &&
|
||||||
!serverAuth.isRefreshing &&
|
!serverAuth.isRefreshing &&
|
||||||
serverAuth.isAuthenticated
|
serverAuth.isAuthenticated
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
} from "react-native"
|
} from "react-native"
|
||||||
|
|
||||||
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||||
|
import { downloadedCoverUri } from "@/lib/downloads"
|
||||||
|
|
||||||
import { useThemeColors } from "@/lib/theme"
|
import { useThemeColors } from "@/lib/theme"
|
||||||
import {
|
import {
|
||||||
@@ -66,6 +67,7 @@ export const CoverImage = memo(function CoverImage({
|
|||||||
contentFit = "cover",
|
contentFit = "cover",
|
||||||
blurRadius,
|
blurRadius,
|
||||||
placeholderVariant = "icon",
|
placeholderVariant = "icon",
|
||||||
|
placeholderIcon = "musical-note",
|
||||||
}: {
|
}: {
|
||||||
uri: string
|
uri: string
|
||||||
hasCover: boolean
|
hasCover: boolean
|
||||||
@@ -73,6 +75,7 @@ export const CoverImage = memo(function CoverImage({
|
|||||||
contentFit?: ImageContentFit
|
contentFit?: ImageContentFit
|
||||||
blurRadius?: number
|
blurRadius?: number
|
||||||
placeholderVariant?: "icon" | "solid"
|
placeholderVariant?: "icon" | "solid"
|
||||||
|
placeholderIcon?: keyof typeof Ionicons.glyphMap
|
||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
|
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
|
||||||
@@ -81,6 +84,12 @@ export const CoverImage = memo(function CoverImage({
|
|||||||
[flatStyle, hasCover, uri]
|
[flatStyle, hasCover, uri]
|
||||||
)
|
)
|
||||||
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri])
|
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri])
|
||||||
|
// A downloaded cover shows while the network copy loads, and offline.
|
||||||
|
const savedUri = hasCover ? downloadedCoverUri(uri) : null
|
||||||
|
const placeholder = useMemo(
|
||||||
|
() => (savedUri ? { uri: savedUri } : undefined),
|
||||||
|
[savedUri]
|
||||||
|
)
|
||||||
|
|
||||||
if (!hasCover) {
|
if (!hasCover) {
|
||||||
return (
|
return (
|
||||||
@@ -93,7 +102,7 @@ export const CoverImage = memo(function CoverImage({
|
|||||||
>
|
>
|
||||||
{placeholderVariant === "icon" ? (
|
{placeholderVariant === "icon" ? (
|
||||||
<Ionicons
|
<Ionicons
|
||||||
name="musical-note"
|
name={placeholderIcon}
|
||||||
size={placeholderIconSize(flatStyle)}
|
size={placeholderIconSize(flatStyle)}
|
||||||
color={colors.coverPlaceholderIcon}
|
color={colors.coverPlaceholderIcon}
|
||||||
/>
|
/>
|
||||||
@@ -107,6 +116,8 @@ export const CoverImage = memo(function CoverImage({
|
|||||||
source={source}
|
source={source}
|
||||||
style={[style, { backgroundColor: colors.coverPlaceholder }]}
|
style={[style, { backgroundColor: colors.coverPlaceholder }]}
|
||||||
contentFit={contentFit}
|
contentFit={contentFit}
|
||||||
|
placeholder={placeholder}
|
||||||
|
placeholderContentFit={contentFit}
|
||||||
transition={150}
|
transition={150}
|
||||||
blurRadius={blurRadius}
|
blurRadius={blurRadius}
|
||||||
onLoad={
|
onLoad={
|
||||||
|
|||||||
@@ -112,7 +112,10 @@ function SwipeRowBody({
|
|||||||
setIsOpen(false)
|
setIsOpen(false)
|
||||||
}, [removing, translateX])
|
}, [removing, translateX])
|
||||||
|
|
||||||
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
|
const handleSwipeStart = useCallback(
|
||||||
|
() => group.setOpen(close),
|
||||||
|
[close, group]
|
||||||
|
)
|
||||||
|
|
||||||
const handleSettle = useCallback(
|
const handleSettle = useCallback(
|
||||||
(open: boolean) => {
|
(open: boolean) => {
|
||||||
@@ -251,8 +254,7 @@ function SwipeRowBody({
|
|||||||
const pillWidth = Math.max(
|
const pillWidth = Math.max(
|
||||||
0,
|
0,
|
||||||
resting +
|
resting +
|
||||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
|
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
|
||||||
commitProgress.value
|
|
||||||
)
|
)
|
||||||
const restingHeight = interpolate(
|
const restingHeight = interpolate(
|
||||||
pillWidth,
|
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 { CoverImage } from "@/components/cover-image"
|
||||||
import { MediaContextMenu } from "@/components/media-context-menu"
|
import { MediaContextMenu } from "@/components/media-context-menu"
|
||||||
|
import { useIsCollectionDownloaded } from "@/contexts/downloads"
|
||||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
import { useAppNavigation } from "@/lib/app-navigation"
|
import { useAppNavigation } from "@/lib/app-navigation"
|
||||||
@@ -51,6 +52,7 @@ export const AlbumCard = memo(function AlbumCard({
|
|||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||||
|
const downloaded = useIsCollectionDownloaded({ kind: "album", id: album.id })
|
||||||
if (!config) return null
|
if (!config) return null
|
||||||
|
|
||||||
const card = (
|
const card = (
|
||||||
@@ -102,6 +104,7 @@ export const AlbumCard = memo(function AlbumCard({
|
|||||||
hasArtwork: album.cover != null,
|
hasArtwork: album.cover != null,
|
||||||
}}
|
}}
|
||||||
favorited={isAlbumFavorite(album.id)}
|
favorited={isAlbumFavorite(album.id)}
|
||||||
|
downloaded={downloaded}
|
||||||
stationArtistId={album.artist.id}
|
stationArtistId={album.artist.id}
|
||||||
navigation={{ artist: { id: album.artist.id } }}
|
navigation={{ artist: { id: album.artist.id } }}
|
||||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||||
@@ -187,6 +190,10 @@ export const PlaylistCard = memo(function PlaylistCard({
|
|||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { handlePlaylistAction } = useMediaMenuActions()
|
const { handlePlaylistAction } = useMediaMenuActions()
|
||||||
|
const downloaded = useIsCollectionDownloaded({
|
||||||
|
kind: "playlist",
|
||||||
|
id: playlist.id,
|
||||||
|
})
|
||||||
if (!config) return null
|
if (!config) return null
|
||||||
|
|
||||||
const card = (
|
const card = (
|
||||||
@@ -200,7 +207,11 @@ export const PlaylistCard = memo(function PlaylistCard({
|
|||||||
<Link.AppleZoom>
|
<Link.AppleZoom>
|
||||||
<View collapsable={false}>
|
<View collapsable={false}>
|
||||||
<CoverImage
|
<CoverImage
|
||||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
uri={playlistCoverUrl(
|
||||||
|
config.serverUrl,
|
||||||
|
playlist.id,
|
||||||
|
playlist.cover
|
||||||
|
)}
|
||||||
hasCover={playlist.cover != null}
|
hasCover={playlist.cover != null}
|
||||||
style={
|
style={
|
||||||
fluid
|
fluid
|
||||||
@@ -231,6 +242,7 @@ export const PlaylistCard = memo(function PlaylistCard({
|
|||||||
return (
|
return (
|
||||||
<MediaContextMenu
|
<MediaContextMenu
|
||||||
showFavorite={false}
|
showFavorite={false}
|
||||||
|
downloaded={downloaded}
|
||||||
share={{
|
share={{
|
||||||
type: "playlist",
|
type: "playlist",
|
||||||
playlistId: playlist.id,
|
playlistId: playlist.id,
|
||||||
|
|||||||
@@ -33,7 +33,10 @@ export type MediaAction =
|
|||||||
| "go-artist"
|
| "go-artist"
|
||||||
| "go-album"
|
| "go-album"
|
||||||
| "remove-from-playlist"
|
| "remove-from-playlist"
|
||||||
|
| "change-cover"
|
||||||
| "delete-playlist"
|
| "delete-playlist"
|
||||||
|
| "download"
|
||||||
|
| "remove-download"
|
||||||
|
|
||||||
export type MediaNavigation = {
|
export type MediaNavigation = {
|
||||||
artist?: { id: string }
|
artist?: { id: string }
|
||||||
@@ -59,6 +62,8 @@ export type MediaMenuConfig = {
|
|||||||
stationArtistId?: string
|
stationArtistId?: string
|
||||||
navigation?: MediaNavigation
|
navigation?: MediaNavigation
|
||||||
share?: MediaShareContext
|
share?: MediaShareContext
|
||||||
|
/** Shows Download, or Remove Download when true. Omit to hide both. */
|
||||||
|
downloaded?: boolean
|
||||||
includeActions?: MediaAction[]
|
includeActions?: MediaAction[]
|
||||||
onAction: (action: MediaAction) => void
|
onAction: (action: MediaAction) => void
|
||||||
}
|
}
|
||||||
@@ -72,33 +77,39 @@ const QUEUE_ACTIONS: MediaAction[] = ["play-next", "play-last", "shuffle"]
|
|||||||
|
|
||||||
const MEDIA_ACTION_ITEMS: {
|
const MEDIA_ACTION_ITEMS: {
|
||||||
action: MediaAction
|
action: MediaAction
|
||||||
label: (
|
label: (favorited: boolean | undefined, playlistLabel: string) => string
|
||||||
countSuffix: string,
|
|
||||||
favorited: boolean | undefined,
|
|
||||||
playlistLabel: string
|
|
||||||
) => string
|
|
||||||
image: NonNullable<MenuAction["image"]> & string
|
image: NonNullable<MenuAction["image"]> & string
|
||||||
destructive?: boolean
|
destructive?: boolean
|
||||||
}[] = [
|
}[] = [
|
||||||
{
|
{
|
||||||
action: "playlist",
|
action: "playlist",
|
||||||
label: (countSuffix, _favorited, playlistLabel) =>
|
label: (_favorited, playlistLabel) => playlistLabel,
|
||||||
`${playlistLabel}${countSuffix}`,
|
|
||||||
image: "text.badge.plus",
|
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",
|
action: "play-next",
|
||||||
label: (countSuffix) => `Play Next${countSuffix}`,
|
label: () => "Play Next",
|
||||||
image: "text.line.first.and.arrowtriangle.forward",
|
image: "text.line.first.and.arrowtriangle.forward",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: "play-last",
|
action: "play-last",
|
||||||
label: (countSuffix) => `Play Last${countSuffix}`,
|
label: () => "Play Last",
|
||||||
image: "text.line.last.and.arrowtriangle.forward",
|
image: "text.line.last.and.arrowtriangle.forward",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: "shuffle",
|
action: "shuffle",
|
||||||
label: (countSuffix) => `Shuffle${countSuffix}`,
|
label: () => "Shuffle",
|
||||||
image: "shuffle",
|
image: "shuffle",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -118,8 +129,7 @@ const MEDIA_ACTION_ITEMS: {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
action: "favorite",
|
action: "favorite",
|
||||||
label: (countSuffix, favorited) =>
|
label: (favorited) => (favorited ? "Unfavorite" : "Favorite"),
|
||||||
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
|
|
||||||
image: "star",
|
image: "star",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -128,6 +138,11 @@ const MEDIA_ACTION_ITEMS: {
|
|||||||
image: "minus.circle",
|
image: "minus.circle",
|
||||||
destructive: true,
|
destructive: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
action: "change-cover",
|
||||||
|
label: () => "Change Cover",
|
||||||
|
image: "photo",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
action: "delete-playlist",
|
action: "delete-playlist",
|
||||||
label: () => "Delete Playlist",
|
label: () => "Delete Playlist",
|
||||||
@@ -147,11 +162,19 @@ function isActionIncluded(
|
|||||||
return config.showRemoveFromPlaylist === true
|
return config.showRemoveFromPlaylist === true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (action === "download") {
|
||||||
|
return config.downloaded === false
|
||||||
|
}
|
||||||
|
|
||||||
|
if (action === "remove-download") {
|
||||||
|
return config.downloaded === true
|
||||||
|
}
|
||||||
|
|
||||||
if (config.includeActions) {
|
if (config.includeActions) {
|
||||||
return config.includeActions.includes(action)
|
return config.includeActions.includes(action)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (action === "delete-playlist") {
|
if (action === "delete-playlist" || action === "change-cover") {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -177,12 +200,7 @@ function isActionIncluded(
|
|||||||
export function buildMediaMenuActions(
|
export function buildMediaMenuActions(
|
||||||
config: Omit<MediaMenuConfig, "onAction">
|
config: Omit<MediaMenuConfig, "onAction">
|
||||||
): MenuAction[] {
|
): MenuAction[] {
|
||||||
const {
|
const { favorited, playlistLabel = "Add to Playlist" } = config
|
||||||
selectedCount = 1,
|
|
||||||
favorited,
|
|
||||||
playlistLabel = "Add to Playlist",
|
|
||||||
} = config
|
|
||||||
const countSuffix = selectedCount > 1 ? ` (${selectedCount})` : ""
|
|
||||||
|
|
||||||
const actions: MenuAction[] = []
|
const actions: MenuAction[] = []
|
||||||
|
|
||||||
@@ -201,7 +219,7 @@ export function buildMediaMenuActions(
|
|||||||
|
|
||||||
actions.push({
|
actions.push({
|
||||||
id: item.action,
|
id: item.action,
|
||||||
title: item.label(countSuffix, favorited, playlistLabel),
|
title: item.label(favorited, playlistLabel),
|
||||||
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||||
...(item.destructive ? { attributes: { destructive: true } } : {}),
|
...(item.destructive ? { attributes: { destructive: true } } : {}),
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -26,7 +26,10 @@ const actionIcons = {
|
|||||||
"go-artist": "person-outline",
|
"go-artist": "person-outline",
|
||||||
"go-album": "disc-outline",
|
"go-album": "disc-outline",
|
||||||
"remove-from-playlist": "remove-circle-outline",
|
"remove-from-playlist": "remove-circle-outline",
|
||||||
|
"change-cover": "image-outline",
|
||||||
"delete-playlist": "trash-outline",
|
"delete-playlist": "trash-outline",
|
||||||
|
download: "arrow-down-circle-outline",
|
||||||
|
"remove-download": "close-circle-outline",
|
||||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||||
|
|
||||||
// The community MenuView creates a dynamic-color Host internally. Own this
|
// The community MenuView creates a dynamic-color Host internally. Own this
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
import {
|
import { useAndroidTabPalette } from "@/contexts/android-tab-theme"
|
||||||
useAndroidTabPalette,
|
|
||||||
useAndroidTabHasArtworkPalette,
|
|
||||||
} from "@/contexts/android-tab-theme"
|
|
||||||
import { Ionicons } from "@expo/vector-icons"
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
import { NativeTabs } from "expo-router/native-tabs"
|
import { NativeTabs } from "expo-router/native-tabs"
|
||||||
import { useRouter } from "expo-router"
|
import { useRouter } from "expo-router"
|
||||||
@@ -166,20 +163,10 @@ function MiniPlayerContent({
|
|||||||
|
|
||||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||||
const palette = useAndroidTabPalette()
|
const palette = useAndroidTabPalette()
|
||||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||||
{children}
|
{children}
|
||||||
{hasArtworkPalette ? (
|
|
||||||
<View
|
|
||||||
style={[
|
|
||||||
styles.separator,
|
|
||||||
styles.topBorder,
|
|
||||||
{ backgroundColor: palette.secondaryForeground },
|
|
||||||
]}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.separator,
|
styles.separator,
|
||||||
@@ -267,7 +254,6 @@ const styles = StyleSheet.create({
|
|||||||
height: 1,
|
height: 1,
|
||||||
zIndex: 1,
|
zIndex: 1,
|
||||||
},
|
},
|
||||||
topBorder: { top: 0 },
|
|
||||||
bottomBorder: { bottom: 0 },
|
bottomBorder: { bottom: 0 },
|
||||||
content: {
|
content: {
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
|
|||||||
@@ -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 },
|
||||||
|
})
|
||||||
@@ -3,8 +3,14 @@ import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
|||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
import { collectionInset } from "@/components/collection-list"
|
import { collectionInset } from "@/components/collection-list"
|
||||||
import { CoverImage } from "@/components/cover-image"
|
import { CoverImage } from "@/components/cover-image"
|
||||||
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
|
import {
|
||||||
|
useSongDownloadState,
|
||||||
|
useToggleSongDownload,
|
||||||
|
} from "@/contexts/downloads"
|
||||||
|
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
import type { BrowseSong } from "@otunes/convex/types"
|
import type { BrowseSong, SearchSong } from "@otunes/convex/types"
|
||||||
import type { CoverPalette } from "@/lib/cover-palette"
|
import type { CoverPalette } from "@/lib/cover-palette"
|
||||||
import { formatDuration } from "@/lib/format"
|
import { formatDuration } from "@/lib/format"
|
||||||
import { albumCoverUrl } from "@/lib/urls"
|
import { albumCoverUrl } from "@/lib/urls"
|
||||||
@@ -33,8 +39,10 @@ export const SongRow = memo(function SongRow({
|
|||||||
palette,
|
palette,
|
||||||
inset = false,
|
inset = false,
|
||||||
swipe,
|
swipe,
|
||||||
|
downloadFrom,
|
||||||
}: {
|
}: {
|
||||||
song: BrowseSong
|
/** Search results also show the lyrics line they matched. */
|
||||||
|
song: SearchSong
|
||||||
onPress?: () => void
|
onPress?: () => void
|
||||||
contextMenu?: Omit<MediaMenuConfig, "onAction"> & {
|
contextMenu?: Omit<MediaMenuConfig, "onAction"> & {
|
||||||
onAction: MediaMenuConfig["onAction"]
|
onAction: MediaMenuConfig["onAction"]
|
||||||
@@ -50,9 +58,14 @@ export const SongRow = memo(function SongRow({
|
|||||||
}
|
}
|
||||||
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
||||||
inset?: boolean
|
inset?: boolean
|
||||||
|
/** The download this row belongs to; removing only takes it out of that. */
|
||||||
|
downloadFrom?: DownloadSource
|
||||||
}) {
|
}) {
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
|
const downloadState = useSongDownloadState(song.id, downloadFrom)
|
||||||
|
const downloaded = downloadState === "here"
|
||||||
|
const toggleDownload = useToggleSongDownload()
|
||||||
if (!config) return null
|
if (!config) return null
|
||||||
|
|
||||||
const foreground = palette?.foreground ?? colors.foreground
|
const foreground = palette?.foreground ?? colors.foreground
|
||||||
@@ -75,7 +88,23 @@ export const SongRow = memo(function SongRow({
|
|||||||
>
|
>
|
||||||
{song.artist.name} · {song.album.title}
|
{song.artist.name} · {song.album.title}
|
||||||
</Text>
|
</Text>
|
||||||
|
{song.lyricsSnippet ? (
|
||||||
|
<Text
|
||||||
|
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||||
|
numberOfLines={1}
|
||||||
|
>
|
||||||
|
Lyrics: “{song.lyricsSnippet}”
|
||||||
|
</Text>
|
||||||
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
|
{downloaded || downloadState === "device" ? (
|
||||||
|
<Ionicons
|
||||||
|
name="arrow-down-circle"
|
||||||
|
size={14}
|
||||||
|
color={secondaryForeground}
|
||||||
|
accessibilityLabel="Downloaded"
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||||
{formatDuration(song.durationSeconds)}
|
{formatDuration(song.durationSeconds)}
|
||||||
</Text>
|
</Text>
|
||||||
@@ -109,6 +138,8 @@ export const SongRow = memo(function SongRow({
|
|||||||
onPlayNext={swipe.onPlayNext}
|
onPlayNext={swipe.onPlayNext}
|
||||||
onAddToQueue={swipe.onAddToQueue}
|
onAddToQueue={swipe.onAddToQueue}
|
||||||
onRemove={swipe.onRemove}
|
onRemove={swipe.onRemove}
|
||||||
|
downloaded={downloaded}
|
||||||
|
onDownload={() => toggleDownload(song, downloaded, downloadFrom)}
|
||||||
backgroundColor={swipe.backgroundColor}
|
backgroundColor={swipe.backgroundColor}
|
||||||
onPress={onPress}
|
onPress={onPress}
|
||||||
style={rowStyle}
|
style={rowStyle}
|
||||||
@@ -155,10 +186,11 @@ export const SongListRow = memo(function SongListRow({
|
|||||||
inset,
|
inset,
|
||||||
swipe,
|
swipe,
|
||||||
removable,
|
removable,
|
||||||
|
downloadFrom,
|
||||||
onPlay,
|
onPlay,
|
||||||
onAction,
|
onAction,
|
||||||
}: {
|
}: {
|
||||||
song: BrowseSong
|
song: SearchSong
|
||||||
favorited: boolean
|
favorited: boolean
|
||||||
playlistLabel?: string
|
playlistLabel?: string
|
||||||
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
||||||
@@ -172,10 +204,13 @@ export const SongListRow = memo(function SongListRow({
|
|||||||
}
|
}
|
||||||
/** Shows "Remove from Playlist" in the context menu. */
|
/** Shows "Remove from Playlist" in the context menu. */
|
||||||
removable?: boolean
|
removable?: boolean
|
||||||
|
/** The download this row belongs to; removing only takes it out of that. */
|
||||||
|
downloadFrom?: DownloadSource
|
||||||
onPlay: (song: BrowseSong) => void
|
onPlay: (song: BrowseSong) => void
|
||||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||||
}) {
|
}) {
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
|
const downloaded = useSongDownloadState(song.id, downloadFrom) === "here"
|
||||||
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -184,6 +219,7 @@ export const SongListRow = memo(function SongListRow({
|
|||||||
palette={palette}
|
palette={palette}
|
||||||
inset={inset}
|
inset={inset}
|
||||||
swipe={swipe}
|
swipe={swipe}
|
||||||
|
downloadFrom={downloadFrom}
|
||||||
onPress={handlePress}
|
onPress={handlePress}
|
||||||
contextMenu={{
|
contextMenu={{
|
||||||
preview: config
|
preview: config
|
||||||
@@ -198,6 +234,7 @@ export const SongListRow = memo(function SongListRow({
|
|||||||
: undefined,
|
: undefined,
|
||||||
stationArtistId: song.artist.id,
|
stationArtistId: song.artist.id,
|
||||||
favorited,
|
favorited,
|
||||||
|
downloaded,
|
||||||
playlistLabel,
|
playlistLabel,
|
||||||
showRemoveFromPlaylist: removable,
|
showRemoveFromPlaylist: removable,
|
||||||
navigation: {
|
navigation: {
|
||||||
|
|||||||
@@ -2,16 +2,23 @@ import { useCallback, useMemo } from "react"
|
|||||||
import { Platform } from "react-native"
|
import { Platform } from "react-native"
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
|
|
||||||
|
import { useQuery } from "convex/react"
|
||||||
|
|
||||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||||
|
import { api } from "@otunes/convex/_generated/api"
|
||||||
import { useThemeColors } from "@/lib/theme"
|
import { useThemeColors } from "@/lib/theme"
|
||||||
import { filterSongs } from "@otunes/convex/client/song-search"
|
import { filterSongs } from "@otunes/convex/client/song-search"
|
||||||
import type { BrowseSong } from "@otunes/convex/types"
|
import type { BrowseSong } from "@otunes/convex/types"
|
||||||
|
|
||||||
export function usePlaylistSearch(songs: BrowseSong[]) {
|
export function usePlaylistSearch(songs: BrowseSong[]) {
|
||||||
const search = useDebouncedSearch()
|
const search = useDebouncedSearch()
|
||||||
|
const lyricsMatches = useQuery(
|
||||||
|
api.lyrics.matchingSongIds,
|
||||||
|
search.searchQuery.trim() ? { query: search.searchQuery } : "skip"
|
||||||
|
)
|
||||||
const filteredSongs = useMemo(
|
const filteredSongs = useMemo(
|
||||||
() => filterSongs(songs, search.searchQuery),
|
() => filterSongs(songs, search.searchQuery, lyricsMatches),
|
||||||
[songs, search.searchQuery]
|
[songs, search.searchQuery, lyricsMatches]
|
||||||
)
|
)
|
||||||
|
|
||||||
return { ...search, filteredSongs }
|
return { ...search, filteredSongs }
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import { usePlaybackActions } from "@/contexts/playback"
|
|||||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||||
import { api } from "@otunes/convex/_generated/api"
|
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"
|
import { spacing, useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
|
function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
|
||||||
@@ -64,7 +64,7 @@ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
|
|||||||
[handleSongAction]
|
[handleSongAction]
|
||||||
)
|
)
|
||||||
const renderItem = useCallback(
|
const renderItem = useCallback(
|
||||||
({ item: song }: ListRenderItemInfo<BrowseSong>) => (
|
({ item: song }: ListRenderItemInfo<SearchSong>) => (
|
||||||
<SongListRow
|
<SongListRow
|
||||||
song={song}
|
song={song}
|
||||||
favorited={isSongFavorite(song.id)}
|
favorited={isSongFavorite(song.id)}
|
||||||
|
|||||||
@@ -42,7 +42,8 @@ function impact() {
|
|||||||
/**
|
/**
|
||||||
* 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
|
* A full swipe commits the outer action: Add to Queue on the leading side, and
|
||||||
* Remove on the trailing side when `onRemove` is set.
|
* Remove on the trailing side when `onRemove` is set, else Download. Download
|
||||||
|
* turns into a red Remove Download once `downloaded`.
|
||||||
*/
|
*/
|
||||||
export function SongSwipeRow({
|
export function SongSwipeRow({
|
||||||
children,
|
children,
|
||||||
@@ -53,6 +54,8 @@ export function SongSwipeRow({
|
|||||||
onPlayNext,
|
onPlayNext,
|
||||||
onAddToQueue,
|
onAddToQueue,
|
||||||
onRemove,
|
onRemove,
|
||||||
|
onDownload,
|
||||||
|
downloaded = false,
|
||||||
}: {
|
}: {
|
||||||
children: ReactNode
|
children: ReactNode
|
||||||
style?: StyleProp<ViewStyle>
|
style?: StyleProp<ViewStyle>
|
||||||
@@ -62,6 +65,8 @@ export function SongSwipeRow({
|
|||||||
onPlayNext: () => void
|
onPlayNext: () => void
|
||||||
onAddToQueue: () => void
|
onAddToQueue: () => void
|
||||||
onRemove?: () => void
|
onRemove?: () => void
|
||||||
|
onDownload?: () => void
|
||||||
|
downloaded?: boolean
|
||||||
}) {
|
}) {
|
||||||
const hasRemove = !!onRemove
|
const hasRemove = !!onRemove
|
||||||
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
|
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
|
||||||
@@ -95,10 +100,10 @@ export function SongSwipeRow({
|
|||||||
(side: number) => {
|
(side: number) => {
|
||||||
close()
|
close()
|
||||||
if (side > 0) onAddToQueue()
|
if (side > 0) onAddToQueue()
|
||||||
// Without Remove, the trailing action is the Download placeholder.
|
else if (onRemove) onRemove()
|
||||||
else onRemove?.()
|
else onDownload?.()
|
||||||
},
|
},
|
||||||
[close, onAddToQueue, onRemove]
|
[close, onAddToQueue, onRemove, onDownload]
|
||||||
)
|
)
|
||||||
const tapRow = useCallback(() => {
|
const tapRow = useCallback(() => {
|
||||||
if (open) close()
|
if (open) close()
|
||||||
@@ -233,6 +238,7 @@ export function SongSwipeRow({
|
|||||||
side={-1}
|
side={-1}
|
||||||
paired={hasRemove}
|
paired={hasRemove}
|
||||||
remove={hasRemove}
|
remove={hasRemove}
|
||||||
|
downloaded={downloaded}
|
||||||
x={x}
|
x={x}
|
||||||
height={height}
|
height={height}
|
||||||
progress={commitProgress}
|
progress={commitProgress}
|
||||||
@@ -244,11 +250,15 @@ export function SongSwipeRow({
|
|||||||
side={-1}
|
side={-1}
|
||||||
secondary
|
secondary
|
||||||
paired
|
paired
|
||||||
|
downloaded={downloaded}
|
||||||
x={x}
|
x={x}
|
||||||
height={height}
|
height={height}
|
||||||
progress={commitProgress}
|
progress={commitProgress}
|
||||||
open={open === -1}
|
open={open === -1}
|
||||||
onPress={close}
|
onPress={() => {
|
||||||
|
close()
|
||||||
|
onDownload?.()
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<GestureDetector gesture={gesture}>
|
<GestureDetector gesture={gesture}>
|
||||||
@@ -259,7 +269,10 @@ export function SongSwipeRow({
|
|||||||
accessibilityActions={[
|
accessibilityActions={[
|
||||||
{ name: "addToQueue", label: "Add to Queue" },
|
{ name: "addToQueue", label: "Add to Queue" },
|
||||||
{ name: "playNext", label: "Play Next" },
|
{ name: "playNext", label: "Play Next" },
|
||||||
{ name: "download", label: "Download" },
|
{
|
||||||
|
name: "download",
|
||||||
|
label: downloaded ? "Remove Download" : "Download",
|
||||||
|
},
|
||||||
...(hasRemove
|
...(hasRemove
|
||||||
? [{ name: "remove", label: "Remove from Playlist" }]
|
? [{ name: "remove", label: "Remove from Playlist" }]
|
||||||
: []),
|
: []),
|
||||||
@@ -267,6 +280,10 @@ export function SongSwipeRow({
|
|||||||
onAccessibilityAction={(event) => {
|
onAccessibilityAction={(event) => {
|
||||||
if (event.nativeEvent.actionName === "remove") activate(-1)
|
if (event.nativeEvent.actionName === "remove") activate(-1)
|
||||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||||
|
if (event.nativeEvent.actionName === "download") {
|
||||||
|
close()
|
||||||
|
onDownload?.()
|
||||||
|
}
|
||||||
if (event.nativeEvent.actionName === "playNext") {
|
if (event.nativeEvent.actionName === "playNext") {
|
||||||
close()
|
close()
|
||||||
onPlayNext()
|
onPlayNext()
|
||||||
@@ -290,6 +307,7 @@ function SwipeAction({
|
|||||||
secondary = false,
|
secondary = false,
|
||||||
paired = side > 0,
|
paired = side > 0,
|
||||||
remove = false,
|
remove = false,
|
||||||
|
downloaded = false,
|
||||||
x,
|
x,
|
||||||
height,
|
height,
|
||||||
progress,
|
progress,
|
||||||
@@ -300,6 +318,8 @@ function SwipeAction({
|
|||||||
secondary?: boolean
|
secondary?: boolean
|
||||||
paired?: boolean
|
paired?: boolean
|
||||||
remove?: boolean
|
remove?: boolean
|
||||||
|
/** Shows the download action as Remove Download. */
|
||||||
|
downloaded?: boolean
|
||||||
x: SharedValue<number>
|
x: SharedValue<number>
|
||||||
height: SharedValue<number>
|
height: SharedValue<number>
|
||||||
progress: SharedValue<number>
|
progress: SharedValue<number>
|
||||||
@@ -370,6 +390,8 @@ function SwipeAction({
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
}))
|
}))
|
||||||
|
const removesDownload = side < 0 && !remove && downloaded
|
||||||
|
const destructive = remove || removesDownload
|
||||||
return (
|
return (
|
||||||
<Animated.View
|
<Animated.View
|
||||||
pointerEvents={open ? "auto" : "none"}
|
pointerEvents={open ? "auto" : "none"}
|
||||||
@@ -386,11 +408,13 @@ function SwipeAction({
|
|||||||
accessibilityLabel={
|
accessibilityLabel={
|
||||||
remove
|
remove
|
||||||
? "Remove from Playlist"
|
? "Remove from Playlist"
|
||||||
: side > 0
|
: removesDownload
|
||||||
? secondary
|
? "Remove Download"
|
||||||
? "Play Next"
|
: side > 0
|
||||||
: "Add to Queue"
|
? secondary
|
||||||
: "Download"
|
? "Play Next"
|
||||||
|
: "Add to Queue"
|
||||||
|
: "Download"
|
||||||
}
|
}
|
||||||
onPress={onPress}
|
onPress={onPress}
|
||||||
style={styles.actionButton}
|
style={styles.actionButton}
|
||||||
@@ -399,7 +423,7 @@ function SwipeAction({
|
|||||||
style={[
|
style={[
|
||||||
styles.pill,
|
styles.pill,
|
||||||
{
|
{
|
||||||
backgroundColor: remove
|
backgroundColor: destructive
|
||||||
? IS_ANDROID
|
? IS_ANDROID
|
||||||
? "#d32f2f"
|
? "#d32f2f"
|
||||||
: "#ff3b30"
|
: "#ff3b30"
|
||||||
@@ -416,7 +440,7 @@ function SwipeAction({
|
|||||||
{IS_ANDROID ? (
|
{IS_ANDROID ? (
|
||||||
<Ionicons
|
<Ionicons
|
||||||
name={
|
name={
|
||||||
remove
|
destructive
|
||||||
? "trash-outline"
|
? "trash-outline"
|
||||||
: side < 0
|
: side < 0
|
||||||
? "arrow-down"
|
? "arrow-down"
|
||||||
@@ -430,7 +454,7 @@ function SwipeAction({
|
|||||||
) : (
|
) : (
|
||||||
<SymbolView
|
<SymbolView
|
||||||
name={
|
name={
|
||||||
remove
|
destructive
|
||||||
? "trash"
|
? "trash"
|
||||||
: side > 0
|
: side > 0
|
||||||
? secondary
|
? secondary
|
||||||
|
|||||||
@@ -5,16 +5,46 @@ import type { ReactNode } from "react"
|
|||||||
|
|
||||||
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||||
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||||
|
import { OfflineOverlay } from "@/components/offline-overlay"
|
||||||
import { TabletSidebar } from "@/components/tablet-sidebar"
|
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||||
|
|
||||||
|
type ScreenRoute = { name: string; params?: object }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Screen content with the no-connection overlay layered on top. A fragment
|
||||||
|
* keeps the scroll view as the screen's first subview for large titles.
|
||||||
|
*/
|
||||||
|
function ScreenBody({
|
||||||
|
route,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
route: ScreenRoute
|
||||||
|
children: ReactNode
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
{children}
|
||||||
|
<OfflineOverlay route={route} />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
||||||
export function TabScreenContent({ children }: { children: ReactNode }) {
|
export function TabScreenContent({
|
||||||
|
route,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
route: ScreenRoute
|
||||||
|
children: ReactNode
|
||||||
|
}) {
|
||||||
const backgroundStyle = useTabletBackgroundStyle()
|
const backgroundStyle = useTabletBackgroundStyle()
|
||||||
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
if (Platform.OS !== "ios" || !Platform.isPad) {
|
||||||
|
return <ScreenBody route={route}>{children}</ScreenBody>
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||||
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
|
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
|
||||||
{children}
|
<ScreenBody route={route}>{children}</ScreenBody>
|
||||||
</SafeAreaView>
|
</SafeAreaView>
|
||||||
<TabletSidebar />
|
<TabletSidebar />
|
||||||
<TabletPlayerLayoutSync />
|
<TabletPlayerLayoutSync />
|
||||||
@@ -22,6 +52,13 @@ export function TabScreenContent({ children }: { children: ReactNode }) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function renderTabScreenContent({ children }: { children: ReactNode }) {
|
/** `screenLayout` for every tab stack. */
|
||||||
return <TabScreenContent>{children}</TabScreenContent>
|
export function renderTabScreenContent({
|
||||||
|
route,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
route: ScreenRoute
|
||||||
|
children: ReactNode
|
||||||
|
}) {
|
||||||
|
return <TabScreenContent route={route}>{children}</TabScreenContent>
|
||||||
}
|
}
|
||||||
@@ -23,6 +23,7 @@ import { PlayerSymbol } from "@/components/player-symbol"
|
|||||||
import { useFavorites } from "@/contexts/favorites"
|
import { useFavorites } from "@/contexts/favorites"
|
||||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
|
import { useLyrics } from "@/hooks/use-lyrics"
|
||||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||||
import { tabletMiniPlayerHeight } from "@/lib/theme"
|
import { tabletMiniPlayerHeight } from "@/lib/theme"
|
||||||
import { albumCoverUrl } from "@/lib/urls"
|
import { albumCoverUrl } from "@/lib/urls"
|
||||||
@@ -58,6 +59,7 @@ export function TabletMiniPlayer() {
|
|||||||
const { handleSongAction } = useMediaMenuActions()
|
const { handleSongAction } = useMediaMenuActions()
|
||||||
const { isSongFavorite } = useFavorites()
|
const { isSongFavorite } = useFavorites()
|
||||||
const roomy = width - insets.left - insets.right >= 650
|
const roomy = width - insets.left - insets.right >= 650
|
||||||
|
const lyrics = useLyrics(roomy ? (currentSong?.id ?? null) : null)
|
||||||
|
|
||||||
if (!focused || !config || !currentSong || queueSongIds.length === 0)
|
if (!focused || !config || !currentSong || queueSongIds.length === 0)
|
||||||
return null
|
return null
|
||||||
@@ -166,16 +168,22 @@ export function TabletMiniPlayer() {
|
|||||||
{roomy ? (
|
{roomy ? (
|
||||||
<Pressable
|
<Pressable
|
||||||
style={styles.control}
|
style={styles.control}
|
||||||
disabled
|
disabled={!lyrics}
|
||||||
|
onPress={() =>
|
||||||
|
router.push({
|
||||||
|
pathname: "/(app)/player",
|
||||||
|
params: { lyrics: "1" },
|
||||||
|
})
|
||||||
|
}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel="Lyrics"
|
accessibilityLabel="Show lyrics"
|
||||||
accessibilityState={{ disabled: true }}
|
accessibilityState={{ disabled: !lyrics }}
|
||||||
>
|
>
|
||||||
<PlayerSymbol
|
<PlayerSymbol
|
||||||
name="quote.bubble"
|
name="quote.bubble"
|
||||||
fallback="chatbox-outline"
|
fallback="chatbox-outline"
|
||||||
size={23}
|
size={23}
|
||||||
color={inactive}
|
color={lyrics ? color : inactive}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
) : null}
|
) : null}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { StatusBar } from "expo-status-bar"
|
|||||||
|
|
||||||
import { AudioOutputButton } from "@/components/audio-output-button"
|
import { AudioOutputButton } from "@/components/audio-output-button"
|
||||||
import { CoverImage } from "@/components/cover-image"
|
import { CoverImage } from "@/components/cover-image"
|
||||||
|
import { LyricsView } from "@/components/lyrics-view"
|
||||||
import { NowPlayingQueue } from "@/components/now-playing-queue"
|
import { NowPlayingQueue } from "@/components/now-playing-queue"
|
||||||
import { PlayerProgress } from "@/components/player-progress"
|
import { PlayerProgress } from "@/components/player-progress"
|
||||||
import { PlayerSlider } from "@/components/player-slider"
|
import { PlayerSlider } from "@/components/player-slider"
|
||||||
@@ -24,6 +25,10 @@ import { useServerConfig } from "@/contexts/server-config"
|
|||||||
import { useSystemVolume } from "@/hooks/use-system-volume"
|
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||||
import { albumCoverUrl } from "@/lib/urls"
|
import { albumCoverUrl } from "@/lib/urls"
|
||||||
|
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 = {
|
const queueMotion = {
|
||||||
duration: 420,
|
duration: 420,
|
||||||
@@ -31,14 +36,18 @@ const queueMotion = {
|
|||||||
reduceMotion: ReduceMotion.System,
|
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({
|
export function TabletNowPlaying({
|
||||||
colors,
|
colors,
|
||||||
backgroundStyle,
|
backgroundStyle,
|
||||||
dismissStyle,
|
dismissStyle,
|
||||||
dismissGestures,
|
dismissGestures,
|
||||||
showQueue,
|
panel,
|
||||||
toggleQueue,
|
togglePanel,
|
||||||
|
lyrics,
|
||||||
metadata,
|
metadata,
|
||||||
}: {
|
}: {
|
||||||
colors: NowPlayingColors
|
colors: NowPlayingColors
|
||||||
@@ -48,8 +57,9 @@ export function TabletNowPlaying({
|
|||||||
handle: ReturnType<typeof Gesture.Pan>
|
handle: ReturnType<typeof Gesture.Pan>
|
||||||
artwork: ReturnType<typeof Gesture.Pan>
|
artwork: ReturnType<typeof Gesture.Pan>
|
||||||
}
|
}
|
||||||
showQueue: boolean
|
panel: PlayerPanel | null
|
||||||
toggleQueue: () => void
|
togglePanel: (panel: PlayerPanel) => void
|
||||||
|
lyrics: Lyrics | null | undefined
|
||||||
metadata: ReactNode
|
metadata: ReactNode
|
||||||
}) {
|
}) {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
@@ -63,7 +73,9 @@ export function TabletNowPlaying({
|
|||||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||||
const [queueHeight, setQueueHeight] = useState(0)
|
const [queueHeight, setQueueHeight] = useState(0)
|
||||||
const wideLayout = width >= 700
|
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)
|
const progress = useSharedValue(sideBySide ? 1 : 0)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
|
progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
|
||||||
@@ -124,7 +136,14 @@ export function TabletNowPlaying({
|
|||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
)
|
)
|
||||||
const queue = (
|
const panelContent = showLyrics ? (
|
||||||
|
<LyricsView
|
||||||
|
key={currentSong.id}
|
||||||
|
lyrics={lyrics}
|
||||||
|
colors={colors}
|
||||||
|
fontSize={34}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
<NowPlayingQueue
|
<NowPlayingQueue
|
||||||
tablet
|
tablet
|
||||||
colors={colors}
|
colors={colors}
|
||||||
@@ -241,20 +260,18 @@ export function TabletNowPlaying({
|
|||||||
</Animated.View>
|
</Animated.View>
|
||||||
{wideLayout ? (
|
{wideLayout ? (
|
||||||
<Animated.View
|
<Animated.View
|
||||||
pointerEvents={showQueue ? "auto" : "none"}
|
pointerEvents={panel ? "auto" : "none"}
|
||||||
accessibilityElementsHidden={!showQueue}
|
accessibilityElementsHidden={!panel}
|
||||||
importantForAccessibility={
|
importantForAccessibility={panel ? "auto" : "no-hide-descendants"}
|
||||||
showQueue ? "auto" : "no-hide-descendants"
|
|
||||||
}
|
|
||||||
style={[styles.queue, queueStyle]}
|
style={[styles.queue, queueStyle]}
|
||||||
onLayout={(event) =>
|
onLayout={(event) =>
|
||||||
setQueueHeight(event.nativeEvent.layout.height)
|
setQueueHeight(event.nativeEvent.layout.height)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{queueHeight > 0 ? queue : null}
|
{queueHeight > 0 ? panelContent : null}
|
||||||
</Animated.View>
|
</Animated.View>
|
||||||
) : null}
|
) : null}
|
||||||
{showQueue && !sideBySide ? (
|
{panel && !sideBySide ? (
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.portraitQueue,
|
styles.portraitQueue,
|
||||||
@@ -264,7 +281,7 @@ export function TabletNowPlaying({
|
|||||||
setQueueHeight(event.nativeEvent.layout.height)
|
setQueueHeight(event.nativeEvent.layout.height)
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{queueHeight > 0 ? queue : null}
|
{queueHeight > 0 ? panelContent : null}
|
||||||
</View>
|
</View>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
@@ -280,21 +297,29 @@ export function TabletNowPlaying({
|
|||||||
/>
|
/>
|
||||||
<View style={styles.footerActions}>
|
<View style={styles.footerActions}>
|
||||||
<Pressable
|
<Pressable
|
||||||
disabled
|
onPress={() => togglePanel("lyrics")}
|
||||||
|
disabled={!lyrics && !showLyrics}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel="Lyrics"
|
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"}
|
||||||
accessibilityState={{ disabled: true }}
|
accessibilityState={{
|
||||||
style={[styles.footerButton, { opacity: 0.4 }]}
|
selected: showLyrics,
|
||||||
|
disabled: !lyrics && !showLyrics,
|
||||||
|
}}
|
||||||
|
style={[
|
||||||
|
styles.footerButton,
|
||||||
|
!lyrics && !showLyrics && { opacity: 0.4 },
|
||||||
|
showLyrics && { backgroundColor: colors.selected },
|
||||||
|
]}
|
||||||
>
|
>
|
||||||
<PlayerSymbol
|
<PlayerSymbol
|
||||||
name="quote.bubble"
|
name="quote.bubble"
|
||||||
fallback="chatbox-outline"
|
fallback="chatbox-outline"
|
||||||
size={25}
|
size={25}
|
||||||
color={colors.foreground}
|
color={showLyrics ? colors.selectedForeground : colors.foreground}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
<Pressable
|
<Pressable
|
||||||
onPress={toggleQueue}
|
onPress={() => togglePanel("queue")}
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||||
accessibilityState={{ selected: showQueue }}
|
accessibilityState={{ selected: showQueue }}
|
||||||
|
|||||||
@@ -1,13 +1,19 @@
|
|||||||
import { useOpenSettings } from "@/hooks/use-open-settings"
|
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||||
import { requireNativeView } from "expo"
|
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 { Platform, type ViewProps } from "react-native"
|
||||||
|
|
||||||
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||||
|
import { tabPath } from "@/lib/app-navigation"
|
||||||
import { initialsFromName } from "@/lib/format"
|
import { initialsFromName } from "@/lib/format"
|
||||||
|
import { playlistCoverUrl } from "@/lib/urls"
|
||||||
import { api } from "@otunes/convex/_generated/api"
|
import { api } from "@otunes/convex/_generated/api"
|
||||||
|
|
||||||
|
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
|
||||||
|
|
||||||
const NativeSidebar =
|
const NativeSidebar =
|
||||||
Platform.OS === "ios"
|
Platform.OS === "ios"
|
||||||
? requireNativeView<
|
? requireNativeView<
|
||||||
@@ -16,16 +22,39 @@ const NativeSidebar =
|
|||||||
initials: string
|
initials: string
|
||||||
imageURL?: string
|
imageURL?: string
|
||||||
active: boolean
|
active: boolean
|
||||||
|
playlists: SidebarPlaylist[]
|
||||||
onProfilePress: () => void
|
onProfilePress: () => void
|
||||||
|
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
|
||||||
}
|
}
|
||||||
>("TabletSidebar")
|
>("TabletSidebar")
|
||||||
: null
|
: null
|
||||||
|
|
||||||
|
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
|
||||||
export function TabletSidebar() {
|
export function TabletSidebar() {
|
||||||
const user = useCachedQuery(api.auth.currentUser)
|
const user = useCachedQuery(api.auth.currentUser)
|
||||||
|
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
|
||||||
|
const { config } = useServerConfig()
|
||||||
const imageUrl = useProfileImageUrl(user?.image)
|
const imageUrl = useProfileImageUrl(user?.image)
|
||||||
const openSettings = useOpenSettings()
|
const openSettings = useOpenSettings()
|
||||||
|
const router = useRouter()
|
||||||
const active = useIsFocused()
|
const active = useIsFocused()
|
||||||
|
const serverUrl = config?.serverUrl
|
||||||
|
|
||||||
|
const playlists = useMemo(
|
||||||
|
() =>
|
||||||
|
[
|
||||||
|
...(sidebarPlaylists?.owned ?? []),
|
||||||
|
...(sidebarPlaylists?.subscribed ?? []),
|
||||||
|
].map((playlist): SidebarPlaylist => ({
|
||||||
|
id: playlist.id,
|
||||||
|
title: playlist.title,
|
||||||
|
imageURL:
|
||||||
|
serverUrl && playlist.cover
|
||||||
|
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
|
||||||
|
: undefined,
|
||||||
|
})),
|
||||||
|
[serverUrl, sidebarPlaylists]
|
||||||
|
)
|
||||||
|
|
||||||
if (!NativeSidebar) return null
|
if (!NativeSidebar) return null
|
||||||
return (
|
return (
|
||||||
@@ -35,7 +64,11 @@ export function TabletSidebar() {
|
|||||||
initials={initialsFromName(user?.name ?? "Me")}
|
initials={initialsFromName(user?.name ?? "Me")}
|
||||||
imageURL={imageUrl}
|
imageURL={imageUrl}
|
||||||
active={active}
|
active={active}
|
||||||
|
playlists={playlists}
|
||||||
onProfilePress={openSettings}
|
onProfilePress={openSettings}
|
||||||
|
onPlaylistPress={({ nativeEvent }) =>
|
||||||
|
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
|
|||||||
{ artistId }
|
{ artistId }
|
||||||
)
|
)
|
||||||
if (selectionRequestIdRef.current !== requestId) return
|
if (selectionRequestIdRef.current !== requestId) return
|
||||||
setPendingSongIds(songIds)
|
setPendingSongIds(songIds.flat())
|
||||||
setOpen(true)
|
setOpen(true)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (selectionRequestIdRef.current !== requestId) return
|
if (selectionRequestIdRef.current !== requestId) return
|
||||||
|
|||||||
@@ -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(
|
const songIds = useMemo(
|
||||||
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
|
() => new Set<string>(favorites?.favoriteSongs.flat()),
|
||||||
[favorites?.favoriteSongs]
|
[favorites?.favoriteSongs]
|
||||||
)
|
)
|
||||||
const albumIds = useMemo(
|
const albumIds = useMemo(
|
||||||
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
|
() => new Set<string>(favorites?.favoriteAlbums.flat()),
|
||||||
[favorites?.favoriteAlbums]
|
[favorites?.favoriteAlbums]
|
||||||
)
|
)
|
||||||
const artistIds = useMemo(
|
const artistIds = useMemo(
|
||||||
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
|
() => new Set<string>(favorites?.favoriteArtists.flat()),
|
||||||
[favorites?.favoriteArtists]
|
[favorites?.favoriteArtists]
|
||||||
)
|
)
|
||||||
const idsRef = useRef({ songIds, albumIds, artistIds })
|
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 * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||||
|
import { isDownloadsQueueOrigin } from "@otunes/convex/download-quality"
|
||||||
import { rememberSongs, useSong, useSongs } from "@/lib/song-cache"
|
import { rememberSongs, useSong, useSongs } from "@/lib/song-cache"
|
||||||
import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents"
|
import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents"
|
||||||
import { showError } from "@/lib/toast"
|
import { showError } from "@/lib/toast"
|
||||||
@@ -43,8 +44,9 @@ type PlaybackContextValue = {
|
|||||||
seekTo: (seconds: number) => void
|
seekTo: (seconds: number) => void
|
||||||
waitForPlaybackReady: (playing?: boolean) => Promise<void>
|
waitForPlaybackReady: (playing?: boolean) => Promise<void>
|
||||||
setIsPlaying: (playing: boolean) => void
|
setIsPlaying: (playing: boolean) => void
|
||||||
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
|
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */
|
||||||
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
|
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||||
|
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
|
||||||
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
||||||
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
||||||
playFromSong: (
|
playFromSong: (
|
||||||
@@ -245,6 +247,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
const queueOriginRef = useRef<string | undefined>(undefined)
|
const queueOriginRef = useRef<string | undefined>(undefined)
|
||||||
const playRequestRef = useRef(0)
|
const playRequestRef = useRef(0)
|
||||||
const [queueStartVersion, setQueueStartVersion] = useState(0)
|
const [queueStartVersion, setQueueStartVersion] = useState(0)
|
||||||
|
// Queues started from the Downloads page play downloads in any quality.
|
||||||
|
const [fromDownloads, setFromDownloads] = useState(false)
|
||||||
|
|
||||||
const queueSongIds = playback.queue
|
const queueSongIds = playback.queue
|
||||||
const queueHistorySongIds = playback.history
|
const queueHistorySongIds = playback.history
|
||||||
@@ -280,6 +284,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
repeatEnabled,
|
repeatEnabled,
|
||||||
currentSong,
|
currentSong,
|
||||||
queueStartVersion,
|
queueStartVersion,
|
||||||
|
fromDownloads,
|
||||||
})
|
})
|
||||||
|
|
||||||
const { resetProgress } = useProgressPersistence({
|
const { resetProgress } = useProgressPersistence({
|
||||||
@@ -310,6 +315,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
queueOriginRef.current =
|
queueOriginRef.current =
|
||||||
recorded.origin ??
|
recorded.origin ??
|
||||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||||
|
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
|
||||||
resetQueuePlayback()
|
resetQueuePlayback()
|
||||||
store.update(playbackQueue.clearQueue)
|
store.update(playbackQueue.clearQueue)
|
||||||
store.update(recipe)
|
store.update(recipe)
|
||||||
@@ -363,10 +369,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
const playSongs = useCallback(
|
const playSongs = useCallback(
|
||||||
(shuffled: boolean) => async (songIds: Id<"songs">[]) => {
|
(shuffled: boolean) => async (songIds: Id<"songs">[], origin?: string) => {
|
||||||
if (songIds.length === 0) return
|
if (songIds.length === 0) return
|
||||||
startPlayback((state) =>
|
startPlayback(
|
||||||
playbackQueue.startQueue(state, songIds, shuffled)
|
(state) => playbackQueue.startQueue(state, songIds, shuffled),
|
||||||
|
{ origin }
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
[startPlayback]
|
[startPlayback]
|
||||||
@@ -401,7 +408,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
cacheScope,
|
cacheScope,
|
||||||
api.playlists.getOrderedArtistSongIds,
|
api.playlists.getOrderedArtistSongIds,
|
||||||
{ artistId }
|
{ artistId }
|
||||||
),
|
).then((chunks) => chunks.flat()),
|
||||||
recorded: { entity: { kind: "artist", id: artistId } },
|
recorded: { entity: { kind: "artist", id: artistId } },
|
||||||
}))
|
}))
|
||||||
const playlist = collection(
|
const playlist = collection(
|
||||||
@@ -482,12 +489,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
|
|
||||||
let songIds: Id<"songs">[]
|
let songIds: Id<"songs">[]
|
||||||
try {
|
try {
|
||||||
songIds = await fetchCachedQuery(
|
songIds = (
|
||||||
convex,
|
await fetchCachedQuery(
|
||||||
cacheScope,
|
convex,
|
||||||
api.library.browseSortedSongIds,
|
cacheScope,
|
||||||
sort
|
api.library.browseSortedSongIds,
|
||||||
)
|
sort
|
||||||
|
)
|
||||||
|
).flat()
|
||||||
} catch {
|
} catch {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,7 +83,11 @@ export function createCoverPaletteSource<Swatches>({
|
|||||||
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||||
|
|
||||||
const swatches =
|
const swatches =
|
||||||
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
|
resolved.key === key
|
||||||
|
? resolved.swatches
|
||||||
|
: key
|
||||||
|
? cachedSwatches(key)
|
||||||
|
: null
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!key || hasCover === false) return
|
if (!key || hasCover === false) return
|
||||||
|
|||||||
@@ -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(), [])
|
||||||
|
}
|
||||||
@@ -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 { useCallback } from "react"
|
||||||
|
|
||||||
import type { MediaAction } from "@/components/media-context-menu"
|
import type { MediaAction } from "@/components/media-context-menu"
|
||||||
|
import type { DownloadSource } from "@otunes/convex/client/download-queue"
|
||||||
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
|
import { useAddToPlaylist } from "@/contexts/add-to-playlist"
|
||||||
|
import { useDownloads } from "@/contexts/downloads"
|
||||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||||
import { useFavorites } from "@/contexts/favorites"
|
import { useFavorites } from "@/contexts/favorites"
|
||||||
import { usePlaybackActions } from "@/contexts/playback"
|
import { usePlaybackActions } from "@/contexts/playback"
|
||||||
@@ -48,6 +50,7 @@ export function useMediaMenuActions() {
|
|||||||
} = useFavorites()
|
} = useFavorites()
|
||||||
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
|
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
|
||||||
usePlaybackActions()
|
usePlaybackActions()
|
||||||
|
const { requestDownload, removeDownload } = useDownloads()
|
||||||
|
|
||||||
const runQueueAction = useCallback(
|
const runQueueAction = useCallback(
|
||||||
async (action: MediaAction, songIds: Id<"songs">[]) => {
|
async (action: MediaAction, songIds: Id<"songs">[]) => {
|
||||||
@@ -71,8 +74,9 @@ export function useMediaMenuActions() {
|
|||||||
[addToQueueLast, addToQueueNext, playShuffled]
|
[addToQueueLast, addToQueueNext, playShuffled]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/** `from` limits removing a download to that album, playlist, or Other. */
|
||||||
const handleSongAction = useCallback(
|
const handleSongAction = useCallback(
|
||||||
async (song: BrowseSong, action: MediaAction) => {
|
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => {
|
||||||
const songIds = [song.id as Id<"songs">]
|
const songIds = [song.id as Id<"songs">]
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case "create-station":
|
case "create-station":
|
||||||
@@ -97,6 +101,19 @@ export function useMediaMenuActions() {
|
|||||||
case "go-album":
|
case "go-album":
|
||||||
push(`/album/${song.album.id}`)
|
push(`/album/${song.album.id}`)
|
||||||
break
|
break
|
||||||
|
case "download":
|
||||||
|
case "remove-download": {
|
||||||
|
const target = {
|
||||||
|
kind: "songs" as const,
|
||||||
|
songIds,
|
||||||
|
title: song.title,
|
||||||
|
from,
|
||||||
|
}
|
||||||
|
await (action === "download"
|
||||||
|
? requestDownload(target)
|
||||||
|
: removeDownload(target))
|
||||||
|
break
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -107,6 +124,8 @@ export function useMediaMenuActions() {
|
|||||||
runQueueAction,
|
runQueueAction,
|
||||||
toggleSongFavorite,
|
toggleSongFavorite,
|
||||||
playArtistShuffled,
|
playArtistShuffled,
|
||||||
|
requestDownload,
|
||||||
|
removeDownload,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -138,6 +157,25 @@ export function useMediaMenuActions() {
|
|||||||
case "go-artist":
|
case "go-artist":
|
||||||
push(`/artist/${album.artist.id}`)
|
push(`/artist/${album.artist.id}`)
|
||||||
break
|
break
|
||||||
|
case "download":
|
||||||
|
case "remove-download": {
|
||||||
|
const songIds = await fetchCachedQuery(
|
||||||
|
convex,
|
||||||
|
cacheScope,
|
||||||
|
api.playlists.getAlbumSongIds,
|
||||||
|
{ albumId: album.id as Id<"albums"> }
|
||||||
|
)
|
||||||
|
const target = {
|
||||||
|
kind: "album" as const,
|
||||||
|
id: album.id,
|
||||||
|
title: album.title,
|
||||||
|
songIds,
|
||||||
|
}
|
||||||
|
await (action === "download"
|
||||||
|
? requestDownload(target)
|
||||||
|
: removeDownload(target))
|
||||||
|
break
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -151,6 +189,8 @@ export function useMediaMenuActions() {
|
|||||||
push,
|
push,
|
||||||
runQueueAction,
|
runQueueAction,
|
||||||
toggleAlbumFavorite,
|
toggleAlbumFavorite,
|
||||||
|
requestDownload,
|
||||||
|
removeDownload,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -173,7 +213,7 @@ export function useMediaMenuActions() {
|
|||||||
api.playlists.getOrderedArtistSongIds,
|
api.playlists.getOrderedArtistSongIds,
|
||||||
{ artistId: artist.id as Id<"artists"> }
|
{ artistId: artist.id as Id<"artists"> }
|
||||||
)
|
)
|
||||||
await runQueueAction(action, songIds)
|
await runQueueAction(action, songIds.flat())
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@@ -211,12 +251,38 @@ export function useMediaMenuActions() {
|
|||||||
await runQueueAction(action, songIds)
|
await runQueueAction(action, songIds)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
case "download":
|
||||||
|
case "remove-download": {
|
||||||
|
const songIds = await fetchCachedQuery(
|
||||||
|
convex,
|
||||||
|
cacheScope,
|
||||||
|
api.playlists.getPlaylistSongIds,
|
||||||
|
{ playlistId: playlist.id as Id<"playlists"> }
|
||||||
|
)
|
||||||
|
const target = {
|
||||||
|
kind: "playlist" as const,
|
||||||
|
id: playlist.id,
|
||||||
|
title: playlist.title,
|
||||||
|
songIds,
|
||||||
|
}
|
||||||
|
await (action === "download"
|
||||||
|
? requestDownload(target)
|
||||||
|
: removeDownload(target))
|
||||||
|
break
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
[convex, cacheScope, openAddPlaylistToPlaylist, runQueueAction]
|
[
|
||||||
|
convex,
|
||||||
|
cacheScope,
|
||||||
|
openAddPlaylistToPlaylist,
|
||||||
|
runQueueAction,
|
||||||
|
requestDownload,
|
||||||
|
removeDownload,
|
||||||
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
const handleAlbumDetailAction = useCallback(
|
const handleAlbumDetailAction = useCallback(
|
||||||
@@ -265,7 +331,7 @@ export function useMediaMenuActions() {
|
|||||||
cover: album.cover,
|
cover: album.cover,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
await handleSongAction(song, action)
|
await handleSongAction(song, action, { kind: "album", id: album.id })
|
||||||
},
|
},
|
||||||
[handleSongAction]
|
[handleSongAction]
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -18,10 +18,12 @@ import { api } from "@otunes/convex/_generated/api"
|
|||||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||||
import type { BrowseSong } from "@otunes/convex/types"
|
import type { BrowseSong } from "@otunes/convex/types"
|
||||||
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
|
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
|
||||||
|
import { streamDownloadQuality } from "@otunes/convex/download-quality"
|
||||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||||
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
||||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||||
|
import { downloadedAudioUri, downloadQueueFor } from "@/lib/downloads"
|
||||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||||
import { showError } from "@/lib/toast"
|
import { showError } from "@/lib/toast"
|
||||||
import { albumCoverUrl, songAudioSource } from "@/lib/urls"
|
import { albumCoverUrl, songAudioSource } from "@/lib/urls"
|
||||||
@@ -71,6 +73,7 @@ export function useNativePlaylistSync({
|
|||||||
repeatEnabled,
|
repeatEnabled,
|
||||||
currentSong,
|
currentSong,
|
||||||
queueStartVersion,
|
queueStartVersion,
|
||||||
|
fromDownloads,
|
||||||
}: {
|
}: {
|
||||||
store: PlaybackStore
|
store: PlaybackStore
|
||||||
queueSongIds: Id<"songs">[]
|
queueSongIds: Id<"songs">[]
|
||||||
@@ -78,6 +81,8 @@ export function useNativePlaylistSync({
|
|||||||
repeatEnabled: RepeatMode
|
repeatEnabled: RepeatMode
|
||||||
currentSong: BrowseSong | null
|
currentSong: BrowseSong | null
|
||||||
queueStartVersion: number
|
queueStartVersion: number
|
||||||
|
/** Plays downloads in any quality, for queues started from Downloads. */
|
||||||
|
fromDownloads: boolean
|
||||||
}) {
|
}) {
|
||||||
const convex = useConvex()
|
const convex = useConvex()
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
@@ -459,7 +464,7 @@ export function useNativePlaylistSync({
|
|||||||
}
|
}
|
||||||
if (!isCurrentLoad()) return
|
if (!isCurrentLoad()) return
|
||||||
|
|
||||||
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
|
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${fromDownloads}:${cookieHeader}`
|
||||||
const needsRebuild =
|
const needsRebuild =
|
||||||
loadedLoadKeyRef.current !== loadKey ||
|
loadedLoadKeyRef.current !== loadKey ||
|
||||||
nativePlaylistNeedsRebuild(
|
nativePlaylistNeedsRebuild(
|
||||||
@@ -493,7 +498,12 @@ export function useNativePlaylistSync({
|
|||||||
}
|
}
|
||||||
|
|
||||||
const buildSources = async (songIds: Id<"songs">[]) => {
|
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>()
|
const sources = new Map<Id<"songs">, AudioSource>()
|
||||||
for (const song of songs) {
|
for (const song of songs) {
|
||||||
if (!song) return null
|
if (!song) return null
|
||||||
@@ -502,6 +512,18 @@ export function useNativePlaylistSync({
|
|||||||
user.playbackQuality,
|
user.playbackQuality,
|
||||||
atmosEnabled(user)
|
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(
|
sources.set(
|
||||||
song.id,
|
song.id,
|
||||||
songAudioSource(
|
songAudioSource(
|
||||||
@@ -628,6 +650,7 @@ export function useNativePlaylistSync({
|
|||||||
currentSongId,
|
currentSongId,
|
||||||
currentSongSyncKey,
|
currentSongSyncKey,
|
||||||
destroyPlaylist,
|
destroyPlaylist,
|
||||||
|
fromDownloads,
|
||||||
ensurePlaylist,
|
ensurePlaylist,
|
||||||
handlePlaybackLoadFailure,
|
handlePlaybackLoadFailure,
|
||||||
historySyncKey,
|
historySyncKey,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useRouter, useSegments, type Href } from "expo-router"
|
import { useRouter, useSegments, type Href } from "expo-router"
|
||||||
import { useCallback } from "react"
|
import { createContext, use, useCallback } from "react"
|
||||||
|
|
||||||
import { tabletSections } from "@/lib/tablet-navigation"
|
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
|
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 {
|
function getActiveTabFromRef(): AppTab {
|
||||||
return getActiveTab(activeSegmentsRef.current)
|
return getActiveTab(activeSegmentsRef.current)
|
||||||
}
|
}
|
||||||
@@ -41,8 +48,15 @@ export function AppNavigationSync() {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Tab-aware navigation: paths resolve inside the caller's tab stack, falling back to the active tab outside one. */
|
||||||
export function useAppNavigation() {
|
export function useAppNavigation() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
const stackTab = use(TabStackContext)
|
||||||
|
|
||||||
|
const currentTab = useCallback(
|
||||||
|
() => stackTab ?? getActiveTabFromRef(),
|
||||||
|
[stackTab]
|
||||||
|
)
|
||||||
|
|
||||||
const push = useCallback(
|
const push = useCallback(
|
||||||
(path: string) => {
|
(path: string) => {
|
||||||
@@ -53,26 +67,26 @@ export function useAppNavigation() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
router.push(tabPath(getActiveTabFromRef(), path))
|
router.push(tabPath(currentTab(), path))
|
||||||
},
|
},
|
||||||
[router]
|
[router, currentTab]
|
||||||
)
|
)
|
||||||
|
|
||||||
const replace = useCallback(
|
const replace = useCallback(
|
||||||
(path: string) => {
|
(path: string) => {
|
||||||
router.replace(tabPath(getActiveTabFromRef(), path))
|
router.replace(tabPath(currentTab(), path))
|
||||||
},
|
},
|
||||||
[router]
|
[router, currentTab]
|
||||||
)
|
)
|
||||||
|
|
||||||
const href = useCallback(
|
const href = useCallback(
|
||||||
(path: string) => tabPath(getActiveTabFromRef(), path),
|
(path: string) => tabPath(currentTab(), path),
|
||||||
[]
|
[currentTab]
|
||||||
)
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
get tab() {
|
get tab() {
|
||||||
return getActiveTabFromRef()
|
return currentTab()
|
||||||
},
|
},
|
||||||
href,
|
href,
|
||||||
push,
|
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(
|
export async function getAuthCookieHeader(
|
||||||
serverUrl: string,
|
serverUrl: string,
|
||||||
convexUrl: string
|
convexUrl: string,
|
||||||
|
{ refresh = true }: { refresh?: boolean } = {}
|
||||||
): Promise<string | null> {
|
): Promise<string | null> {
|
||||||
const [jwt, refreshToken] = await Promise.all([
|
const [jwt, refreshToken] = await Promise.all([
|
||||||
secureGetItem(authStorageKey(JWT_STORAGE_KEY, convexUrl)),
|
secureGetItem(authStorageKey(JWT_STORAGE_KEY, convexUrl)),
|
||||||
@@ -31,7 +38,7 @@ export async function getAuthCookieHeader(
|
|||||||
|
|
||||||
const names = authCookieNames(serverUrl)
|
const names = authCookieNames(serverUrl)
|
||||||
const parts = [`${names.jwt}=${jwt}`]
|
const parts = [`${names.jwt}=${jwt}`]
|
||||||
if (refreshToken) {
|
if (refresh && refreshToken) {
|
||||||
parts.push(`${names.refresh}=${refreshToken}`)
|
parts.push(`${names.refresh}=${refreshToken}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
import { ConvexError, type Value } from "convex/values"
|
import { ConvexError, type Value } from "convex/values"
|
||||||
|
|
||||||
const AUTH_ERROR_MESSAGES = new Set([
|
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"])
|
||||||
"Not authenticated",
|
|
||||||
"User not logged in",
|
|
||||||
])
|
|
||||||
|
|
||||||
function matchesAuthMessage(message: string): boolean {
|
function matchesAuthMessage(message: string): boolean {
|
||||||
if (AUTH_ERROR_MESSAGES.has(message)) {
|
if (AUTH_ERROR_MESSAGES.has(message)) {
|
||||||
|
|||||||
@@ -12,19 +12,28 @@ const secureStoreOptions: SecureStore.SecureStoreOptions = {
|
|||||||
keychainAccessible: SecureStore.AFTER_FIRST_UNLOCK,
|
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> {
|
export async function secureGetItem(key: string): Promise<string | null> {
|
||||||
try {
|
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 {
|
} catch {
|
||||||
return null
|
return remembered.get(key) ?? null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function secureSetItem(key: string, value: string): Promise<void> {
|
export async function secureSetItem(key: string, value: string): Promise<void> {
|
||||||
|
remembered.set(key, value)
|
||||||
await SecureStore.setItemAsync(key, value, secureStoreOptions)
|
await SecureStore.setItemAsync(key, value, secureStoreOptions)
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function secureRemoveItem(key: string): Promise<void> {
|
export async function secureRemoveItem(key: string): Promise<void> {
|
||||||
|
remembered.delete(key)
|
||||||
try {
|
try {
|
||||||
await SecureStore.deleteItemAsync(key, secureStoreOptions)
|
await SecureStore.deleteItemAsync(key, secureStoreOptions)
|
||||||
} catch {
|
} catch {
|
||||||
@@ -37,7 +46,9 @@ export function authStorageKey(key: string, storageNamespace: string): string {
|
|||||||
return `${key}_${escapedNamespace}`
|
return `${key}_${escapedNamespace}`
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
|
export async function clearStoredAuthTokens(
|
||||||
|
storageNamespace: string
|
||||||
|
): Promise<void> {
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
AUTH_STORAGE_KEYS.map((key) =>
|
AUTH_STORAGE_KEYS.map((key) =>
|
||||||
secureRemoveItem(authStorageKey(key, storageNamespace))
|
secureRemoveItem(authStorageKey(key, storageNamespace))
|
||||||
|
|||||||
@@ -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")}`
|
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))
|
const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
|
||||||
return `-${formatDuration(remaining)}`
|
return `-${formatDuration(remaining)}`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,7 +79,9 @@ export function deriveCoverPalette(
|
|||||||
secondaryForeground: toHex(secondaryForeground),
|
secondaryForeground: toHex(secondaryForeground),
|
||||||
accent: toHex(accent),
|
accent: toHex(accent),
|
||||||
accentForeground: toHex(accentForeground),
|
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)),
|
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
|
||||||
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
|
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
|
||||||
isDark: lightText,
|
isDark: lightText,
|
||||||
@@ -94,7 +96,10 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
|
|||||||
? withLightness(color, Math.min(lch.l, 0.86))
|
? withLightness(color, Math.min(lch.l, 0.86))
|
||||||
: withLightness(color, Math.max(lch.l, 0.2))
|
: withLightness(color, Math.max(lch.l, 0.2))
|
||||||
const y = luminance(clamped)
|
const y = luminance(clamped)
|
||||||
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
|
if (
|
||||||
|
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
|
||||||
|
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
|
||||||
|
) {
|
||||||
return clamped
|
return clamped
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,7 +130,10 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function prefersLightText(background: Rgb) {
|
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`. */
|
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
|
||||||
@@ -180,7 +188,10 @@ function withLuminance(color: Rgb, target: number): Rgb {
|
|||||||
high = mid
|
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`. */
|
/** `amount` of `color` over `base`. */
|
||||||
@@ -206,7 +217,8 @@ function toLinear(channel: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function fromLinear(value: 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
|
return c * 255
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ export const tabStackScreenTitles: Record<string, string> = {
|
|||||||
"recently-played": "Recently Played",
|
"recently-played": "Recently Played",
|
||||||
"recently-added": "Recently Added",
|
"recently-added": "Recently Added",
|
||||||
settings: "Settings",
|
settings: "Settings",
|
||||||
|
"downloads/index": "Downloads",
|
||||||
|
"downloads/other": "Other Downloaded Songs",
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useStackScreenOptions(
|
export function useStackScreenOptions(
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ export type NowPlayingColors = {
|
|||||||
selected: string
|
selected: string
|
||||||
selectedForeground: string
|
selectedForeground: string
|
||||||
highlight: string
|
highlight: string
|
||||||
|
/** Words of the playing line not yet sung. */
|
||||||
|
lyricsUnsung: string
|
||||||
isDark: boolean
|
isDark: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,6 +30,7 @@ export function nowPlayingColors(palette: CoverPalette): NowPlayingColors {
|
|||||||
selected: withAlpha(foreground, 0.8),
|
selected: withAlpha(foreground, 0.8),
|
||||||
selectedForeground: palette.background,
|
selectedForeground: palette.background,
|
||||||
highlight: withAlpha(foreground, 0.1),
|
highlight: withAlpha(foreground, 0.1),
|
||||||
|
lyricsUnsung: withAlpha(foreground, 0.55),
|
||||||
isDark: palette.isDark,
|
isDark: palette.isDark,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
import { Platform } from "react-native"
|
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.
|
// Android Dolby decoder reports do not reliably indicate working Atmos playback.
|
||||||
export const dolbyAtmosSupported = Platform.OS === "ios"
|
export const dolbyAtmosSupported = Platform.OS === "ios"
|
||||||
|
|
||||||
@@ -7,3 +12,13 @@ export const dolbyAtmosSupported = Platform.OS === "ios"
|
|||||||
export function atmosEnabled(user: { preferAtmos?: boolean }) {
|
export function atmosEnabled(user: { preferAtmos?: boolean }) {
|
||||||
return dolbyAtmosSupported && (user.preferAtmos ?? false)
|
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"
|
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
|
||||||
|
|
||||||
function normalizeHostnameInput(input: string): string {
|
function normalizeHostnameInput(input: string): string {
|
||||||
return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
|
return input
|
||||||
|
.trim()
|
||||||
|
.replace(/^https?:\/\//i, "")
|
||||||
|
.replace(/\/+$/, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildServerUrl(hostname: string): string {
|
function buildServerUrl(hostname: string): string {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ export const tabletSections = [
|
|||||||
{ name: "albums", group: "(albums)", title: "Albums" },
|
{ name: "albums", group: "(albums)", title: "Albums" },
|
||||||
{ name: "artists", group: "(artists)", title: "Artists" },
|
{ name: "artists", group: "(artists)", title: "Artists" },
|
||||||
{ name: "songs", group: "(songs)", title: "Songs" },
|
{ name: "songs", group: "(songs)", title: "Songs" },
|
||||||
|
{ name: "downloads", group: "(downloads)", title: "Downloads" },
|
||||||
{ name: "playlists", group: "(playlists)", title: "All Playlists" },
|
{ name: "playlists", group: "(playlists)", title: "All Playlists" },
|
||||||
{ name: "favorites", group: "(favorites)", title: "Favorites" },
|
{ name: "favorites", group: "(favorites)", title: "Favorites" },
|
||||||
{ name: "recent", group: "(recent)", title: "Recently Played" },
|
{ name: "recent", group: "(recent)", title: "Recently Played" },
|
||||||
|
|||||||
@@ -39,12 +39,15 @@ export function albumCoverUrl(
|
|||||||
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
|
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** `version` is the summary's `cover`; it changes with the artwork. */
|
||||||
export function playlistCoverUrl(
|
export function playlistCoverUrl(
|
||||||
serverUrl: string,
|
serverUrl: string,
|
||||||
playlistId: string,
|
playlistId: string,
|
||||||
|
version: string | null,
|
||||||
size?: CoverImageSize
|
size?: CoverImageSize
|
||||||
) {
|
) {
|
||||||
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(
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"platforms": ["android"],
|
||||||
|
"android": {
|
||||||
|
"modules": ["expo.modules.downloadservice.DownloadServiceModule"]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "otunes-download-service",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"private": true
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"platforms": ["apple"]
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
// React Native draws `filter: [{ blur }]` on iOS only with its SwiftUI
|
||||||
|
// filters flag, which the stable release leaves off. This keeps the stable
|
||||||
|
// flags and turns that one on.
|
||||||
|
|
||||||
|
#import <UIKit/UIKit.h>
|
||||||
|
#import <react/featureflags/ReactNativeFeatureFlags.h>
|
||||||
|
#import <react/featureflags/ReactNativeFeatureFlagsOverridesOSSStable.h>
|
||||||
|
|
||||||
|
using namespace facebook::react;
|
||||||
|
|
||||||
|
class SwiftUIFilterFlags : public ReactNativeFeatureFlagsOverridesOSSStable {
|
||||||
|
public:
|
||||||
|
bool enableSwiftUIBasedFilters() override {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
@interface SwiftUIFilters : NSObject
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation SwiftUIFilters
|
||||||
|
|
||||||
|
+ (void)load
|
||||||
|
{
|
||||||
|
// React Native sets its flags once while launching and throws if they were
|
||||||
|
// set first, so this waits for launch to finish. No views exist yet then.
|
||||||
|
[NSNotificationCenter.defaultCenter
|
||||||
|
addObserverForName:UIApplicationDidFinishLaunchingNotification
|
||||||
|
object:nil
|
||||||
|
queue:nil
|
||||||
|
usingBlock:^(NSNotification *notification) {
|
||||||
|
ReactNativeFeatureFlags::dangerouslyForceOverride(
|
||||||
|
std::make_unique<SwiftUIFilterFlags>());
|
||||||
|
}];
|
||||||
|
}
|
||||||
|
|
||||||
|
@end
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
Pod::Spec.new do |s|
|
||||||
|
s.name = 'SwiftUIFilters'
|
||||||
|
s.version = '1.0.0'
|
||||||
|
s.summary = 'Turns on React Native view filters like blur on iOS'
|
||||||
|
s.description = s.summary
|
||||||
|
s.license = { :type => 'MIT' }
|
||||||
|
s.author = 'oTunes'
|
||||||
|
s.homepage = 'https://otunes.abunchofknowitalls.com'
|
||||||
|
s.platforms = { :ios => '16.4' }
|
||||||
|
s.source = { :git => '' }
|
||||||
|
s.static_framework = true
|
||||||
|
install_modules_dependencies(s)
|
||||||
|
s.source_files = '**/*.{h,mm}'
|
||||||
|
end
|
||||||
@@ -5,7 +5,11 @@ final class TabletSidebar: Module {
|
|||||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||||
Name("TabletSidebar")
|
Name("TabletSidebar")
|
||||||
View(TabletSidebarView.self) {
|
View(TabletSidebarView.self) {
|
||||||
Events("onProfilePress")
|
Events("onProfilePress", "onPlaylistPress")
|
||||||
|
Prop("playlists") { (view: TabletSidebarView, value: [SidebarPlaylist]) in
|
||||||
|
view.playlists = value
|
||||||
|
view.configure()
|
||||||
|
}
|
||||||
Prop("accountName") { (view: TabletSidebarView, value: String) in
|
Prop("accountName") { (view: TabletSidebarView, value: String) in
|
||||||
view.accountName = value
|
view.accountName = value
|
||||||
view.configure()
|
view.configure()
|
||||||
@@ -26,9 +30,25 @@ final class TabletSidebar: Module {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A playlist row under the sidebar's Playlists section.
|
||||||
|
struct SidebarPlaylist: Record {
|
||||||
|
@Field var id: String = ""
|
||||||
|
@Field var title: String = ""
|
||||||
|
/// Cover URL; changes whenever the artwork does. `nil` shows a list icon.
|
||||||
|
@Field var imageURL: String?
|
||||||
|
}
|
||||||
|
|
||||||
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
|
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
|
||||||
final class TabletSidebarView: ExpoView {
|
final class TabletSidebarView: ExpoView {
|
||||||
let onProfilePress = EventDispatcher()
|
let onProfilePress = EventDispatcher()
|
||||||
|
let onPlaylistPress = EventDispatcher()
|
||||||
|
var playlists: [SidebarPlaylist] = []
|
||||||
|
private let selectionProxy = SidebarSelectionProxy()
|
||||||
|
/// Playlist rows by identifier. Typed loosely because stored properties
|
||||||
|
/// can't be gated to iOS 18, where `UITab` arrives; values are always `UITab`.
|
||||||
|
private var playlistTabs: [String: NSObject] = [:]
|
||||||
|
private var coverImages: [String: UIImage] = [:]
|
||||||
|
private var coverTasks: [String: URLSessionDataTask] = [:]
|
||||||
var accountName = ""
|
var accountName = ""
|
||||||
var initials = ""
|
var initials = ""
|
||||||
var imageURL: String?
|
var imageURL: String?
|
||||||
@@ -82,11 +102,13 @@ final class TabletSidebarView: ExpoView {
|
|||||||
|
|
||||||
deinit {
|
deinit {
|
||||||
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
|
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
|
||||||
|
coverTasks.values.forEach { $0.cancel() }
|
||||||
}
|
}
|
||||||
|
|
||||||
@available(iOS 18.0, *)
|
@available(iOS 18.0, *)
|
||||||
private func configure(_ controller: UITabBarController) {
|
private func configure(_ controller: UITabBarController) {
|
||||||
configureGroups(controller)
|
configureGroups(controller)
|
||||||
|
configurePlaylists(controller)
|
||||||
|
|
||||||
let footer: SidebarAccountButton
|
let footer: SidebarAccountButton
|
||||||
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
|
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
|
||||||
@@ -103,6 +125,7 @@ final class TabletSidebarView: ExpoView {
|
|||||||
@available(iOS 18.0, *)
|
@available(iOS 18.0, *)
|
||||||
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
|
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
|
||||||
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
|
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
|
||||||
|
.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
|
||||||
let selected = destinations.first { $0 === controller.selectedTab }
|
let selected = destinations.first { $0 === controller.selectedTab }
|
||||||
let contextualTab = selected ?? footer.contextualTab ?? destinations.first
|
let contextualTab = selected ?? footer.contextualTab ?? destinations.first
|
||||||
footer.contextualTab = contextualTab
|
footer.contextualTab = contextualTab
|
||||||
@@ -160,6 +183,101 @@ final class TabletSidebarView: ExpoView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private let playlistTabPrefix = "otunes.playlist."
|
||||||
|
private let playlistIconSize: CGFloat = 24
|
||||||
|
|
||||||
|
extension TabletSidebarView {
|
||||||
|
/// Lists each playlist under Playlists with its cover. Rows are never
|
||||||
|
/// selected natively: a tap opens the playlist in the All Playlists stack.
|
||||||
|
@available(iOS 18.0, *)
|
||||||
|
fileprivate func configurePlaylists(_ controller: UITabBarController) {
|
||||||
|
guard let group = controller.tabs.first(where: { $0.identifier == "otunes.playlists" })
|
||||||
|
as? UITabGroup else { return }
|
||||||
|
|
||||||
|
if !(controller.delegate is SidebarSelectionProxy) {
|
||||||
|
selectionProxy.original = controller.delegate
|
||||||
|
controller.delegate = selectionProxy
|
||||||
|
}
|
||||||
|
selectionProxy.onPlaylist = { [weak self] id in self?.onPlaylistPress(["id": id]) }
|
||||||
|
|
||||||
|
var rows: [UITab] = []
|
||||||
|
for playlist in playlists {
|
||||||
|
let identifier = playlistTabPrefix + playlist.id
|
||||||
|
let tab = playlistTabs[identifier] as? UITab ?? UITab(
|
||||||
|
title: playlist.title, image: nil, identifier: identifier,
|
||||||
|
viewControllerProvider: { _ in UIViewController() })
|
||||||
|
playlistTabs[identifier] = tab
|
||||||
|
if tab.title != playlist.title { tab.title = playlist.title }
|
||||||
|
tab.preferredPlacement = .sidebarOnly
|
||||||
|
tab.image = playlistImage(identifier: identifier, url: playlist.imageURL)
|
||||||
|
rows.append(tab)
|
||||||
|
}
|
||||||
|
let ids = Set(rows.map(\.identifier))
|
||||||
|
playlistTabs = playlistTabs.filter { ids.contains($0.key) }
|
||||||
|
|
||||||
|
let fixed = group.children.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
|
||||||
|
let children = fixed + rows
|
||||||
|
if group.children.map(\.identifier) != children.map(\.identifier) {
|
||||||
|
group.children = children
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The cached cover for `url`, starting a download on a miss.
|
||||||
|
@available(iOS 18.0, *)
|
||||||
|
private func playlistImage(identifier: String, url: String?) -> UIImage? {
|
||||||
|
let placeholder = UIImage(systemName: "music.note.list")
|
||||||
|
guard let url, let remote = URL(string: url) else { return placeholder }
|
||||||
|
if let image = coverImages[url] { return image }
|
||||||
|
if coverTasks[url] == nil {
|
||||||
|
let task = URLSession.shared.dataTask(with: remote) { [weak self] data, _, _ in
|
||||||
|
guard let data, let image = UIImage(data: data) else { return }
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
guard let self else { return }
|
||||||
|
self.coverTasks[url] = nil
|
||||||
|
self.coverImages[url] = roundedIcon(image)
|
||||||
|
if let tab = self.playlistTabs[identifier] as? UITab { tab.image = self.coverImages[url] }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
coverTasks[url] = task
|
||||||
|
task.resume()
|
||||||
|
}
|
||||||
|
return placeholder
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Square cover shrunk to sidebar icon size with rounded corners, drawn as is
|
||||||
|
/// rather than tinted like a symbol.
|
||||||
|
private func roundedIcon(_ image: UIImage) -> UIImage {
|
||||||
|
let size = CGSize(width: playlistIconSize, height: playlistIconSize)
|
||||||
|
let rendered = UIGraphicsImageRenderer(size: size).image { _ in
|
||||||
|
UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 4).addClip()
|
||||||
|
image.draw(in: CGRect(origin: .zero, size: size))
|
||||||
|
}
|
||||||
|
return rendered.withRenderingMode(.alwaysOriginal)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sits in front of the router's tab controller delegate. Taps on playlist
|
||||||
|
/// rows go to JS; everything else is forwarded untouched.
|
||||||
|
private final class SidebarSelectionProxy: NSObject, UITabBarControllerDelegate {
|
||||||
|
weak var original: UITabBarControllerDelegate?
|
||||||
|
var onPlaylist: ((String) -> Void)?
|
||||||
|
|
||||||
|
override func responds(to aSelector: Selector!) -> Bool {
|
||||||
|
super.responds(to: aSelector) || (original?.responds(to: aSelector) ?? false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override func forwardingTarget(for aSelector: Selector!) -> Any? { original }
|
||||||
|
|
||||||
|
@available(iOS 18.0, *)
|
||||||
|
func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
|
||||||
|
if tab.identifier.hasPrefix(playlistTabPrefix) {
|
||||||
|
onPlaylist?(String(tab.identifier.dropFirst(playlistTabPrefix.count)))
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return original?.tabBarController?(tabBarController, shouldSelectTab: tab) ?? true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@available(iOS 18.0, *)
|
@available(iOS 18.0, *)
|
||||||
private final class SidebarAccountButton: UIView {
|
private final class SidebarAccountButton: UIView {
|
||||||
var onPress: (() -> Void)?
|
var onPress: (() -> Void)?
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
"@otunes/convex": "workspace:*",
|
"@otunes/convex": "workspace:*",
|
||||||
"@react-native-async-storage/async-storage": "2.2.0",
|
"@react-native-async-storage/async-storage": "2.2.0",
|
||||||
"@react-native-community/slider": "5.2.1",
|
"@react-native-community/slider": "5.2.1",
|
||||||
|
"@react-native-masked-view/masked-view": "0.3.2",
|
||||||
"@react-native/metro-config": "0.88.0",
|
"@react-native/metro-config": "0.88.0",
|
||||||
"convex": "^1.40.0",
|
"convex": "^1.40.0",
|
||||||
"expo": "~58.0.17",
|
"expo": "~58.0.17",
|
||||||
@@ -29,6 +30,7 @@
|
|||||||
"expo-blur": "~58.0.5",
|
"expo-blur": "~58.0.5",
|
||||||
"expo-constants": "~58.0.13",
|
"expo-constants": "~58.0.13",
|
||||||
"expo-dev-client": "~58.0.14",
|
"expo-dev-client": "~58.0.14",
|
||||||
|
"expo-file-system": "~58.0.10",
|
||||||
"expo-font": "~58.0.9",
|
"expo-font": "~58.0.9",
|
||||||
"expo-glass-effect": "~58.0.5",
|
"expo-glass-effect": "~58.0.5",
|
||||||
"expo-haptics": "~58.0.7",
|
"expo-haptics": "~58.0.7",
|
||||||
@@ -36,6 +38,7 @@
|
|||||||
"expo-image-picker": "~58.0.10",
|
"expo-image-picker": "~58.0.10",
|
||||||
"expo-linking": "~58.0.14",
|
"expo-linking": "~58.0.14",
|
||||||
"expo-navigation-bar": "~58.0.4",
|
"expo-navigation-bar": "~58.0.4",
|
||||||
|
"expo-network": "~58.0.5",
|
||||||
"expo-router": "~58.0.25",
|
"expo-router": "~58.0.25",
|
||||||
"expo-secure-store": "~58.0.2",
|
"expo-secure-store": "~58.0.2",
|
||||||
"expo-sharing": "~58.0.20",
|
"expo-sharing": "~58.0.20",
|
||||||
@@ -46,8 +49,10 @@
|
|||||||
"react": "19.3.0",
|
"react": "19.3.0",
|
||||||
"react-dom": "19.3.0",
|
"react-dom": "19.3.0",
|
||||||
"react-native": "0.88.0",
|
"react-native": "0.88.0",
|
||||||
|
"react-native-continued-task": "0.1.0",
|
||||||
"react-native-gesture-handler": "~3.3.0",
|
"react-native-gesture-handler": "~3.3.0",
|
||||||
"react-native-image-colors": "^2.6.0",
|
"react-native-image-colors": "^2.6.0",
|
||||||
|
"react-native-nitro-modules": "0.37.2",
|
||||||
"react-native-reanimated": "4.7.1",
|
"react-native-reanimated": "4.7.1",
|
||||||
"react-native-safe-area-context": "~5.10.1",
|
"react-native-safe-area-context": "~5.10.1",
|
||||||
"react-native-screens": "4.30.0",
|
"react-native-screens": "4.30.0",
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export default function Page() {
|
|||||||
<ContentCarousel
|
<ContentCarousel
|
||||||
title="Recently Added"
|
title="Recently Added"
|
||||||
href="/recently-added"
|
href="/recently-added"
|
||||||
content={recentlyAdded}
|
content={recentlyAdded.flat()}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider"
|
import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider"
|
||||||
|
import { DownloadsProvider } from "@/components/downloads-provider"
|
||||||
import { FavoritesProvider } from "@/components/favorites-provider"
|
import { FavoritesProvider } from "@/components/favorites-provider"
|
||||||
|
import { OfflineGate } from "@/components/offline-gate"
|
||||||
import { PlaybackProvider } from "@/components/playback-provider"
|
import { PlaybackProvider } from "@/components/playback-provider"
|
||||||
import { PlayerBar } from "@/components/player-bar"
|
import { PlayerBar } from "@/components/player-bar"
|
||||||
import { LazyQueuePanel } from "@/components/lazy-queue-panel"
|
import { LazyQueuePanel } from "@/components/lazy-queue-panel"
|
||||||
@@ -17,18 +19,22 @@ export default function AppLayout({
|
|||||||
<SidebarProvider>
|
<SidebarProvider>
|
||||||
<PlaybackProvider>
|
<PlaybackProvider>
|
||||||
<AddToPlaylistProvider>
|
<AddToPlaylistProvider>
|
||||||
<FavoritesProvider>
|
<DownloadsProvider>
|
||||||
<AppSidebar />
|
<FavoritesProvider>
|
||||||
<div className="flex min-h-svh min-w-0 flex-1">
|
<AppSidebar />
|
||||||
<SidebarInset className="min-w-0 flex-1">
|
<div className="flex min-h-svh min-w-0 flex-1">
|
||||||
<Suspense>
|
<SidebarInset className="min-w-0 flex-1">
|
||||||
<ScrollRestoration>{children}</ScrollRestoration>
|
<Suspense>
|
||||||
</Suspense>
|
<ScrollRestoration>
|
||||||
</SidebarInset>
|
<OfflineGate>{children}</OfflineGate>
|
||||||
<LazyQueuePanel />
|
</ScrollRestoration>
|
||||||
</div>
|
</Suspense>
|
||||||
<PlayerBar />
|
</SidebarInset>
|
||||||
</FavoritesProvider>
|
<LazyQueuePanel />
|
||||||
|
</div>
|
||||||
|
<PlayerBar />
|
||||||
|
</FavoritesProvider>
|
||||||
|
</DownloadsProvider>
|
||||||
</AddToPlaylistProvider>
|
</AddToPlaylistProvider>
|
||||||
</PlaybackProvider>
|
</PlaybackProvider>
|
||||||
</SidebarProvider>
|
</SidebarProvider>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ export default function Page() {
|
|||||||
) : (
|
) : (
|
||||||
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
||||||
<div className={albumGridClassName}>
|
<div className={albumGridClassName}>
|
||||||
{albums.map((album) => (
|
{albums.flat().map((album) => (
|
||||||
<AlbumCard key={album.id} album={album} />
|
<AlbumCard key={album.id} album={album} />
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
"use client"
|
||||||
|
|
||||||
|
import { OtherDownloadsView } from "@/components/other-downloads-view"
|
||||||
|
|
||||||
|
export default function Page() {
|
||||||
|
return <OtherDownloadsView />
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
"use client"
|
||||||
|
|
||||||
|
import { DownloadsView } from "@/components/downloads-view"
|
||||||
|
|
||||||
|
export default function Page() {
|
||||||
|
return <DownloadsView />
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
|
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
|
||||||
|
|
||||||
export default function Loading() {
|
export default function Loading() {
|
||||||
return <CollectionDetailSkeleton />
|
return <CollectionDetailSkeleton search />
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
|
import { CollectionDetailSkeleton } from "@/components/library-skeletons"
|
||||||
|
|
||||||
export default function Loading() {
|
export default function Loading() {
|
||||||
return <CollectionDetailSkeleton />
|
return <CollectionDetailSkeleton search />
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,7 @@ export default function Page() {
|
|||||||
) : (
|
) : (
|
||||||
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
||||||
<div className={albumGridClassName}>
|
<div className={albumGridClassName}>
|
||||||
{albums.map((album) => (
|
{albums.flat().map((album) => (
|
||||||
<AlbumCard key={album.id} album={album} />
|
<AlbumCard key={album.id} album={album} />
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -8,11 +8,7 @@ import { albumGridClassName } from "@/lib/album-grid-classes"
|
|||||||
import { api } from "@otunes/convex/_generated/api"
|
import { api } from "@otunes/convex/_generated/api"
|
||||||
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
|
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
|
||||||
|
|
||||||
function RecentlyPlayedCard({
|
function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) {
|
||||||
item,
|
|
||||||
}: {
|
|
||||||
item: BrowseAlbum | PlaylistSummary
|
|
||||||
}) {
|
|
||||||
if ("owner" in item) {
|
if ("owner" in item) {
|
||||||
return <PlaylistCard playlist={item} />
|
return <PlaylistCard playlist={item} />
|
||||||
}
|
}
|
||||||
|
|||||||
Loaded 100 of 209 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user