Compare commits

..
214 changed files with 2980 additions and 12557 deletions

No files matched your search

+1 -6
View File
@@ -41,9 +41,4 @@ apps/web/next-env.d.ts
/.convex /.convex
/.cursor /.cursor
/database /database
docker-compose.yml docker-compose.yml
**/credentials.json
**/credentials/
**/*.ipa
**/*.apk
+15 -7
View File
@@ -25,16 +25,20 @@ FROM node:${NODE_VERSION} AS dependencies
WORKDIR /app WORKDIR /app
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex). # Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
# Mobile's manifest is never copied, so the workspace globs cannot discover it. # Mobile is intentionally omitted so its deps are never installed.
# The workspace file must be the real one: its overrides and patches are COPY package.json pnpm-lock.yaml .npmrc ./
# checked against the lockfile.
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./
# pnpm validates patches even when their packages are outside the install filter. # pnpm validates patches even when their packages are outside the install filter.
COPY patches ./patches COPY patches ./patches
COPY apps/web/package.json ./apps/web/ COPY apps/web/package.json ./apps/web/
COPY packages/convex/package.json ./packages/convex/ COPY packages/convex/package.json ./packages/convex/
RUN printf '\n%s\n' \ # Explicit workspace — do not use apps/* so mobile cannot be discovered.
RUN printf '%s\n' \
'packages:' \
' - "apps/web"' \
' - "packages/convex"' \
>> pnpm-workspace.yaml \
&& printf '\n%s\n' \
'supportedArchitectures.os=current' \ 'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \ 'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \ 'supportedArchitectures.libc=current' \
@@ -78,11 +82,15 @@ FROM node:${NODE_VERSION} AS convex-functions
WORKDIR /app WORKDIR /app
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./ COPY package.json pnpm-lock.yaml .npmrc ./
COPY patches ./patches COPY patches ./patches
COPY packages/convex/package.json ./packages/convex/ COPY packages/convex/package.json ./packages/convex/
RUN printf '\n%s\n' \ RUN printf '%s\n' \
'packages:' \
' - "packages/convex"' \
> pnpm-workspace.yaml \
&& printf '\n%s\n' \
'supportedArchitectures.os=current' \ 'supportedArchitectures.os=current' \
'supportedArchitectures.cpu=current' \ 'supportedArchitectures.cpu=current' \
'supportedArchitectures.libc=current' \ 'supportedArchitectures.libc=current' \
+4 -9
View File
@@ -73,15 +73,10 @@ select your signing team, then build and run. For a Release build, use Xcode's
Archive action with the Catalyst destination. EAS's existing iOS profiles still Archive action with the Catalyst destination. EAS's existing iOS profiles still
build iPhone/iPad apps. build iPhone/iPad apps.
Don't enable Catalyst by hand in Xcode; the plugin configures everything during The Catalyst plugin enables the Xcode target and React Native's CocoaPods
prebuild. It enables the Xcode target and React Native's CocoaPods patches, patches. It disables precompiled React Native and Expo modules so dependencies
raises pod deployment targets to the app's, and disables precompiled React can compile for Catalyst. The Mac app derives a separate bundle identifier with
Native and Expo modules so dependencies can compile for Catalyst. System volume Apple's `maccatalyst.` prefix. System volume stays under macOS control.
stays under macOS control.
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
same team. Handoff only pairs apps with a matching team and activity type, which
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
To return a checkout to ordinary iOS builds, rerun prebuild without To return a checkout to ordinary iOS builds, rerun prebuild without
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro. `MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
+2 -5
View File
@@ -26,8 +26,6 @@ export default ({ config }: ConfigContext): ExpoConfig => {
production: "oTunes", production: "oTunes",
}[variant] }[variant]
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
return { return {
...config, ...config,
plugins: [ plugins: [
@@ -42,12 +40,11 @@ export default ({ config }: ConfigContext): ExpoConfig => {
icon: `./assets/icon${iconSuffix}.png`, icon: `./assets/icon${iconSuffix}.png`,
ios: { ios: {
...config.ios, ...config.ios,
bundleIdentifier, bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
icon: `./assets/${composer}.icon`, icon: `./assets/${composer}.icon`,
infoPlist: { infoPlist: {
...config.ios?.infoPlist, ...config.ios?.infoPlist,
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID. NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
NSUserActivityTypes: [`${bundleIdentifier}.media`],
}, },
}, },
android: { android: {
@@ -1,11 +1,7 @@
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { renderTabScreenContent } from "@/components/tab-screen-content" import { renderTabScreenContent } from "@/components/tab-screen-content"
import { import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
inlineTitleOptions,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation" import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
export default function TabletSectionLayout({ segment }: { segment: string }) { export default function TabletSectionLayout({ segment }: { segment: string }) {
@@ -18,7 +14,6 @@ export default function TabletSectionLayout({ segment }: { segment: string }) {
screenLayout={renderTabScreenContent} screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
...options, ...options,
...inlineTitleOptions,
title: title:
route.name === "index" route.name === "index"
? section?.title ? section?.title
@@ -5,7 +5,6 @@ import Songs from "../home/browse/songs"
import Playlists from "../home/browse/playlists" import Playlists from "../home/browse/playlists"
import Favorites from "../home/playlist/favorites" import Favorites from "../home/playlist/favorites"
import RecentlyPlayed from "../home/recently-played" import RecentlyPlayed from "../home/recently-played"
import Downloads from "../home/downloads"
import { TabletSectionContext } from "@/lib/tablet-navigation" import { TabletSectionContext } from "@/lib/tablet-navigation"
const screens = { const screens = {
@@ -15,7 +14,6 @@ const screens = {
playlists: Playlists, playlists: Playlists,
favorites: Favorites, favorites: Favorites,
recent: RecentlyPlayed, recent: RecentlyPlayed,
downloads: Downloads,
} }
export default function TabletSectionScreen() { export default function TabletSectionScreen() {
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
+1 -11
View File
@@ -127,9 +127,7 @@ function TabsContent() {
tintColor={tabColors.tintColor} tintColor={tabColors.tintColor}
minimizeBehavior="onScrollDown" minimizeBehavior="onScrollDown"
{...(Platform.OS === "android" {...(Platform.OS === "android"
? // A new ripple color rebuilds Material's item backgrounds and ? { disableIndicator: true, rippleColor: tabColors.tintColor }
// cuts off the in-flight ripple, so it must not follow the palette.
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
: {})} : {})}
> >
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? ( {Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
@@ -193,14 +191,6 @@ 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)}
@@ -2,11 +2,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button" import { ProfileHeaderButton } from "@/components/profile-header-button"
import { import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
inlineTitleOptions,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
export const unstable_settings = { export const unstable_settings = {
anchor: "index", anchor: "index",
@@ -20,7 +16,6 @@ export default function HomeLayout() {
screenLayout={renderTabScreenContent} screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
...baseOptions, ...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Home", title: tabStackScreenTitles[route.name] ?? "Home",
headerRight: headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined, route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
+42 -105
View File
@@ -1,4 +1,3 @@
import { Ionicons } from "@expo/vector-icons"
import { SongSwipeRow } from "@/components/song-swipe-row" import { SongSwipeRow } from "@/components/song-swipe-row"
import { import {
useSwipeRowGroup, useSwipeRowGroup,
@@ -15,6 +14,7 @@ import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native" import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
import { Ionicons } from "@expo/vector-icons"
import { import {
CollectionDivider, CollectionDivider,
@@ -22,18 +22,6 @@ import {
DiscHeader, DiscHeader,
} from "@/components/collection-list" } from "@/components/collection-list"
import { AudioFormatBadge } from "@/components/audio-format-badge" import { AudioFormatBadge } from "@/components/audio-format-badge"
import {
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 {
@@ -70,18 +58,9 @@ export default function AlbumScreen() {
api.library.browseAlbumDetail, api.library.browseAlbumDetail,
typeof id === "string" ? { id: id as Id<"albums"> } : "skip" typeof id === "string" ? { id: id as Id<"albums"> } : "skip"
) )
const { const { playAlbum, playAlbumShuffled, playFromSong } = usePlaybackActions()
playAlbum, const { isAlbumFavorite, toggleAlbumFavorite, isSongFavorite } =
playAlbumShuffled, useFavorites()
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin(`album:${id}`)
: `album:${id}`
const { isSongFavorite } = useFavorites()
const { const {
handleAlbumDetailAction, handleAlbumDetailAction,
handleAlbumTrackAction, handleAlbumTrackAction,
@@ -102,17 +81,6 @@ 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) {
@@ -124,8 +92,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, playOrigin), playFromSong(songId, ids, `album:${id}`),
[playOrigin, playFromSong] [id, playFromSong]
) )
const renderItem = useCallback( const renderItem = useCallback(
@@ -174,7 +142,7 @@ export default function AlbumScreen() {
}} }}
/> />
<CollectionDetailSkeleton <CollectionDetailSkeleton
variant="album" zoomCoverSize={220}
onLayout={onLayout} onLayout={onLayout}
style={backgroundStyle} style={backgroundStyle}
backgroundColor={ backgroundColor={
@@ -204,6 +172,7 @@ 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 (
<> <>
@@ -228,28 +197,21 @@ 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) =>
if (action === "download") { void handleAlbumDetailAction(
void requestDownload(downloadTarget) album.id as Id<"albums">,
} else if (action === "remove-download") { songIds,
void removeDownload(downloadTarget) action,
} else { album.artist.id as Id<"artists">
void handleAlbumDetailAction( )
album.id as Id<"albums">, }
songIds,
action,
album.artist.id as Id<"artists">
)
}
}}
> >
<Pressable hitSlop={8}> <Pressable hitSlop={8}>
<Ionicons <Ionicons
name="ellipsis-horizontal" name="ellipsis-horizontal"
size={22} size={22}
color={colors.foreground} color={palette.isDark ? "#fff" : "#000"}
/> />
</Pressable> </Pressable>
</MediaActionMenu> </MediaActionMenu>
@@ -299,15 +261,35 @@ 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={() => onPress={() => void playAlbumShuffled(album.id, songIds)}
void (fromDownloads
? playShuffled(songIds, playOrigin)
: playAlbumShuffled(album.id, songIds))
}
style={[ style={[
styles.iconAction, styles.iconAction,
{ backgroundColor: palette.surface }, { backgroundColor: palette.surface },
@@ -319,28 +301,6 @@ 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>
} }
> >
@@ -412,11 +372,6 @@ export default function AlbumScreen() {
</> </>
) : null} ) : null}
</View> </View>
<DownloadedQuality
collection={downloadTarget}
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</CollectionHero> </CollectionHero>
</MusicEntityView> </MusicEntityView>
<CollectionDivider color={palette.divider} /> <CollectionDivider color={palette.divider} />
@@ -496,13 +451,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
}) { }) {
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
const { config } = useServerConfig() const { config } = useServerConfig()
const downloadRef = useMemo(
() => ({ kind: "album" as const, id: album.id }),
[album.id]
)
const downloadState = useSongDownloadState(track.id, downloadRef)
const downloaded = downloadState === "here"
const toggleDownload = useToggleSongDownload()
return ( return (
<MediaContextMenu <MediaContextMenu
preview={ preview={
@@ -519,7 +467,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
} }
stationArtistId={album.artist.id} stationArtistId={album.artist.id}
favorited={favorited} favorited={favorited}
downloaded={downloaded}
navigation={{ navigation={{
artist: { id: album.artist.id }, artist: { id: album.artist.id },
album: { id: album.id }, album: { id: album.id },
@@ -538,8 +485,6 @@ 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)}
> >
@@ -570,14 +515,6 @@ 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>
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
headerLargeTitle: false, headerLargeTitle: false,
}} }}
/> />
<CollectionDetailSkeleton variant="artist" /> <CollectionDetailSkeleton round />
</> </>
) )
} }
@@ -53,7 +53,7 @@ export default function AlbumsScreen() {
return ( return (
<> <>
{searchBar} {searchBar}
<MediaGridSkeleton title="Albums" /> <MediaGridSkeleton />
</> </>
) )
} }
@@ -63,7 +63,6 @@ export default function AlbumsScreen() {
{searchBar} {searchBar}
<MediaGridList <MediaGridList
title="Albums"
content={albums} content={albums}
paddingBottom={contentBottomInset} paddingBottom={contentBottomInset}
onEndReached={() => { onEndReached={() => {
@@ -2,13 +2,12 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { memo, useCallback } from "react" import { memo, useCallback } from "react"
import { import {
type FlatList, FlatList,
Pressable, Pressable,
StyleSheet, StyleSheet,
Text, Text,
type ListRenderItemInfo, type ListRenderItemInfo,
} from "react-native" } from "react-native"
import Animated from "react-native-reanimated"
import { import {
MediaContextMenu, MediaContextMenu,
@@ -16,7 +15,6 @@ import {
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { ArtistListSkeleton } from "@/components/skeletons" import { ArtistListSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { contentBottomInset } from "@/components/player" import { contentBottomInset } from "@/components/player"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { import {
@@ -35,7 +33,6 @@ import { spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 50 const PAGE_SIZE = 50
export default function ArtistsScreen() { export default function ArtistsScreen() {
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseArtist>>()
const { push } = useAppNavigation() const { push } = useAppNavigation()
const colors = useThemeColors() const colors = useThemeColors()
const { config } = useServerConfig() const { config } = useServerConfig()
@@ -97,7 +94,7 @@ export default function ArtistsScreen() {
return ( return (
<> <>
{searchBar} {searchBar}
<ArtistListSkeleton title="Artists" /> <ArtistListSkeleton />
</> </>
) )
} }
@@ -106,11 +103,8 @@ export default function ArtistsScreen() {
<> <>
{searchBar} {searchBar}
<Animated.FlatList <FlatList
{...longListProps} {...longListProps}
ref={ref}
scrollEventThrottle={16}
ListHeaderComponent={<ScreenTitle title="Artists" scrollY={scrollY} />}
data={artists} data={artists}
keyExtractor={artistKey} keyExtractor={artistKey}
renderItem={renderItem} renderItem={renderItem}
@@ -1,4 +1,3 @@
import { useContext } from "react"
import { Pressable } from "react-native" import { Pressable } from "react-native"
import { MediaGridList } from "@/components/media-cards" import { MediaGridList } from "@/components/media-cards"
@@ -11,20 +10,19 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { SymbolView } from "expo-symbols" import { SymbolView } from "expo-symbols"
import { useAddToPlaylist } from "@/contexts/add-to-playlist" import { useAddToPlaylist } from "@/contexts/add-to-playlist"
import { TabletSectionContext } from "@/lib/tablet-navigation"
export default function PlaylistsTabScreen() { export default function PlaylistsTabScreen() {
const colors = useThemeColors() const colors = useThemeColors()
const playlists = useCachedQuery(api.playlists.listAllPlaylists) const playlists = useCachedQuery(api.playlists.listAllPlaylists)
const { openCreatePlaylist } = useAddToPlaylist() const { openCreatePlaylist } = useAddToPlaylist()
const title = useContext(TabletSectionContext)?.title ?? "Playlists"
if (playlists === undefined) { if (playlists === undefined) {
return ( return (
<> <>
<Stack.Screen <Stack.Screen
options={{ options={{
title, title: "Playlists",
headerLargeTitle: true,
headerRight: () => ( headerRight: () => (
<Pressable <Pressable
onPress={openCreatePlaylist} onPress={openCreatePlaylist}
@@ -40,7 +38,7 @@ export default function PlaylistsTabScreen() {
), ),
}} }}
/> />
<MediaGridSkeleton title={title} /> <MediaGridSkeleton />
</> </>
) )
} }
@@ -49,7 +47,8 @@ export default function PlaylistsTabScreen() {
<> <>
<Stack.Screen <Stack.Screen
options={{ options={{
title, title: "Playlists",
headerLargeTitle: true,
headerRight: () => ( headerRight: () => (
<Pressable <Pressable
onPress={openCreatePlaylist} onPress={openCreatePlaylist}
@@ -62,7 +61,6 @@ export default function PlaylistsTabScreen() {
}} }}
/> />
<MediaGridList <MediaGridList
title={title}
content={playlists} content={playlists}
paddingBottom={tabContentBottomInset} paddingBottom={tabContentBottomInset}
/> />
@@ -1,16 +1,10 @@
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { useCallback, useState } from "react" import { useCallback, useState } from "react"
import { import { FlatList, StyleSheet, type ListRenderItemInfo } from "react-native"
type FlatList,
StyleSheet,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import type { MediaAction } from "@/components/media-context-menu" import type { MediaAction } from "@/components/media-context-menu"
import { contentBottomInset, SongListRow } from "@/components/player" import { contentBottomInset, SongListRow } from "@/components/player"
import { SongListSkeleton } from "@/components/skeletons" import { SongListSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback" import { usePlaybackActions } from "@/contexts/playback"
import { import {
@@ -26,7 +20,6 @@ import { longListProps } from "@/lib/list"
const PAGE_SIZE = 50 const PAGE_SIZE = 50
export default function SongsScreen() { export default function SongsScreen() {
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const { playFromLibrarySong } = usePlaybackActions() const { playFromLibrarySong } = usePlaybackActions()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions() const { handleSongAction } = useMediaMenuActions()
@@ -94,7 +87,7 @@ export default function SongsScreen() {
return ( return (
<> <>
{searchBar} {searchBar}
<SongListSkeleton title="Songs" /> <SongListSkeleton />
</> </>
) )
} }
@@ -103,11 +96,8 @@ export default function SongsScreen() {
<> <>
{searchBar} {searchBar}
<Animated.FlatList <FlatList
{...longListProps} {...longListProps}
ref={ref}
scrollEventThrottle={16}
ListHeaderComponent={<ScreenTitle title="Songs" scrollY={scrollY} />}
data={songs} data={songs}
keyExtractor={songKey} keyExtractor={songKey}
renderItem={renderItem} renderItem={renderItem}
@@ -1,188 +0,0 @@
import { useMemo } from "react"
import {
type FlatList,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import { Stack } from "expo-router"
import Animated from "react-native-reanimated"
import { CoverImage } from "@/components/cover-image"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
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 { ref, scrollY } = useScreenTitleScroll<FlatList<Card>>()
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" }} />
<Animated.FlatList
ref={ref}
scrollEventThrottle={16}
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={{
paddingHorizontal: horizontalPadding,
paddingBottom: tabContentBottomInset,
gap,
}}
columnWrapperStyle={columns > 1 ? { gap } : undefined}
contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={
<ScreenTitle
title="Downloads"
scrollY={scrollY}
// The list padding already insets the title.
style={{ paddingHorizontal: 0 }}
/>
}
ListEmptyComponent={
<View style={styles.empty}>
<Text style={{ color: colors.mutedForeground }}>
Nothing downloaded on this device.
</Text>
</View>
}
/>
</>
)
}
const styles = StyleSheet.create({
card: { gap: spacing.xs },
title: { fontSize: 14, fontWeight: "600" },
subtitle: { fontSize: 12, fontVariant: ["tabular-nums"] },
empty: { alignItems: "center", paddingTop: spacing.xl },
})
@@ -1,162 +0,0 @@
import { useCallback, useMemo } from "react"
import {
type FlatList,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import Animated from "react-native-reanimated"
import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
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 { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
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 }} />
<Animated.FlatList
{...longListProps}
ref={ref}
scrollEventThrottle={16}
data={songs}
keyExtractor={(song) => song.id}
renderItem={renderItem}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: contentBottomInset }}
contentInsetAdjustmentBehavior="automatic"
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListHeaderComponent={
<>
<ScreenTitle title={OTHER_DOWNLOADS_TITLE} scrollY={scrollY} />
{songs.length > 0 ? (
<View style={styles.actions}>
<Button
title="Play"
icon="play"
onPress={() => void playInOrder(playableIds, PLAY_ORIGIN)}
style={styles.play}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playShuffled(playableIds, PLAY_ORIGIN)}
style={[styles.shuffle, { backgroundColor: colors.card }]}
>
<Ionicons
name="shuffle"
size={24}
color={colors.foreground}
/>
</Pressable>
</View>
) : null}
</>
}
ListEmptyComponent={
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
Songs you download on their own appear here.
</Text>
}
/>
</>
)
}
const styles = StyleSheet.create({
actions: {
flexDirection: "row",
alignItems: "center",
gap: spacing.sm,
padding: spacing.lg,
},
play: { flex: 1 },
shuffle: {
width: 48,
height: 48,
borderRadius: 24,
alignItems: "center",
justifyContent: "center",
},
empty: { padding: spacing.lg, textAlign: "center" },
})
+5 -20
View File
@@ -1,10 +1,8 @@
import { memo } from "react" import { memo } from "react"
import { type ScrollViewInstance, StyleSheet } from "react-native" import { ScrollView, StyleSheet } from "react-native"
import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards" import { ContentCarousel } from "@/components/media-cards"
import { HomeSkeleton } from "@/components/skeletons" import { HomeSkeleton } from "@/components/skeletons"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { tabContentBottomInset } from "@/components/player" import { tabContentBottomInset } from "@/components/player"
import { useCachedPaginatedQuery } from "@/hooks/use-cached-query" import { useCachedPaginatedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -40,7 +38,6 @@ const HomeCarousels = memo(function HomeCarousels({
export default function HomeScreen() { export default function HomeScreen() {
const colors = useThemeColors() const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<ScrollViewInstance>()
const recentlyAdded = useCachedPaginatedQuery( const recentlyAdded = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated, api.library.browseRecentlyAddedPaginated,
{}, {},
@@ -56,26 +53,20 @@ export default function HomeScreen() {
(result) => result.status === "LoadingFirstPage" && !result.isCached (result) => result.status === "LoadingFirstPage" && !result.isCached
) )
if (isLoading) { if (isLoading) {
return <HomeSkeleton title="Home" /> return <HomeSkeleton />
} }
const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT) const added = recentlyAdded.results.slice(0, CAROUSEL_ITEM_LIMIT)
const played = recentlyPlayed.results.slice(0, CAROUSEL_ITEM_LIMIT) const played = recentlyPlayed.results.slice(0, CAROUSEL_ITEM_LIMIT)
return ( return (
<Animated.ScrollView <ScrollView
ref={ref}
scrollEventThrottle={16}
style={{ flex: 1, backgroundColor: colors.background }} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[ contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
styles.content,
{ paddingBottom: tabContentBottomInset },
]}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
> >
<ScreenTitle title="Home" scrollY={scrollY} style={styles.title} />
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} /> <HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
</Animated.ScrollView> </ScrollView>
) )
} }
@@ -84,10 +75,4 @@ const styles = StyleSheet.create({
padding: spacing.lg, padding: spacing.lg,
gap: spacing.xl, gap: spacing.xl,
}, },
// The content padding already insets the title.
title: {
paddingHorizontal: 0,
marginTop: -spacing.lg,
marginBottom: -spacing.md,
},
}) })
@@ -1,4 +1,3 @@
import { Ionicons } from "@expo/vector-icons"
import { import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
@@ -29,6 +28,7 @@ import {
type ListRenderItemInfo, type ListRenderItemInfo,
} from "react-native" } from "react-native"
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable" import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
import { Ionicons } from "@expo/vector-icons"
import { CollectionDivider } from "@/components/collection-list" import { CollectionDivider } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
@@ -44,19 +44,6 @@ import {
import { CollectionDetailSkeleton } from "@/components/skeletons" import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives" import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player" import { contentBottomInset, SongListRow } from "@/components/player"
import {
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"
@@ -81,7 +68,6 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
"play-last", "play-last",
"shuffle", "shuffle",
"favorite", "favorite",
"change-cover",
"delete-playlist", "delete-playlist",
] ]
@@ -97,11 +83,7 @@ export default function PlaylistScreen() {
const songs = playlist?.songs const songs = playlist?.songs
const coverUri = const coverUri =
config && playlistId config && playlistId
? playlistCoverUrl( ? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
config.serverUrl,
playlist?.id ?? playlistId,
playlist?.cover ?? null
)
: "" : ""
const { palette: artworkPalette, settled } = useCoverPalette( const { palette: artworkPalette, settled } = useCoverPalette(
coverUri, coverUri,
@@ -130,7 +112,7 @@ export default function PlaylistScreen() {
}} }}
/> />
<CollectionDetailSkeleton <CollectionDetailSkeleton
variant="playlist" zoomCoverSize={200}
onLayout={onLayout} onLayout={onLayout}
style={backgroundStyle} style={backgroundStyle}
backgroundColor={ backgroundColor={
@@ -188,18 +170,10 @@ function PlaylistContent({
}) { }) {
const router = useRouter() const router = useRouter()
const isFocused = useIsFocused() const isFocused = useIsFocused()
const colors = useThemeColors() const { playPlaylist, playPlaylistShuffled, playFromSong } =
const { usePlaybackActions()
playPlaylist,
playPlaylistShuffled,
playFromSong,
playInOrder,
playShuffled,
} = usePlaybackActions()
const fromDownloads = useOpenedFromDownloads()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions() const { handleSongAction, handlePlaylistDetailAction } = useMediaMenuActions()
const { requestDownload, removeDownload } = useDownloads()
const subscribe = useMutation(api.playlists.subscribeToPlaylist) const subscribe = useMutation(api.playlists.subscribeToPlaylist)
const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist) const unsubscribe = useMutation(api.playlists.unsubscribeFromPlaylist)
const deletePlaylist = useMutation(api.playlists.deletePlaylist) const deletePlaylist = useMutation(api.playlists.deletePlaylist)
@@ -212,25 +186,11 @@ function PlaylistContent({
const { filteredSongs, onQueryChange, onSearchSubmit } = const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs) usePlaylistSearch(songs)
const swipeGroup = useSwipeRowGroup() const swipeGroup = useSwipeRowGroup()
const downloadRef = useMemo(
() => ({
kind: "playlist" as const,
id: playlistId ?? FAVORITES_DOWNLOAD_ID,
}),
[playlistId]
)
const downloadTarget = useMemo(
() => ({ ...downloadRef, title: playlist.title, songIds }),
[downloadRef, playlist.title, songIds]
)
const playOrigin = fromDownloads
? downloadsQueueOrigin(`playlist:${downloadRef.id}`)
: `playlist:${playlistId}`
const playlistDownloaded = useIsCollectionDownloaded(downloadTarget)
const handlePlaySong = useCallback( const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin), (song: BrowseSong) =>
[playFromSong, songIds, playOrigin] void playFromSong(song.id, songIds, `playlist:${playlistId}`),
[playFromSong, songIds, playlistId]
) )
const handleRemoveSong = useCallback( const handleRemoveSong = useCallback(
@@ -254,34 +214,18 @@ 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, downloadRef) else void handleSongAction(song, action)
}, },
[downloadRef, handleRemoveSong, handleSongAction] [handleRemoveSong, handleSongAction]
) )
const handlePlay = useCallback(() => { const handlePlay = useCallback(() => {
if (fromDownloads) void playInOrder(songIds, playOrigin) if (playlistId) void playPlaylist(playlistId, songIds)
else if (playlistId) void playPlaylist(playlistId, songIds) }, [playPlaylist, playlistId, songIds])
}, [
fromDownloads,
playInOrder,
playOrigin,
playPlaylist,
playlistId,
songIds,
])
const handleShuffle = useCallback(() => { const handleShuffle = useCallback(() => {
if (fromDownloads) void playShuffled(songIds, playOrigin) if (playlistId) void playPlaylistShuffled(playlistId, songIds)
else if (playlistId) void playPlaylistShuffled(playlistId, songIds) }, [playPlaylistShuffled, playlistId, songIds])
}, [
fromDownloads,
playShuffled,
playOrigin,
playPlaylistShuffled,
playlistId,
songIds,
])
const handleSubscribeToggle = useCallback(async () => { const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return if (!playlistId) return
@@ -316,23 +260,6 @@ function PlaylistContent({
void handleDelete() void handleDelete()
return return
} }
if (action === "change-cover") {
if (playlistId) {
router.push({
pathname: "/playlist-cover",
params: { id: playlistId },
})
}
return
}
if (action === "download") {
void requestDownload(downloadTarget)
return
}
if (action === "remove-download") {
void removeDownload(downloadTarget)
return
}
void handlePlaylistDetailAction(songIds, action) void handlePlaylistDetailAction(songIds, action)
} }
@@ -353,7 +280,6 @@ 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",
@@ -366,7 +292,7 @@ function PlaylistContent({
<Ionicons <Ionicons
name="ellipsis-horizontal" name="ellipsis-horizontal"
size={22} size={22}
color={colors.foreground} color={palette.isDark ? "#fff" : "#000"}
/> />
</Pressable> </Pressable>
</MediaActionMenu> </MediaActionMenu>
@@ -374,12 +300,7 @@ function PlaylistContent({
} }
}, [ }, [
canEdit, canEdit,
colors.foreground,
deletePlaylist, deletePlaylist,
downloadTarget,
playlistDownloaded,
requestDownload,
removeDownload,
handlePlaylistDetailAction, handlePlaylistDetailAction,
palette.foreground, palette.foreground,
palette.isDark, palette.isDark,
@@ -397,7 +318,6 @@ function PlaylistContent({
removable={canEdit} removable={canEdit}
palette={palette} palette={palette}
swipeGroup={swipeGroup} swipeGroup={swipeGroup}
downloadRef={downloadRef}
onPlay={handlePlaySong} onPlay={handlePlaySong}
onAction={handleSongMenuAction} onAction={handleSongMenuAction}
onRemove={handleRemoveSong} onRemove={handleRemoveSong}
@@ -405,7 +325,6 @@ function PlaylistContent({
), ),
[ [
canEdit, canEdit,
downloadRef,
handlePlaySong, handlePlaySong,
handleRemoveSong, handleRemoveSong,
handleSongMenuAction, handleSongMenuAction,
@@ -460,7 +379,6 @@ 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}
/> />
@@ -480,7 +398,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
removable, removable,
palette, palette,
swipeGroup, swipeGroup,
downloadRef,
onPlay, onPlay,
onAction, onAction,
onRemove, onRemove,
@@ -490,7 +407,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
removable: boolean removable: boolean
palette: CoverPalette palette: CoverPalette
swipeGroup: SwipeRowGroup swipeGroup: SwipeRowGroup
downloadRef: CollectionRef
onPlay: (song: BrowseSong) => void onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void onAction: (song: BrowseSong, action: MediaAction) => void
onRemove: (songId: Id<"songs">) => Promise<boolean> onRemove: (songId: Id<"songs">) => Promise<boolean>
@@ -505,7 +421,6 @@ 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"
? { ? {
@@ -571,11 +486,9 @@ 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
@@ -643,15 +556,6 @@ 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"
@@ -662,11 +566,15 @@ const PlaylistHero = memo(function PlaylistHero({
foreground: palette.accentForeground, foreground: palette.accentForeground,
}} }}
/> />
<CollectionDownloadButton <Pressable
target={downloadTarget} accessibilityRole="button"
color={palette.foreground} accessibilityLabel="Shuffle"
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>
} }
> >
@@ -687,11 +595,6 @@ 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,14 +16,6 @@ import { CollectionDivider } from "@/components/collection-list"
import { CollectionDetailSkeleton } from "@/components/skeletons" import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives" import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player" import { contentBottomInset, SongListRow } from "@/components/player"
import {
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"
@@ -39,52 +31,39 @@ import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router" import { Stack } from "expo-router"
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false } const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
const DOWNLOAD_REF = { kind: "playlist", id: FAVORITES_DOWNLOAD_ID } as const
export default function FavoritesScreen() { export default function FavoritesScreen() {
const colors = useThemeColors() const colors = useThemeColors()
const { config } = useServerConfig() const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail) const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites]) const songs = favorites?.songs ?? []
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions() const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions() const { handleSongAction } = useMediaMenuActions()
const songIds = useMemo(() => songs.map((song) => song.id), [songs]) const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const fromDownloads = useOpenedFromDownloads()
const playOrigin = fromDownloads
? downloadsQueueOrigin("playlist:favorites")
: undefined
const 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(() => {
rememberSongs(songs) if (favorites) rememberSongs(favorites.songs)
}, [songs]) }, [favorites])
const handlePlaySong = useCallback( const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds, playOrigin), (song: BrowseSong) => void playFromSong(song.id, songIds),
[playFromSong, playOrigin, songIds] [playFromSong, songIds]
) )
const handleSongMenuAction = useCallback( const handleSongMenuAction = useCallback(
(song: BrowseSong, action: MediaAction) => (song: BrowseSong, action: MediaAction) =>
void handleSongAction(song, action, DOWNLOAD_REF), void handleSongAction(song, action),
[handleSongAction] [handleSongAction]
) )
const handlePlay = useCallback( const handlePlay = useCallback(
() => void playInOrder(songIds, playOrigin), () => void playInOrder(songIds),
[playInOrder, playOrigin, songIds] [playInOrder, songIds]
) )
const handleShuffle = useCallback( const handleShuffle = useCallback(
() => void playShuffled(songIds, playOrigin), () => void playShuffled(songIds),
[playShuffled, playOrigin, songIds] [playShuffled, songIds]
) )
const renderItem = useCallback( const renderItem = useCallback(
@@ -94,7 +73,6 @@ export default function FavoritesScreen() {
favorited={isSongFavorite(song.id)} favorited={isSongFavorite(song.id)}
playlistLabel="Add to Another Playlist" playlistLabel="Add to Another Playlist"
inset inset
downloadFrom={DOWNLOAD_REF}
onPlay={handlePlaySong} onPlay={handlePlaySong}
onAction={handleSongMenuAction} onAction={handleSongMenuAction}
/> />
@@ -106,7 +84,7 @@ export default function FavoritesScreen() {
return ( return (
<> <>
<Stack.Screen options={SCREEN_OPTIONS} /> <Stack.Screen options={SCREEN_OPTIONS} />
<CollectionDetailSkeleton variant="favorites" /> <CollectionDetailSkeleton />
</> </>
) )
} }
@@ -149,7 +127,6 @@ export default function FavoritesScreen() {
ListHeaderComponent={ ListHeaderComponent={
<FavoritesHero <FavoritesHero
title={favorites.title} title={favorites.title}
downloadTarget={downloadTarget}
onPlay={handlePlay} onPlay={handlePlay}
onShuffle={handleShuffle} onShuffle={handleShuffle}
/> />
@@ -165,12 +142,10 @@ 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
}) { }) {
@@ -191,12 +166,13 @@ 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"
@@ -206,17 +182,6 @@ 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 />
@@ -14,12 +14,11 @@ export default function RecentlyAddedScreen() {
) )
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton title="Recently Added" /> return <MediaGridSkeleton />
} }
return ( return (
<MediaGridList <MediaGridList
title="Recently Added"
content={results} content={results}
paddingBottom={contentBottomInset} paddingBottom={contentBottomInset}
onEndReached={() => { onEndReached={() => {
@@ -14,12 +14,11 @@ export default function RecentlyPlayedScreen() {
) )
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
return <MediaGridSkeleton title="Recently Played" /> return <MediaGridSkeleton />
} }
return ( return (
<MediaGridList <MediaGridList
title="Recently Played"
content={results} content={results}
paddingBottom={contentBottomInset} paddingBottom={contentBottomInset}
onEndReached={() => { onEndReached={() => {
+2 -335
View File
@@ -3,10 +3,9 @@ import { Ionicons } from "@expo/vector-icons"
import { useAction, useMutation, useQuery } from "convex/react" import { useAction, useMutation, useQuery } from "convex/react"
import { Image } from "expo-image" import { Image } from "expo-image"
import * as ImagePicker from "expo-image-picker" import * as ImagePicker from "expo-image-picker"
import { useEffect, useMemo, useState } from "react" import { useState } from "react"
import { router } from "expo-router" import { router } from "expo-router"
import { import {
Alert,
Platform, Platform,
Pressable, Pressable,
ScrollView, ScrollView,
@@ -17,20 +16,7 @@ import {
} from "react-native" } from "react-native"
import type { StyleProp, ViewStyle } from "react-native" import type { StyleProp, ViewStyle } from "react-native"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { contentBottomInset } from "@/components/player" import { contentBottomInset } from "@/components/player"
import { useDownloads, useDownloadsVersion } from "@/contexts/downloads"
import {
readRememberedDownloadQuality,
writeRememberedDownloadQuality,
} from "@/lib/downloads"
import {
DOWNLOAD_QUALITIES,
DOWNLOAD_QUALITY_DETAILS,
DOWNLOAD_QUALITY_LABELS,
formatBytes,
type DownloadQuality,
} from "@otunes/convex/download-quality"
import { Button, Input, LoadingView } from "@/components/ui/primitives" import { Button, Input, LoadingView } from "@/components/ui/primitives"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session" import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
@@ -49,7 +35,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" | "downloads" | "library" | "users" type Section = "profile" | "quality" | "library" | "users"
type CurrentUser = { type CurrentUser = {
_id: Id<"users"> _id: Id<"users">
@@ -89,7 +75,6 @@ const QUALITY_OPTIONS: {
const SECTIONS: SectionConfig[] = [ const SECTIONS: SectionConfig[] = [
{ id: "profile", label: "Profile", icon: "person-circle-outline" }, { id: "profile", label: "Profile", icon: "person-circle-outline" },
{ id: "quality", label: "Playback", icon: "volume-high-outline" }, { id: "quality", label: "Playback", icon: "volume-high-outline" },
{ id: "downloads", label: "Downloads", icon: "arrow-down-circle-outline" },
{ id: "library", label: "Library", icon: "library-outline", admin: true }, { id: "library", label: "Library", icon: "library-outline", admin: true },
{ id: "users", label: "Users", icon: "people-outline", admin: true }, { id: "users", label: "Users", icon: "people-outline", admin: true },
] ]
@@ -171,7 +156,6 @@ export default function SettingsScreen() {
</> </>
) : null} ) : null}
{section === "quality" ? <QualitySection user={user} /> : null} {section === "quality" ? <QualitySection user={user} /> : null}
{section === "downloads" ? <DownloadsSection /> : null}
{section === "library" && isAdmin ? <LibrarySection /> : null} {section === "library" && isAdmin ? <LibrarySection /> : null}
{section === "users" && isAdmin && allUsers ? ( {section === "users" && isAdmin && allUsers ? (
<UsersSection users={allUsers} currentUserId={user._id} /> <UsersSection users={allUsers} currentUserId={user._id} />
@@ -448,298 +432,6 @@ function QualitySection({ user }: { user: CurrentUser }) {
) )
} }
/** Shades of the text color, faintest for the smallest files. */
const QUALITY_OPACITY: Record<DownloadQuality, number> = {
medium: 0.25,
high: 0.45,
lossless: 0.7,
atmos: 1,
}
function songCount(count: number) {
return count === 1 ? "1 song" : `${count} songs`
}
function QualityName({
quality,
color,
backgroundColor,
}: {
quality: DownloadQuality
color: string
backgroundColor: string
}) {
if (quality === "lossless" || quality === "atmos") {
return (
<AudioFormatBadge
format={quality}
color={color}
backgroundColor={backgroundColor}
/>
)
}
return (
<Text style={{ color, fontSize: 13, fontWeight: "500" }}>
{DOWNLOAD_QUALITY_LABELS[quality]}
</Text>
)
}
function confirm(title: string, onConfirm: () => void) {
Alert.alert(title, undefined, [
{ text: "Cancel", style: "cancel" },
{ text: "Remove", style: "destructive", onPress: onConfirm },
])
}
function RememberedQualityCard() {
const colors = useThemeColors()
// undefined until read; null means ask every time.
const [remembered, setRemembered] = useState<DownloadQuality | null>()
useEffect(() => {
void readRememberedDownloadQuality().then((quality) =>
setRemembered(quality ?? null)
)
}, [])
const options: {
value: DownloadQuality | null
label: string
detail: string
}[] = [
{ value: null, label: "Ask every time", detail: "Choose when downloading" },
...DOWNLOAD_QUALITIES.map((quality) => ({
value: quality,
label: DOWNLOAD_QUALITY_LABELS[quality],
detail: DOWNLOAD_QUALITY_DETAILS[quality],
})),
]
return (
<SettingsCard title="Download Quality">
{options.map((option) => {
const selected = remembered === option.value
return (
<Pressable
key={option.value ?? "ask"}
accessibilityRole="button"
accessibilityState={{ selected }}
onPress={() => {
setRemembered(option.value)
void writeRememberedDownloadQuality(option.value ?? undefined)
}}
style={[
styles.optionRow,
{
borderColor: selected ? colors.primary : colors.border,
backgroundColor: selected ? colors.muted : colors.card,
},
]}
>
<View style={styles.optionCopy}>
<Text style={[styles.optionTitle, { color: colors.foreground }]}>
{option.label}
</Text>
<Text style={{ color: colors.mutedForeground }}>
{option.detail}
</Text>
</View>
{selected ? (
<Ionicons
name="checkmark-circle"
size={22}
color={colors.primary}
/>
) : null}
</Pressable>
)
})}
</SettingsCard>
)
}
function DownloadsSection() {
const colors = useThemeColors()
const { queue } = useDownloads()
const version = useDownloadsVersion()
const breakdown = useMemo(
() => queue?.breakdown(),
// version invalidates the breakdown when downloads change.
// eslint-disable-next-line react-hooks/exhaustive-deps
[queue, version]
)
if (!queue || !breakdown) return null
const qualities = breakdown.byQuality.filter((entry) => entry.songs > 0)
return (
<>
<SettingsCard title="Storage">
<Text style={{ color: colors.foreground, fontSize: 15 }}>
{formatBytes(breakdown.bytes)} · {songCount(breakdown.songs)}
{breakdown.queued > 0 ? ` · ${breakdown.queued} downloading` : ""}
</Text>
{breakdown.songs > 0 ? (
<>
<View
style={[styles.storageBar, { backgroundColor: colors.muted }]}
>
{qualities.map((entry) => (
<View
key={entry.quality}
style={{
flex: entry.bytes,
backgroundColor: colors.foreground,
opacity: QUALITY_OPACITY[entry.quality],
}}
/>
))}
</View>
{qualities.map((entry) => (
<View key={entry.quality} style={styles.storageRow}>
<View
style={[
styles.storageDot,
{
backgroundColor: colors.foreground,
opacity: QUALITY_OPACITY[entry.quality],
},
]}
/>
<View style={{ flex: 1 }}>
<QualityName
quality={entry.quality}
color={colors.foreground}
backgroundColor={colors.card}
/>
</View>
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
{songCount(entry.songs)}
</Text>
<Text
style={[styles.storageSize, { color: colors.foreground }]}
>
{formatBytes(entry.bytes)}
</Text>
</View>
))}
</>
) : null}
</SettingsCard>
<RememberedQualityCard />
{breakdown.collections.length > 0 ||
breakdown.otherSongs.songIds.length > 0 ? (
<SettingsCard title="Downloaded">
{breakdown.collections.map(
({ collection, bytes, status, fallbackCount }) => (
<View
key={`${collection.kind}:${collection.id}`}
style={styles.storageRow}
>
<View style={styles.optionCopy}>
<Text
style={{ color: colors.foreground, fontSize: 15 }}
numberOfLines={1}
>
{collection.title}
</Text>
<View style={styles.collectionMeta}>
<Text
style={{ color: colors.mutedForeground, fontSize: 13 }}
>
{collection.kind === "album" ? "Album" : "Playlist"} ·
</Text>
<QualityName
quality={collection.quality}
color={colors.mutedForeground}
backgroundColor={colors.card}
/>
{fallbackCount > 0 ? (
<Text
style={{ color: colors.mutedForeground, fontSize: 13 }}
>
({fallbackCount} in High)
</Text>
) : null}
{status.downloaded < status.total ? (
<Text
style={{ color: colors.mutedForeground, fontSize: 13 }}
>
· {status.downloaded} of {status.total}
</Text>
) : null}
</View>
</View>
<Text
style={[styles.storageSize, { color: colors.foreground }]}
>
{formatBytes(bytes)}
</Text>
<Pressable
hitSlop={8}
accessibilityRole="button"
accessibilityLabel={`Remove download of ${collection.title}`}
onPress={() =>
confirm(
`Remove ${collection.title}?`,
() => void queue.removeCollection(collection)
)
}
>
<Ionicons
name="trash-outline"
size={20}
color={colors.mutedForeground}
/>
</Pressable>
</View>
)
)}
{breakdown.otherSongs.songIds.length > 0 ? (
<View style={styles.storageRow}>
<View style={styles.optionCopy}>
<Text style={{ color: colors.foreground, fontSize: 15 }}>
Other Downloaded Songs
</Text>
<Text style={{ color: colors.mutedForeground, fontSize: 13 }}>
{songCount(breakdown.otherSongs.songIds.length)}
</Text>
</View>
<Text style={[styles.storageSize, { color: colors.foreground }]}>
{formatBytes(breakdown.otherSongs.bytes)}
</Text>
<Pressable
hitSlop={8}
accessibilityRole="button"
accessibilityLabel="Remove Other Downloaded Songs"
onPress={() =>
confirm(
"Remove Other Downloaded Songs?",
() => void queue.removeOtherSongs()
)
}
>
<Ionicons
name="trash-outline"
size={20}
color={colors.mutedForeground}
/>
</Pressable>
</View>
) : null}
<Button
title="Remove All Downloads"
variant="destructive"
onPress={() =>
confirm("Remove all downloads?", () => void queue.removeAll())
}
/>
</SettingsCard>
) : null}
</>
)
}
function LibrarySection() { function LibrarySection() {
const updateLibrary = useAction(api.actions.updateLibrary) const updateLibrary = useAction(api.actions.updateLibrary)
const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams) const cleanupHlsStreams = useAction(api.actions.adminCleanupHlsStreams)
@@ -1182,31 +874,6 @@ const styles = StyleSheet.create({
divider: { divider: {
height: StyleSheet.hairlineWidth, height: StyleSheet.hairlineWidth,
}, },
storageBar: {
height: 8,
borderRadius: 4,
overflow: "hidden",
flexDirection: "row",
},
storageRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
minHeight: 36,
},
storageDot: { width: 8, height: 8, borderRadius: 4 },
storageSize: {
minWidth: 56,
textAlign: "right",
fontSize: 13,
fontVariant: ["tabular-nums"],
},
collectionMeta: {
flexDirection: "row",
alignItems: "center",
flexWrap: "wrap",
gap: 4,
},
optionRow: { optionRow: {
borderWidth: 1, borderWidth: 1,
borderRadius: radius.lg, borderRadius: radius.lg,
@@ -3,11 +3,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button" import { ProfileHeaderButton } from "@/components/profile-header-button"
import { import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
inlineTitleOptions,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
export const unstable_settings = { export const unstable_settings = {
anchor: "index", anchor: "index",
@@ -22,7 +18,6 @@ export default function LibraryLayout() {
screenLayout={renderTabScreenContent} screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
...baseOptions, ...baseOptions,
...inlineTitleOptions,
title: title:
tabStackScreenTitles[route.name] ?? tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"), (tabletLayout ? "Recently Added" : "Library"),
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
+4 -13
View File
@@ -24,11 +24,6 @@ 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",
@@ -56,7 +51,6 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
clock: "time", clock: "time",
sparkles: "sparkles", sparkles: "sparkles",
star: "star", star: "star",
"arrow.down.circle": "arrow-down-circle",
} }
return ( return (
<Ionicons <Ionicons
@@ -72,7 +66,6 @@ export default function LibraryScreen() {
const { push } = useAppNavigation() const { push } = useAppNavigation()
const isTablet = tabletLayout const isTablet = tabletLayout
const colors = useThemeColors() const colors = useThemeColors()
const title = isTablet ? "Recently Added" : "Library"
const { results, status, loadMore, isCached } = useCachedPaginatedQuery( const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated, api.library.browseRecentlyAddedPaginated,
{}, {},
@@ -126,17 +119,15 @@ export default function LibraryScreen() {
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
return ( return (
<MediaGridSkeleton <View style={{ flex: 1, backgroundColor: colors.background }}>
title={title} {listHeader}
contentInset={false} <MediaGridSkeleton contentInset={false} />
header={listHeader} </View>
/>
) )
} }
return ( return (
<MediaGridList <MediaGridList
title={title}
content={results} content={results}
paddingBottom={tabContentBottomInset} paddingBottom={tabContentBottomInset}
contentInset={false} contentInset={false}
@@ -2,11 +2,7 @@ import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button" import { ProfileHeaderButton } from "@/components/profile-header-button"
import { import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
inlineTitleOptions,
tabStackScreenTitles,
useStackScreenOptions,
} from "@/lib/navigation"
export const unstable_settings = { export const unstable_settings = {
anchor: "index", anchor: "index",
@@ -20,7 +16,6 @@ export default function SearchLayout() {
screenLayout={renderTabScreenContent} screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
...baseOptions, ...baseOptions,
...inlineTitleOptions,
title: tabStackScreenTitles[route.name] ?? "Search", title: tabStackScreenTitles[route.name] ?? "Search",
headerRight: headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined, route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
@@ -1 +0,0 @@
export { default } from "../../home/downloads"
@@ -1 +0,0 @@
export { default } from "../../home/downloads/other"
@@ -35,7 +35,7 @@ export default function SearchScreen() {
: {})} : {})}
/> />
<SearchResults searchQuery={searchQuery} title="Search" /> <SearchResults searchQuery={searchQuery} />
</> </>
) )
} }
+46 -65
View File
@@ -17,7 +17,6 @@ import { useEffect, useSyncExternalStore } from "react"
import { AppIntentBridge } from "@/components/app-intent-bridge" import { AppIntentBridge } from "@/components/app-intent-bridge"
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery" import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist" import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
import { DownloadsProvider } from "@/contexts/downloads"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session" import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { FavoritesProvider } from "@/contexts/favorites" import { FavoritesProvider } from "@/contexts/favorites"
import { PlaybackProvider } from "@/contexts/playback" import { PlaybackProvider } from "@/contexts/playback"
@@ -76,70 +75,52 @@ export default function AppLayout() {
<PlaybackProvider> <PlaybackProvider>
<AppNavigationSync /> <AppNavigationSync />
<AddToPlaylistProvider> <AddToPlaylistProvider>
<DownloadsProvider> <FavoritesProvider>
<FavoritesProvider> <AppIntentBridge />
<AppIntentBridge /> <Stack screenOptions={stackOptions}>
<Stack screenOptions={stackOptions}> <Stack.Screen
<Stack.Screen name="(tabs)"
name="(tabs)" options={{ headerShown: false, animation: "none" }}
options={{ headerShown: false, animation: "none" }} />
/> <Stack.Screen
<Stack.Screen name="settings"
name="settings" options={{
options={{ headerShown: Platform.OS === "android",
headerShown: Platform.OS === "android", title: "Settings",
title: "Settings", presentation:
presentation: Platform.OS === "ios" ? "modal" : "fullScreenModal",
Platform.OS === "ios" ? "modal" : "fullScreenModal", animation: "slide_from_bottom",
animation: "slide_from_bottom", gestureEnabled: true,
gestureEnabled: true, gestureDirection: "vertical",
gestureDirection: "vertical", }}
}} />
/> <Stack.Screen
<Stack.Screen name="create-account"
name="create-account" options={{
options={{ title: "Create account",
title: "Create account", presentation: "modal",
presentation: "modal", headerLargeTitle: false,
headerLargeTitle: false, headerTransparent: false,
headerTransparent: false, headerStyle: { backgroundColor: "#000" },
headerStyle: { backgroundColor: "#000" }, headerTintColor: "#fff",
headerTintColor: "#fff", contentStyle: { backgroundColor: "#000" },
contentStyle: { backgroundColor: "#000" }, }}
}} />
/> <Stack.Screen
<Stack.Screen name="player"
name="playlist-cover" options={{
options={{ headerShown: false,
title: "Cover", // Keep the library visible behind the custom swipe animation.
headerTitleAlign: "center", presentation: "transparentModal",
presentation: contentStyle: { backgroundColor: "transparent" },
Platform.OS === "ios" ? "modal" : "fullScreenModal", animation: "slide_from_bottom",
animation: "slide_from_bottom", gestureEnabled: true,
headerLargeTitle: false, gestureDirection: "vertical",
headerTransparent: false, fullScreenGestureEnabled: true,
headerShadowVisible: false, }}
headerStyle: { backgroundColor: "#000" }, />
headerTintColor: "#fff", </Stack>
contentStyle: { backgroundColor: "#000" }, </FavoritesProvider>
}}
/>
<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>
+15 -52
View File
@@ -1,8 +1,5 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout" import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { import { TabletNowPlaying } from "@/components/tablet-now-playing"
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"
@@ -54,9 +51,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 { 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"
@@ -98,14 +93,8 @@ export default function PlayerScreen() {
queueSongIds, queueSongIds,
} = usePlaybackQueue() } = usePlaybackQueue()
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions() const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
const params = useLocalSearchParams<{ queue?: string; lyrics?: string }>() const { queue } = useLocalSearchParams<{ queue?: string }>()
// The queue or lyrics, shown in place of the artwork. const [showQueue, setShowQueue] = useState(queue === "1")
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)
@@ -198,8 +187,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(panel === null), () => makeDismissGesture().enabled(!showQueue),
[makeDismissGesture, panel] [makeDismissGesture, showQueue]
) )
const hasCover = currentSong ? currentSong.album.cover != null : false const hasCover = currentSong ? currentSong.album.cover != null : false
@@ -254,9 +243,9 @@ export default function PlayerScreen() {
setIsPlaying(!isPlaying) setIsPlaying(!isPlaying)
} }
function togglePanel(next: PlayerPanel) { function toggleQueue() {
void Haptics.selectionAsync() void Haptics.selectionAsync()
setPanel((value) => (value === next ? null : next)) setShowQueue((value) => !value)
} }
if (isTablet) { if (isTablet) {
@@ -267,9 +256,8 @@ export default function PlayerScreen() {
backgroundStyle={backgroundStyle} backgroundStyle={backgroundStyle}
dismissStyle={dismissStyle} dismissStyle={dismissStyle}
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }} dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
panel={panel} showQueue={showQueue}
togglePanel={togglePanel} toggleQueue={toggleQueue}
lyrics={lyrics}
metadata={songMeta} metadata={songMeta}
/> />
</MusicEntityView> </MusicEntityView>
@@ -334,20 +322,6 @@ 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"
@@ -435,29 +409,18 @@ export default function PlayerScreen() {
<View style={styles.footer}> <View style={styles.footer}>
<Pressable <Pressable
onPress={() => togglePanel("lyrics")} disabled
disabled={!lyrics && !showLyrics}
hitSlop={8}
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"} accessibilityLabel="Lyrics"
accessibilityState={{ accessibilityState={{ disabled: true }}
selected: showLyrics, style={[styles.queueButton, styles.unavailable]}
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={ color={colors.foreground}
showLyrics ? colors.selectedForeground : colors.foreground
}
/> />
</Pressable> </Pressable>
<AudioOutputButton <AudioOutputButton
@@ -465,7 +428,7 @@ export default function PlayerScreen() {
style={styles.queueButton} style={styles.queueButton}
/> />
<Pressable <Pressable
onPress={() => togglePanel("queue")} onPress={toggleQueue}
hitSlop={8} hitSlop={8}
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"} accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
-391
View File
@@ -1,391 +0,0 @@
import { useMutation } from "convex/react"
import { Image } from "expo-image"
import * as ImagePicker from "expo-image-picker"
import { router, Stack, useLocalSearchParams } from "expo-router"
import { useMemo, useState, type ReactNode } from "react"
import {
Pressable,
ScrollView,
StyleSheet,
Text,
useWindowDimensions,
View,
} from "react-native"
import { CoverImage } from "@/components/cover-image"
import { Button, LoadingView } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { showError } from "@/lib/toast"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
import { radius, spacing, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import {
COVER_GRID_ALBUMS,
playlistCoverAlbums,
randomPlaylistCovers,
} from "@otunes/convex/client/playlist-cover"
type Choice =
| { kind: "current" }
| { kind: "albums"; albumIds: Id<"albums">[] }
| { kind: "upload"; uri: string; image: string }
const STRIP_GAP = spacing.sm
/** Selection border and padding around each thumb, both sides. */
const THUMB_CHROME = 6
/**
* Full screen cover editor for a playlist owner: a large preview of the
* selected cover, the current cover pinned apart from four random album
* grids, and Save in the header. Opened from the playlist's menu.
*/
export default function PlaylistCoverScreen() {
const { id } = useLocalSearchParams<{ id: string }>()
const playlistId = id as Id<"playlists">
const playlist = useCachedQuery(api.playlists.browsePlaylistDetail, {
id: playlistId,
})
const { config } = useServerConfig()
const colors = useThemeColors()
const { width } = useWindowDimensions()
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
const albums = useMemo(
() => (playlist ? playlistCoverAlbums(playlist.songs) : []),
[playlist]
)
const [options, setOptions] = useState<Id<"albums">[][] | null>(null)
const [selected, setSelected] = useState<Choice | null>(null)
const [saving, setSaving] = useState(false)
// Draw options once the songs arrive.
if (options === null && playlist) {
setOptions(randomPlaylistCovers(albums))
}
const hasCurrent = playlist?.cover != null
const choice: Choice | null =
selected ??
(hasCurrent
? { kind: "current" }
: options?.[0]
? { kind: "albums", albumIds: options[0] }
: null)
async function pickImage() {
const result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
aspect: [1, 1],
quality: 0.7,
base64: true,
})
const asset = result.canceled ? undefined : result.assets[0]
if (!asset?.base64) return
setSelected({
kind: "upload",
uri: asset.uri,
image: `data:${asset.mimeType ?? "image/jpeg"};base64,${asset.base64}`,
})
}
async function save() {
if (!choice || choice.kind === "current") {
router.back()
return
}
setSaving(true)
try {
if (choice.kind === "albums") {
await setCoverAlbums({ playlistId, albumIds: choice.albumIds })
} else {
await uploadCover({ playlistId, image: choice.image })
}
router.back()
} catch (error) {
showError(
error instanceof Error ? error.message : "Failed to change cover"
)
setSaving(false)
}
}
const header = (
<Stack.Screen
options={{
headerLeft: () => (
<HeaderButton label="Cancel" onPress={() => router.back()} />
),
headerRight: () => (
<HeaderButton
label="Save"
bold
disabled={saving || !choice}
onPress={() => void save()}
/>
),
}}
/>
)
if (!playlist || !config || !options) {
return (
<>
{header}
<LoadingView />
</>
)
}
const serverUrl = config.serverUrl
const currentUri = playlistCoverUrl(serverUrl, playlistId, playlist.cover)
const previewSize = Math.min(width - spacing.lg * 2, 360)
// One row: current | uploaded? | options, thumbs at most 72pt.
const thumbCount =
options.length + (hasCurrent ? 1 : 0) + (choice?.kind === "upload" ? 1 : 0)
const rowItems = thumbCount + (hasCurrent ? 1 : 0)
const thumbSize = Math.min(
72,
Math.floor(
(width - spacing.lg * 2 - STRIP_GAP * (rowItems - 1) - 1) /
Math.max(thumbCount, 1)
) - THUMB_CHROME
)
function renderChoice(item: Choice, size: number) {
if (item.kind === "current") {
return (
<CoverImage
uri={currentUri}
hasCover
style={{ width: size, height: size }}
/>
)
}
if (item.kind === "upload") {
return (
<Image
source={{ uri: item.uri }}
style={{ width: size, height: size }}
/>
)
}
return (
<AlbumGrid serverUrl={serverUrl} albumIds={item.albumIds} size={size} />
)
}
const isSelected = (item: Choice) =>
choice?.kind === item.kind &&
(item.kind !== "albums" ||
(choice.kind === "albums" && choice.albumIds === item.albumIds))
return (
<ScrollView
style={{ backgroundColor: colors.background }}
contentContainerStyle={styles.content}
>
{header}
<View
style={[
styles.preview,
{
width: previewSize,
height: previewSize,
backgroundColor: colors.coverPlaceholder,
},
]}
>
{choice ? renderChoice(choice, previewSize) : null}
</View>
<View style={styles.strip}>
{hasCurrent ? (
<>
<Thumb
size={thumbSize}
selected={isSelected({ kind: "current" })}
label="Current cover"
onPress={() => setSelected({ kind: "current" })}
>
{renderChoice({ kind: "current" }, thumbSize)}
</Thumb>
<View
style={[styles.separator, { backgroundColor: colors.border }]}
/>
</>
) : null}
{choice?.kind === "upload" ? (
<Thumb size={thumbSize} selected label="Uploaded image">
{renderChoice(choice, thumbSize)}
</Thumb>
) : null}
{options.map((albumIds) => {
const item: Choice = { kind: "albums", albumIds }
return (
<Thumb
key={albumIds.join(",")}
size={thumbSize}
selected={isSelected(item)}
label="Album cover option"
onPress={() => setSelected(item)}
>
{renderChoice(item, thumbSize)}
</Thumb>
)
})}
</View>
{albums.length === 0 ? (
<Text style={{ color: colors.mutedForeground, textAlign: "center" }}>
No album artwork in this playlist yet.
</Text>
) : null}
<View style={styles.actions}>
{albums.length >= COVER_GRID_ALBUMS ? (
<Button
title="Shuffle"
icon="shuffle"
variant="secondary"
onPress={() => {
setOptions(randomPlaylistCovers(albums))
if (selected?.kind === "albums") setSelected(null)
}}
/>
) : null}
<Button
title="Upload"
icon="arrow-up"
variant="secondary"
onPress={() => void pickImage()}
/>
</View>
</ScrollView>
)
}
function HeaderButton({
label,
bold = false,
disabled = false,
onPress,
}: {
label: string
bold?: boolean
disabled?: boolean
onPress: () => void
}) {
const colors = useThemeColors()
return (
<Pressable
accessibilityRole="button"
hitSlop={8}
disabled={disabled}
onPress={onPress}
style={{ opacity: disabled ? 0.4 : 1, paddingHorizontal: spacing.xs }}
>
<Text
style={{
color: colors.foreground,
fontSize: 17,
fontWeight: bold ? "600" : "400",
}}
>
{label}
</Text>
</Pressable>
)
}
function Thumb({
size,
selected,
label,
onPress,
children,
}: {
size: number
selected: boolean
label: string
onPress?: () => void
children: ReactNode
}) {
const colors = useThemeColors()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel={label}
accessibilityState={{ selected }}
onPress={onPress}
style={[
styles.thumb,
{
width: size + THUMB_CHROME,
height: size + THUMB_CHROME,
borderColor: selected ? colors.foreground : "transparent",
},
]}
>
<View style={styles.thumbInner}>{children}</View>
</Pressable>
)
}
/** A generated cover option: one album alone, or four tiled 2x2. */
function AlbumGrid({
serverUrl,
albumIds,
size,
}: {
serverUrl: string
albumIds: Id<"albums">[]
size: number
}) {
const tile = albumIds.length > 1 ? size / 2 : size
return (
<View
style={{
width: size,
height: size,
flexDirection: "row",
flexWrap: "wrap",
}}
>
{albumIds.map((albumId) => (
<CoverImage
key={albumId}
uri={albumCoverUrl(serverUrl, albumId)}
hasCover
style={{ width: tile, height: tile }}
/>
))}
</View>
)
}
const styles = StyleSheet.create({
content: {
alignItems: "center",
gap: spacing.xl,
padding: spacing.lg,
},
preview: { borderRadius: radius.lg, overflow: "hidden" },
strip: {
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
gap: STRIP_GAP,
},
separator: { width: StyleSheet.hairlineWidth, alignSelf: "stretch" },
thumb: {
borderWidth: 2,
borderRadius: radius.sm + 2,
padding: 1,
},
thumbInner: { flex: 1, borderRadius: radius.sm, overflow: "hidden" },
actions: { flexDirection: "row", gap: spacing.sm },
})
@@ -23,16 +23,19 @@ 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 = FunctionReturnType<typeof api.favorites.getUserFavorites> type Favorites = {
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,13 +214,12 @@ export function useIntentDispatch() {
) )
} }
if (kind === "artist") { if (kind === "artist") {
const chunks = await fetchCachedQuery( return 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) {
@@ -230,7 +229,7 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites, api.favorites.getUserFavorites,
{} {}
) )
return favorites.favoriteSongs.flat() return favorites.favoriteSongs
} }
return fetchCachedQuery( return fetchCachedQuery(
convex, convex,
@@ -392,18 +391,17 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites, api.favorites.getUserFavorites,
{} {}
) )
const favoriteSongs = favorites.favoriteSongs.flat() if (favorites.favoriteSongs.length === 0) {
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(favoriteSongs) await actions.playShuffled(favorites.favoriteSongs)
} else { } else {
ensureActive(invocation) ensureActive(invocation)
await actions.playInOrder(favoriteSongs) await actions.playInOrder(favorites.favoriteSongs)
} }
return return
} }
@@ -1,172 +0,0 @@
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,10 +71,7 @@ class ConvexAuthErrorBoundary extends Component<
} }
} }
export function ConvexAuthRecovery({ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
children,
onInvalidate,
}: ConvexAuthRecoveryProps) {
const localAuth = useLocalConvexAuth() const localAuth = useLocalConvexAuth()
const serverAuth = useServerConvexAuth() const serverAuth = useServerConvexAuth()
const hadServerAuthRef = useRef(false) const hadServerAuthRef = useRef(false)
@@ -116,9 +113,9 @@ export function ConvexAuthRecovery({
const sessionEstablished = Boolean( const sessionEstablished = Boolean(
serverAuth && serverAuth &&
!serverAuth.isLoading && !serverAuth.isLoading &&
!serverAuth.isRefreshing && !serverAuth.isRefreshing &&
serverAuth.isAuthenticated serverAuth.isAuthenticated
) )
return ( return (
+1 -12
View File
@@ -11,7 +11,6 @@ import {
} from "react-native" } from "react-native"
import { prefetchCoverPalette } from "@/hooks/use-cover-palette" import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
import { downloadedCoverUri } from "@/lib/downloads"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
import { import {
@@ -67,7 +66,6 @@ export const CoverImage = memo(function CoverImage({
contentFit = "cover", contentFit = "cover",
blurRadius, blurRadius,
placeholderVariant = "icon", placeholderVariant = "icon",
placeholderIcon = "musical-note",
}: { }: {
uri: string uri: string
hasCover: boolean hasCover: boolean
@@ -75,7 +73,6 @@ export const CoverImage = memo(function CoverImage({
contentFit?: ImageContentFit contentFit?: ImageContentFit
blurRadius?: number blurRadius?: number
placeholderVariant?: "icon" | "solid" placeholderVariant?: "icon" | "solid"
placeholderIcon?: keyof typeof Ionicons.glyphMap
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style]) const flatStyle = useMemo(() => StyleSheet.flatten(style) ?? {}, [style])
@@ -84,12 +81,6 @@ export const CoverImage = memo(function CoverImage({
[flatStyle, hasCover, uri] [flatStyle, hasCover, uri]
) )
const source = useMemo(() => ({ uri: sourceUri }), [sourceUri]) const source = useMemo(() => ({ uri: sourceUri }), [sourceUri])
// A downloaded cover shows while the network copy loads, and offline.
const savedUri = hasCover ? downloadedCoverUri(uri) : null
const placeholder = useMemo(
() => (savedUri ? { uri: savedUri } : undefined),
[savedUri]
)
if (!hasCover) { if (!hasCover) {
return ( return (
@@ -102,7 +93,7 @@ export const CoverImage = memo(function CoverImage({
> >
{placeholderVariant === "icon" ? ( {placeholderVariant === "icon" ? (
<Ionicons <Ionicons
name={placeholderIcon} name="musical-note"
size={placeholderIconSize(flatStyle)} size={placeholderIconSize(flatStyle)}
color={colors.coverPlaceholderIcon} color={colors.coverPlaceholderIcon}
/> />
@@ -116,8 +107,6 @@ export const CoverImage = memo(function CoverImage({
source={source} source={source}
style={[style, { backgroundColor: colors.coverPlaceholder }]} style={[style, { backgroundColor: colors.coverPlaceholder }]}
contentFit={contentFit} contentFit={contentFit}
placeholder={placeholder}
placeholderContentFit={contentFit}
transition={150} transition={150}
blurRadius={blurRadius} blurRadius={blurRadius}
onLoad={ onLoad={
+1 -5
View File
@@ -35,11 +35,7 @@ export function HandoffBridge() {
if (!active || !activity) return if (!active || !activity) return
try { try {
const source = new URL(activity.server) const source = new URL(activity.server)
if (!config) { if (!config || source.origin !== new URL(config.serverUrl).origin) {
showError("Connect to an oTunes server to continue this activity.")
return
}
if (source.origin !== new URL(config.serverUrl).origin) {
showError("This activity belongs to a different oTunes server.") showError("This activity belongs to a different oTunes server.")
return return
} }
@@ -112,10 +112,7 @@ function SwipeRowBody({
setIsOpen(false) setIsOpen(false)
}, [removing, translateX]) }, [removing, translateX])
const handleSwipeStart = useCallback( const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
() => group.setOpen(close),
[close, group]
)
const handleSettle = useCallback( const handleSettle = useCallback(
(open: boolean) => { (open: boolean) => {
@@ -254,7 +251,8 @@ function SwipeRowBody({
const pillWidth = Math.max( const pillWidth = Math.max(
0, 0,
resting + resting +
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value (revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
commitProgress.value
) )
const restingHeight = interpolate( const restingHeight = interpolate(
pillWidth, pillWidth,
-370
View File
@@ -1,370 +0,0 @@
import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react"
import {
Pressable,
ScrollView,
StyleSheet,
Text,
View,
type ScrollViewInstance,
} from "react-native"
import Animated, {
cancelAnimation,
Easing,
useAnimatedStyle,
useSharedValue,
withTiming,
type SharedValue,
} from "react-native-reanimated"
import {
usePlaybackActions,
usePlaybackProgress,
usePlaybackQueue,
} from "@/contexts/playback"
import { useLyricsTime } 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"
/** 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]
/**
* 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 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}
time={index === active ? time : null}
isPlaying={isPlaying}
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, blurred by its `distance` from the playing line. Only the
* playing line gets the time, so the others skip re-rendering as the song
* plays.
*/
const SyncedLine = memo(function SyncedLine({
index,
line,
distance,
active,
time,
isPlaying,
colors,
textStyle,
onSelect,
onLayoutY,
}: {
index: number
line: LyricLine
distance: number
active: boolean
time: number | null
isPlaying: boolean
colors: NowPlayingColors
textStyle: { fontSize: number; lineHeight: number }
onSelect: (seconds: number) => void
onLayoutY: (index: number, y: number) => void
}) {
const blur = LINE_BLUR[distance]
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, blur > 0 && { filter: [{ blur }] }]}
>
{active && line.words && time !== null ? (
<FilledWords
words={line.words}
time={time}
isPlaying={isPlaying}
colors={colors}
textStyle={textStyle}
/>
) : (
<Text
style={[
styles.lineText,
textStyle,
{
color:
active && !line.words
? colors.foreground
: colors.lyricsInactive,
},
]}
>
{line.text}
</Text>
)}
</Pressable>
)
})
/**
* The playing line's words, each wiping from dim to bright as it is sung.
* Reanimated runs the wipe; playback updates only re-anchor it.
*/
function FilledWords({
words,
time,
isPlaying,
colors,
textStyle,
}: {
words: LyricWord[]
time: number
isPlaying: boolean
colors: NowPlayingColors
textStyle: { fontSize: number; lineHeight: number }
}) {
const sung = useSharedValue(time)
const end = words.at(-1)?.end ?? time
useEffect(() => {
cancelAnimation(sung)
sung.value = time
if (isPlaying && end > time) {
sung.value = withTiming(end, {
duration: (end - time) * 1000,
easing: Easing.linear,
})
}
}, [sung, time, isPlaying, end])
return (
<View style={[styles.words, { columnGap: textStyle.fontSize * 0.25 }]}>
{words.map((word, index) => (
<FilledWord
key={index}
word={word}
sung={sung}
colors={colors}
textStyle={textStyle}
/>
))}
</View>
)
}
function FilledWord({
word,
sung,
colors,
textStyle,
}: {
word: LyricWord
sung: SharedValue<number>
colors: NowPlayingColors
textStyle: { fontSize: number; lineHeight: number }
}) {
const [width, setWidth] = useState(0)
const text = word.text.trim()
const wipe = useAnimatedStyle(() => {
const progress =
(sung.value - word.start) / Math.max(word.end - word.start, 0.05)
return { width: width * Math.min(Math.max(progress, 0), 1) }
})
return (
<View>
<Text
style={[styles.lineText, textStyle, { color: colors.lyricsUnsung }]}
onLayout={(event) => setWidth(event.nativeEvent.layout.width)}
>
{text}
</Text>
<Animated.View style={[styles.wipe, wipe]}>
<Text
numberOfLines={1}
style={[
styles.lineText,
textStyle,
{ color: colors.foreground, width },
]}
>
{text}
</Text>
</Animated.View>
</View>
)
}
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" },
wipe: {
position: "absolute",
top: 0,
bottom: 0,
left: 0,
overflow: "hidden",
},
plainLine: { fontWeight: "700", paddingVertical: 2 },
stanzaGap: { height: 18 },
})
+3 -38
View File
@@ -4,7 +4,6 @@ import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { TabletMediaGrid } from "@/components/tablet-media-grid" import { TabletMediaGrid } from "@/components/tablet-media-grid"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout" import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { MusicEntityView } from "@/components/music-entity-view" import { MusicEntityView } from "@/components/music-entity-view"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { Link } from "expo-router" import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons" import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react" import { memo, useCallback, type ReactElement } from "react"
@@ -21,7 +20,6 @@ import {
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { MediaContextMenu } from "@/components/media-context-menu" import { MediaContextMenu } from "@/components/media-context-menu"
import { useIsCollectionDownloaded } from "@/contexts/downloads"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useAppNavigation } from "@/lib/app-navigation" import { useAppNavigation } from "@/lib/app-navigation"
@@ -53,7 +51,6 @@ export const AlbumCard = memo(function AlbumCard({
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions() const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
const downloaded = useIsCollectionDownloaded({ kind: "album", id: album.id })
if (!config) return null if (!config) return null
const card = ( const card = (
@@ -105,7 +102,6 @@ export const AlbumCard = memo(function AlbumCard({
hasArtwork: album.cover != null, hasArtwork: album.cover != null,
}} }}
favorited={isAlbumFavorite(album.id)} favorited={isAlbumFavorite(album.id)}
downloaded={downloaded}
stationArtistId={album.artist.id} stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }} navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id, title: album.title }} share={{ type: "album", albumId: album.id, title: album.title }}
@@ -191,10 +187,6 @@ export const PlaylistCard = memo(function PlaylistCard({
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const { handlePlaylistAction } = useMediaMenuActions() const { handlePlaylistAction } = useMediaMenuActions()
const downloaded = useIsCollectionDownloaded({
kind: "playlist",
id: playlist.id,
})
if (!config) return null if (!config) return null
const card = ( const card = (
@@ -208,11 +200,7 @@ export const PlaylistCard = memo(function PlaylistCard({
<Link.AppleZoom> <Link.AppleZoom>
<View collapsable={false}> <View collapsable={false}>
<CoverImage <CoverImage
uri={playlistCoverUrl( uri={playlistCoverUrl(config.serverUrl, playlist.id)}
config.serverUrl,
playlist.id,
playlist.cover
)}
hasCover={playlist.cover != null} hasCover={playlist.cover != null}
style={ style={
fluid fluid
@@ -243,7 +231,6 @@ export const PlaylistCard = memo(function PlaylistCard({
return ( return (
<MediaContextMenu <MediaContextMenu
showFavorite={false} showFavorite={false}
downloaded={downloaded}
share={{ share={{
type: "playlist", type: "playlist",
playlistId: playlist.id, playlistId: playlist.id,
@@ -301,21 +288,17 @@ export function MediaGridList({
onEndReached, onEndReached,
ListHeaderComponent, ListHeaderComponent,
contentInset = true, contentInset = true,
title,
}: { }: {
content: MediaItem[] content: MediaItem[]
paddingBottom: number paddingBottom: number
onEndReached?: () => void onEndReached?: () => void
ListHeaderComponent?: ReactElement ListHeaderComponent?: ReactElement
contentInset?: boolean contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
}) { }) {
const tabletLayout = useTabletLayout() const tabletLayout = useTabletLayout()
const { columns, cardWidth, onLayout, horizontalPadding, gap } = const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout() useMediaGridLayout()
const colors = useThemeColors() const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<FlatList<MediaItem>>()
const renderItem = useCallback( const renderItem = useCallback(
({ item }: ListRenderItemInfo<MediaItem>) => ( ({ item }: ListRenderItemInfo<MediaItem>) => (
<View style={{ width: cardWidth }}> <View style={{ width: cardWidth }}>
@@ -333,30 +316,13 @@ export function MediaGridList({
onEndReached={onEndReached} onEndReached={onEndReached}
ListHeaderComponent={ListHeaderComponent} ListHeaderComponent={ListHeaderComponent}
contentInset={contentInset} contentInset={contentInset}
title={title}
renderCard={renderTabletCard} renderCard={renderTabletCard}
/> />
) )
} }
const header = title ? (
<View>
<ScreenTitle
title={title}
scrollY={scrollY}
// Inset grids already pad the whole list horizontally.
style={{ paddingHorizontal: contentInset ? 0 : horizontalPadding }}
/>
{ListHeaderComponent}
</View>
) : (
ListHeaderComponent
)
return ( return (
<Animated.FlatList <FlatList
ref={ref}
scrollEventThrottle={16}
key={columns} key={columns}
onLayout={onLayout} onLayout={onLayout}
data={content} data={content}
@@ -373,7 +339,6 @@ export function MediaGridList({
paddingBottom, paddingBottom,
gap, gap,
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}), ...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
...(title ? { paddingTop: 0 } : {}),
}, },
]} ]}
columnWrapperStyle={[ columnWrapperStyle={[
@@ -382,7 +347,7 @@ export function MediaGridList({
{ gap }, { gap },
]} ]}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={header} ListHeaderComponent={ListHeaderComponent}
onEndReached={onEndReached} onEndReached={onEndReached}
onEndReachedThreshold={0.5} onEndReachedThreshold={0.5}
/> />
+20 -38
View File
@@ -33,10 +33,7 @@ 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 }
@@ -62,8 +59,6 @@ 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
} }
@@ -77,39 +72,33 @@ const QUEUE_ACTIONS: MediaAction[] = ["play-next", "play-last", "shuffle"]
const MEDIA_ACTION_ITEMS: { const MEDIA_ACTION_ITEMS: {
action: MediaAction action: MediaAction
label: (favorited: boolean | undefined, playlistLabel: string) => string label: (
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: (_favorited, playlistLabel) => playlistLabel, label: (countSuffix, _favorited, 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: () => "Play Next", label: (countSuffix) => `Play Next${countSuffix}`,
image: "text.line.first.and.arrowtriangle.forward", image: "text.line.first.and.arrowtriangle.forward",
}, },
{ {
action: "play-last", action: "play-last",
label: () => "Play Last", label: (countSuffix) => `Play Last${countSuffix}`,
image: "text.line.last.and.arrowtriangle.forward", image: "text.line.last.and.arrowtriangle.forward",
}, },
{ {
action: "shuffle", action: "shuffle",
label: () => "Shuffle", label: (countSuffix) => `Shuffle${countSuffix}`,
image: "shuffle", image: "shuffle",
}, },
{ {
@@ -129,7 +118,8 @@ const MEDIA_ACTION_ITEMS: {
}, },
{ {
action: "favorite", action: "favorite",
label: (favorited) => (favorited ? "Unfavorite" : "Favorite"), label: (countSuffix, favorited) =>
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
image: "star", image: "star",
}, },
{ {
@@ -138,11 +128,6 @@ 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",
@@ -162,19 +147,11 @@ 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" || action === "change-cover") { if (action === "delete-playlist") {
return false return false
} }
@@ -200,7 +177,12 @@ function isActionIncluded(
export function buildMediaMenuActions( export function buildMediaMenuActions(
config: Omit<MediaMenuConfig, "onAction"> config: Omit<MediaMenuConfig, "onAction">
): MenuAction[] { ): MenuAction[] {
const { favorited, playlistLabel = "Add to Playlist" } = config const {
selectedCount = 1,
favorited,
playlistLabel = "Add to Playlist",
} = config
const countSuffix = selectedCount > 1 ? ` (${selectedCount})` : ""
const actions: MenuAction[] = [] const actions: MenuAction[] = []
@@ -219,7 +201,7 @@ export function buildMediaMenuActions(
actions.push({ actions.push({
id: item.action, id: item.action,
title: item.label(favorited, playlistLabel), title: item.label(countSuffix, favorited, playlistLabel),
image: item.action === "favorite" && favorited ? "star.fill" : item.image, image: item.action === "favorite" && favorited ? "star.fill" : item.image,
...(item.destructive ? { attributes: { destructive: true } } : {}), ...(item.destructive ? { attributes: { destructive: true } } : {}),
}) })
@@ -26,10 +26,7 @@ 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
-109
View File
@@ -1,109 +0,0 @@
import { Ionicons } from "@expo/vector-icons"
import {
connectivityStore,
type PlatformNetwork,
} from "@otunes/convex/client/connectivity"
import { useConvex } from "convex/react"
import {
addNetworkStateListener,
getNetworkStateAsync,
type NetworkState,
} from "expo-network"
import { useTheme } from "expo-router"
import { useContext, useSyncExternalStore } from "react"
import { Pressable, StyleSheet, Text, View } from "react-native"
import { useAppNavigation } from "@/lib/app-navigation"
import { TabletSectionContext } from "@/lib/tablet-navigation"
import { spacing, useThemeColors } from "@/lib/theme"
let deviceOnline = true
/** The device's network state. Unknown reachability counts as online. */
const deviceNetwork: PlatformNetwork = {
isOnline: () => deviceOnline,
subscribe(onChange) {
const apply = (state: NetworkState) => {
deviceOnline =
state.isConnected !== false && state.isInternetReachable !== false
onChange()
}
const subscription = addNetworkStateListener(apply)
void getNetworkStateAsync().then(apply)
return () => subscription.remove()
},
}
/** True while the device has no network or the server can't be reached. */
export function useIsOffline() {
const store = connectivityStore(useConvex(), deviceNetwork)
return useSyncExternalStore(store.subscribe, store.getSnapshot)
}
type ScreenRoute = { name: string; params?: object }
/** Downloads screens, and albums and playlists opened from them, stay usable offline. */
function worksOffline(route: ScreenRoute, tabletSection: string | undefined) {
if (route.name.startsWith("downloads/")) return true
if (route.name === "index" && tabletSection === "downloads") return true
// Settings stays reachable so an unreachable server can be changed.
if (route.name === "settings") return true
return (route.params as { from?: string } | undefined)?.from === "downloads"
}
/**
* Covers a tab screen with a no-connection message while offline. The screen
* stays mounted underneath so it picks up where it was once the server is back.
*/
export function OfflineOverlay({ route }: { route: ScreenRoute }) {
const offline = useIsOffline()
const tabletSection = useContext(TabletSectionContext)?.name
const { push } = useAppNavigation()
const { colors: routerColors } = useTheme()
const colors = useThemeColors()
if (!offline || worksOffline(route, tabletSection)) return null
return (
<View
style={[
StyleSheet.absoluteFill,
styles.overlay,
{ backgroundColor: routerColors.background },
]}
>
<Ionicons
name="cloud-offline-outline"
size={28}
color={colors.mutedForeground}
/>
<Text style={[styles.title, { color: routerColors.text }]}>
No connection
</Text>
<Text style={[styles.body, { color: colors.mutedForeground }]}>
Your downloads still play.
</Text>
<Pressable
accessibilityRole="link"
hitSlop={spacing.sm}
onPress={() => push("/downloads")}
>
<Text style={[styles.link, { color: colors.primary }]}>
Go to Downloads
</Text>
</Pressable>
</View>
)
}
const styles = StyleSheet.create({
overlay: {
alignItems: "center",
justifyContent: "center",
gap: spacing.sm,
padding: spacing.lg,
},
title: { fontSize: 17, fontWeight: "600", marginTop: spacing.xs },
body: { fontSize: 15, textAlign: "center" },
link: { fontSize: 15, fontWeight: "600", marginTop: spacing.xs },
})
+3 -40
View File
@@ -3,14 +3,8 @@ 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, SearchSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import type { CoverPalette } from "@/lib/cover-palette" import type { CoverPalette } from "@/lib/cover-palette"
import { formatDuration } from "@/lib/format" import { formatDuration } from "@/lib/format"
import { albumCoverUrl } from "@/lib/urls" import { albumCoverUrl } from "@/lib/urls"
@@ -39,10 +33,8 @@ export const SongRow = memo(function SongRow({
palette, palette,
inset = false, inset = false,
swipe, swipe,
downloadFrom,
}: { }: {
/** Search results also show the lyrics line they matched. */ song: BrowseSong
song: SearchSong
onPress?: () => void onPress?: () => void
contextMenu?: Omit<MediaMenuConfig, "onAction"> & { contextMenu?: Omit<MediaMenuConfig, "onAction"> & {
onAction: MediaMenuConfig["onAction"] onAction: MediaMenuConfig["onAction"]
@@ -58,14 +50,9 @@ export const SongRow = memo(function SongRow({
} }
/** Album/playlist layout: the divider starts at the title, not the artwork. */ /** Album/playlist layout: the divider starts at the title, not the artwork. */
inset?: boolean inset?: boolean
/** The download this row belongs to; removing only takes it out of that. */
downloadFrom?: DownloadSource
}) { }) {
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const downloadState = useSongDownloadState(song.id, downloadFrom)
const downloaded = downloadState === "here"
const toggleDownload = useToggleSongDownload()
if (!config) return null if (!config) return null
const foreground = palette?.foreground ?? colors.foreground const foreground = palette?.foreground ?? colors.foreground
@@ -88,23 +75,7 @@ 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>
@@ -138,8 +109,6 @@ export const SongRow = memo(function SongRow({
onPlayNext={swipe.onPlayNext} onPlayNext={swipe.onPlayNext}
onAddToQueue={swipe.onAddToQueue} onAddToQueue={swipe.onAddToQueue}
onRemove={swipe.onRemove} onRemove={swipe.onRemove}
downloaded={downloaded}
onDownload={() => toggleDownload(song, downloaded, downloadFrom)}
backgroundColor={swipe.backgroundColor} backgroundColor={swipe.backgroundColor}
onPress={onPress} onPress={onPress}
style={rowStyle} style={rowStyle}
@@ -186,11 +155,10 @@ export const SongListRow = memo(function SongListRow({
inset, inset,
swipe, swipe,
removable, removable,
downloadFrom,
onPlay, onPlay,
onAction, onAction,
}: { }: {
song: SearchSong song: BrowseSong
favorited: boolean favorited: boolean
playlistLabel?: string playlistLabel?: string
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider"> palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
@@ -204,13 +172,10 @@ 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 (
@@ -219,7 +184,6 @@ export const SongListRow = memo(function SongListRow({
palette={palette} palette={palette}
inset={inset} inset={inset}
swipe={swipe} swipe={swipe}
downloadFrom={downloadFrom}
onPress={handlePress} onPress={handlePress}
contextMenu={{ contextMenu={{
preview: config preview: config
@@ -234,7 +198,6 @@ 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,23 +2,16 @@ 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, lyricsMatches), () => filterSongs(songs, search.searchQuery),
[songs, search.searchQuery, lyricsMatches] [songs, search.searchQuery]
) )
return { ...search, filteredSongs } return { ...search, filteredSongs }
-84
View File
@@ -1,84 +0,0 @@
import { useHeaderHeight } from "expo-router/react-navigation"
import type { Component } from "react"
import {
Platform,
StyleSheet,
type ScrollViewInstance,
type StyleProp,
type TextStyle,
} from "react-native"
import Animated, {
useAnimatedRef,
useAnimatedStyle,
useScrollOffset,
type SharedValue,
} from "react-native-reanimated"
import { spacing, useThemeColors } from "@/lib/theme"
/**
* Tracks the scroll view that renders a `ScreenTitle`. Attach `ref` to that
* Reanimated `Animated.ScrollView` / `Animated.FlatList` and pass `scrollY`
* to the title.
*/
export function useScreenTitleScroll<
TScrollView extends Component | ScrollViewInstance,
>() {
const ref = useAnimatedRef<TScrollView>()
const scrollY = useScrollOffset(ref)
return { ref, scrollY }
}
/**
* iOS screen title rendered as the first item of a screen's scroll content,
* in place of the native large title (Apple Music style): it scrolls away
* with the content, never collapses into the bar, and stays put on
* pull-down. Android keeps its native header title, so this renders nothing.
*/
export function ScreenTitle({
title,
scrollY,
style,
}: {
title: string
/** From `useScreenTitleScroll`; omit for screens that never scroll. */
scrollY?: SharedValue<number>
style?: StyleProp<TextStyle>
}) {
const colors = useThemeColors()
// At rest the scroll offset is minus the automatic header inset, so any
// offset below that is overscroll the title should cancel out.
const headerHeight = useHeaderHeight()
const pinStyle = useAnimatedStyle(() => ({
transform: [
{
translateY: scrollY ? Math.min(0, scrollY.value + headerHeight) : 0,
},
],
}))
if (Platform.OS !== "ios") return null
return (
<Animated.Text
accessibilityRole="header"
numberOfLines={2}
style={[styles.title, { color: colors.foreground }, style, pinStyle]}
>
{title}
</Animated.Text>
)
}
// Matches UIKit's large title metrics: 34pt bold in a 52pt tall area.
const styles = StyleSheet.create({
title: {
fontSize: 34,
lineHeight: 41,
fontWeight: "700",
letterSpacing: 0.37,
paddingHorizontal: spacing.lg,
paddingTop: 3,
paddingBottom: 8,
},
})
+15 -24
View File
@@ -1,15 +1,13 @@
import { memo, useCallback, useMemo } from "react" import { memo, useCallback, useMemo } from "react"
import { import {
type FlatList, FlatList,
StyleSheet, StyleSheet,
Text, Text,
View, View,
type ListRenderItemInfo, type ListRenderItemInfo,
} from "react-native" } from "react-native"
import Animated from "react-native-reanimated"
import { ContentCarousel } from "@/components/media-cards" import { ContentCarousel } from "@/components/media-cards"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import type { MediaAction } from "@/components/media-context-menu" import type { MediaAction } from "@/components/media-context-menu"
import { tabContentBottomInset, SongListRow } from "@/components/player" import { tabContentBottomInset, SongListRow } from "@/components/player"
import { SongListSkeleton } from "@/components/skeletons" import { SongListSkeleton } from "@/components/skeletons"
@@ -18,19 +16,11 @@ 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, SearchSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import { spacing, useThemeColors } from "@/lib/theme" import { spacing, useThemeColors } from "@/lib/theme"
function SearchResultsBody({ function SearchResultsBody({ searchQuery }: { searchQuery: string }) {
searchQuery,
title,
}: {
searchQuery: string
/** iOS `ScreenTitle`, shown above the results and while idle. */
title: string
}) {
const colors = useThemeColors() const colors = useThemeColors()
const { ref, scrollY } = useScreenTitleScroll<FlatList<BrowseSong>>()
const { playFromSong } = usePlaybackActions() const { playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions() const { handleSongAction } = useMediaMenuActions()
@@ -74,7 +64,7 @@ function SearchResultsBody({
[handleSongAction] [handleSongAction]
) )
const renderItem = useCallback( const renderItem = useCallback(
({ item: song }: ListRenderItemInfo<SearchSong>) => ( ({ item: song }: ListRenderItemInfo<BrowseSong>) => (
<SongListRow <SongListRow
song={song} song={song}
favorited={isSongFavorite(song.id)} favorited={isSongFavorite(song.id)}
@@ -86,14 +76,16 @@ function SearchResultsBody({
) )
if (isSearching) { if (isSearching) {
return <SongListSkeleton title={title} /> return <SongListSkeleton />
}
if (!hasQuery) {
return <></>
} }
return ( return (
<Animated.FlatList <FlatList
ref={ref} data={results?.songs ?? []}
scrollEventThrottle={16}
data={hasQuery ? (results?.songs ?? []) : []}
keyExtractor={(song) => song.id} keyExtractor={(song) => song.id}
style={{ flex: 1, backgroundColor: colors.background }} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: tabContentBottomInset }} contentContainerStyle={{ paddingBottom: tabContentBottomInset }}
@@ -101,8 +93,7 @@ function SearchResultsBody({
keyboardShouldPersistTaps="handled" keyboardShouldPersistTaps="handled"
ListHeaderComponent={ ListHeaderComponent={
<> <>
<ScreenTitle title={title} scrollY={scrollY} /> {!hasResults ? (
{hasQuery && !hasResults ? (
<View style={styles.empty}> <View style={styles.empty}>
<Text <Text
style={[styles.emptyText, { color: colors.mutedForeground }]} style={[styles.emptyText, { color: colors.mutedForeground }]}
@@ -112,13 +103,13 @@ function SearchResultsBody({
</View> </View>
) : null} ) : null}
{hasQuery && results?.artists.length ? ( {results?.artists.length ? (
<View style={styles.section}> <View style={styles.section}>
<ContentCarousel title="Artists" content={results.artists} /> <ContentCarousel title="Artists" content={results.artists} />
</View> </View>
) : null} ) : null}
{hasQuery && results?.albums.length ? ( {results?.albums.length ? (
<View style={styles.section}> <View style={styles.section}>
<ContentCarousel title="Albums" content={results.albums} /> <ContentCarousel title="Albums" content={results.albums} />
</View> </View>
@@ -127,7 +118,7 @@ function SearchResultsBody({
} }
renderItem={renderItem} renderItem={renderItem}
ListFooterComponent={ ListFooterComponent={
hasQuery && playlistResults && playlistResults.length > 0 ? ( playlistResults && playlistResults.length > 0 ? (
<View style={styles.section}> <View style={styles.section}>
<ContentCarousel title="Playlists" content={playlistResults} /> <ContentCarousel title="Playlists" content={playlistResults} />
</View> </View>
+164 -338
View File
@@ -1,21 +1,15 @@
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout" import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { import {
CollectionHero, CollectionHero,
useCollectionHeroLayout, useCollectionHeroLayout,
} from "@/components/collection-hero" } from "@/components/collection-hero"
import {
CollectionDivider,
collectionInset,
} from "@/components/collection-list"
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
import { ScreenTitle } from "@/components/screen-title"
import { Link } from "expo-router" import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation" import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated" import Reanimated from "react-native-reanimated"
import { type ComponentProps, type ReactNode } from "react" import { type ReactNode, type ComponentProps } from "react"
import { import {
Platform, Platform,
ScrollView,
StyleSheet, StyleSheet,
View, View,
type DimensionValue, type DimensionValue,
@@ -23,42 +17,34 @@ import {
type ViewStyle, type ViewStyle,
} from "react-native" } from "react-native"
import { contentBottomInset } from "@/components/player"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme" import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
/** /** Reserve the transparent native header explicitly while skeletons cannot scroll. */
* Loading screens never scroll, so they cannot rely on scroll-view inset function SkeletonContent({
* adjustment. iOS headers are transparent and overlap the screen; Android
* headers are opaque and already sit above it.
*/
function SkeletonScreen({
children, children,
style, embedded = false,
backgroundColor,
onLayout,
}: { }: {
children: ReactNode children: ReactNode
style?: ComponentProps<typeof Reanimated.View>["style"] embedded?: boolean
backgroundColor?: string
onLayout?: () => void
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const headerHeight = useHeaderHeight() const headerHeight = useHeaderHeight()
if (embedded) return <>{children}</>
return ( return (
<Reanimated.View <ScrollView
onLayout={onLayout} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading" accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[
styles.screen,
{
backgroundColor: backgroundColor ?? colors.background,
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
},
style,
]}
> >
{children} {children}
</Reanimated.View> </ScrollView>
) )
} }
@@ -75,110 +61,56 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
) )
} }
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
function TextLine({ function TextLine({
width, width,
fontSize, height = 14,
}: { }: {
width: DimensionValue width: DimensionValue
fontSize: number height?: number
}) { }) {
return ( return <Skeleton style={{ width, height, borderRadius: 4 }} />
<View
style={{
width,
height: Math.round(fontSize * 1.2),
justifyContent: "center",
}}
>
<Skeleton
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
/>
</View>
)
} }
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */ export function SongRowSkeleton() {
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
const colors = useThemeColors() const colors = useThemeColors()
const meta = (
<View style={styles.songMeta}>
<TextLine width="60%" fontSize={16} />
<View style={styles.songSubtitle}>
<TextLine width="40%" fontSize={14} />
</View>
</View>
)
if (inset) {
return (
<View style={styles.insetRow}>
<Skeleton style={styles.songArtwork} />
<View
style={[
styles.insetSongContent,
{ borderBottomColor: colors.border },
]}
>
{meta}
</View>
</View>
)
}
return ( return (
<View style={[styles.songRow, { borderBottomColor: colors.border }]}> <View style={[styles.songRow, { borderBottomColor: colors.border }]}>
<Skeleton style={styles.songArtwork} /> <Skeleton style={styles.songArtwork} />
{meta} <View style={styles.songMeta}>
</View> <TextLine width="60%" height={16} />
) <TextLine width="40%" />
}
function TrackRowSkeleton() {
const colors = useThemeColors()
return (
<View style={styles.trackRow}>
<View style={styles.trackNumber}>
<TextLine width={12} fontSize={16} />
</View>
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
<TextLine width="55%" fontSize={16} />
</View> </View>
</View> </View>
) )
} }
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
return Array.from({ length: rows }, (_, index) => (
<SongRowSkeleton key={index} inset={inset} />
))
}
export function SongListSkeleton({ export function SongListSkeleton({
rows = 10, rows = 10,
title, embedded = false,
}: { }: {
rows?: number rows?: number
title?: string embedded?: boolean
}) { }) {
return ( return (
<SkeletonScreen> <SkeletonContent embedded={embedded}>
{title ? <ScreenTitle title={title} /> : null} <View accessibilityLabel="Loading" accessibilityRole="progressbar">
<SongRows rows={rows} /> {Array.from({ length: rows }, (_, index) => (
</SkeletonScreen> <SongRowSkeleton key={index} />
))}
</View>
</SkeletonContent>
) )
} }
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
function CardSkeleton({ function CardSkeleton({
width, width,
minHeight,
round = false, round = false,
}: { }: {
width: number width: number
minHeight?: number
round?: boolean round?: boolean
}) { }) {
return ( return (
<View style={[styles.card, { width, minHeight }]}> <View style={[styles.card, { width }]}>
<Skeleton <Skeleton
style={{ style={{
width, width,
@@ -186,37 +118,35 @@ function CardSkeleton({
borderRadius: round ? width / 2 : radius.md, borderRadius: round ? width / 2 : radius.md,
}} }}
/> />
<TextLine width="80%" fontSize={14} /> <TextLine width="80%" />
{round ? null : <TextLine width="50%" fontSize={12} />} {round ? null : <TextLine width="50%" height={12} />}
</View> </View>
) )
} }
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */ export function MediaGridSkeleton({
function MediaGridContent({ items = 6,
items, contentInset = true,
contentInset, embedded = false,
header,
}: { }: {
items: number items?: number
contentInset: boolean contentInset?: boolean
header?: ReactNode embedded?: boolean
}) { }) {
const tabletLayout = useTabletLayout()
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } = const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout() useMediaGridLayout()
return ( return (
<> <SkeletonContent embedded={embedded}>
{header}
<View <View
onLayout={onLayout} onLayout={onLayout}
accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[ style={[
styles.grid, styles.grid,
contentInset ? styles.gridInset : styles.gridRowInset,
{ {
paddingHorizontal: horizontalPadding, paddingHorizontal: horizontalPadding,
paddingTop: contentInset ? horizontalPadding : 0, paddingTop: contentInset ? horizontalPadding : 0,
// FlatList applies its content gap after the list header as well.
marginTop: header && !tabletLayout ? gap : 0,
gap, gap,
}, },
]} ]}
@@ -224,69 +154,20 @@ function MediaGridContent({
{Array.from( {Array.from(
{ length: ready ? Math.max(items, columns * 3) : 0 }, { length: ready ? Math.max(items, columns * 3) : 0 },
(_, index) => ( (_, index) => (
<CardSkeleton <CardSkeleton key={index} width={cardWidth} />
key={index}
width={cardWidth}
minHeight={
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
}
/>
) )
)} )}
</View> </View>
</> </SkeletonContent>
)
}
export function MediaGridSkeleton({
items = 6,
contentInset = true,
header,
title,
}: {
items?: number
contentInset?: boolean
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
header?: ReactNode
/** The loaded list's `ScreenTitle`, which replaces its top inset. */
title?: string
}) {
return (
<SkeletonScreen>
<MediaGridContent
items={items}
contentInset={contentInset && !title}
header={
title ? (
<>
<MediaGridTitle title={title} />
{header}
</>
) : (
header
)
}
/>
</SkeletonScreen>
)
}
function MediaGridTitle({ title }: { title: string }) {
const { horizontalPadding } = useMediaGridLayout()
return (
<ScreenTitle
title={title}
style={{ paddingHorizontal: horizontalPadding }}
/>
) )
} }
export function CarouselSkeleton() { export function CarouselSkeleton() {
return ( return (
<View style={styles.carousel}> <View style={styles.carousel}>
<TextLine width={160} fontSize={22} /> <TextLine width={160} height={22} />
<View style={styles.carouselRow}> <View style={styles.carouselRow}>
{Array.from({ length: 8 }, (_, index) => ( {Array.from({ length: 3 }, (_, index) => (
<CardSkeleton key={index} width={carouselCardWidth} /> <CardSkeleton key={index} width={carouselCardWidth} />
))} ))}
</View> </View>
@@ -294,157 +175,141 @@ export function CarouselSkeleton() {
) )
} }
export function HomeSkeleton({ title }: { title: string }) { export function HomeSkeleton() {
const headerHeight = useHeaderHeight()
const colors = useThemeColors()
return ( return (
<SkeletonScreen> <ScrollView
<View style={styles.home}> style={{ flex: 1, backgroundColor: colors.background }}
<ScreenTitle title={title} style={styles.homeTitle} /> contentContainerStyle={[
<CarouselSkeleton /> styles.home,
<CarouselSkeleton /> { paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
</View> ]}
</SkeletonScreen> contentInsetAdjustmentBehavior="never"
) scrollEnabled={false}
} accessibilityLabel="Loading"
>
function HeroActions({ <CarouselSkeleton />
favorite = true, <CarouselSkeleton />
reverse = false, </ScrollView>
}: {
favorite?: boolean
reverse?: boolean
}) {
return (
<View style={[styles.actions, reverse && styles.actionsReverse]}>
{favorite ? <Skeleton style={styles.iconAction} /> : null}
<Skeleton style={styles.playButton} />
<Skeleton style={styles.iconAction} />
</View>
) )
} }
/** Album and playlist pages: cover, title, play buttons, then tracks. */ /** Album and playlist pages: cover, title, play buttons, then tracks. */
export function CollectionDetailSkeleton({ export function CollectionDetailSkeleton({
variant, zoomCoverSize,
style, style,
round = false,
backgroundColor, backgroundColor,
onLayout, onLayout,
}: { }: {
variant: "album" | "playlist" | "favorites" | "artist" zoomCoverSize?: number
style?: ComponentProps<typeof Reanimated.View>["style"] style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
round?: boolean
backgroundColor?: string backgroundColor?: string
onLayout?: () => void onLayout?: () => void
}) { }) {
const colors = useThemeColors()
const headerHeight = useHeaderHeight()
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout() const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
const coverSize =
if (variant === "artist" || variant === "favorites") { !round && landscape
const artist = variant === "artist" ? tabletCoverSize!
const coverSize = artist ? 180 : 200 : (zoomCoverSize ?? (round ? 180 : 210))
const hero = ( const actions = (
<View style={styles.centeredHero}> <View style={styles.actions}>
<Skeleton <Skeleton style={styles.iconAction} />
style={{ <Skeleton style={styles.playButton} />
width: coverSize, <Skeleton style={styles.iconAction} />
height: coverSize, </View>
borderRadius: artist ? coverSize / 2 : radius.lg, )
}} const artwork = (
/> <Skeleton
<TextLine width={200} fontSize={artist ? 28 : 24} /> style={{
<HeroActions favorite={artist} /> width: coverSize,
</View> height: coverSize,
) borderRadius: round ? coverSize / 2 : radius.lg,
return ( }}
<SkeletonScreen />
style={style} )
backgroundColor={backgroundColor}
onLayout={onLayout}
>
{artist ? (
<MediaGridContent items={4} contentInset={false} header={hero} />
) : (
<>
{hero}
<CollectionDivider />
<SongRows rows={8} inset />
</>
)}
</SkeletonScreen>
)
}
const album = variant === "album"
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
return ( return (
<SkeletonScreen <Reanimated.ScrollView
style={style}
backgroundColor={backgroundColor}
onLayout={onLayout} onLayout={onLayout}
style={[
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
style,
]}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading"
> >
<CollectionHero {round ? (
artwork={ <View style={styles.artistHero}>
<Link.AppleZoomTarget> {zoomCoverSize ? (
<View collapsable={false}> <Link.AppleZoomTarget>
<Skeleton <View collapsable={false}>{artwork}</View>
style={{ </Link.AppleZoomTarget>
width: coverSize, ) : (
height: coverSize, artwork
borderRadius: radius.lg, )}
}} <TextLine width={200} height={24} />
/> <TextLine width={120} height={16} />
</View> {actions}
</Link.AppleZoomTarget> </View>
}
actions={<HeroActions favorite={album} reverse={landscape} />}
>
<TextLine
width={landscape ? "85%" : 200}
fontSize={landscape ? 22 : 24}
/>
<TextLine
width={landscape ? "60%" : 120}
fontSize={landscape ? 22 : 16}
/>
{album ? (
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
) : null}
</CollectionHero>
<CollectionDivider />
{album ? (
Array.from({ length: 10 }, (_, index) => (
<TrackRowSkeleton key={index} />
))
) : ( ) : (
<SongRows rows={8} inset /> <CollectionHero
artwork={
zoomCoverSize ? (
<Link.AppleZoomTarget>
<View collapsable={false}>{artwork}</View>
</Link.AppleZoomTarget>
) : (
artwork
)
}
actions={actions}
>
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
<TextLine
width={landscape && !round ? "60%" : 120}
height={landscape && !round ? 22 : 16}
/>
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
</CollectionHero>
)} )}
</SkeletonScreen> {round ? (
<MediaGridSkeleton items={4} contentInset={false} embedded />
) : (
<SongListSkeleton rows={8} embedded />
)}
</Reanimated.ScrollView>
) )
} }
export function ArtistListSkeleton({ export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
rows = 12,
title,
}: {
rows?: number
title?: string
}) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<SkeletonScreen> <SkeletonContent>
{title ? <ScreenTitle title={title} /> : null} <View accessibilityLabel="Loading" accessibilityRole="progressbar">
{Array.from({ length: rows }, (_, index) => ( {Array.from({ length: rows }, (_, index) => (
<View <View
key={index} key={index}
style={[styles.artistRow, { borderBottomColor: colors.border }]} style={[styles.artistRow, { borderBottomColor: colors.border }]}
> >
<Skeleton style={styles.artistAvatar} /> <Skeleton style={styles.artistAvatar} />
<TextLine width="50%" fontSize={16} /> <TextLine width="50%" height={16} />
</View> </View>
))} ))}
</SkeletonScreen> </View>
</SkeletonContent>
) )
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
screen: { flex: 1, overflow: "hidden" },
songRow: { songRow: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
@@ -454,61 +319,22 @@ const styles = StyleSheet.create({
paddingHorizontal: spacing.lg, paddingHorizontal: spacing.lg,
borderBottomWidth: StyleSheet.hairlineWidth, borderBottomWidth: StyleSheet.hairlineWidth,
}, },
insetRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
paddingLeft: collectionInset,
},
insetSongContent: {
flex: 1,
flexDirection: "row",
alignItems: "center",
alignSelf: "stretch",
minHeight: 64,
paddingVertical: 10,
marginRight: collectionInset,
borderBottomWidth: StyleSheet.hairlineWidth,
},
songArtwork: { width: 44, height: 44, borderRadius: 6 }, songArtwork: { width: 44, height: 44, borderRadius: 6 },
songMeta: { flex: 1 }, songMeta: { flex: 1, gap: 6 },
songSubtitle: { marginTop: 3 },
trackRow: {
flexDirection: "row",
alignItems: "center",
gap: spacing.sm,
paddingLeft: collectionInset,
},
trackNumber: { width: 24, alignItems: "center" },
trackContent: {
flex: 1,
justifyContent: "center",
alignSelf: "stretch",
minHeight: 52,
paddingVertical: 12,
marginRight: collectionInset,
borderBottomWidth: StyleSheet.hairlineWidth,
},
card: { gap: spacing.xs }, card: { gap: spacing.xs },
grid: { flexDirection: "row", flexWrap: "wrap" }, grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
gridInset: { padding: spacing.lg },
gridRowInset: { paddingHorizontal: spacing.lg },
carousel: { gap: spacing.md, overflow: "hidden" }, carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md }, carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl }, home: { padding: spacing.lg, gap: spacing.xl },
// Mirrors the home screen's title spacing. artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
homeTitle: {
paddingHorizontal: 0,
marginTop: -spacing.lg,
marginBottom: -spacing.md,
},
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: { actions: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
justifyContent: "center",
gap: spacing.sm, gap: spacing.sm,
marginTop: spacing.sm, marginTop: spacing.sm,
}, },
actionsReverse: { flexDirection: "row-reverse" },
iconAction: { width: 44, height: 44, borderRadius: 22 }, iconAction: { width: 44, height: 44, borderRadius: 22 },
playButton: { width: 160, height: 44, borderRadius: 999 }, playButton: { width: 160, height: 44, borderRadius: 999 },
artistRow: { artistRow: {
+14 -38
View File
@@ -42,8 +42,7 @@ 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, else Download. Download * Remove on the trailing side when `onRemove` is set.
* turns into a red Remove Download once `downloaded`.
*/ */
export function SongSwipeRow({ export function SongSwipeRow({
children, children,
@@ -54,8 +53,6 @@ export function SongSwipeRow({
onPlayNext, onPlayNext,
onAddToQueue, onAddToQueue,
onRemove, onRemove,
onDownload,
downloaded = false,
}: { }: {
children: ReactNode children: ReactNode
style?: StyleProp<ViewStyle> style?: StyleProp<ViewStyle>
@@ -65,8 +62,6 @@ 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
@@ -100,10 +95,10 @@ export function SongSwipeRow({
(side: number) => { (side: number) => {
close() close()
if (side > 0) onAddToQueue() if (side > 0) onAddToQueue()
else if (onRemove) onRemove() // Without Remove, the trailing action is the Download placeholder.
else onDownload?.() else onRemove?.()
}, },
[close, onAddToQueue, onRemove, onDownload] [close, onAddToQueue, onRemove]
) )
const tapRow = useCallback(() => { const tapRow = useCallback(() => {
if (open) close() if (open) close()
@@ -238,7 +233,6 @@ 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}
@@ -250,15 +244,11 @@ 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={() => { onPress={close}
close()
onDownload?.()
}}
/> />
)} )}
<GestureDetector gesture={gesture}> <GestureDetector gesture={gesture}>
@@ -269,10 +259,7 @@ 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" }]
: []), : []),
@@ -280,10 +267,6 @@ 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()
@@ -307,7 +290,6 @@ function SwipeAction({
secondary = false, secondary = false,
paired = side > 0, paired = side > 0,
remove = false, remove = false,
downloaded = false,
x, x,
height, height,
progress, progress,
@@ -318,8 +300,6 @@ function SwipeAction({
secondary?: boolean secondary?: boolean
paired?: boolean paired?: boolean
remove?: boolean remove?: boolean
/** Shows the download action as Remove Download. */
downloaded?: boolean
x: SharedValue<number> x: SharedValue<number>
height: SharedValue<number> height: SharedValue<number>
progress: SharedValue<number> progress: SharedValue<number>
@@ -390,8 +370,6 @@ function SwipeAction({
}, },
], ],
})) }))
const removesDownload = side < 0 && !remove && downloaded
const destructive = remove || removesDownload
return ( return (
<Animated.View <Animated.View
pointerEvents={open ? "auto" : "none"} pointerEvents={open ? "auto" : "none"}
@@ -408,13 +386,11 @@ function SwipeAction({
accessibilityLabel={ accessibilityLabel={
remove remove
? "Remove from Playlist" ? "Remove from Playlist"
: removesDownload : side > 0
? "Remove Download" ? secondary
: side > 0 ? "Play Next"
? secondary : "Add to Queue"
? "Play Next" : "Download"
: "Add to Queue"
: "Download"
} }
onPress={onPress} onPress={onPress}
style={styles.actionButton} style={styles.actionButton}
@@ -423,7 +399,7 @@ function SwipeAction({
style={[ style={[
styles.pill, styles.pill,
{ {
backgroundColor: destructive backgroundColor: remove
? IS_ANDROID ? IS_ANDROID
? "#d32f2f" ? "#d32f2f"
: "#ff3b30" : "#ff3b30"
@@ -440,7 +416,7 @@ function SwipeAction({
{IS_ANDROID ? ( {IS_ANDROID ? (
<Ionicons <Ionicons
name={ name={
destructive remove
? "trash-outline" ? "trash-outline"
: side < 0 : side < 0
? "arrow-down" ? "arrow-down"
@@ -454,7 +430,7 @@ function SwipeAction({
) : ( ) : (
<SymbolView <SymbolView
name={ name={
destructive remove
? "trash" ? "trash"
: side > 0 : side > 0
? secondary ? secondary
+5 -42
View File
@@ -5,46 +5,16 @@ 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({ export function TabScreenContent({ children }: { children: ReactNode }) {
route,
children,
}: {
route: ScreenRoute
children: ReactNode
}) {
const backgroundStyle = useTabletBackgroundStyle() const backgroundStyle = useTabletBackgroundStyle()
if (Platform.OS !== "ios" || !Platform.isPad) { if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
return <ScreenBody route={route}>{children}</ScreenBody>
}
return ( return (
<Animated.View style={[{ flex: 1 }, backgroundStyle]}> <Animated.View style={[{ flex: 1 }, backgroundStyle]}>
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}> <SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
<ScreenBody route={route}>{children}</ScreenBody> {children}
</SafeAreaView> </SafeAreaView>
<TabletSidebar /> <TabletSidebar />
<TabletPlayerLayoutSync /> <TabletPlayerLayoutSync />
@@ -52,13 +22,6 @@ export function TabScreenContent({
) )
} }
/** `screenLayout` for every tab stack. */ export function renderTabScreenContent({ children }: { children: ReactNode }) {
export function renderTabScreenContent({ return <TabScreenContent>{children}</TabScreenContent>
route,
children,
}: {
route: ScreenRoute
children: ReactNode
}) {
return <TabScreenContent route={route}>{children}</TabScreenContent>
} }
+6 -24
View File
@@ -6,7 +6,7 @@ import {
type ReactElement, type ReactElement,
} from "react" } from "react"
import { import {
type ScrollViewInstance, ScrollView,
View, View,
type NativeSyntheticEvent, type NativeSyntheticEvent,
type NativeScrollEvent, type NativeScrollEvent,
@@ -15,22 +15,16 @@ import Animated from "react-native-reanimated"
import { useSafeAreaInsets } from "react-native-safe-area-context" import { useSafeAreaInsets } from "react-native-safe-area-context"
import type { MediaItem } from "@/components/media-cards" import type { MediaItem } from "@/components/media-cards"
import { ScreenTitle, useScreenTitleScroll } from "@/components/screen-title"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout" import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { tabletLayoutTransition } from "@/lib/tablet-motion" import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
/** Height reserved under each tablet card's artwork for its title and subtitle. */
export const tabletCardTextHeight = 48
type GridProps = { type GridProps = {
content: MediaItem[] content: MediaItem[]
paddingBottom: number paddingBottom: number
onEndReached?: () => void onEndReached?: () => void
ListHeaderComponent?: ReactElement ListHeaderComponent?: ReactElement
contentInset?: boolean contentInset?: boolean
/** iOS `ScreenTitle` shown above the grid; it replaces the top inset. */
title?: string
renderCard: (item: MediaItem, width: number) => ReactElement renderCard: (item: MediaItem, width: number) => ReactElement
} }
@@ -44,12 +38,9 @@ export function TabletMediaGrid({
onEndReached, onEndReached,
ListHeaderComponent, ListHeaderComponent,
contentInset = true, contentInset = true,
title,
renderCard, renderCard,
}: GridProps) { }: GridProps) {
const colors = useThemeColors() const colors = useThemeColors()
const { ref, scrollY: titleScrollY } =
useScreenTitleScroll<ScrollViewInstance>()
const insets = useSafeAreaInsets() const insets = useSafeAreaInsets()
const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } = const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout() useMediaGridLayout()
@@ -57,7 +48,7 @@ export function TabletMediaGrid({
const [headerHeight, setHeaderHeight] = useState(0) const [headerHeight, setHeaderHeight] = useState(0)
const [scrollY, setScrollY] = useState(0) const [scrollY, setScrollY] = useState(0)
const lastRequestedLength = useRef(-1) const lastRequestedLength = useRef(-1)
const rowHeight = cardWidth + tabletCardTextHeight + gap const rowHeight = cardWidth + 48 + gap
const firstRow = Math.max( const firstRow = Math.max(
0, 0,
Math.floor((scrollY - headerHeight) / rowHeight) - 2 Math.floor((scrollY - headerHeight) / rowHeight) - 2
@@ -108,27 +99,18 @@ export function TabletMediaGrid({
setViewportHeight(event.nativeEvent.layout.height) setViewportHeight(event.nativeEvent.layout.height)
}} }}
> >
<Animated.ScrollView <ScrollView
ref={ref}
onScroll={onScroll} onScroll={onScroll}
// Every frame, so the title pins smoothly on pull-down. scrollEventThrottle={32}
scrollEventThrottle={16}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{ contentContainerStyle={{
paddingTop: contentInset && !title ? horizontalPadding : 0, paddingTop: contentInset ? horizontalPadding : 0,
paddingBottom: paddingBottom + insets.bottom, paddingBottom: paddingBottom + insets.bottom,
}} }}
> >
<View <View
onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)} onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)}
> >
{title ? (
<ScreenTitle
title={title}
scrollY={titleScrollY}
style={{ paddingHorizontal: horizontalPadding }}
/>
) : null}
{ListHeaderComponent} {ListHeaderComponent}
</View> </View>
<View style={{ height: gridHeight }}> <View style={{ height: gridHeight }}>
@@ -151,7 +133,7 @@ export function TabletMediaGrid({
) )
})} })}
</View> </View>
</Animated.ScrollView> </ScrollView>
</Animated.View> </Animated.View>
) )
} }
+4 -12
View File
@@ -23,7 +23,6 @@ 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"
@@ -59,7 +58,6 @@ 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
@@ -168,22 +166,16 @@ export function TabletMiniPlayer() {
{roomy ? ( {roomy ? (
<Pressable <Pressable
style={styles.control} style={styles.control}
disabled={!lyrics} disabled
onPress={() =>
router.push({
pathname: "/(app)/player",
params: { lyrics: "1" },
})
}
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel="Show lyrics" accessibilityLabel="Lyrics"
accessibilityState={{ disabled: !lyrics }} accessibilityState={{ disabled: true }}
> >
<PlayerSymbol <PlayerSymbol
name="quote.bubble" name="quote.bubble"
fallback="chatbox-outline" fallback="chatbox-outline"
size={23} size={23}
color={lyrics ? color : inactive} color={inactive}
/> />
</Pressable> </Pressable>
) : null} ) : null}
+21 -46
View File
@@ -15,7 +15,6 @@ 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"
@@ -25,10 +24,6 @@ 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,
@@ -36,18 +31,14 @@ 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,
panel, showQueue,
togglePanel, toggleQueue,
lyrics,
metadata, metadata,
}: { }: {
colors: NowPlayingColors colors: NowPlayingColors
@@ -57,9 +48,8 @@ export function TabletNowPlaying({
handle: ReturnType<typeof Gesture.Pan> handle: ReturnType<typeof Gesture.Pan>
artwork: ReturnType<typeof Gesture.Pan> artwork: ReturnType<typeof Gesture.Pan>
} }
panel: PlayerPanel | null showQueue: boolean
togglePanel: (panel: PlayerPanel) => void toggleQueue: () => void
lyrics: Lyrics | null | undefined
metadata: ReactNode metadata: ReactNode
}) { }) {
const router = useRouter() const router = useRouter()
@@ -73,9 +63,7 @@ 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 showQueue = panel === "queue" const sideBySide = showQueue && wideLayout
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)
@@ -136,14 +124,7 @@ export function TabletNowPlaying({
/> />
</Pressable> </Pressable>
) )
const panelContent = showLyrics ? ( const queue = (
<LyricsView
key={currentSong.id}
lyrics={lyrics}
colors={colors}
fontSize={34}
/>
) : (
<NowPlayingQueue <NowPlayingQueue
tablet tablet
colors={colors} colors={colors}
@@ -260,18 +241,20 @@ export function TabletNowPlaying({
</Animated.View> </Animated.View>
{wideLayout ? ( {wideLayout ? (
<Animated.View <Animated.View
pointerEvents={panel ? "auto" : "none"} pointerEvents={showQueue ? "auto" : "none"}
accessibilityElementsHidden={!panel} accessibilityElementsHidden={!showQueue}
importantForAccessibility={panel ? "auto" : "no-hide-descendants"} importantForAccessibility={
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 ? panelContent : null} {queueHeight > 0 ? queue : null}
</Animated.View> </Animated.View>
) : null} ) : null}
{panel && !sideBySide ? ( {showQueue && !sideBySide ? (
<View <View
style={[ style={[
styles.portraitQueue, styles.portraitQueue,
@@ -281,7 +264,7 @@ export function TabletNowPlaying({
setQueueHeight(event.nativeEvent.layout.height) setQueueHeight(event.nativeEvent.layout.height)
} }
> >
{queueHeight > 0 ? panelContent : null} {queueHeight > 0 ? queue : null}
</View> </View>
) : null} ) : null}
</View> </View>
@@ -297,29 +280,21 @@ export function TabletNowPlaying({
/> />
<View style={styles.footerActions}> <View style={styles.footerActions}>
<Pressable <Pressable
onPress={() => togglePanel("lyrics")} disabled
disabled={!lyrics && !showLyrics}
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel={showLyrics ? "Hide lyrics" : "Show lyrics"} accessibilityLabel="Lyrics"
accessibilityState={{ accessibilityState={{ disabled: true }}
selected: showLyrics, style={[styles.footerButton, { opacity: 0.4 }]}
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={showLyrics ? colors.selectedForeground : colors.foreground} color={colors.foreground}
/> />
</Pressable> </Pressable>
<Pressable <Pressable
onPress={() => togglePanel("queue")} onPress={toggleQueue}
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"} accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
accessibilityState={{ selected: showQueue }} accessibilityState={{ selected: showQueue }}
+1 -34
View File
@@ -1,19 +1,13 @@
import { useOpenSettings } from "@/hooks/use-open-settings" import { useOpenSettings } from "@/hooks/use-open-settings"
import { requireNativeView } from "expo" import { requireNativeView } from "expo"
import { useIsFocused, useRouter } from "expo-router" import { useIsFocused } from "expo-router"
import { useMemo } from "react"
import { Platform, type ViewProps } from "react-native" import { Platform, type ViewProps } from "react-native"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url" import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { tabPath } from "@/lib/app-navigation"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { playlistCoverUrl } from "@/lib/urls"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
const NativeSidebar = const NativeSidebar =
Platform.OS === "ios" Platform.OS === "ios"
? requireNativeView< ? requireNativeView<
@@ -22,39 +16,16 @@ const NativeSidebar =
initials: string initials: string
imageURL?: string imageURL?: string
active: boolean active: boolean
playlists: SidebarPlaylist[]
onProfilePress: () => void onProfilePress: () => void
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
} }
>("TabletSidebar") >("TabletSidebar")
: null : null
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
export function TabletSidebar() { export function TabletSidebar() {
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
const { config } = useServerConfig()
const imageUrl = useProfileImageUrl(user?.image) const imageUrl = useProfileImageUrl(user?.image)
const openSettings = useOpenSettings() const openSettings = useOpenSettings()
const router = useRouter()
const active = useIsFocused() const active = useIsFocused()
const serverUrl = config?.serverUrl
const playlists = useMemo(
() =>
[
...(sidebarPlaylists?.owned ?? []),
...(sidebarPlaylists?.subscribed ?? []),
].map((playlist): SidebarPlaylist => ({
id: playlist.id,
title: playlist.title,
imageURL:
serverUrl && playlist.cover
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
: undefined,
})),
[serverUrl, sidebarPlaylists]
)
if (!NativeSidebar) return null if (!NativeSidebar) return null
return ( return (
@@ -64,11 +35,7 @@ export function TabletSidebar() {
initials={initialsFromName(user?.name ?? "Me")} initials={initialsFromName(user?.name ?? "Me")}
imageURL={imageUrl} imageURL={imageUrl}
active={active} active={active}
playlists={playlists}
onProfilePress={openSettings} onProfilePress={openSettings}
onPlaylistPress={({ nativeEvent }) =>
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
}
/> />
) )
} }
+1 -1
View File
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
{ artistId } { artistId }
) )
if (selectionRequestIdRef.current !== requestId) return if (selectionRequestIdRef.current !== requestId) return
setPendingSongIds(songIds.flat()) setPendingSongIds(songIds)
setOpen(true) setOpen(true)
} catch (error) { } catch (error) {
if (selectionRequestIdRef.current !== requestId) return if (selectionRequestIdRef.current !== requestId) return
-476
View File
@@ -1,476 +0,0 @@
import { useConvex, useQuery } from "convex/react"
import {
createContext,
useCallback,
useContext,
useEffect,
useMemo,
useState,
useSyncExternalStore,
type ReactNode,
} from "react"
import {
Alert,
Modal,
Platform,
Pressable,
StyleSheet,
Switch,
Text,
View,
} from "react-native"
import { toast } from "sonner-native"
import { AndroidSheet } from "@/components/android-sheet"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { useCacheScope } from "@/contexts/persistent-cache"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { getAuthCookieHeader } from "@/lib/auth-cookies"
import {
downloadQueueFor,
readRememberedDownloadQuality,
writeRememberedDownloadQuality,
} from "@/lib/downloads"
import { loadPlaybackSongs } from "@/lib/playback-files"
import type { ServerConfig } from "@/lib/server-config"
import { showError } from "@/lib/toast"
import { useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type {
CollectionRef,
DownloadableSong,
DownloadSource,
DownloadQueue,
SongDownloadState,
} from "@otunes/convex/client/download-queue"
import { FAVORITES_ID } from "@otunes/convex/client/download-queue"
import {
DOWNLOAD_OPTIONS_PATH,
DOWNLOAD_QUALITY_DETAILS,
DOWNLOAD_QUALITY_LABELS,
formatBytes,
type DownloadOptionsResponse,
type DownloadQuality,
type SizedDownloadOption,
} from "@otunes/convex/download-quality"
/** Songs on their own, or an album or playlist that stays downloaded as a whole. */
export type DownloadTarget =
| {
kind: "songs"
songIds: string[]
title: string
/** Removing takes the songs out of only this download. */
from?: DownloadSource
}
| (CollectionRef & { title: string; songIds: string[] })
/** The Favorites playlist has no ID, so downloads use this one. */
export const FAVORITES_DOWNLOAD_ID = FAVORITES_ID
type DownloadsContextValue = {
queue: DownloadQueue | null
/** Asks for a quality (unless remembered) and starts downloading. */
requestDownload: (target: DownloadTarget) => Promise<void>
removeDownload: (target: DownloadTarget) => Promise<void>
}
const DownloadsContext = createContext<DownloadsContextValue | null>(null)
export function useDownloads() {
const context = useContext(DownloadsContext)
if (!context) {
throw new Error("useDownloads must be used within DownloadsProvider")
}
return context
}
const noopSubscribe = () => () => {}
/** Re-renders on every download change. Prefer the narrower hooks in lists. */
export function useDownloadsVersion() {
const { queue } = useDownloads()
return useSyncExternalStore(
queue?.subscribe ?? noopSubscribe,
() => queue?.getVersion() ?? 0
)
}
/**
* A song's download state as seen from `from` (see `downloadState`). Only
* re-renders when that state changes.
*/
export function useSongDownloadState(
songId: string,
from?: DownloadSource
): SongDownloadState {
const { queue } = useDownloads()
return useSyncExternalStore(
queue?.subscribe ?? noopSubscribe,
() => queue?.downloadState(songId, from) ?? "none"
)
}
/** Whether an album or playlist is downloaded. */
export function useIsCollectionDownloaded(ref: CollectionRef) {
const { queue } = useDownloads()
return useSyncExternalStore(
queue?.subscribe ?? noopSubscribe,
() => queue?.getCollection(ref) !== undefined
)
}
/**
* For swipe actions: downloads a song, or asks before removing its download
* (from `from` only, when given).
*/
export function useToggleSongDownload() {
const { requestDownload, removeDownload } = useDownloads()
return useCallback(
(
song: { id: string; title: string },
downloaded: boolean,
from?: DownloadSource
) => {
const target = {
kind: "songs" as const,
songIds: [song.id],
title: song.title,
from,
}
if (!downloaded) {
void requestDownload(target)
return
}
Alert.alert("Remove download?", song.title, [
{ text: "Cancel", style: "cancel" },
{
text: "Remove",
style: "destructive",
onPress: () => void removeDownload(target),
},
])
},
[requestDownload, removeDownload]
)
}
async function fetchDownloadOptions(config: ServerConfig, songIds: string[]) {
const cookieHeader = await getAuthCookieHeader(
config.serverUrl,
config.convexUrl
)
if (!cookieHeader) throw new Error("Sign in to download")
const response = await fetch(`${config.serverUrl}${DOWNLOAD_OPTIONS_PATH}`, {
method: "POST",
headers: { "Content-Type": "application/json", Cookie: cookieHeader },
body: JSON.stringify({
songIds,
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
}),
})
if (!response.ok) {
throw new Error("Could not reach the server to download")
}
return (await response.json()) as DownloadOptionsResponse
}
function startDownload(
queue: DownloadQueue,
target: DownloadTarget,
songs: DownloadableSong[],
quality: DownloadQuality
) {
if (target.kind === "songs") return queue.enqueue(songs, quality)
return queue.downloadCollection(
{ kind: target.kind, id: target.id, title: target.title, quality },
songs
)
}
function optionDetail(option: SizedDownloadOption, songCount: number) {
if (option.fallbackCount === 0) {
return DOWNLOAD_QUALITY_DETAILS[option.quality]
}
const included = songCount - option.fallbackCount
return `${included} of ${songCount} songs, ${option.fallbackCount} in High`
}
/** 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.map((option) => (
<Pressable
key={option.quality}
accessibilityRole="button"
style={[styles.row, { borderBottomColor: colors.border }]}
onPress={() => onPick(option.quality, remember)}
>
<View style={styles.rowText}>
{option.quality === "lossless" ||
option.quality === "atmos" ? (
<AudioFormatBadge
format={option.quality}
color={colors.foreground}
backgroundColor={colors.card}
/>
) : (
<Text style={[styles.label, { color: colors.foreground }]}>
{DOWNLOAD_QUALITY_LABELS[option.quality]}
</Text>
)}
<Text style={{ color: colors.mutedForeground, fontSize: 12 }}>
{optionDetail(option, songCount)}
</Text>
</View>
<Text style={[styles.size, { color: colors.mutedForeground }]}>
{option.estimated ? "~" : ""}
{formatBytes(option.bytes)}
</Text>
</Pressable>
))}
<View style={styles.rememberRow}>
<Text style={{ color: colors.foreground, fontSize: 15 }}>
Remember my choice
</Text>
<Switch value={remember} onValueChange={setRemember} />
</View>
</Pressable>
</Pressable>
</AndroidSheet>
</Modal>
)
}
/** Keeps a downloaded playlist's songs in step with the playlist. */
function useSyncDownloadedPlaylist(
queue: DownloadQueue,
id: string,
songIds: readonly string[] | undefined
) {
const convex = useConvex()
const cacheScope = useCacheScope()
useEffect(() => {
if (!songIds) return
void queue
.syncCollection({ kind: "playlist", id }, songIds, async (added) => {
const songs = await loadPlaybackSongs(
convex,
cacheScope,
added as Id<"songs">[]
)
return songs.filter((song) => song !== null)
})
.catch(() => {})
}, [cacheScope, convex, id, queue, songIds])
}
function PlaylistSync({ queue, id }: { queue: DownloadQueue; id: string }) {
const songIds = useQuery(api.playlists.getPlaylistSongIds, {
playlistId: id as Id<"playlists">,
})
useSyncDownloadedPlaylist(queue, id, songIds)
return null
}
function FavoritesSync({ queue }: { queue: DownloadQueue }) {
const favorites = useCachedQuery(api.favorites.getUserFavorites)
const songIds = useMemo(() => favorites?.favoriteSongs.flat(), [favorites])
useSyncDownloadedPlaylist(queue, FAVORITES_DOWNLOAD_ID, songIds)
return null
}
function DownloadSync({ queue }: { queue: DownloadQueue }) {
useSyncExternalStore(queue.subscribe, queue.getVersion)
return queue
.collections()
.filter((collection) => collection.kind === "playlist")
.map((collection) =>
collection.id === FAVORITES_DOWNLOAD_ID ? (
<FavoritesSync key={collection.id} queue={queue} />
) : (
<PlaylistSync key={collection.id} queue={queue} id={collection.id} />
)
)
}
export function DownloadsProvider({ children }: { children: ReactNode }) {
const { config } = useServerConfig()
const convex = useConvex()
const cacheScope = useCacheScope()
const queue = useMemo(
() => (config ? downloadQueueFor(config) : null),
[config]
)
const [pending, setPending] = useState<{
target: DownloadTarget
response: DownloadOptionsResponse
} | null>(null)
useEffect(() => {
if (!queue) return
void queue.load().catch(() => {})
// Reports failed songs once per burst instead of once per song.
let failed = 0
let timer: ReturnType<typeof setTimeout> | null = null
const unsubscribe = queue.onFailure(() => {
failed += 1
timer ??= setTimeout(() => {
showError(
failed === 1
? "A song could not be downloaded"
: `${failed} songs could not be downloaded`
)
failed = 0
timer = null
}, 1000)
})
return () => {
unsubscribe()
if (timer) clearTimeout(timer)
}
}, [queue])
const requestDownload = useCallback(
async (target: DownloadTarget) => {
if (!config || !queue || target.songIds.length === 0) return
if (target.songIds.every((id) => queue.getDownloaded(id))) {
// Already on this device: just give them back to their downloads.
await queue.enqueue(
target.songIds.map((id) => ({ id, files: {} })),
"high"
)
return
}
try {
// Caches titles and formats so downloads can be queued offline.
void loadPlaybackSongs(
convex,
cacheScope,
target.songIds as Id<"songs">[]
).catch(() => {})
const response = await fetchDownloadOptions(config, target.songIds)
const remembered = await readRememberedDownloadQuality()
if (remembered) {
await startDownload(queue, target, response.songs, remembered)
toast(`Downloading ${target.title}`)
} else {
setPending({ target, response })
}
} catch (error) {
showError(error instanceof Error ? error.message : "Download failed")
}
},
[cacheScope, config, convex, queue]
)
const removeDownload = useCallback(
async (target: DownloadTarget) => {
if (!queue) return
if (target.kind === "songs") {
await queue.removeSongs(target.songIds, target.from)
} else await queue.removeCollection(target)
},
[queue]
)
const handlePick = useCallback(
(quality: DownloadQuality, remember: boolean) => {
if (!pending || !queue) return
setPending(null)
if (remember) void writeRememberedDownloadQuality(quality)
void startDownload(queue, pending.target, pending.response.songs, quality)
},
[pending, queue]
)
const value = useMemo(
() => ({ queue, requestDownload, removeDownload }),
[queue, requestDownload, removeDownload]
)
return (
<DownloadsContext.Provider value={value}>
{children}
{queue ? <DownloadSync queue={queue} /> : null}
<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,
},
})
+3 -3
View File
@@ -100,15 +100,15 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
) )
const songIds = useMemo( const songIds = useMemo(
() => new Set<string>(favorites?.favoriteSongs.flat()), () => new Set(favorites?.favoriteSongs.map(String) ?? []),
[favorites?.favoriteSongs] [favorites?.favoriteSongs]
) )
const albumIds = useMemo( const albumIds = useMemo(
() => new Set<string>(favorites?.favoriteAlbums.flat()), () => new Set(favorites?.favoriteAlbums.map(String) ?? []),
[favorites?.favoriteAlbums] [favorites?.favoriteAlbums]
) )
const artistIds = useMemo( const artistIds = useMemo(
() => new Set<string>(favorites?.favoriteArtists.flat()), () => new Set(favorites?.favoriteArtists.map(String) ?? []),
[favorites?.favoriteArtists] [favorites?.favoriteArtists]
) )
const idsRef = useRef({ songIds, albumIds, artistIds }) const idsRef = useRef({ songIds, albumIds, artistIds })
+12 -21
View File
@@ -24,7 +24,6 @@ import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
import * as playbackQueue from "@otunes/convex/client/playback-queue" import * as playbackQueue from "@otunes/convex/client/playback-queue"
import type { RepeatMode } from "@otunes/convex/client/playback-queue" import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import { getPlaybackStore } from "@otunes/convex/client/playback-store" import { getPlaybackStore } from "@otunes/convex/client/playback-store"
import { isDownloadsQueueOrigin } from "@otunes/convex/download-quality"
import { rememberSongs, useSong, useSongs } from "@/lib/song-cache" import { rememberSongs, useSong, useSongs } from "@/lib/song-cache"
import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents" import { donateMusicPlay, type MusicEntityKind } from "@/lib/app-intents"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
@@ -44,9 +43,8 @@ type PlaybackContextValue = {
seekTo: (seconds: number) => void seekTo: (seconds: number) => void
waitForPlaybackReady: (playing?: boolean) => Promise<void> waitForPlaybackReady: (playing?: boolean) => Promise<void>
setIsPlaying: (playing: boolean) => void setIsPlaying: (playing: boolean) => void
/** An origin from `downloadsQueueOrigin` plays downloads in any quality. */ playInOrder: (songIds: Id<"songs">[]) => Promise<void>
playInOrder: (songIds: Id<"songs">[], origin?: string) => Promise<void> playShuffled: (songIds: Id<"songs">[]) => Promise<void>
playShuffled: (songIds: Id<"songs">[], origin?: string) => Promise<void>
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void> addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void> addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
playFromSong: ( playFromSong: (
@@ -247,8 +245,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const queueOriginRef = useRef<string | undefined>(undefined) const queueOriginRef = useRef<string | undefined>(undefined)
const playRequestRef = useRef(0) const playRequestRef = useRef(0)
const [queueStartVersion, setQueueStartVersion] = useState(0) const [queueStartVersion, setQueueStartVersion] = useState(0)
// Queues started from the Downloads page play downloads in any quality.
const [fromDownloads, setFromDownloads] = useState(false)
const queueSongIds = playback.queue const queueSongIds = playback.queue
const queueHistorySongIds = playback.history const queueHistorySongIds = playback.history
@@ -284,7 +280,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
repeatEnabled, repeatEnabled,
currentSong, currentSong,
queueStartVersion, queueStartVersion,
fromDownloads,
}) })
const { resetProgress } = useProgressPersistence({ const { resetProgress } = useProgressPersistence({
@@ -315,7 +310,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
queueOriginRef.current = queueOriginRef.current =
recorded.origin ?? recorded.origin ??
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined) (recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
setFromDownloads(isDownloadsQueueOrigin(recorded.origin))
resetQueuePlayback() resetQueuePlayback()
store.update(playbackQueue.clearQueue) store.update(playbackQueue.clearQueue)
store.update(recipe) store.update(recipe)
@@ -369,11 +363,10 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
) )
const playSongs = useCallback( const playSongs = useCallback(
(shuffled: boolean) => async (songIds: Id<"songs">[], origin?: string) => { (shuffled: boolean) => async (songIds: Id<"songs">[]) => {
if (songIds.length === 0) return if (songIds.length === 0) return
startPlayback( startPlayback((state) =>
(state) => playbackQueue.startQueue(state, songIds, shuffled), playbackQueue.startQueue(state, songIds, shuffled)
{ origin }
) )
}, },
[startPlayback] [startPlayback]
@@ -408,7 +401,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope, cacheScope,
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId } { artistId }
).then((chunks) => chunks.flat()), ),
recorded: { entity: { kind: "artist", id: artistId } }, recorded: { entity: { kind: "artist", id: artistId } },
})) }))
const playlist = collection( const playlist = collection(
@@ -489,14 +482,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[] let songIds: Id<"songs">[]
try { try {
songIds = ( songIds = await fetchCachedQuery(
await fetchCachedQuery( convex,
convex, cacheScope,
cacheScope, api.library.browseSortedSongIds,
api.library.browseSortedSongIds, sort
sort )
)
).flat()
} catch { } catch {
return return
} }
+2 -4
View File
@@ -9,15 +9,13 @@
"APP_VARIANT": "development" "APP_VARIANT": "development"
}, },
"developmentClient": true, "developmentClient": true,
"distribution": "internal", "distribution": "internal"
"credentialsSource": "local"
}, },
"preview": { "preview": {
"env": { "env": {
"APP_VARIANT": "preview" "APP_VARIANT": "preview"
}, },
"distribution": "internal", "distribution": "internal"
"credentialsSource": "local"
}, },
"production": { "production": {
"env": { "env": {
+1 -5
View File
@@ -83,11 +83,7 @@ export function createCoverPaletteSource<Swatches>({
const [waitedKey, setWaitedKey] = useState<string | null>(null) const [waitedKey, setWaitedKey] = useState<string | null>(null)
const swatches = const swatches =
resolved.key === key resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
? resolved.swatches
: key
? cachedSwatches(key)
: null
useEffect(() => { useEffect(() => {
if (!key || hasCover === false) return if (!key || hasCover === false) return
-109
View File
@@ -1,109 +0,0 @@
import { File } from "expo-file-system"
import { useEffect, useMemo, useState, useSyncExternalStore } from "react"
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
}
+4 -70
View File
@@ -2,9 +2,7 @@ import { useConvex } from "convex/react"
import { useCallback } from "react" import { useCallback } from "react"
import type { MediaAction } from "@/components/media-context-menu" import type { MediaAction } from "@/components/media-context-menu"
import type { DownloadSource } from "@otunes/convex/client/download-queue"
import { useAddToPlaylist } from "@/contexts/add-to-playlist" import { useAddToPlaylist } from "@/contexts/add-to-playlist"
import { useDownloads } from "@/contexts/downloads"
import { useCacheScope } from "@/contexts/persistent-cache" import { useCacheScope } from "@/contexts/persistent-cache"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback" import { usePlaybackActions } from "@/contexts/playback"
@@ -50,7 +48,6 @@ export function useMediaMenuActions() {
} = useFavorites() } = useFavorites()
const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } = const { addToQueueNext, addToQueueLast, playShuffled, playArtistShuffled } =
usePlaybackActions() usePlaybackActions()
const { requestDownload, removeDownload } = useDownloads()
const runQueueAction = useCallback( const runQueueAction = useCallback(
async (action: MediaAction, songIds: Id<"songs">[]) => { async (action: MediaAction, songIds: Id<"songs">[]) => {
@@ -74,9 +71,8 @@ export function useMediaMenuActions() {
[addToQueueLast, addToQueueNext, playShuffled] [addToQueueLast, addToQueueNext, playShuffled]
) )
/** `from` limits removing a download to that album, playlist, or Other. */
const handleSongAction = useCallback( const handleSongAction = useCallback(
async (song: BrowseSong, action: MediaAction, from?: DownloadSource) => { async (song: BrowseSong, action: MediaAction) => {
const songIds = [song.id as Id<"songs">] const songIds = [song.id as Id<"songs">]
switch (action) { switch (action) {
case "create-station": case "create-station":
@@ -101,19 +97,6 @@ export function useMediaMenuActions() {
case "go-album": case "go-album":
push(`/album/${song.album.id}`) push(`/album/${song.album.id}`)
break break
case "download":
case "remove-download": {
const target = {
kind: "songs" as const,
songIds,
title: song.title,
from,
}
await (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
default: default:
break break
} }
@@ -124,8 +107,6 @@ export function useMediaMenuActions() {
runQueueAction, runQueueAction,
toggleSongFavorite, toggleSongFavorite,
playArtistShuffled, playArtistShuffled,
requestDownload,
removeDownload,
] ]
) )
@@ -157,25 +138,6 @@ export function useMediaMenuActions() {
case "go-artist": case "go-artist":
push(`/artist/${album.artist.id}`) push(`/artist/${album.artist.id}`)
break break
case "download":
case "remove-download": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getAlbumSongIds,
{ albumId: album.id as Id<"albums"> }
)
const target = {
kind: "album" as const,
id: album.id,
title: album.title,
songIds,
}
await (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
default: default:
break break
} }
@@ -189,8 +151,6 @@ export function useMediaMenuActions() {
push, push,
runQueueAction, runQueueAction,
toggleAlbumFavorite, toggleAlbumFavorite,
requestDownload,
removeDownload,
] ]
) )
@@ -213,7 +173,7 @@ export function useMediaMenuActions() {
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> } { artistId: artist.id as Id<"artists"> }
) )
await runQueueAction(action, songIds.flat()) await runQueueAction(action, songIds)
break break
} }
default: default:
@@ -251,38 +211,12 @@ export function useMediaMenuActions() {
await runQueueAction(action, songIds) await runQueueAction(action, songIds)
break break
} }
case "download":
case "remove-download": {
const songIds = await fetchCachedQuery(
convex,
cacheScope,
api.playlists.getPlaylistSongIds,
{ playlistId: playlist.id as Id<"playlists"> }
)
const target = {
kind: "playlist" as const,
id: playlist.id,
title: playlist.title,
songIds,
}
await (action === "download"
? requestDownload(target)
: removeDownload(target))
break
}
default: default:
break break
} }
}) })
}, },
[ [convex, cacheScope, openAddPlaylistToPlaylist, runQueueAction]
convex,
cacheScope,
openAddPlaylistToPlaylist,
runQueueAction,
requestDownload,
removeDownload,
]
) )
const handleAlbumDetailAction = useCallback( const handleAlbumDetailAction = useCallback(
@@ -331,7 +265,7 @@ export function useMediaMenuActions() {
cover: album.cover, cover: album.cover,
}, },
} }
await handleSongAction(song, action, { kind: "album", id: album.id }) await handleSongAction(song, action)
}, },
[handleSongAction] [handleSongAction]
) )
+2 -25
View File
@@ -18,12 +18,10 @@ import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel" import type { Id } from "@otunes/convex/_generated/dataModel"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import { playbackStreamPlan } from "@otunes/convex/playback-stream" import { playbackStreamPlan } from "@otunes/convex/playback-stream"
import { streamDownloadQuality } from "@otunes/convex/download-quality"
import * as playbackQueue from "@otunes/convex/client/playback-queue" import * as playbackQueue from "@otunes/convex/client/playback-queue"
import type { RepeatMode } from "@otunes/convex/client/playback-queue" import type { RepeatMode } from "@otunes/convex/client/playback-queue"
import type { PlaybackStore } from "@otunes/convex/client/playback-store" import type { PlaybackStore } from "@otunes/convex/client/playback-store"
import { getAuthCookieHeader } from "@/lib/auth-cookies" import { getAuthCookieHeader } from "@/lib/auth-cookies"
import { downloadedAudioUri, downloadQueueFor } from "@/lib/downloads"
import { loadPlaybackSongs } from "@/lib/playback-files" import { loadPlaybackSongs } from "@/lib/playback-files"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
import { albumCoverUrl, songAudioSource } from "@/lib/urls" import { albumCoverUrl, songAudioSource } from "@/lib/urls"
@@ -73,7 +71,6 @@ export function useNativePlaylistSync({
repeatEnabled, repeatEnabled,
currentSong, currentSong,
queueStartVersion, queueStartVersion,
fromDownloads,
}: { }: {
store: PlaybackStore store: PlaybackStore
queueSongIds: Id<"songs">[] queueSongIds: Id<"songs">[]
@@ -81,8 +78,6 @@ export function useNativePlaylistSync({
repeatEnabled: RepeatMode repeatEnabled: RepeatMode
currentSong: BrowseSong | null currentSong: BrowseSong | null
queueStartVersion: number queueStartVersion: number
/** Plays downloads in any quality, for queues started from Downloads. */
fromDownloads: boolean
}) { }) {
const convex = useConvex() const convex = useConvex()
const { config } = useServerConfig() const { config } = useServerConfig()
@@ -464,7 +459,7 @@ export function useNativePlaylistSync({
} }
if (!isCurrentLoad()) return if (!isCurrentLoad()) return
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${fromDownloads}:${cookieHeader}` const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
const needsRebuild = const needsRebuild =
loadedLoadKeyRef.current !== loadKey || loadedLoadKeyRef.current !== loadKey ||
nativePlaylistNeedsRebuild( nativePlaylistNeedsRebuild(
@@ -498,12 +493,7 @@ export function useNativePlaylistSync({
} }
const buildSources = async (songIds: Id<"songs">[]) => { const buildSources = async (songIds: Id<"songs">[]) => {
const [songs] = await Promise.all([ const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
loadPlaybackSongs(convex, cacheScope, songIds),
downloadQueueFor(config)
.load()
.catch(() => {}),
])
const sources = new Map<Id<"songs">, AudioSource>() const sources = new Map<Id<"songs">, AudioSource>()
for (const song of songs) { for (const song of songs) {
if (!song) return null if (!song) return null
@@ -512,18 +502,6 @@ 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(
@@ -650,7 +628,6 @@ export function useNativePlaylistSync({
currentSongId, currentSongId,
currentSongSyncKey, currentSongSyncKey,
destroyPlaylist, destroyPlaylist,
fromDownloads,
ensurePlaylist, ensurePlaylist,
handlePlaybackLoadFailure, handlePlaybackLoadFailure,
historySyncKey, historySyncKey,
+4 -1
View File
@@ -1,6 +1,9 @@
import { ConvexError, type Value } from "convex/values" import { ConvexError, type Value } from "convex/values"
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"]) const AUTH_ERROR_MESSAGES = new Set([
"Not authenticated",
"User not logged in",
])
function matchesAuthMessage(message: string): boolean { function matchesAuthMessage(message: string): boolean {
if (AUTH_ERROR_MESSAGES.has(message)) { if (AUTH_ERROR_MESSAGES.has(message)) {
+1 -3
View File
@@ -37,9 +37,7 @@ export function authStorageKey(key: string, storageNamespace: string): string {
return `${key}_${escapedNamespace}` return `${key}_${escapedNamespace}`
} }
export async function clearStoredAuthTokens( export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
storageNamespace: string
): Promise<void> {
await Promise.all( await Promise.all(
AUTH_STORAGE_KEYS.map((key) => AUTH_STORAGE_KEYS.map((key) =>
secureRemoveItem(authStorageKey(key, storageNamespace)) secureRemoveItem(authStorageKey(key, storageNamespace))
-15
View File
@@ -1,15 +0,0 @@
import { useLocalSearchParams } from "expo-router"
export const OTHER_DOWNLOADS_TITLE = "Other Downloaded Songs"
/** Route param marking album and playlist screens opened from Downloads. */
export const FROM_DOWNLOADS_PARAM = "from=downloads"
/**
* True on album and playlist screens opened from Downloads, where playback
* uses the downloads whatever their quality.
*/
export function useOpenedFromDownloads() {
const { from } = useLocalSearchParams<{ from?: string }>()
return from === "downloads"
}
-229
View File
@@ -1,229 +0,0 @@
import AsyncStorage from "@react-native-async-storage/async-storage"
import { Directory, File, Paths } from "expo-file-system"
import { Platform } from "react-native"
import {
createDownloadQueue,
type DownloadedCover,
type DownloadedSong,
type DownloadIndex,
type DownloadQueue,
type DownloadStorage,
} from "@otunes/convex/client/download-queue"
import {
parseDownloadQuality,
songDownloadPath,
type DownloadQuality,
} from "@otunes/convex/download-quality"
import { getAuthCookieHeader } from "@/lib/auth-cookies"
import type { ServerConfig } from "@/lib/server-config"
const REMEMBERED_QUALITY_KEY = "otunes.download-quality"
const PARTIAL_SUFFIX = ".partial"
const COVERS_FOLDER = "covers"
const COVER_SIZE = 1024
// Each song is a folder named `<songId>.<quality>.<albumId>` holding one audio
// file, named by the server so it keeps the right extension. Folders end in
// `.partial` until their download completes. Covers are files named
// `<kind>-<id>` in the `covers` folder.
function serverDirectory(config: ServerConfig) {
const host = config.hostname.replace(/[^a-z0-9.-]/gi, "_")
return new Directory(Paths.document, "downloads", host)
}
function songFolderName(song: {
songId: string
quality: DownloadQuality
albumId?: string
}) {
return [song.songId, song.quality, song.albumId].filter(Boolean).join(".")
}
function parseSongFolder(name: string) {
const [songId, rawQuality, albumId, ...rest] = name.split(".")
const quality = parseDownloadQuality(rawQuality)
if (!songId || !quality || rest.length > 0) return null
return { songId, quality, albumId: albumId || undefined }
}
function songFolders(root: Directory) {
if (!root.exists) return []
return root
.list()
.filter(
(entry): entry is Directory =>
entry instanceof Directory && entry.name !== COVERS_FOLDER
)
}
function coverFileName({ kind, id }: DownloadedCover) {
return `${kind}-${id}`
}
// Saved covers by their server URL, for `downloadedCoverUri`.
const savedCoverUris = new Map<string, string>()
function coverUrl(config: ServerConfig, { kind, id }: DownloadedCover) {
return `${config.serverUrl}/api/${kind}/${id}/cover`
}
function audioFile(folder: Directory) {
return folder.list().find((entry): entry is File => entry instanceof File)
}
function createStorage(config: ServerConfig): DownloadStorage {
const root = serverDirectory(config)
const indexFile = new File(root, "index.json")
const coversFolder = new Directory(root, COVERS_FOLDER)
// Remembers the covers saved in earlier launches.
if (coversFolder.exists) {
for (const entry of coversFolder.list()) {
const dash = entry.name.indexOf("-")
const kind = entry.name.slice(0, dash)
if (entry instanceof File && (kind === "album" || kind === "playlist")) {
const cover = { kind, id: entry.name.slice(dash + 1) } as const
savedCoverUris.set(coverUrl(config, cover), entry.uri)
}
}
}
function foldersFor(songIds: ReadonlySet<string>) {
return songFolders(root).filter((folder) => {
const name = folder.name.replace(PARTIAL_SUFFIX, "")
const parsed = parseSongFolder(name)
return parsed !== null && songIds.has(parsed.songId)
})
}
return {
async list() {
const songs: DownloadedSong[] = []
for (const folder of songFolders(root)) {
const parsed = parseSongFolder(folder.name)
const file = parsed ? audioFile(folder) : undefined
if (!parsed || !file) {
// Interrupted downloads from an earlier launch.
folder.delete()
continue
}
songs.push({ ...parsed, bytes: file.size ?? 0 })
}
return songs
},
async save({ songId, requested, quality, albumId }, signal) {
const cookieHeader = await getAuthCookieHeader(
config.serverUrl,
config.convexUrl
)
if (!cookieHeader) throw new Error("Sign in to download")
root.create({ intermediates: true, idempotent: true })
const name = songFolderName({ songId, quality, albumId })
const partial = new Directory(root, `${name}${PARTIAL_SUFFIX}`)
if (partial.exists) partial.delete()
partial.create()
try {
const path = songDownloadPath(songId, requested, {
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
})
const file = await File.downloadFileAsync(
`${config.serverUrl}${path}`,
partial,
{ headers: { Cookie: cookieHeader }, signal }
)
signal.throwIfAborted()
partial.rename(name)
return file.size ?? 0
} catch (error) {
if (partial.exists) partial.delete()
throw error
}
},
async saveCover(cover) {
const file = new File(coversFolder, coverFileName(cover))
if (file.exists) return
coversFolder.create({ intermediates: true, idempotent: true })
const url = coverUrl(config, cover)
await File.downloadFileAsync(`${url}?size=${COVER_SIZE}`, file)
savedCoverUris.set(url, file.uri)
},
async pruneCovers(keep) {
if (!coversFolder.exists) return
const kept = new Set(keep.map(coverFileName))
for (const entry of coversFolder.list()) {
if (kept.has(entry.name)) continue
entry.delete()
for (const [url, uri] of savedCoverUris) {
if (uri === entry.uri) savedCoverUris.delete(url)
}
}
},
async readIndex() {
if (indexFile.exists) {
try {
return JSON.parse(await indexFile.text()) as DownloadIndex
} catch {
// An unreadable index starts empty.
}
}
return { collections: [], otherSongIds: [] }
},
async writeIndex(index) {
root.create({ intermediates: true, idempotent: true })
if (!indexFile.exists) indexFile.create()
await indexFile.write(JSON.stringify(index))
},
async remove(songIds) {
for (const folder of foldersFor(new Set(songIds))) folder.delete()
},
}
}
const queues = new Map<string, DownloadQueue>()
/** Downloads are kept per server, since song IDs only mean something there. */
export function downloadQueueFor(config: ServerConfig) {
let queue = queues.get(config.hostname)
if (!queue) {
queue = createDownloadQueue(createStorage(config))
queues.set(config.hostname, queue)
}
return queue
}
/** The local file for a downloaded song, for the player to use offline. */
export function downloadedAudioUri(config: ServerConfig, songId: string) {
const song = downloadQueueFor(config).getDownloaded(songId)
if (!song) return null
const folder = new Directory(serverDirectory(config), songFolderName(song))
return folder.exists ? (audioFile(folder)?.uri ?? null) : null
}
/**
* The saved copy of a cover URL (`albumCoverUrl` or `playlistCoverUrl`,
* without size), for showing while the network copy loads or fails.
*/
export function downloadedCoverUri(url: string) {
return savedCoverUris.get(url.split("?")[0]) ?? null
}
export async function readRememberedDownloadQuality() {
try {
return parseDownloadQuality(
await AsyncStorage.getItem(REMEMBERED_QUALITY_KEY)
)
} catch {
return undefined
}
}
/** Pass undefined to ask every time again. */
export async function writeRememberedDownloadQuality(
quality: DownloadQuality | undefined
) {
if (quality) await AsyncStorage.setItem(REMEMBERED_QUALITY_KEY, quality)
else await AsyncStorage.removeItem(REMEMBERED_QUALITY_KEY)
}
+1 -4
View File
@@ -5,10 +5,7 @@ export function formatDuration(seconds: number): string {
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}` return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
} }
export function formatRemainingDuration( export function formatRemainingDuration(current: number, total: number): string {
current: number,
total: number
): string {
const remaining = Math.max(0, Math.floor(total) - Math.floor(current)) const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
return `-${formatDuration(remaining)}` return `-${formatDuration(remaining)}`
} }
+5 -17
View File
@@ -79,9 +79,7 @@ export function deriveCoverPalette(
secondaryForeground: toHex(secondaryForeground), secondaryForeground: toHex(secondaryForeground),
accent: toHex(accent), accent: toHex(accent),
accentForeground: toHex(accentForeground), accentForeground: toHex(accentForeground),
accentText: toHex( accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
),
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)), surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)), divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
isDark: lightText, isDark: lightText,
@@ -96,10 +94,7 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
? withLightness(color, Math.min(lch.l, 0.86)) ? withLightness(color, Math.min(lch.l, 0.86))
: withLightness(color, Math.max(lch.l, 0.2)) : withLightness(color, Math.max(lch.l, 0.2))
const y = luminance(clamped) const y = luminance(clamped)
if ( if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
) {
return clamped return clamped
} }
@@ -130,10 +125,7 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
} }
function prefersLightText(background: Rgb) { function prefersLightText(background: Rgb) {
return ( return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
contrastRatio([255, 255, 255], background) >=
contrastRatio([0, 0, 0], background)
)
} }
/** Moves `color`'s lightness away from `background` until it reaches `min`. */ /** Moves `color`'s lightness away from `background` until it reaches `min`. */
@@ -188,10 +180,7 @@ function withLuminance(color: Rgb, target: number): Rgb {
high = mid high = mid
} }
} }
return withLightness( return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
color,
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
)
} }
/** `amount` of `color` over `base`. */ /** `amount` of `color` over `base`. */
@@ -217,8 +206,7 @@ function toLinear(channel: number) {
} }
function fromLinear(value: number) { function fromLinear(value: number) {
const c = const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
return c * 255 return c * 255
} }
+1 -10
View File
@@ -13,24 +13,15 @@ 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",
} }
/**
* iOS tab stacks render their titles in the scroll content with
* `ScreenTitle`, so the bar keeps the title (for back menus) but hides it.
*/
export const inlineTitleOptions: StackScreenOptions =
Platform.OS === "ios" ? { headerTitleStyle: { color: "transparent" } } : {}
export function useStackScreenOptions( export function useStackScreenOptions(
overrides?: StackScreenOptions overrides?: StackScreenOptions
): StackScreenOptions { ): StackScreenOptions {
const theme = useThemeColors() const theme = useThemeColors()
return { return {
headerLargeTitle: false, headerLargeTitle: true,
headerTransparent: true, headerTransparent: true,
headerTintColor: theme.foreground, headerTintColor: theme.foreground,
headerLargeTitleStyle: { color: theme.foreground }, headerLargeTitleStyle: { color: theme.foreground },
-6
View File
@@ -12,10 +12,6 @@ export type NowPlayingColors = {
selected: string selected: string
selectedForeground: string selectedForeground: string
highlight: string highlight: string
/** Lyrics lines other than the one playing. */
lyricsInactive: string
/** Words of the playing line not yet sung. */
lyricsUnsung: string
isDark: boolean isDark: boolean
} }
@@ -32,8 +28,6 @@ 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),
lyricsInactive: withAlpha(foreground, 0.35),
lyricsUnsung: withAlpha(foreground, 0.55),
isDark: palette.isDark, isDark: palette.isDark,
} }
} }
+1 -4
View File
@@ -13,10 +13,7 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config" const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
function normalizeHostnameInput(input: string): string { function normalizeHostnameInput(input: string): string {
return input return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
.trim()
.replace(/^https?:\/\//i, "")
.replace(/\/+$/, "")
} }
function buildServerUrl(hostname: string): string { function buildServerUrl(hostname: string): string {
-1
View File
@@ -4,7 +4,6 @@ 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" },
+1 -4
View File
@@ -39,15 +39,12 @@ export function albumCoverUrl(
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size) return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
} }
/** `version` is the summary's `cover`; it changes with the artwork. */
export function playlistCoverUrl( export function playlistCoverUrl(
serverUrl: string, serverUrl: string,
playlistId: string, playlistId: string,
version: string | null,
size?: CoverImageSize size?: CoverImageSize
) { ) {
const uri = `${serverUrl}/api/playlist/${playlistId}/cover` return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
return sizedCoverUrl(version ? `${uri}?v=${version}` : uri, size)
} }
export function songAudioSource( export function songAudioSource(
@@ -7,15 +7,11 @@ private enum HandoffState {
static var pending: [String: String]? static var pending: [String: String]?
static var notify: (() -> Void)? static var notify: (() -> Void)?
// app.config.ts declares the one `.media` type per build profile; iOS and static var activityType: String {
// Catalyst must publish the same string for Handoff to pair them. Other "\(Bundle.main.bundleIdentifier!).media"
// plugins (expo-router) append their own types, so match by suffix. }
static let activityType =
(Bundle.main.object(forInfoDictionaryKey: "NSUserActivityTypes") as! [String])
.first { $0.hasSuffix(".media") }!
} }
// ExpoAppSceneDelegate forwards scene(_:continue:) and cold-start activities here.
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber { public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
public func application( public func application(
_ application: UIApplication, _ application: UIApplication,
+1 -119
View File
@@ -5,11 +5,7 @@ final class TabletSidebar: Module {
public func definition() -> ExpoModulesCore.ModuleDefinition { public func definition() -> ExpoModulesCore.ModuleDefinition {
Name("TabletSidebar") Name("TabletSidebar")
View(TabletSidebarView.self) { View(TabletSidebarView.self) {
Events("onProfilePress", "onPlaylistPress") Events("onProfilePress")
Prop("playlists") { (view: TabletSidebarView, value: [SidebarPlaylist]) in
view.playlists = value
view.configure()
}
Prop("accountName") { (view: TabletSidebarView, value: String) in Prop("accountName") { (view: TabletSidebarView, value: String) in
view.accountName = value view.accountName = value
view.configure() view.configure()
@@ -30,25 +26,9 @@ final class TabletSidebar: Module {
} }
} }
/// A playlist row under the sidebar's Playlists section.
struct SidebarPlaylist: Record {
@Field var id: String = ""
@Field var title: String = ""
/// Cover URL; changes whenever the artwork does. `nil` shows a list icon.
@Field var imageURL: String?
}
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs. /// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
final class TabletSidebarView: ExpoView { final class TabletSidebarView: ExpoView {
let onProfilePress = EventDispatcher() let onProfilePress = EventDispatcher()
let onPlaylistPress = EventDispatcher()
var playlists: [SidebarPlaylist] = []
private let selectionProxy = SidebarSelectionProxy()
/// Playlist rows by identifier. Typed loosely because stored properties
/// can't be gated to iOS 18, where `UITab` arrives; values are always `UITab`.
private var playlistTabs: [String: NSObject] = [:]
private var coverImages: [String: UIImage] = [:]
private var coverTasks: [String: URLSessionDataTask] = [:]
var accountName = "" var accountName = ""
var initials = "" var initials = ""
var imageURL: String? var imageURL: String?
@@ -102,13 +82,11 @@ final class TabletSidebarView: ExpoView {
deinit { deinit {
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) } if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
coverTasks.values.forEach { $0.cancel() }
} }
@available(iOS 18.0, *) @available(iOS 18.0, *)
private func configure(_ controller: UITabBarController) { private func configure(_ controller: UITabBarController) {
configureGroups(controller) configureGroups(controller)
configurePlaylists(controller)
let footer: SidebarAccountButton let footer: SidebarAccountButton
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton { if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
@@ -125,7 +103,6 @@ final class TabletSidebarView: ExpoView {
@available(iOS 18.0, *) @available(iOS 18.0, *)
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) { private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children } let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let selected = destinations.first { $0 === controller.selectedTab } let selected = destinations.first { $0 === controller.selectedTab }
let contextualTab = selected ?? footer.contextualTab ?? destinations.first let contextualTab = selected ?? footer.contextualTab ?? destinations.first
footer.contextualTab = contextualTab footer.contextualTab = contextualTab
@@ -183,101 +160,6 @@ final class TabletSidebarView: ExpoView {
} }
} }
private let playlistTabPrefix = "otunes.playlist."
private let playlistIconSize: CGFloat = 24
extension TabletSidebarView {
/// Lists each playlist under Playlists with its cover. Rows are never
/// selected natively: a tap opens the playlist in the All Playlists stack.
@available(iOS 18.0, *)
fileprivate func configurePlaylists(_ controller: UITabBarController) {
guard let group = controller.tabs.first(where: { $0.identifier == "otunes.playlists" })
as? UITabGroup else { return }
if !(controller.delegate is SidebarSelectionProxy) {
selectionProxy.original = controller.delegate
controller.delegate = selectionProxy
}
selectionProxy.onPlaylist = { [weak self] id in self?.onPlaylistPress(["id": id]) }
var rows: [UITab] = []
for playlist in playlists {
let identifier = playlistTabPrefix + playlist.id
let tab = playlistTabs[identifier] as? UITab ?? UITab(
title: playlist.title, image: nil, identifier: identifier,
viewControllerProvider: { _ in UIViewController() })
playlistTabs[identifier] = tab
if tab.title != playlist.title { tab.title = playlist.title }
tab.preferredPlacement = .sidebarOnly
tab.image = playlistImage(identifier: identifier, url: playlist.imageURL)
rows.append(tab)
}
let ids = Set(rows.map(\.identifier))
playlistTabs = playlistTabs.filter { ids.contains($0.key) }
let fixed = group.children.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let children = fixed + rows
if group.children.map(\.identifier) != children.map(\.identifier) {
group.children = children
}
}
/// The cached cover for `url`, starting a download on a miss.
@available(iOS 18.0, *)
private func playlistImage(identifier: String, url: String?) -> UIImage? {
let placeholder = UIImage(systemName: "music.note.list")
guard let url, let remote = URL(string: url) else { return placeholder }
if let image = coverImages[url] { return image }
if coverTasks[url] == nil {
let task = URLSession.shared.dataTask(with: remote) { [weak self] data, _, _ in
guard let data, let image = UIImage(data: data) else { return }
DispatchQueue.main.async {
guard let self else { return }
self.coverTasks[url] = nil
self.coverImages[url] = roundedIcon(image)
if let tab = self.playlistTabs[identifier] as? UITab { tab.image = self.coverImages[url] }
}
}
coverTasks[url] = task
task.resume()
}
return placeholder
}
}
/// Square cover shrunk to sidebar icon size with rounded corners, drawn as is
/// rather than tinted like a symbol.
private func roundedIcon(_ image: UIImage) -> UIImage {
let size = CGSize(width: playlistIconSize, height: playlistIconSize)
let rendered = UIGraphicsImageRenderer(size: size).image { _ in
UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 4).addClip()
image.draw(in: CGRect(origin: .zero, size: size))
}
return rendered.withRenderingMode(.alwaysOriginal)
}
/// Sits in front of the router's tab controller delegate. Taps on playlist
/// rows go to JS; everything else is forwarded untouched.
private final class SidebarSelectionProxy: NSObject, UITabBarControllerDelegate {
weak var original: UITabBarControllerDelegate?
var onPlaylist: ((String) -> Void)?
override func responds(to aSelector: Selector!) -> Bool {
super.responds(to: aSelector) || (original?.responds(to: aSelector) ?? false)
}
override func forwardingTarget(for aSelector: Selector!) -> Any? { original }
@available(iOS 18.0, *)
func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
if tab.identifier.hasPrefix(playlistTabPrefix) {
onPlaylist?(String(tab.identifier.dropFirst(playlistTabPrefix.count)))
return false
}
return original?.tabBarController?(tabBarController, shouldSelectTab: tab) ?? true
}
}
@available(iOS 18.0, *) @available(iOS 18.0, *)
private final class SidebarAccountButton: UIView { private final class SidebarAccountButton: UIView {
var onPress: (() -> Void)? var onPress: (() -> Void)?
-2
View File
@@ -29,7 +29,6 @@
"expo-blur": "~58.0.5", "expo-blur": "~58.0.5",
"expo-constants": "~58.0.13", "expo-constants": "~58.0.13",
"expo-dev-client": "~58.0.14", "expo-dev-client": "~58.0.14",
"expo-file-system": "~58.0.10",
"expo-font": "~58.0.9", "expo-font": "~58.0.9",
"expo-glass-effect": "~58.0.5", "expo-glass-effect": "~58.0.5",
"expo-haptics": "~58.0.7", "expo-haptics": "~58.0.7",
@@ -37,7 +36,6 @@
"expo-image-picker": "~58.0.10", "expo-image-picker": "~58.0.10",
"expo-linking": "~58.0.14", "expo-linking": "~58.0.14",
"expo-navigation-bar": "~58.0.4", "expo-navigation-bar": "~58.0.4",
"expo-network": "~58.0.5",
"expo-router": "~58.0.25", "expo-router": "~58.0.25",
"expo-secure-store": "~58.0.2", "expo-secure-store": "~58.0.2",
"expo-sharing": "~58.0.20", "expo-sharing": "~58.0.20",
+7 -23
View File
@@ -4,20 +4,6 @@ const {
withXcodeProject, withXcodeProject,
} = require("expo/config-plugins") } = require("expo/config-plugins")
// Pods left at React Native's iOS 15.1 minimum map to a macOS target below what
// current Xcode accepts for Catalyst, so raise them to the app's own target.
const raisePodDeploymentTargets = `
app_target = installer.aggregate_targets.first.platform.deployment_target
installer.pods_project.targets.each do |target|
target.build_configurations.each do |build|
current = build.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
if current.nil? || Pod::Version.new(current) < app_target
build.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = app_target.to_s
end
end
end
`
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies. // Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
module.exports = (config) => { module.exports = (config) => {
config = withPodfileProperties(config, (config) => { config = withPodfileProperties(config, (config) => {
@@ -27,15 +13,14 @@ module.exports = (config) => {
}) })
config = withPodfile(config, (config) => { config = withPodfile(config, (config) => {
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/ const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/ if (!pattern.test(config.modResults.contents)) {
let contents = config.modResults.contents
if (!flag.test(contents) || !postInstall.test(contents)) {
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed") throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
} }
contents = contents.replace(flag, ":mac_catalyst_enabled => true") config.modResults.contents = config.modResults.contents.replace(
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`) pattern,
config.modResults.contents = contents ":mac_catalyst_enabled => true"
)
return config return config
}) })
@@ -47,8 +32,7 @@ module.exports = (config) => {
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) { for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
const settings = configurations[value].buildSettings const settings = configurations[value].buildSettings
settings.SUPPORTS_MACCATALYST = "YES" settings.SUPPORTS_MACCATALYST = "YES"
// Share the iOS bundle ID so Handoff and the App ID match across devices. settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
settings.TARGETED_DEVICE_FAMILY = '"1,2"' settings.TARGETED_DEVICE_FAMILY = '"1,2"'
} }
return config return config
+1 -1
View File
@@ -32,7 +32,7 @@ export default function Page() {
<ContentCarousel <ContentCarousel
title="Recently Added" title="Recently Added"
href="/recently-added" href="/recently-added"
content={recentlyAdded.flat()} content={recentlyAdded}
/> />
</div> </div>
</div> </div>
+12 -18
View File
@@ -1,7 +1,5 @@
import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider" import { AddToPlaylistProvider } from "@/components/add-to-playlist-provider"
import { DownloadsProvider } from "@/components/downloads-provider"
import { FavoritesProvider } from "@/components/favorites-provider" import { FavoritesProvider } from "@/components/favorites-provider"
import { OfflineGate } from "@/components/offline-gate"
import { PlaybackProvider } from "@/components/playback-provider" import { PlaybackProvider } from "@/components/playback-provider"
import { PlayerBar } from "@/components/player-bar" import { PlayerBar } from "@/components/player-bar"
import { LazyQueuePanel } from "@/components/lazy-queue-panel" import { LazyQueuePanel } from "@/components/lazy-queue-panel"
@@ -19,22 +17,18 @@ export default function AppLayout({
<SidebarProvider> <SidebarProvider>
<PlaybackProvider> <PlaybackProvider>
<AddToPlaylistProvider> <AddToPlaylistProvider>
<DownloadsProvider> <FavoritesProvider>
<FavoritesProvider> <AppSidebar />
<AppSidebar /> <div className="flex min-h-svh min-w-0 flex-1">
<div className="flex min-h-svh min-w-0 flex-1"> <SidebarInset className="min-w-0 flex-1">
<SidebarInset className="min-w-0 flex-1"> <Suspense>
<Suspense> <ScrollRestoration>{children}</ScrollRestoration>
<ScrollRestoration> </Suspense>
<OfflineGate>{children}</OfflineGate> </SidebarInset>
</ScrollRestoration> <LazyQueuePanel />
</Suspense> </div>
</SidebarInset> <PlayerBar />
<LazyQueuePanel /> </FavoritesProvider>
</div>
<PlayerBar />
</FavoritesProvider>
</DownloadsProvider>
</AddToPlaylistProvider> </AddToPlaylistProvider>
</PlaybackProvider> </PlaybackProvider>
</SidebarProvider> </SidebarProvider>
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : ( ) : (
<div className="flex-1 overflow-y-auto p-6 pb-28"> <div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}> <div className={albumGridClassName}>
{albums.flat().map((album) => ( {albums.map((album) => (
<AlbumCard key={album.id} album={album} /> <AlbumCard key={album.id} album={album} />
))} ))}
</div> </div>
@@ -1,7 +0,0 @@
"use client"
import { OtherDownloadsView } from "@/components/other-downloads-view"
export default function Page() {
return <OtherDownloadsView />
}
@@ -1,7 +0,0 @@
"use client"
import { DownloadsView } from "@/components/downloads-view"
export default function Page() {
return <DownloadsView />
}
+1 -1
View File
@@ -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 search /> return <CollectionDetailSkeleton />
} }
@@ -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 search /> return <CollectionDetailSkeleton />
} }
Loaded 100 of 214 files, more files were not shown because too many files have changed in this diff. Show more