Compare commits
3
Commits
No files matched your search
+6
-5
@@ -54,11 +54,12 @@ playwright.config.*
|
||||
*~
|
||||
*.log
|
||||
|
||||
# Environment variables, in any workspace. Next.js inlines NEXT_PUBLIC_* values
|
||||
# into the bundle and the Convex CLI reads .env.local on deploy.
|
||||
**/.env
|
||||
**/.env.*
|
||||
!**/.env.example
|
||||
# Environment variables (only commit template files)
|
||||
.env
|
||||
.env*.local
|
||||
.env.development
|
||||
.env.test
|
||||
.env.production.local
|
||||
|
||||
# Docker configuration files (not needed inside build context)
|
||||
Dockerfile*
|
||||
|
||||
+1
-6
@@ -195,12 +195,7 @@ RUN node --version \
|
||||
&& ldd /convex/generate_key \
|
||||
&& ! ldd /convex/convex-local-backend /convex/generate_key | grep -q 'not found'
|
||||
|
||||
# The backend gets its own user so the web server cannot read the database or
|
||||
# instance secret. It joins the otunes group to clean up the web server's HLS
|
||||
# cache in /tmp/otunes.
|
||||
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes \
|
||||
&& useradd --system --user-group --groups otunes --create-home --home-dir /home/convex \
|
||||
--shell /usr/sbin/nologin convex
|
||||
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes
|
||||
|
||||
COPY --from=convex-functions /app /opt/otunes/convex
|
||||
COPY docker/generate-auth-keys.mjs /opt/otunes/generate-auth-keys.mjs
|
||||
|
||||
@@ -4,9 +4,7 @@ This integration uses Expo 58 inline modules and `expo-app-intents`. Rebuild the
|
||||
|
||||
Playback and library changes open oTunes because they need its authenticated React runtime. Swift dispatches a request and waits for an app-owned completion acknowledgment. Playback waits for the native audio player to load the requested track; warmup waits for it to load while paused. Errors reach Siri, and requests that have expired are discarded before starting a side effect. Native catalog reads do not open the app.
|
||||
|
||||
The full entity catalog lives in Application Support. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog.
|
||||
|
||||
Sync is incremental. The app subscribes to `intentCatalog.head`, the newest insert, rename or deletion per kind, and fetches a kind only when it moves past the cursor stored in AsyncStorage. `intentCatalog.page` then returns records created after the cursor plus renames and deletions from the `intentCatalogChanges` log. The log keeps 30 days; older cursors, or more than 2,000 changes, rebuild that kind from scratch. Favorites are stamped onto records on device from the favorites subscription, so liking a song costs no catalog queries. Playlists come from the live `intentCatalog.playlists` query. Code lives in `components/app-intents/`: `catalog-sync.ts`, `now-playing.ts`, and `dispatch.ts`.
|
||||
The full entity catalog lives in Application Support. The backend supplies pages of 200 records. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog. Catalogs refresh on launch, foreground entry, favorite changes, and every five minutes while foregrounded.
|
||||
|
||||
Songs, albums, artists, and playlists have Spotlight open intents and on-screen entity associations. Associations require iOS 18.4 and Xcode 27; Spotlight indexing requires iOS 18. Playback donations are made after the player starts, preserve shuffle, and resolve real catalog entities. Removed records trigger donation cleanup. Sign-out clears catalogs, Spotlight entries, donations, and pending invocations. On iOS 27, the query types also handle system requests to rebuild Spotlight indexes.
|
||||
|
||||
@@ -16,7 +14,7 @@ Audio schema intents require Xcode 27 and iOS 27. Custom intents remain availabl
|
||||
|
||||
Deploy the companion Convex changes before installing the new mobile build:
|
||||
|
||||
- `intentCatalog.head`, `intentCatalog.page` and `intentCatalog.playlists` supply the entity catalog. Library mutations record renames and deletions in `intentCatalogChanges`, pruned daily.
|
||||
- `library.intentCatalogPage` supplies authenticated, paginated entity records.
|
||||
- `appIntentPlaylists` records playlist-creation request IDs in the same transaction as creation. Replaying a request returns the original playlist ID.
|
||||
- `playlists.createPlaylist` accepts an optional `invocationId`; existing callers can omit it.
|
||||
|
||||
|
||||
@@ -54,7 +54,6 @@
|
||||
"expo-status-bar",
|
||||
"expo-app-intents",
|
||||
"./plugins/with-android-colors",
|
||||
"./plugins/with-android-fast-fade",
|
||||
[
|
||||
"expo-navigation-bar",
|
||||
{
|
||||
|
||||
+1
@@ -0,0 +1 @@
|
||||
export { default } from "../library/queue"
|
||||
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
|
||||
import {
|
||||
ScreenPaletteProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
useTabletBackgroundStyle,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidNativeTabColors,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
@@ -46,13 +46,12 @@ function useRouterTheme() {
|
||||
}
|
||||
|
||||
function useNativeTabColors() {
|
||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||
const selectedColor = colors.dark.primary
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const selectedColor = hasArtworkPalette
|
||||
? androidPalette.foreground
|
||||
: androidPalette.accentText
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const androidPalette = colors.dark
|
||||
const artworkPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -62,14 +61,14 @@ function useNativeTabColors() {
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
: {
|
||||
default: androidPalette.secondaryForeground,
|
||||
default: androidPalette.mutedForeground,
|
||||
selected: selectedColor,
|
||||
}
|
||||
|
||||
const labelColor =
|
||||
Platform.OS === "ios"
|
||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||
: androidPalette.secondaryForeground
|
||||
: androidPalette.mutedForeground
|
||||
|
||||
return {
|
||||
isDark,
|
||||
@@ -86,17 +85,20 @@ function useNativeTabColors() {
|
||||
blurEffect: isDark
|
||||
? "systemChromeMaterialDark"
|
||||
: "systemChromeMaterialLight",
|
||||
backgroundColor:
|
||||
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
||||
}
|
||||
}
|
||||
|
||||
function TabsContent() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const homeColors = useAndroidNativeTabColors()
|
||||
const libraryColors = useAndroidNativeTabColors()
|
||||
const searchColors = useAndroidNativeTabColors()
|
||||
const keyboardVisible = useAndroidKeyboardVisible()
|
||||
const routerTheme = useRouterTheme()
|
||||
const tabColors = useNativeTabColors()
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||
|
||||
@@ -127,9 +129,7 @@ function TabsContent() {
|
||||
tintColor={tabColors.tintColor}
|
||||
minimizeBehavior="onScrollDown"
|
||||
{...(Platform.OS === "android"
|
||||
? // A new ripple color rebuilds Material's item backgrounds and
|
||||
// cuts off the in-flight ripple, so it must not follow the palette.
|
||||
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||
@@ -140,6 +140,9 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? homeColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -149,6 +152,9 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? libraryColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -163,6 +169,9 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? searchColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import {
|
||||
useSwipeRowGroup,
|
||||
@@ -8,13 +7,21 @@ import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
@@ -28,7 +35,7 @@ import {
|
||||
MediaActionMenu,
|
||||
MediaContextMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
} from "@/components/media-actions-sheet"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
@@ -82,6 +89,20 @@ export default function AlbumScreen() {
|
||||
[album]
|
||||
)
|
||||
|
||||
// Older servers do not include album format availability yet.
|
||||
const formatTracks = useCachedQuery(
|
||||
api.library.getSongsForPlayback,
|
||||
album && (album.hasLossless === undefined || album.hasAtmos === undefined)
|
||||
? { ids: songIds }
|
||||
: "skip"
|
||||
)
|
||||
const hasLossless =
|
||||
album?.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album?.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
rememberSongs(albumDetailSongs(album))
|
||||
@@ -90,12 +111,6 @@ export default function AlbumScreen() {
|
||||
|
||||
const listItems = useMemo(() => albumListItems(album?.tracks ?? []), [album])
|
||||
|
||||
const playTrack = useCallback(
|
||||
(songId: Id<"songs">, ids: Id<"songs">[]) =>
|
||||
playFromSong(songId, ids, `album:${id}`),
|
||||
[id, playFromSong]
|
||||
)
|
||||
|
||||
const renderItem = useCallback(
|
||||
({ item }: { item: AlbumListItem }) => {
|
||||
if (item.type === "disc") {
|
||||
@@ -110,7 +125,9 @@ export default function AlbumScreen() {
|
||||
songIds={songIds}
|
||||
palette={palette}
|
||||
favorited={isSongFavorite(item.track.id)}
|
||||
onPlay={playTrack}
|
||||
onPlay={(songId, ids) =>
|
||||
playFromSong(songId, ids, `album:${album.id}`)
|
||||
}
|
||||
onAction={handleAlbumTrackAction}
|
||||
/>
|
||||
) : null
|
||||
@@ -120,7 +137,7 @@ export default function AlbumScreen() {
|
||||
handleAlbumTrackAction,
|
||||
isSongFavorite,
|
||||
palette,
|
||||
playTrack,
|
||||
playFromSong,
|
||||
songIds,
|
||||
swipeGroup,
|
||||
]
|
||||
@@ -135,14 +152,17 @@ export default function AlbumScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
variant="album"
|
||||
zoomCoverSize={220}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -163,9 +183,9 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
Album not found.
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -186,7 +206,10 @@ export default function AlbumScreen() {
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -208,10 +231,11 @@ export default function AlbumScreen() {
|
||||
}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={colors.foreground}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -269,7 +293,8 @@ export default function AlbumScreen() {
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone={favorited ? "accent" : "foreground"}
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
@@ -295,7 +320,8 @@ export default function AlbumScreen() {
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
@@ -304,7 +330,8 @@ export default function AlbumScreen() {
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -312,12 +339,13 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="accentText"
|
||||
style={[
|
||||
styles.artist,
|
||||
heroLayout.landscape && styles.artistLandscape,
|
||||
@@ -325,7 +353,7 @@ export default function AlbumScreen() {
|
||||
]}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
@@ -339,32 +367,43 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{metadata}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
{album.hasLossless ? (
|
||||
{hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{album.hasAtmos ? (
|
||||
{hasAtmos ? (
|
||||
<>
|
||||
{metadata || album.hasLossless ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata || hasLossless ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
@@ -449,7 +488,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
action: MediaAction
|
||||
) => Promise<void>
|
||||
}) {
|
||||
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
|
||||
const Row = Platform.OS === "ios" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
@@ -484,15 +523,15 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
group={swipeGroup}
|
||||
backgroundColor={palette.background}
|
||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||
onAddToQueue={() => void onAction(track, album, "play-last")}
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||
>
|
||||
{number}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
<View
|
||||
style={[
|
||||
styles.trackContent,
|
||||
@@ -500,24 +539,29 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
]}
|
||||
>
|
||||
<View style={styles.trackMeta}>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
{track.artists ? (
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
) : null}
|
||||
</View>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</Row>
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -6,7 +6,7 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import { MediaGridList } from "@/components/media-cards"
|
||||
import { MediaActionMenu } from "@/components/media-context-menu"
|
||||
import { MediaActionMenu } from "@/components/media-actions-sheet"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
|
||||
headerLargeTitle: false,
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton variant="artist" />
|
||||
<CollectionDetailSkeleton round />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -62,10 +62,7 @@ export default function HomeScreen() {
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.content,
|
||||
{ paddingBottom: tabContentBottomInset },
|
||||
]}
|
||||
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
>
|
||||
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
|
||||
|
||||
@@ -1,14 +1,21 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
@@ -24,7 +31,6 @@ import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
@@ -40,7 +46,7 @@ import {
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
} from "@/components/media-actions-sheet"
|
||||
import { CollectionDetailSkeleton } from "@/components/skeletons"
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
@@ -68,7 +74,6 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
|
||||
"play-last",
|
||||
"shuffle",
|
||||
"favorite",
|
||||
"change-cover",
|
||||
"delete-playlist",
|
||||
]
|
||||
|
||||
@@ -84,11 +89,7 @@ export default function PlaylistScreen() {
|
||||
const songs = playlist?.songs
|
||||
const coverUri =
|
||||
config && playlistId
|
||||
? playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist?.id ?? playlistId,
|
||||
playlist?.cover ?? null
|
||||
)
|
||||
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
|
||||
: ""
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
@@ -110,14 +111,17 @@ export default function PlaylistScreen() {
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
variant="playlist"
|
||||
zoomCoverSize={200}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
@@ -138,9 +142,9 @@ export default function PlaylistScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
Playlist not found.
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -175,7 +179,6 @@ function PlaylistContent({
|
||||
}) {
|
||||
const router = useRouter()
|
||||
const isFocused = useIsFocused()
|
||||
const colors = useThemeColors()
|
||||
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
||||
usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
@@ -199,6 +202,12 @@ function PlaylistContent({
|
||||
[playFromSong, songIds, playlistId]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) =>
|
||||
void handleSongAction(song, action),
|
||||
[handleSongAction]
|
||||
)
|
||||
|
||||
const handleRemoveSong = useCallback(
|
||||
async (songId: Id<"songs">) => {
|
||||
if (!playlistId) return false
|
||||
@@ -217,14 +226,6 @@ function PlaylistContent({
|
||||
[playlistId, removeSongs]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
(song: BrowseSong, action: MediaAction) => {
|
||||
if (action === "remove-from-playlist") void handleRemoveSong(song.id)
|
||||
else void handleSongAction(song, action)
|
||||
},
|
||||
[handleRemoveSong, handleSongAction]
|
||||
)
|
||||
|
||||
const handlePlay = useCallback(() => {
|
||||
if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [playPlaylist, playlistId, songIds])
|
||||
@@ -266,15 +267,6 @@ function PlaylistContent({
|
||||
void handleDelete()
|
||||
return
|
||||
}
|
||||
if (action === "change-cover") {
|
||||
if (playlistId) {
|
||||
router.push({
|
||||
pathname: "/playlist-cover",
|
||||
params: { id: playlistId },
|
||||
})
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
void handlePlaylistDetailAction(songIds, action)
|
||||
}
|
||||
@@ -285,7 +277,10 @@ function PlaylistContent({
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -304,10 +299,11 @@ function PlaylistContent({
|
||||
onAction={handlePlaylistMenuAction}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={colors.foreground}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -315,10 +311,10 @@ function PlaylistContent({
|
||||
}
|
||||
}, [
|
||||
canEdit,
|
||||
colors.foreground,
|
||||
deletePlaylist,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
playlist?.title,
|
||||
@@ -375,14 +371,15 @@ function PlaylistContent({
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListEmptyComponent={
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[
|
||||
styles.emptyResults,
|
||||
{ color: palette.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<PlaylistHero
|
||||
@@ -436,15 +433,12 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
palette={palette}
|
||||
inset
|
||||
removable={removable}
|
||||
swipe={
|
||||
Platform.OS !== "web"
|
||||
Platform.OS === "ios"
|
||||
? {
|
||||
group: swipeGroup,
|
||||
backgroundColor: palette.background,
|
||||
onPlayNext: () => onAction(song, "play-next"),
|
||||
onAddToQueue: () => onAction(song, "play-last"),
|
||||
onRemove: removable ? () => void handleRemove() : undefined,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
@@ -453,7 +447,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
/>
|
||||
)
|
||||
|
||||
if (Platform.OS !== "web" || !removable) {
|
||||
if (Platform.OS === "ios" || !removable) {
|
||||
return row
|
||||
}
|
||||
|
||||
@@ -475,15 +469,19 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
}}
|
||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||
>
|
||||
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||
<Text
|
||||
<PaletteIcon
|
||||
name="trash"
|
||||
size={22}
|
||||
color={colors.primaryForeground}
|
||||
/>
|
||||
<PaletteText
|
||||
style={[
|
||||
styles.removeActionText,
|
||||
{ color: colors.primaryForeground },
|
||||
]}
|
||||
>
|
||||
Remove
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</Pressable>
|
||||
)}
|
||||
>
|
||||
@@ -563,7 +561,8 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={
|
||||
@@ -589,12 +588,18 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
@@ -602,15 +607,16 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
]}
|
||||
>
|
||||
{title}
|
||||
</Text>
|
||||
<Text
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={{
|
||||
color: palette.foreground,
|
||||
fontSize: heroLayout.landscape ? 22 : 16,
|
||||
}}
|
||||
>
|
||||
{ownerName}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</CollectionHero>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</MusicEntityView>
|
||||
|
||||
@@ -36,7 +36,7 @@ export default function FavoritesScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
|
||||
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
|
||||
const songs = favorites?.songs ?? []
|
||||
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
@@ -45,8 +45,8 @@ export default function FavoritesScreen() {
|
||||
usePlaylistSearch(songs)
|
||||
|
||||
useEffect(() => {
|
||||
rememberSongs(songs)
|
||||
}, [songs])
|
||||
if (favorites) rememberSongs(favorites.songs)
|
||||
}, [favorites])
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<CollectionDetailSkeleton variant="favorites" />
|
||||
<CollectionDetailSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,186 @@
|
||||
import { Stack, useRouter } from "expo-router"
|
||||
import { memo, useCallback, useMemo } from "react"
|
||||
import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { Button } from "@/components/ui/primitives"
|
||||
import { contentBottomInset, SongRow } from "@/components/player"
|
||||
import { SongRowSkeleton } from "@/components/skeletons"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { longListProps } from "@/lib/list"
|
||||
import { useSong, useSongs } from "@/lib/song-cache"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** `key` stays stable when earlier songs leave the queue, so rows are not remounted on skip. */
|
||||
type QueueItem = { songId: Id<"songs">; queueIndex: number; key: string }
|
||||
|
||||
function queueItemKey(item: QueueItem) {
|
||||
return item.key
|
||||
}
|
||||
|
||||
const QueueRow = memo(function QueueRow({
|
||||
songId,
|
||||
queueIndex,
|
||||
isLast,
|
||||
isCurrent,
|
||||
onSkipTo,
|
||||
onMove,
|
||||
}: Omit<QueueItem, "key"> & {
|
||||
isLast: boolean
|
||||
isCurrent: boolean
|
||||
onSkipTo: (index: number) => void
|
||||
onMove: (index: number, direction: -1 | 1) => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const song = useSong(songId)
|
||||
|
||||
return (
|
||||
<View>
|
||||
{song ? (
|
||||
<SongRow song={song} onPress={() => onSkipTo(queueIndex)} />
|
||||
) : (
|
||||
<SongRowSkeleton />
|
||||
)}
|
||||
<View style={styles.queueActions}>
|
||||
<Pressable
|
||||
disabled={queueIndex === 0}
|
||||
onPress={() => onMove(queueIndex, -1)}
|
||||
>
|
||||
<Text style={{ color: colors.foreground }}>Move up</Text>
|
||||
</Pressable>
|
||||
<Pressable disabled={isLast} onPress={() => onMove(queueIndex, 1)}>
|
||||
<Text style={{ color: colors.foreground }}>Move down</Text>
|
||||
</Pressable>
|
||||
{isCurrent ? (
|
||||
<Text style={{ color: colors.primary, fontWeight: "700" }}>
|
||||
Now playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
})
|
||||
|
||||
export default function QueueScreen() {
|
||||
const router = useRouter()
|
||||
const colors = useThemeColors()
|
||||
const { queueSongIds, queueHistorySongIds } = usePlaybackQueue()
|
||||
const { skipToQueueIndex, clearQueue, reorderQueue } = usePlaybackActions()
|
||||
const historySongs = useSongs(queueHistorySongIds)
|
||||
|
||||
const items = useMemo<QueueItem[]>(() => {
|
||||
const occurrences = new Map<string, number>()
|
||||
return queueSongIds.map((songId, queueIndex) => {
|
||||
const occurrence = occurrences.get(songId) ?? 0
|
||||
occurrences.set(songId, occurrence + 1)
|
||||
return { songId, queueIndex, key: `${songId}:${occurrence}` }
|
||||
})
|
||||
}, [queueSongIds])
|
||||
|
||||
const moveSong = useCallback(
|
||||
(fromIndex: number, direction: -1 | 1) => {
|
||||
const toIndex = fromIndex + direction
|
||||
if (toIndex < 0 || toIndex >= queueSongIds.length) return
|
||||
const next = [...queueSongIds]
|
||||
const [item] = next.splice(fromIndex, 1)
|
||||
next.splice(toIndex, 0, item)
|
||||
void reorderQueue(next)
|
||||
},
|
||||
[queueSongIds, reorderQueue]
|
||||
)
|
||||
|
||||
function handleClearQueue() {
|
||||
if (router.canGoBack()) {
|
||||
router.back()
|
||||
setTimeout(() => {
|
||||
void clearQueue()
|
||||
}, 0)
|
||||
return
|
||||
}
|
||||
|
||||
void clearQueue()
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
headerRight: () =>
|
||||
queueSongIds.length > 0 ? (
|
||||
<Button
|
||||
title="Clear"
|
||||
variant="ghost"
|
||||
onPress={handleClearQueue}
|
||||
/>
|
||||
) : null,
|
||||
}}
|
||||
/>
|
||||
<FlatList
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
ListHeaderComponent={
|
||||
<View>
|
||||
<Text style={[styles.section, { color: colors.mutedForeground }]}>
|
||||
Up Next
|
||||
</Text>
|
||||
{queueSongIds.length === 0 ? (
|
||||
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
|
||||
Queue is empty
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
}
|
||||
{...longListProps}
|
||||
data={items}
|
||||
keyExtractor={queueItemKey}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
renderItem={({ item }) => (
|
||||
<QueueRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
isLast={item.queueIndex === queueSongIds.length - 1}
|
||||
isCurrent={item.queueIndex === 0}
|
||||
onSkipTo={skipToQueueIndex}
|
||||
onMove={moveSong}
|
||||
/>
|
||||
)}
|
||||
ListFooterComponent={
|
||||
queueHistorySongIds.length > 0 ? (
|
||||
<View style={styles.history}>
|
||||
<Text style={[styles.section, { color: colors.mutedForeground }]}>
|
||||
History
|
||||
</Text>
|
||||
{historySongs.map((song, index) =>
|
||||
song ? (
|
||||
<SongRow key={`${song.id}-${index}`} song={song} />
|
||||
) : (
|
||||
<SongRowSkeleton
|
||||
key={`${queueHistorySongIds[index]}-${index}`}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
) : undefined
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
section: {
|
||||
paddingHorizontal: spacing.lg,
|
||||
paddingTop: spacing.md,
|
||||
fontSize: 12,
|
||||
fontWeight: "700",
|
||||
textTransform: "uppercase",
|
||||
},
|
||||
empty: { padding: spacing.lg },
|
||||
queueActions: {
|
||||
flexDirection: "row",
|
||||
gap: spacing.lg,
|
||||
paddingHorizontal: spacing.lg,
|
||||
paddingBottom: spacing.sm,
|
||||
},
|
||||
history: { marginTop: spacing.lg },
|
||||
})
|
||||
@@ -1,4 +1,4 @@
|
||||
import { atmosEnabled, dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
@@ -23,15 +23,14 @@ import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
setArtworkColorsEnabled,
|
||||
useArtworkColorsEnabled,
|
||||
useArtworkColorPreferenceLoaded,
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { changeServer, signOut } from "@/lib/session"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { showError } from "@/lib/toast"
|
||||
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
|
||||
import type { PlaybackQuality } from "@/lib/urls"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
@@ -173,6 +172,7 @@ export default function SettingsScreen() {
|
||||
|
||||
function AppearanceSection() {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const loaded = useArtworkColorPreferenceLoaded()
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
return (
|
||||
@@ -180,13 +180,12 @@ function AppearanceSection() {
|
||||
<SwitchRow
|
||||
title="New artwork colors"
|
||||
subtitle="Use the new color algorithm on this device."
|
||||
value={enabled ?? false}
|
||||
disabled={enabled === undefined || saving}
|
||||
value={enabled}
|
||||
disabled={!loaded || saving}
|
||||
onValueChange={async (checked) => {
|
||||
setSaving(true)
|
||||
try {
|
||||
await setArtworkColorsEnabled(checked)
|
||||
clearCoverPaletteCache()
|
||||
} catch {
|
||||
showError("Could not save artwork colors preference.")
|
||||
} finally {
|
||||
@@ -420,7 +419,7 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
: "This device does not support Dolby Atmos playback."
|
||||
}
|
||||
disabled={!dolbyAtmosSupported}
|
||||
value={atmosEnabled(user)}
|
||||
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
|
||||
onValueChange={(checked) =>
|
||||
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
|
||||
showError(error.message)
|
||||
@@ -771,7 +770,6 @@ function ProfileAvatar({
|
||||
style?: StyleProp<ViewStyle>
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const imageUrl = useProfileImageUrl(user.image)
|
||||
const avatarStyle = [
|
||||
styles.avatar,
|
||||
{
|
||||
@@ -783,11 +781,11 @@ function ProfileAvatar({
|
||||
style,
|
||||
]
|
||||
|
||||
if (imageUrl) {
|
||||
if (user.image) {
|
||||
return (
|
||||
<View style={avatarStyle}>
|
||||
<Image
|
||||
source={{ uri: imageUrl }}
|
||||
source={{ uri: user.image }}
|
||||
style={styles.avatarImage}
|
||||
contentFit="cover"
|
||||
/>
|
||||
|
||||
@@ -118,7 +118,12 @@ export default function LibraryScreen() {
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
||||
return (
|
||||
<View style={{ flex: 1, backgroundColor: colors.background }}>
|
||||
{listHeader}
|
||||
<MediaGridSkeleton contentInset={false} />
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../home/queue"
|
||||
@@ -73,10 +73,10 @@ export default function AppLayout() {
|
||||
return (
|
||||
<ConvexAuthRecovery onInvalidate={invalidateSession}>
|
||||
<PlaybackProvider>
|
||||
<AppIntentBridge />
|
||||
<AppNavigationSync />
|
||||
<AddToPlaylistProvider>
|
||||
<FavoritesProvider>
|
||||
<AppIntentBridge />
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
@@ -106,22 +106,6 @@ export default function AppLayout() {
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="playlist-cover"
|
||||
options={{
|
||||
title: "Cover",
|
||||
headerTitleAlign: "center",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerShadowVisible: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
|
||||
+143
-120
@@ -1,12 +1,12 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { TabletNowPlaying } from "@/components/tablet-now-playing"
|
||||
import { atmosEnabled } from "@/lib/playback-capabilities"
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { NavigationBar } from "expo-navigation-bar"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Stack, useRouter, useLocalSearchParams } from "expo-router"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
import {
|
||||
Platform,
|
||||
@@ -39,22 +39,22 @@ import { MarqueeText } from "@/components/marquee-text"
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
} from "@/components/media-actions-sheet"
|
||||
import {
|
||||
NowPlayingQueue,
|
||||
QUEUE_HORIZONTAL_INSET,
|
||||
} from "@/components/now-playing-queue"
|
||||
import { PlayerArtistMenu } from "@/components/player-artist-menu"
|
||||
import { PlayerProgress } from "@/components/player-progress"
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useCoverPalette } from "@/hooks/use-cover-palette"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import {
|
||||
nowPlayingColors,
|
||||
type NowPlayingColors,
|
||||
@@ -90,13 +90,20 @@ export default function PlayerScreen() {
|
||||
isPlaying,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
currentTime,
|
||||
duration,
|
||||
queueSongIds,
|
||||
} = usePlaybackQueue()
|
||||
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
|
||||
setIsPlaying,
|
||||
seekTo,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
} = usePlayback()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const { queue } = useLocalSearchParams<{ queue?: string }>()
|
||||
const [showQueue, setShowQueue] = useState(queue === "1")
|
||||
const [isDismissing, setIsDismissing] = useState(false)
|
||||
const [stageHeight, setStageHeight] = useState(0)
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const playbackInfo = useCachedQuery(
|
||||
api.library.getSongPlaybackInfo,
|
||||
@@ -107,7 +114,7 @@ export default function PlayerScreen() {
|
||||
? playbackFormat(
|
||||
playbackInfo.files,
|
||||
user.playbackQuality,
|
||||
atmosEnabled(user)
|
||||
dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
)
|
||||
: null
|
||||
|
||||
@@ -119,7 +126,7 @@ export default function PlayerScreen() {
|
||||
coverUri,
|
||||
currentSong ? currentSong.album.cover != null : undefined
|
||||
)
|
||||
const colors = useMemo(() => nowPlayingColors(palette), [palette])
|
||||
const colors = nowPlayingColors(palette)
|
||||
|
||||
const background = useSharedValue(colors.background)
|
||||
useEffect(() => {
|
||||
@@ -152,65 +159,33 @@ export default function PlayerScreen() {
|
||||
}))
|
||||
|
||||
// The player covers the status bar, so it can't use the native sheet's
|
||||
// swipe to dismiss. Each GestureDetector needs its own gesture instance.
|
||||
const makeDismissGesture = useCallback(
|
||||
() =>
|
||||
Gesture.Pan()
|
||||
.activeOffsetY(12)
|
||||
.failOffsetY(-12)
|
||||
.failOffsetX([-20, 20])
|
||||
.onUpdate((event) => {
|
||||
dismissY.value = Math.max(0, event.translationY)
|
||||
})
|
||||
.onEnd((event) => {
|
||||
if (
|
||||
event.translationY > DISMISS_DISTANCE ||
|
||||
event.velocityY > DISMISS_VELOCITY
|
||||
) {
|
||||
scheduleOnRN(setIsDismissing, true)
|
||||
dismissY.value = withTiming(
|
||||
windowHeight,
|
||||
{ duration: 220 },
|
||||
(finished) => {
|
||||
if (finished) scheduleOnRN(router.back)
|
||||
}
|
||||
)
|
||||
} else {
|
||||
dismissY.value = withSpring(0, {
|
||||
duration: 350,
|
||||
dampingRatio: 0.85,
|
||||
})
|
||||
}
|
||||
}),
|
||||
[dismissY, router, windowHeight]
|
||||
)
|
||||
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
|
||||
const stageGesture = useMemo(
|
||||
() => makeDismissGesture().enabled(!showQueue),
|
||||
[makeDismissGesture, showQueue]
|
||||
)
|
||||
|
||||
const hasCover = currentSong ? currentSong.album.cover != null : false
|
||||
const queueHeader = useMemo(
|
||||
() =>
|
||||
currentSong ? (
|
||||
<View style={styles.queueHeader}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={styles.queueArtwork}
|
||||
/>
|
||||
<SongMeta song={currentSong} colors={colors} compact />
|
||||
</View>
|
||||
) : null,
|
||||
[colors, coverUri, currentSong, hasCover]
|
||||
)
|
||||
const songMeta = useMemo(
|
||||
() =>
|
||||
currentSong ? <SongMeta song={currentSong} colors={colors} /> : null,
|
||||
[colors, currentSong]
|
||||
)
|
||||
// swipe to dismiss.
|
||||
function dismissGesture() {
|
||||
return Gesture.Pan()
|
||||
.activeOffsetY(12)
|
||||
.failOffsetY(-12)
|
||||
.failOffsetX([-20, 20])
|
||||
.onUpdate((event) => {
|
||||
dismissY.value = Math.max(0, event.translationY)
|
||||
})
|
||||
.onEnd((event) => {
|
||||
if (
|
||||
event.translationY > DISMISS_DISTANCE ||
|
||||
event.velocityY > DISMISS_VELOCITY
|
||||
) {
|
||||
scheduleOnRN(setIsDismissing, true)
|
||||
dismissY.value = withTiming(
|
||||
windowHeight,
|
||||
{ duration: 220 },
|
||||
(finished) => {
|
||||
if (finished) scheduleOnRN(router.back)
|
||||
}
|
||||
)
|
||||
} else {
|
||||
dismissY.value = withSpring(0, { duration: 350, dampingRatio: 0.85 })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const hasQueue = queueSongIds.length > 0
|
||||
|
||||
@@ -229,6 +204,7 @@ export default function PlayerScreen() {
|
||||
return null
|
||||
}
|
||||
|
||||
const hasCover = currentSong.album.cover != null
|
||||
const bottomInset = Math.max(insets.bottom, spacing.md)
|
||||
const artworkSize = Math.max(
|
||||
0,
|
||||
@@ -237,6 +213,9 @@ export default function PlayerScreen() {
|
||||
stageHeight > 0 ? stageHeight - META_HEIGHT - spacing.xl : Infinity
|
||||
)
|
||||
)
|
||||
const displayedTime = scrubTime ?? currentTime
|
||||
const timeColor =
|
||||
scrubTime === null ? colors.secondaryForeground : colors.foreground
|
||||
|
||||
function togglePlayback() {
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light)
|
||||
@@ -255,10 +234,10 @@ export default function PlayerScreen() {
|
||||
colors={colors}
|
||||
backgroundStyle={backgroundStyle}
|
||||
dismissStyle={dismissStyle}
|
||||
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
|
||||
dismissGesture={dismissGesture}
|
||||
showQueue={showQueue}
|
||||
toggleQueue={toggleQueue}
|
||||
metadata={songMeta}
|
||||
metadata={<SongMeta song={currentSong} colors={colors} />}
|
||||
/>
|
||||
</MusicEntityView>
|
||||
)
|
||||
@@ -285,7 +264,7 @@ export default function PlayerScreen() {
|
||||
id={currentSong.id}
|
||||
style={[styles.safe, { paddingTop: insets.top }]}
|
||||
>
|
||||
<GestureDetector gesture={handleGesture}>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
hitSlop={12}
|
||||
@@ -299,7 +278,7 @@ export default function PlayerScreen() {
|
||||
</Pressable>
|
||||
</GestureDetector>
|
||||
|
||||
<GestureDetector gesture={stageGesture}>
|
||||
<GestureDetector gesture={dismissGesture().enabled(!showQueue)}>
|
||||
<View
|
||||
style={styles.stage}
|
||||
onLayout={(event) =>
|
||||
@@ -318,7 +297,20 @@ export default function PlayerScreen() {
|
||||
<NowPlayingQueue
|
||||
colors={colors}
|
||||
viewportHeight={stageHeight}
|
||||
currentHeader={queueHeader}
|
||||
currentHeader={
|
||||
<View style={styles.queueHeader}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={styles.queueArtwork}
|
||||
/>
|
||||
<SongMeta
|
||||
song={currentSong}
|
||||
colors={colors}
|
||||
compact
|
||||
/>
|
||||
</View>
|
||||
}
|
||||
/>
|
||||
</Animated.View>
|
||||
) : null
|
||||
@@ -342,28 +334,50 @@ export default function PlayerScreen() {
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
<View style={styles.meta}>{songMeta}</View>
|
||||
<View style={styles.meta}>
|
||||
<SongMeta song={currentSong} colors={colors} />
|
||||
</View>
|
||||
</Animated.View>
|
||||
)}
|
||||
</LayoutAnimationConfig>
|
||||
</View>
|
||||
</GestureDetector>
|
||||
|
||||
<GestureDetector gesture={controlsGesture}>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<View style={[styles.controls, { paddingBottom: bottomInset }]}>
|
||||
<PlayerProgress
|
||||
colors={colors}
|
||||
timeStyle={styles.time}
|
||||
center={
|
||||
format ? (
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={displayedTime}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.timeRow}>
|
||||
<Text style={[styles.time, { color: timeColor }]}>
|
||||
{formatDuration(displayedTime)}
|
||||
</Text>
|
||||
{format ? (
|
||||
<View style={styles.format} pointerEvents="none">
|
||||
<AudioFormatBadge
|
||||
format={format}
|
||||
color={colors.secondaryForeground}
|
||||
backgroundColor={colors.background}
|
||||
/>
|
||||
) : null
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
<Text style={[styles.time, { color: timeColor }]}>
|
||||
{formatRemainingDuration(displayedTime, duration).replace(
|
||||
"-",
|
||||
"\u2212"
|
||||
)}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
<View style={styles.transport}>
|
||||
<TransportButton
|
||||
@@ -405,7 +419,35 @@ export default function PlayerScreen() {
|
||||
</TransportButton>
|
||||
</View>
|
||||
|
||||
<VolumeSlider colors={colors} />
|
||||
{volumeAvailable ? (
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
commitHoldMs={0}
|
||||
animateValueChanges
|
||||
value={volume}
|
||||
maximumValue={1}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setVolume}
|
||||
leading={
|
||||
<PlayerSymbol
|
||||
name="speaker.fill"
|
||||
fallback="volume-low"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
trailing={
|
||||
<PlayerSymbol
|
||||
name="speaker.wave.3.fill"
|
||||
fallback="volume-high"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
<View style={styles.footer}>
|
||||
<Pressable
|
||||
@@ -475,41 +517,6 @@ export default function PlayerScreen() {
|
||||
)
|
||||
}
|
||||
|
||||
/** Phone volume slider. Owns the volume listener so volume changes stay local. */
|
||||
function VolumeSlider({ colors }: { colors: NowPlayingColors }) {
|
||||
const { volume, setVolume, available } = useSystemVolume()
|
||||
if (!available) return null
|
||||
return (
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
commitHoldMs={0}
|
||||
animateValueChanges
|
||||
value={volume}
|
||||
maximumValue={1}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setVolume}
|
||||
leading={
|
||||
<PlayerSymbol
|
||||
name="speaker.fill"
|
||||
fallback="volume-low"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
trailing={
|
||||
<PlayerSymbol
|
||||
name="speaker.wave.3.fill"
|
||||
fallback="volume-high"
|
||||
size={14}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
/** Title and artist with the favorite and more buttons. */
|
||||
function SongMeta({
|
||||
song,
|
||||
@@ -732,7 +739,23 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: HORIZONTAL_INSET,
|
||||
paddingTop: spacing.md,
|
||||
},
|
||||
time: { fontWeight: "600" },
|
||||
timeRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
format: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
alignItems: "center",
|
||||
},
|
||||
time: {
|
||||
fontSize: 12,
|
||||
fontWeight: "600",
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
transport: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -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 },
|
||||
})
|
||||
@@ -1,21 +1,147 @@
|
||||
import { useQuery } from "convex/react"
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import { useMemo, useSyncExternalStore } from "react"
|
||||
import type { AppIntentEntity, AppIntentInvocation } from "expo-app-intents"
|
||||
import { useEffect, useMemo, useRef, useSyncExternalStore } from "react"
|
||||
import { AppState } from "react-native"
|
||||
import {
|
||||
completeMusicInvocation,
|
||||
publishMusicCatalog,
|
||||
trackMusicCatalogSync,
|
||||
} from "@/lib/app-intents"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
|
||||
import { useMusicCatalogSync } from "@/components/app-intents/catalog-sync"
|
||||
import { useIntentDispatch } from "@/components/app-intents/dispatch"
|
||||
import { useNowPlayingCatalog } from "@/components/app-intents/now-playing"
|
||||
import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
useCacheScope,
|
||||
} from "@/contexts/persistent-cache"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import {
|
||||
FAVORITES_PLAYLIST_ID,
|
||||
loadHandledIntentIds,
|
||||
rememberHandledIntentId,
|
||||
} from "@/lib/app-intent-handled"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
const warmedAudioIds = new Set<string>()
|
||||
|
||||
class IntentRejected extends Error {}
|
||||
|
||||
const KNOWN_INTENTS = new Set([
|
||||
"playMusic",
|
||||
"warmupAudio",
|
||||
"addToPlaylist",
|
||||
"addToUpNext",
|
||||
"clearUpNext",
|
||||
"createPlaylist",
|
||||
"createStation",
|
||||
"updateAffinity",
|
||||
"transport",
|
||||
"openMusic",
|
||||
])
|
||||
|
||||
type MusicSource = {
|
||||
kind: string
|
||||
id: string
|
||||
}
|
||||
|
||||
function readString(value: unknown) {
|
||||
return typeof value === "string" && value.trim() ? value : null
|
||||
}
|
||||
|
||||
function readSources(value: unknown): MusicSource[] {
|
||||
if (!Array.isArray(value)) {
|
||||
return []
|
||||
}
|
||||
return value.flatMap((entry) => {
|
||||
if (!entry || typeof entry !== "object") {
|
||||
return []
|
||||
}
|
||||
const source = entry as { kind?: unknown; id?: unknown }
|
||||
if (typeof source.kind !== "string" || typeof source.id !== "string") {
|
||||
return []
|
||||
}
|
||||
if (!source.kind || !source.id) {
|
||||
return []
|
||||
}
|
||||
return [{ kind: source.kind, id: source.id }]
|
||||
})
|
||||
}
|
||||
|
||||
function shuffleChoice(value: unknown, fallback: boolean) {
|
||||
if (value === "songs") return true
|
||||
if (value === "off") return false
|
||||
if (value == null) return fallback
|
||||
throw new IntentRejected("Shuffle must be Off or Songs.")
|
||||
}
|
||||
|
||||
function repeatChoice(value: unknown): RepeatMode | null {
|
||||
if (value == null) return null
|
||||
if (value === "none") return "none"
|
||||
if (value === "one") return "once"
|
||||
if (value === "all") return "always"
|
||||
throw new IntentRejected("Repeat must be None, One, or All.")
|
||||
}
|
||||
|
||||
function ensureActive(invocation: AppIntentInvocation) {
|
||||
const deadline = invocation.params.deadline
|
||||
if (typeof deadline === "number" && Date.now() >= deadline) {
|
||||
throw new IntentRejected("This request expired. Please try again.")
|
||||
}
|
||||
}
|
||||
|
||||
function isTransient(error: unknown) {
|
||||
const message = (
|
||||
error instanceof Error ? error.message : String(error)
|
||||
).toLowerCase()
|
||||
return (
|
||||
message.includes("not authenticated") ||
|
||||
message.includes("network") ||
|
||||
message.includes("fetch") ||
|
||||
message.includes("connection") ||
|
||||
message.includes("timed out") ||
|
||||
message.includes("timeout")
|
||||
)
|
||||
}
|
||||
|
||||
function songEntity(song: {
|
||||
id: string
|
||||
title: string
|
||||
artistName: string
|
||||
artistId: string
|
||||
albumTitle: string
|
||||
albumId: string
|
||||
durationSeconds: number
|
||||
genres?: string
|
||||
year?: number
|
||||
track?: number
|
||||
diskNumber?: number | null
|
||||
favorite?: boolean
|
||||
}): AppIntentEntity {
|
||||
return {
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
subtitle: song.artistName,
|
||||
synonyms: song.artistName ? [song.artistName] : undefined,
|
||||
metadata: {
|
||||
artistName: song.artistName,
|
||||
artistId: song.artistId,
|
||||
albumTitle: song.albumTitle,
|
||||
albumId: song.albumId,
|
||||
duration: String(song.durationSeconds),
|
||||
genres: song.genres ?? "",
|
||||
year: song.year == null ? "" : String(song.year),
|
||||
track: song.track == null ? "" : String(song.track),
|
||||
disk: song.diskNumber == null ? "" : String(song.diskNumber),
|
||||
favorite: song.favorite ? "1" : "0",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Siri and Shortcuts integration: the on-device entity catalog, the current
|
||||
* song, and intent dispatch. Must render inside `FavoritesProvider`.
|
||||
*/
|
||||
export function AppIntentBridge() {
|
||||
const scope = useCacheScope()
|
||||
const store = useMemo(
|
||||
@@ -28,8 +154,669 @@ export function AppIntentBridge() {
|
||||
}
|
||||
|
||||
function ReadyAppIntentBridge() {
|
||||
useMusicCatalogSync()
|
||||
useNowPlayingCatalog()
|
||||
useIntentDispatch()
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const playback = usePlayback()
|
||||
const user = useQuery(api.auth.currentUser)
|
||||
const navigation = useAppNavigation()
|
||||
const favorites = useQuery(api.favorites.getUserFavorites)
|
||||
const catalogUserKey = user ? JSON.stringify([user._id, favorites]) : null
|
||||
const store = useMemo(
|
||||
() =>
|
||||
getPlaybackStore(
|
||||
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
|
||||
),
|
||||
[cacheScope]
|
||||
)
|
||||
const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot)
|
||||
const handledIds = useRef<Set<string> | null>(null)
|
||||
const publishChain = useRef(Promise.resolve())
|
||||
const publishGeneration = useRef(0)
|
||||
const playbackRef = useRef(playback)
|
||||
playbackRef.current = playback
|
||||
|
||||
useEffect(() => {
|
||||
if (!AppIntents.isAvailable() || !user) return
|
||||
const generation = ++publishGeneration.current
|
||||
let stopped = false
|
||||
let refreshing = false
|
||||
const refresh = () => {
|
||||
if (refreshing || stopped) return
|
||||
refreshing = true
|
||||
publishChain.current = publishChain.current
|
||||
.catch(() => undefined)
|
||||
.then(async () => {
|
||||
for (const kind of ["artist", "album", "song", "playlist"] as const) {
|
||||
const entities: AppIntentEntity[] = []
|
||||
let cursor: string | null = null
|
||||
do {
|
||||
const result: {
|
||||
page: AppIntentEntity[]
|
||||
isDone: boolean
|
||||
continueCursor: string
|
||||
} = await convex.query(api.library.intentCatalogPage, {
|
||||
kind,
|
||||
paginationOpts: { cursor, numItems: 200 },
|
||||
})
|
||||
if (stopped || generation !== publishGeneration.current) return
|
||||
entities.push(...result.page)
|
||||
cursor = result.isDone ? null : result.continueCursor
|
||||
} while (cursor !== null)
|
||||
await publishMusicCatalog(kind, entities)
|
||||
}
|
||||
})
|
||||
.catch((error) =>
|
||||
console.warn("Could not publish music catalog.", error)
|
||||
)
|
||||
.finally(() => {
|
||||
refreshing = false
|
||||
})
|
||||
trackMusicCatalogSync(publishChain.current)
|
||||
}
|
||||
refresh()
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") refresh()
|
||||
})
|
||||
const timer = setInterval(() => {
|
||||
if (AppState.currentState === "active") refresh()
|
||||
}, 5 * 60_000)
|
||||
return () => {
|
||||
stopped = true
|
||||
++publishGeneration.current
|
||||
subscription.remove()
|
||||
clearInterval(timer)
|
||||
}
|
||||
}, [convex, cacheScope, catalogUserKey])
|
||||
|
||||
const currentSongId = playback.queueSongIds[0] ?? null
|
||||
const currentSong = playback.currentSong
|
||||
|
||||
useEffect(() => {
|
||||
if (!snapshot.hydrated || !AppIntents.isAvailable()) {
|
||||
return
|
||||
}
|
||||
if (!currentSongId) {
|
||||
void publishMusicCatalog("nowPlaying", []).catch((error) => {
|
||||
console.warn("Could not clear the current song.", error)
|
||||
})
|
||||
return
|
||||
}
|
||||
if (!currentSong || currentSong.id !== currentSongId) {
|
||||
return
|
||||
}
|
||||
void publishMusicCatalog("nowPlaying", [
|
||||
songEntity({
|
||||
id: currentSong.id,
|
||||
title: currentSong.title,
|
||||
artistName: currentSong.artist.name,
|
||||
artistId: currentSong.artist.id,
|
||||
albumTitle: currentSong.album.title,
|
||||
albumId: currentSong.album.id,
|
||||
durationSeconds: currentSong.durationSeconds,
|
||||
}),
|
||||
]).catch((error) => {
|
||||
console.warn("Could not publish the current song.", error)
|
||||
})
|
||||
}, [currentSong, currentSongId, snapshot.hydrated])
|
||||
|
||||
AppIntents.useAppIntents(async (pendingIntents) => {
|
||||
if (!handledIds.current) {
|
||||
handledIds.current = await loadHandledIntentIds()
|
||||
}
|
||||
const handled = handledIds.current
|
||||
|
||||
for (const invocation of pendingIntents) {
|
||||
if (handled.has(invocation.id)) {
|
||||
const token = readString(invocation.params.completionToken)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
if (!KNOWN_INTENTS.has(invocation.name)) {
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
const token = readString(invocation.params.completionToken)
|
||||
try {
|
||||
ensureActive(invocation)
|
||||
await performInvocation(invocation)
|
||||
if (
|
||||
["playMusic", "warmupAudio", "transport", "createStation"].includes(
|
||||
invocation.name
|
||||
)
|
||||
) {
|
||||
const id = store.getState().queue[0]
|
||||
const song = playbackRef.current.currentSong
|
||||
if (!id) await publishMusicCatalog("nowPlaying", [])
|
||||
else if (song?.id === id)
|
||||
await publishMusicCatalog("nowPlaying", [
|
||||
songEntity({
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
artistName: song.artist.name,
|
||||
artistId: song.artist.id,
|
||||
albumTitle: song.album.title,
|
||||
albumId: song.album.id,
|
||||
durationSeconds: song.durationSeconds,
|
||||
}),
|
||||
])
|
||||
}
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (error) {
|
||||
if (token) {
|
||||
await completeMusicInvocation(
|
||||
token,
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
)
|
||||
}
|
||||
if (token || error instanceof IntentRejected || !isTransient(error)) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
if (!(error instanceof IntentRejected) || message) {
|
||||
showError(message)
|
||||
}
|
||||
try {
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (removeError) {
|
||||
console.warn(
|
||||
"App Intent remains pending",
|
||||
invocation.id,
|
||||
removeError
|
||||
)
|
||||
}
|
||||
continue
|
||||
}
|
||||
console.warn("App Intent remains pending", invocation.id, error)
|
||||
}
|
||||
}
|
||||
|
||||
async function songIdsFor(kind: string, id: string) {
|
||||
if (kind === "song") {
|
||||
return [id as Id<"songs">]
|
||||
}
|
||||
if (kind === "album") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{
|
||||
albumId: id as Id<"albums">,
|
||||
}
|
||||
)
|
||||
}
|
||||
if (kind === "artist") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: id as Id<"artists"> }
|
||||
)
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
if (id === FAVORITES_PLAYLIST_ID) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs
|
||||
}
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: id as Id<"playlists"> }
|
||||
)
|
||||
}
|
||||
throw new IntentRejected("Choose a song, album, artist, or playlist.")
|
||||
}
|
||||
|
||||
async function uniqueSongIds(sources: MusicSource[]) {
|
||||
const ids: Id<"songs">[] = []
|
||||
for (const source of sources) {
|
||||
ids.push(...(await songIdsFor(source.kind, source.id)))
|
||||
}
|
||||
return [...new Set(ids)]
|
||||
}
|
||||
|
||||
async function performInvocation(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
switch (invocation.name) {
|
||||
case "openMusic": {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id || !kind) throw new IntentRejected("Choose music to open.")
|
||||
if (kind === "song") {
|
||||
const song = await convex.query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
})
|
||||
if (!song)
|
||||
throw new IntentRejected("This song is no longer available.")
|
||||
navigation.push(`/album/${song.album}`)
|
||||
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
|
||||
navigation.push("/playlist/favorites")
|
||||
} else if (["album", "artist", "playlist"].includes(kind)) {
|
||||
navigation.push(`/${kind}/${id}`)
|
||||
} else throw new IntentRejected("Unknown music type.")
|
||||
return
|
||||
}
|
||||
case "playMusic":
|
||||
await playMusic(invocation)
|
||||
if (!["next", "tail"].includes(String(invocation.params.queue))) {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
}
|
||||
return
|
||||
case "warmupAudio":
|
||||
await warmup(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(false)
|
||||
warmedAudioIds.add(invocation.id)
|
||||
return
|
||||
case "addToPlaylist":
|
||||
await addToPlaylist(invocation)
|
||||
return
|
||||
case "addToUpNext":
|
||||
await addToUpNext(invocation)
|
||||
return
|
||||
case "clearUpNext":
|
||||
ensureActive(invocation)
|
||||
await actions.clearUpNext()
|
||||
return
|
||||
case "createPlaylist":
|
||||
await createPlaylist(invocation)
|
||||
return
|
||||
case "createStation":
|
||||
await createStation(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
return
|
||||
case "updateAffinity":
|
||||
await updateAffinity(invocation)
|
||||
return
|
||||
case "transport":
|
||||
await transport(invocation)
|
||||
if (store.getState().queue.length > 0) {
|
||||
const command = invocation.params.command
|
||||
await playbackRef.current.waitForPlaybackReady(
|
||||
command === "resume"
|
||||
? true
|
||||
: command === "pause"
|
||||
? false
|
||||
: undefined
|
||||
)
|
||||
}
|
||||
return
|
||||
default:
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
async function playMusic(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const queue = readString(invocation.params.queue) ?? "now"
|
||||
const warmupId = readString(invocation.params.warmupId)
|
||||
const repeat = repeatChoice(invocation.params.repeat)
|
||||
if (repeat) {
|
||||
ensureActive(invocation)
|
||||
await actions.setRepeatMode(repeat)
|
||||
}
|
||||
|
||||
if (queue === "next" || queue === "tail") {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
if (queue === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueNext(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueLast(ids)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (warmupId && warmedAudioIds.has(warmupId)) {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const kind = readString(invocation.params.kind) ?? "resume"
|
||||
if (kind === "resume") {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
if (favorites.favoriteSongs.length === 0) {
|
||||
throw new IntentRejected(
|
||||
"Nothing is queued, and your favorites are empty."
|
||||
)
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(favorites.favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(favorites.favoriteSongs)
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id) {
|
||||
throw new IntentRejected("Choose music to play.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await actions.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
true
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to play.")
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function warmup(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to get ready.")
|
||||
}
|
||||
const shuffled = shuffleChoice(invocation.params.shuffle, false)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
false
|
||||
)
|
||||
} else {
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to get ready.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.prepareQueue(ids, shuffled)
|
||||
}
|
||||
}
|
||||
|
||||
async function addToPlaylist(invocation: AppIntentInvocation) {
|
||||
const playlistId = readString(invocation.params.playlistId)
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (!playlistId || sources.length === 0) {
|
||||
throw new IntentRejected("Choose music and a playlist.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(sources)
|
||||
if (songIds.length === 0) {
|
||||
throw new IntentRejected("Those items have no songs to add.")
|
||||
}
|
||||
if (playlistId === FAVORITES_PLAYLIST_ID) {
|
||||
for (const source of sources) {
|
||||
if (source.kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSong, {
|
||||
songId: source.id as Id<"songs">,
|
||||
})
|
||||
} else if (source.kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteAlbum, {
|
||||
albumId: source.id as Id<"albums">,
|
||||
})
|
||||
} else if (source.kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteArtist, {
|
||||
artistId: source.id as Id<"artists">,
|
||||
})
|
||||
} else if (source.kind === "playlist") {
|
||||
const ids = await songIdsFor(source.kind, source.id)
|
||||
if (ids.length > 0) {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSongs, {
|
||||
songIds: ids,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"Choose a song, album, artist, or playlist."
|
||||
)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.addSongsToPlaylist, {
|
||||
playlistId: playlistId as Id<"playlists">,
|
||||
songIds,
|
||||
})
|
||||
}
|
||||
|
||||
async function addToUpNext(invocation: AppIntentInvocation) {
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (sources.length === 0) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const ids = await uniqueSongIds(sources)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
const position =
|
||||
readString(invocation.params.position) === "last" ? "last" : "next"
|
||||
if (position === "last") {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueLast(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueNext(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function createPlaylist(invocation: AppIntentInvocation) {
|
||||
const name = readString(invocation.params.name)
|
||||
if (!name) {
|
||||
throw new IntentRejected("A playlist needs a name.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(
|
||||
readSources(invocation.params.sources)
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.createPlaylist, {
|
||||
name,
|
||||
songIds,
|
||||
invocationId: invocation.id,
|
||||
})
|
||||
}
|
||||
|
||||
async function createStation(invocation: AppIntentInvocation) {
|
||||
const artistId = readString(invocation.params.artistId)
|
||||
if (!artistId) {
|
||||
throw new IntentRejected("Nothing is playing in oTunes.")
|
||||
}
|
||||
const ids = await songIdsFor("artist", artistId)
|
||||
if (ids.length === 0)
|
||||
throw new IntentRejected("This artist has no songs to play.")
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.playShuffled(ids)
|
||||
}
|
||||
|
||||
async function updateAffinity(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
const state = readString(invocation.params.state)
|
||||
if (!kind || !id || (state !== "like" && state !== "unset")) {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love or unlike a song, album, or artist."
|
||||
)
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
if (state === "like") {
|
||||
if (kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSong, {
|
||||
songId: id as Id<"songs">,
|
||||
})
|
||||
} else if (kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteAlbum, {
|
||||
albumId: id as Id<"albums">,
|
||||
})
|
||||
} else if (kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteArtist, {
|
||||
artistId: id as Id<"artists">,
|
||||
})
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love songs, albums, and artists."
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
if (kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteSong, {
|
||||
songId: id as Id<"songs">,
|
||||
})
|
||||
} else if (kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteAlbum, {
|
||||
albumId: id as Id<"albums">,
|
||||
})
|
||||
} else if (kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteArtist, {
|
||||
artistId: id as Id<"artists">,
|
||||
})
|
||||
} else {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
}
|
||||
|
||||
async function transport(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const command = readString(invocation.params.command)
|
||||
if (command === "pause") {
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(false)
|
||||
return
|
||||
}
|
||||
if (command === "resume") {
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
throw new IntentRejected("Nothing is queued in oTunes.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
if (command === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipNext()
|
||||
return
|
||||
}
|
||||
if (command === "previous") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipPrevious()
|
||||
return
|
||||
}
|
||||
throw new IntentRejected("oTunes doesn't know that playback control.")
|
||||
}
|
||||
})
|
||||
|
||||
return null
|
||||
}
|
||||
@@ -1,195 +0,0 @@
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentEntity } from "expo-app-intents"
|
||||
import { useEffect, useRef } from "react"
|
||||
import { AppState } from "react-native"
|
||||
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import {
|
||||
loadCatalogCursors,
|
||||
saveCatalogCursors,
|
||||
type CatalogCursors,
|
||||
} from "@/lib/app-intent-handled"
|
||||
import {
|
||||
publishMusicCatalog,
|
||||
readMusicCatalog,
|
||||
trackMusicCatalogSync,
|
||||
} from "@/lib/app-intents"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { FunctionReturnType } from "convex/server"
|
||||
|
||||
const LIBRARY_KINDS = ["artist", "album", "song"] as const
|
||||
type LibraryKind = (typeof LIBRARY_KINDS)[number]
|
||||
const PAGE_SIZE = 500
|
||||
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
|
||||
|
||||
type Favorites = FunctionReturnType<typeof api.favorites.getUserFavorites>
|
||||
|
||||
function favoriteIds(favorites: Favorites, kind: LibraryKind) {
|
||||
return new Set<string>(
|
||||
(kind === "song"
|
||||
? favorites.favoriteSongs
|
||||
: kind === "album"
|
||||
? favorites.favoriteAlbums
|
||||
: favorites.favoriteArtists
|
||||
).flat()
|
||||
)
|
||||
}
|
||||
|
||||
/** Stamps `metadata.favorite`, which Siri uses to rank suggestions. */
|
||||
function withFavorite(entity: AppIntentEntity, favorite: boolean) {
|
||||
const flag = favorite ? "1" : "0"
|
||||
return entity.metadata?.favorite === flag
|
||||
? entity
|
||||
: { ...entity, metadata: { ...entity.metadata, favorite: flag } }
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps the on-device Siri catalog in step with the server. `intentCatalog.head`
|
||||
* is a live subscription, so the library is fetched only when it changes, and
|
||||
* then only the records changed since the stored cursor. Favorites are applied
|
||||
* locally from the existing favorites subscription.
|
||||
*/
|
||||
export function useMusicCatalogSync() {
|
||||
const convex = useConvex()
|
||||
const scope = useCacheScope()
|
||||
const head = useQuery(api.intentCatalog.head)
|
||||
const favorites = useQuery(api.favorites.getUserFavorites)
|
||||
const playlists = useQuery(api.intentCatalog.playlists)
|
||||
const latest = useRef({ head, favorites, playlists })
|
||||
latest.current = { head, favorites, playlists }
|
||||
const schedule = useRef<() => void>(() => undefined)
|
||||
|
||||
useEffect(() => {
|
||||
if (!AppIntents.isAvailable()) return
|
||||
let stopped = false
|
||||
let running = false
|
||||
let dirty = false
|
||||
let cursors: CatalogCursors | null = null
|
||||
// What the disk catalog reflects, to skip no-op republishes.
|
||||
const appliedFavorites = new Map<LibraryKind, Set<string>>()
|
||||
let publishedPlaylists: string | null = null
|
||||
|
||||
async function fetchChanges(kind: LibraryKind, since: number | undefined) {
|
||||
const upserts: AppIntentEntity[] = []
|
||||
let removed: string[] = []
|
||||
let head = 0
|
||||
let cursor: string | null = null
|
||||
do {
|
||||
const result: CatalogPage = await convex.query(api.intentCatalog.page, {
|
||||
kind,
|
||||
since,
|
||||
paginationOpts: { cursor, numItems: PAGE_SIZE },
|
||||
})
|
||||
if (stopped) return null
|
||||
if (cursor === null) {
|
||||
if (result.reset) return fetchChanges(kind, undefined)
|
||||
head = result.head ?? 0
|
||||
removed = result.removed
|
||||
}
|
||||
upserts.push(...result.page)
|
||||
cursor = result.isDone ? null : result.continueCursor
|
||||
} while (cursor !== null)
|
||||
return { upserts, removed, head, full: since === undefined }
|
||||
}
|
||||
|
||||
async function syncKind(
|
||||
kind: LibraryKind,
|
||||
serverHead: number,
|
||||
favorites: Favorites
|
||||
) {
|
||||
if (!cursors) return
|
||||
const since = cursors[kind]
|
||||
const stale = since === undefined || serverHead > since
|
||||
const liked = favoriteIds(favorites, kind)
|
||||
const previousLiked = appliedFavorites.get(kind)
|
||||
const likesChanged =
|
||||
!previousLiked ||
|
||||
previousLiked.size !== liked.size ||
|
||||
[...liked].some((id) => !previousLiked.has(id))
|
||||
if (!stale && !likesChanged) return
|
||||
|
||||
const changes = stale ? await fetchChanges(kind, since) : null
|
||||
if (stopped) return
|
||||
const records = new Map<string, AppIntentEntity>()
|
||||
if (!changes?.full) {
|
||||
for (const entity of await readMusicCatalog(kind)) {
|
||||
records.set(entity.id, entity)
|
||||
}
|
||||
}
|
||||
for (const id of changes?.removed ?? []) records.delete(id)
|
||||
for (const entity of changes?.upserts ?? [])
|
||||
records.set(entity.id, entity)
|
||||
|
||||
let modified = changes !== null
|
||||
for (const [id, entity] of records) {
|
||||
const next = withFavorite(entity, liked.has(id))
|
||||
if (next !== entity) {
|
||||
records.set(id, next)
|
||||
modified = true
|
||||
}
|
||||
}
|
||||
if (stopped) return
|
||||
if (modified) await publishMusicCatalog(kind, [...records.values()])
|
||||
appliedFavorites.set(kind, liked)
|
||||
if (changes && !stopped) {
|
||||
cursors = { ...cursors, [kind]: changes.head }
|
||||
await saveCatalogCursors(scope, cursors)
|
||||
}
|
||||
}
|
||||
|
||||
async function syncOnce() {
|
||||
const { head, favorites, playlists } = latest.current
|
||||
cursors ??= await loadCatalogCursors(scope)
|
||||
if (head && favorites) {
|
||||
for (const kind of LIBRARY_KINDS) {
|
||||
if (stopped) return
|
||||
await syncKind(kind, head[kind], favorites)
|
||||
}
|
||||
}
|
||||
if (playlists && !stopped) {
|
||||
const json = JSON.stringify(playlists)
|
||||
if (json !== publishedPlaylists) {
|
||||
await publishMusicCatalog("playlist", playlists)
|
||||
publishedPlaylists = json
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
schedule.current = () => {
|
||||
if (stopped) return
|
||||
if (running) {
|
||||
dirty = true
|
||||
return
|
||||
}
|
||||
running = true
|
||||
const sync = (async () => {
|
||||
do {
|
||||
dirty = false
|
||||
await syncOnce()
|
||||
} while (dirty && !stopped)
|
||||
})()
|
||||
.catch((error) =>
|
||||
console.warn("Could not publish music catalog.", error)
|
||||
)
|
||||
.finally(() => {
|
||||
running = false
|
||||
})
|
||||
trackMusicCatalogSync(sync)
|
||||
}
|
||||
schedule.current()
|
||||
// Retries a failed sync; a no-op without server queries when current.
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") schedule.current()
|
||||
})
|
||||
return () => {
|
||||
stopped = true
|
||||
schedule.current = () => undefined
|
||||
subscription.remove()
|
||||
}
|
||||
}, [convex, scope])
|
||||
|
||||
useEffect(() => {
|
||||
schedule.current()
|
||||
}, [head, favorites, playlists])
|
||||
}
|
||||
@@ -1,633 +0,0 @@
|
||||
import { useConvex } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentInvocation } from "expo-app-intents"
|
||||
import { useMemo, useRef } from "react"
|
||||
|
||||
import { useFavorites, type FavoriteKind } from "@/contexts/favorites"
|
||||
import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
useCacheScope,
|
||||
} from "@/contexts/persistent-cache"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import {
|
||||
FAVORITES_PLAYLIST_ID,
|
||||
loadHandledIntentIds,
|
||||
rememberHandledIntentId,
|
||||
} from "@/lib/app-intent-handled"
|
||||
import { completeMusicInvocation } from "@/lib/app-intents"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { publishNowPlaying } from "./now-playing"
|
||||
|
||||
const warmedAudioIds = new Set<string>()
|
||||
|
||||
class IntentRejected extends Error {}
|
||||
|
||||
const KNOWN_INTENTS = new Set([
|
||||
"playMusic",
|
||||
"warmupAudio",
|
||||
"addToPlaylist",
|
||||
"addToUpNext",
|
||||
"clearUpNext",
|
||||
"createPlaylist",
|
||||
"createStation",
|
||||
"updateAffinity",
|
||||
"transport",
|
||||
"openMusic",
|
||||
])
|
||||
|
||||
type MusicSource = {
|
||||
kind: string
|
||||
id: string
|
||||
}
|
||||
|
||||
function readString(value: unknown) {
|
||||
return typeof value === "string" && value.trim() ? value : null
|
||||
}
|
||||
|
||||
function readSources(value: unknown): MusicSource[] {
|
||||
if (!Array.isArray(value)) {
|
||||
return []
|
||||
}
|
||||
return value.flatMap((entry) => {
|
||||
if (!entry || typeof entry !== "object") {
|
||||
return []
|
||||
}
|
||||
const source = entry as { kind?: unknown; id?: unknown }
|
||||
if (typeof source.kind !== "string" || typeof source.id !== "string") {
|
||||
return []
|
||||
}
|
||||
if (!source.kind || !source.id) {
|
||||
return []
|
||||
}
|
||||
return [{ kind: source.kind, id: source.id }]
|
||||
})
|
||||
}
|
||||
|
||||
function isFavoriteKind(kind: string): kind is FavoriteKind {
|
||||
return kind === "song" || kind === "album" || kind === "artist"
|
||||
}
|
||||
|
||||
function shuffleChoice(value: unknown, fallback: boolean) {
|
||||
if (value === "songs") return true
|
||||
if (value === "off") return false
|
||||
if (value == null) return fallback
|
||||
throw new IntentRejected("Shuffle must be Off or Songs.")
|
||||
}
|
||||
|
||||
function repeatChoice(value: unknown): RepeatMode | null {
|
||||
if (value == null) return null
|
||||
if (value === "none") return "none"
|
||||
if (value === "one") return "once"
|
||||
if (value === "all") return "always"
|
||||
throw new IntentRejected("Repeat must be None, One, or All.")
|
||||
}
|
||||
|
||||
function ensureActive(invocation: AppIntentInvocation) {
|
||||
const deadline = invocation.params.deadline
|
||||
if (typeof deadline === "number" && Date.now() >= deadline) {
|
||||
throw new IntentRejected("This request expired. Please try again.")
|
||||
}
|
||||
}
|
||||
|
||||
function isTransient(error: unknown) {
|
||||
const message = (
|
||||
error instanceof Error ? error.message : String(error)
|
||||
).toLowerCase()
|
||||
return (
|
||||
message.includes("not authenticated") ||
|
||||
message.includes("network") ||
|
||||
message.includes("fetch") ||
|
||||
message.includes("connection") ||
|
||||
message.includes("timed out") ||
|
||||
message.includes("timeout")
|
||||
)
|
||||
}
|
||||
|
||||
/** Runs Siri and Shortcuts invocations queued by the native intents. */
|
||||
export function useIntentDispatch() {
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const playback = { ...usePlaybackQueue(), ...usePlaybackActions() }
|
||||
const favorites = useFavorites()
|
||||
const navigation = useAppNavigation()
|
||||
const store = useMemo(
|
||||
() =>
|
||||
getPlaybackStore(
|
||||
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
|
||||
),
|
||||
[cacheScope]
|
||||
)
|
||||
const handledIds = useRef<Set<string> | null>(null)
|
||||
const playbackRef = useRef(playback)
|
||||
playbackRef.current = playback
|
||||
|
||||
/** Intent ids arrive as strings; the server validates them. */
|
||||
function setFavorite(kind: FavoriteKind, id: string, favorite: boolean) {
|
||||
return kind === "song"
|
||||
? favorites.setFavorite(kind, id as Id<"songs">, favorite)
|
||||
: kind === "album"
|
||||
? favorites.setFavorite(kind, id as Id<"albums">, favorite)
|
||||
: favorites.setFavorite(kind, id as Id<"artists">, favorite)
|
||||
}
|
||||
|
||||
AppIntents.useAppIntents(async (pendingIntents) => {
|
||||
if (!handledIds.current) {
|
||||
handledIds.current = await loadHandledIntentIds()
|
||||
}
|
||||
const handled = handledIds.current
|
||||
|
||||
for (const invocation of pendingIntents) {
|
||||
if (handled.has(invocation.id)) {
|
||||
const token = readString(invocation.params.completionToken)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
if (!KNOWN_INTENTS.has(invocation.name)) {
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
const token = readString(invocation.params.completionToken)
|
||||
try {
|
||||
ensureActive(invocation)
|
||||
await performInvocation(invocation)
|
||||
if (
|
||||
["playMusic", "warmupAudio", "transport", "createStation"].includes(
|
||||
invocation.name
|
||||
)
|
||||
) {
|
||||
await publishNowPlaying(
|
||||
store.getState().queue[0] ?? null,
|
||||
playbackRef.current.currentSong
|
||||
)
|
||||
}
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (error) {
|
||||
if (token) {
|
||||
await completeMusicInvocation(
|
||||
token,
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
)
|
||||
}
|
||||
if (token || error instanceof IntentRejected || !isTransient(error)) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
if (!(error instanceof IntentRejected) || message) {
|
||||
showError(message)
|
||||
}
|
||||
try {
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (removeError) {
|
||||
console.warn(
|
||||
"App Intent remains pending",
|
||||
invocation.id,
|
||||
removeError
|
||||
)
|
||||
}
|
||||
continue
|
||||
}
|
||||
console.warn("App Intent remains pending", invocation.id, error)
|
||||
}
|
||||
}
|
||||
|
||||
async function songIdsFor(kind: string, id: string) {
|
||||
if (kind === "song") {
|
||||
return [id as Id<"songs">]
|
||||
}
|
||||
if (kind === "album") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{
|
||||
albumId: id as Id<"albums">,
|
||||
}
|
||||
)
|
||||
}
|
||||
if (kind === "artist") {
|
||||
const chunks = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: id as Id<"artists"> }
|
||||
)
|
||||
return chunks.flat()
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
if (id === FAVORITES_PLAYLIST_ID) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs.flat()
|
||||
}
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: id as Id<"playlists"> }
|
||||
)
|
||||
}
|
||||
throw new IntentRejected("Choose a song, album, artist, or playlist.")
|
||||
}
|
||||
|
||||
async function uniqueSongIds(sources: MusicSource[]) {
|
||||
const ids: Id<"songs">[] = []
|
||||
for (const source of sources) {
|
||||
ids.push(...(await songIdsFor(source.kind, source.id)))
|
||||
}
|
||||
return [...new Set(ids)]
|
||||
}
|
||||
|
||||
async function performInvocation(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
switch (invocation.name) {
|
||||
case "openMusic": {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id || !kind) throw new IntentRejected("Choose music to open.")
|
||||
if (kind === "song") {
|
||||
const song = await convex.query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
})
|
||||
if (!song)
|
||||
throw new IntentRejected("This song is no longer available.")
|
||||
navigation.push(`/album/${song.album}`)
|
||||
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
|
||||
navigation.push("/playlist/favorites")
|
||||
} else if (["album", "artist", "playlist"].includes(kind)) {
|
||||
navigation.push(`/${kind}/${id}`)
|
||||
} else throw new IntentRejected("Unknown music type.")
|
||||
return
|
||||
}
|
||||
case "playMusic":
|
||||
await playMusic(invocation)
|
||||
if (!["next", "tail"].includes(String(invocation.params.queue))) {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
}
|
||||
return
|
||||
case "warmupAudio":
|
||||
await warmup(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(false)
|
||||
warmedAudioIds.add(invocation.id)
|
||||
return
|
||||
case "addToPlaylist":
|
||||
await addToPlaylist(invocation)
|
||||
return
|
||||
case "addToUpNext":
|
||||
await addToUpNext(invocation)
|
||||
return
|
||||
case "clearUpNext":
|
||||
ensureActive(invocation)
|
||||
await actions.clearUpNext()
|
||||
return
|
||||
case "createPlaylist":
|
||||
await createPlaylist(invocation)
|
||||
return
|
||||
case "createStation":
|
||||
await createStation(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
return
|
||||
case "updateAffinity":
|
||||
await updateAffinity(invocation)
|
||||
return
|
||||
case "transport":
|
||||
await transport(invocation)
|
||||
if (store.getState().queue.length > 0) {
|
||||
const command = invocation.params.command
|
||||
await playbackRef.current.waitForPlaybackReady(
|
||||
command === "resume"
|
||||
? true
|
||||
: command === "pause"
|
||||
? false
|
||||
: undefined
|
||||
)
|
||||
}
|
||||
return
|
||||
default:
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
async function playMusic(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const queue = readString(invocation.params.queue) ?? "now"
|
||||
const warmupId = readString(invocation.params.warmupId)
|
||||
const repeat = repeatChoice(invocation.params.repeat)
|
||||
if (repeat) {
|
||||
ensureActive(invocation)
|
||||
await actions.setRepeatMode(repeat)
|
||||
}
|
||||
|
||||
if (queue === "next" || queue === "tail") {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
if (queue === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueNext(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueLast(ids)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (warmupId && warmedAudioIds.has(warmupId)) {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const kind = readString(invocation.params.kind) ?? "resume"
|
||||
if (kind === "resume") {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
const favoriteSongs = favorites.favoriteSongs.flat()
|
||||
if (favoriteSongs.length === 0) {
|
||||
throw new IntentRejected(
|
||||
"Nothing is queued, and your favorites are empty."
|
||||
)
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(favoriteSongs)
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id) {
|
||||
throw new IntentRejected("Choose music to play.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await actions.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
true
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to play.")
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function warmup(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to get ready.")
|
||||
}
|
||||
const shuffled = shuffleChoice(invocation.params.shuffle, false)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
false
|
||||
)
|
||||
} else {
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to get ready.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.prepareQueue(ids, shuffled)
|
||||
}
|
||||
}
|
||||
|
||||
async function addToPlaylist(invocation: AppIntentInvocation) {
|
||||
const playlistId = readString(invocation.params.playlistId)
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (!playlistId || sources.length === 0) {
|
||||
throw new IntentRejected("Choose music and a playlist.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(sources)
|
||||
if (songIds.length === 0) {
|
||||
throw new IntentRejected("Those items have no songs to add.")
|
||||
}
|
||||
if (playlistId === FAVORITES_PLAYLIST_ID) {
|
||||
for (const source of sources) {
|
||||
if (isFavoriteKind(source.kind)) {
|
||||
ensureActive(invocation)
|
||||
await setFavorite(source.kind, source.id, true)
|
||||
} else if (source.kind === "playlist") {
|
||||
const ids = await songIdsFor(source.kind, source.id)
|
||||
ensureActive(invocation)
|
||||
await favorites.addFavoriteSongs(ids)
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"Choose a song, album, artist, or playlist."
|
||||
)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.addSongsToPlaylist, {
|
||||
playlistId: playlistId as Id<"playlists">,
|
||||
songIds,
|
||||
})
|
||||
}
|
||||
|
||||
async function addToUpNext(invocation: AppIntentInvocation) {
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (sources.length === 0) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const ids = await uniqueSongIds(sources)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
const position =
|
||||
readString(invocation.params.position) === "last" ? "last" : "next"
|
||||
if (position === "last") {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueLast(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueNext(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function createPlaylist(invocation: AppIntentInvocation) {
|
||||
const name = readString(invocation.params.name)
|
||||
if (!name) {
|
||||
throw new IntentRejected("A playlist needs a name.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(
|
||||
readSources(invocation.params.sources)
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.createPlaylist, {
|
||||
name,
|
||||
songIds,
|
||||
invocationId: invocation.id,
|
||||
})
|
||||
}
|
||||
|
||||
async function createStation(invocation: AppIntentInvocation) {
|
||||
const artistId = readString(invocation.params.artistId)
|
||||
if (!artistId) {
|
||||
throw new IntentRejected("Nothing is playing in oTunes.")
|
||||
}
|
||||
const ids = await songIdsFor("artist", artistId)
|
||||
if (ids.length === 0)
|
||||
throw new IntentRejected("This artist has no songs to play.")
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.playShuffled(ids)
|
||||
}
|
||||
|
||||
async function updateAffinity(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
const state = readString(invocation.params.state)
|
||||
if (!kind || !id || (state !== "like" && state !== "unset")) {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love or unlike a song, album, or artist."
|
||||
)
|
||||
}
|
||||
if (!isFavoriteKind(kind)) {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await setFavorite(kind, id, state === "like")
|
||||
}
|
||||
|
||||
async function transport(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const command = readString(invocation.params.command)
|
||||
if (command === "pause") {
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(false)
|
||||
return
|
||||
}
|
||||
if (command === "resume") {
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
throw new IntentRejected("Nothing is queued in oTunes.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
if (command === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipNext()
|
||||
return
|
||||
}
|
||||
if (command === "previous") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipPrevious()
|
||||
return
|
||||
}
|
||||
throw new IntentRejected("oTunes doesn't know that playback control.")
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentEntity } from "expo-app-intents"
|
||||
import { useEffect } from "react"
|
||||
|
||||
import { usePlaybackQueue } from "@/contexts/playback"
|
||||
import { publishMusicCatalog } from "@/lib/app-intents"
|
||||
|
||||
type CurrentSong = NonNullable<
|
||||
ReturnType<typeof usePlaybackQueue>["currentSong"]
|
||||
>
|
||||
|
||||
function nowPlayingEntity(song: CurrentSong): AppIntentEntity {
|
||||
const artistName = song.artist.name
|
||||
return {
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
subtitle: artistName,
|
||||
synonyms: artistName ? [artistName] : undefined,
|
||||
metadata: {
|
||||
artistName,
|
||||
artistId: song.artist.id,
|
||||
albumTitle: song.album.title,
|
||||
albumId: song.album.id,
|
||||
duration: String(song.durationSeconds),
|
||||
genres: "",
|
||||
year: "",
|
||||
track: "",
|
||||
disk: "",
|
||||
favorite: "0",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Publishes the "nowPlaying" catalog Siri reads for the current song. With an
|
||||
* id but no matching `song` it leaves the catalog alone until the song loads.
|
||||
*/
|
||||
export async function publishNowPlaying(
|
||||
queueHeadId: string | null,
|
||||
song: CurrentSong | null
|
||||
) {
|
||||
if (!queueHeadId) await publishMusicCatalog("nowPlaying", [])
|
||||
else if (song?.id === queueHeadId)
|
||||
await publishMusicCatalog("nowPlaying", [nowPlayingEntity(song)])
|
||||
}
|
||||
|
||||
/** Keeps the "nowPlaying" catalog in step with the playback queue. */
|
||||
export function useNowPlayingCatalog() {
|
||||
const playback = usePlaybackQueue()
|
||||
const queueHeadId = playback.queueSongIds[0] ?? null
|
||||
const song = playback.currentSong
|
||||
|
||||
useEffect(() => {
|
||||
if (!AppIntents.isAvailable()) return
|
||||
void publishNowPlaying(queueHeadId, song).catch((error) => {
|
||||
console.warn("Could not publish the current song.", error)
|
||||
})
|
||||
}, [queueHeadId, song])
|
||||
}
|
||||
@@ -1,33 +1,40 @@
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import Svg, { G, Path } from "react-native-svg"
|
||||
|
||||
import {
|
||||
DOLBY_PATHS,
|
||||
DOLBY_VIEW_BOX,
|
||||
DOLBY_WIDTH,
|
||||
LOSSLESS_FALL,
|
||||
LOSSLESS_FALL_GAP,
|
||||
LOSSLESS_PEAKS,
|
||||
LOSSLESS_STROKES,
|
||||
LOSSLESS_THIN_WIDTH,
|
||||
LOSSLESS_VIEW_BOX,
|
||||
LOSSLESS_WIDTH,
|
||||
MARK_HEIGHT,
|
||||
} from "@otunes/convex/client/audio-format-marks"
|
||||
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
|
||||
|
||||
const LABEL_SIZE = 13
|
||||
const MARK_HEIGHT = 11
|
||||
|
||||
function DolbyMark({ color }: { color: string }) {
|
||||
return (
|
||||
<Svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}>
|
||||
{DOLBY_PATHS.map((d) => (
|
||||
<Path key={d} d={d} fill={color} />
|
||||
))}
|
||||
<Svg
|
||||
width={(MARK_HEIGHT * 23) / 16}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="0 0 23 16"
|
||||
>
|
||||
<Path d="M0 0H2.5A8 8 0 0 1 2.5 16H0Z" fill={color} />
|
||||
<Path d="M23 0H20.5A8 8 0 0 0 20.5 16H23Z" fill={color} />
|
||||
</Svg>
|
||||
)
|
||||
}
|
||||
|
||||
const LOSSLESS_PEAKS = [110, 215, 320]
|
||||
const LOSSLESS_THIN_WIDTH = 24
|
||||
const LOSSLESS_STROKES: [peak: number, d: string][] = [
|
||||
[110, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[215, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[320, "M-30 185C-22 173 -11 166 0 166"],
|
||||
[110, "M166 413C176 413 186 406 194 395"],
|
||||
[215, "M166 413C200 413 226 340 240 275"],
|
||||
[320, "M166 413C200 413 226 340 240 275"],
|
||||
]
|
||||
const LOSSLESS_FALL =
|
||||
"M0 178L4 179L8 181L12 184L16 189L20 196L23 204L27 213L30 223L34 233L39 243L43 254L48 266L53 278L58 289L62 301L66 313L71 325L75 336L79 347L83 357L86 364L89 370L93 377L97 382L101 387L105 392L109 397L113 401L117 405L121 408L126 412L130 415L134 417L139 419L143 421L148 423L152 424L157 424L161 425L166 425L166 401L163 401L161 400L159 400L157 399L154 397L152 396L151 394L149 392L147 389L145 386L143 383L142 380L140 376L138 371L137 367L135 362L134 357L132 351L130 345L127 339L124 330L120 319L116 308L111 297L107 285L102 272L98 260L93 248L88 235L82 223L76 212L69 201L61 192L53 183L45 175L37 168L28 163L19 158L10 155L0 154Z"
|
||||
const LOSSLESS_FALL_GAP =
|
||||
"M0 178L4 180L6 184L8 190L9 197L11 203L14 210L17 219L21 228L24 238L29 248L33 259L38 270L43 282L47 293L52 305L56 317L60 328L64 340L68 351L73 361L76 368L79 375L83 381L87 387L91 393L95 398L100 403L104 408L109 412L113 416L118 419L124 422L130 424L135 425L141 426L147 426L152 426L157 425L161 425L166 425L166 401L163 401L161 399L159 398L158 395L157 393L156 390L155 387L155 384L154 381L153 379L152 376L150 373L149 369L148 366L146 361L145 357L143 352L142 347L140 341L137 335L134 326L130 315L126 304L122 293L117 281L113 268L108 256L103 243L98 231L92 219L86 207L79 196L71 186L62 177L53 168L44 161L32 157L21 155L10 154L0 154Z"
|
||||
|
||||
/**
|
||||
* Three overlapping waves. Each thick downstroke is outlined in the
|
||||
* background color so it reads as passing over the strokes behind it.
|
||||
@@ -41,9 +48,9 @@ function LosslessMark({
|
||||
}) {
|
||||
return (
|
||||
<Svg
|
||||
width={LOSSLESS_WIDTH}
|
||||
width={(MARK_HEIGHT * 544) / 271}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox={LOSSLESS_VIEW_BOX}
|
||||
viewBox="28 154 544 271"
|
||||
>
|
||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||
<Path
|
||||
@@ -68,10 +75,12 @@ function LosslessMark({
|
||||
|
||||
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
||||
export function AudioFormatBadge({
|
||||
artwork = false,
|
||||
format,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
artwork?: boolean
|
||||
format: PlaybackFormat
|
||||
color: string
|
||||
backgroundColor: string
|
||||
@@ -84,7 +93,12 @@ export function AudioFormatBadge({
|
||||
) : (
|
||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||
)}
|
||||
<Text style={[styles.label, { color }]}>{label}</Text>
|
||||
<PaletteText
|
||||
tone={artwork ? "secondaryForeground" : undefined}
|
||||
style={[styles.label, { color }]}
|
||||
>
|
||||
{label}
|
||||
</PaletteText>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { memo } from "react"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
@@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||
<PaletteText
|
||||
tone={color ? "foreground" : undefined}
|
||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@@ -71,10 +71,7 @@ class ConvexAuthErrorBoundary extends Component<
|
||||
}
|
||||
}
|
||||
|
||||
export function ConvexAuthRecovery({
|
||||
children,
|
||||
onInvalidate,
|
||||
}: ConvexAuthRecoveryProps) {
|
||||
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
|
||||
const localAuth = useLocalConvexAuth()
|
||||
const serverAuth = useServerConvexAuth()
|
||||
const hadServerAuthRef = useRef(false)
|
||||
@@ -116,9 +113,9 @@ export function ConvexAuthRecovery({
|
||||
|
||||
const sessionEstablished = Boolean(
|
||||
serverAuth &&
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
!serverAuth.isLoading &&
|
||||
!serverAuth.isRefreshing &&
|
||||
serverAuth.isAuthenticated
|
||||
)
|
||||
|
||||
return (
|
||||
|
||||
@@ -112,10 +112,7 @@ function SwipeRowBody({
|
||||
setIsOpen(false)
|
||||
}, [removing, translateX])
|
||||
|
||||
const handleSwipeStart = useCallback(
|
||||
() => group.setOpen(close),
|
||||
[close, group]
|
||||
)
|
||||
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
|
||||
|
||||
const handleSettle = useCallback(
|
||||
(open: boolean) => {
|
||||
@@ -254,7 +251,8 @@ function SwipeRowBody({
|
||||
const pillWidth = Math.max(
|
||||
0,
|
||||
resting +
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
|
||||
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
|
||||
commitProgress.value
|
||||
)
|
||||
const restingHeight = interpolate(
|
||||
pillWidth,
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
export type { MediaAction, MediaMenuConfig, MediaNavigation } from "@/components/media-context-menu"
|
||||
export type { MediaShareContext } from "@/lib/media-links"
|
||||
export {
|
||||
buildMediaMenuActions,
|
||||
MediaActionMenu,
|
||||
MediaContextMenu,
|
||||
} from "@/components/media-context-menu"
|
||||
@@ -200,11 +200,7 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(
|
||||
config.serverUrl,
|
||||
playlist.id,
|
||||
playlist.cover
|
||||
)}
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={
|
||||
fluid
|
||||
|
||||
@@ -32,8 +32,6 @@ export type MediaAction =
|
||||
| "favorite"
|
||||
| "go-artist"
|
||||
| "go-album"
|
||||
| "remove-from-playlist"
|
||||
| "change-cover"
|
||||
| "delete-playlist"
|
||||
|
||||
export type MediaNavigation = {
|
||||
@@ -56,7 +54,6 @@ export type MediaMenuConfig = {
|
||||
playlistLabel?: string
|
||||
favorited?: boolean
|
||||
showFavorite?: boolean
|
||||
showRemoveFromPlaylist?: boolean
|
||||
stationArtistId?: string
|
||||
navigation?: MediaNavigation
|
||||
share?: MediaShareContext
|
||||
@@ -79,7 +76,6 @@ const MEDIA_ACTION_ITEMS: {
|
||||
playlistLabel: string
|
||||
) => string
|
||||
image: NonNullable<MenuAction["image"]> & string
|
||||
destructive?: boolean
|
||||
}[] = [
|
||||
{
|
||||
action: "playlist",
|
||||
@@ -123,17 +119,6 @@ const MEDIA_ACTION_ITEMS: {
|
||||
`${favorited ? "Unfavorite" : "Favorite"}${countSuffix}`,
|
||||
image: "star",
|
||||
},
|
||||
{
|
||||
action: "remove-from-playlist",
|
||||
label: () => "Remove from Playlist",
|
||||
image: "minus.circle",
|
||||
destructive: true,
|
||||
},
|
||||
{
|
||||
action: "change-cover",
|
||||
label: () => "Change Cover",
|
||||
image: "photo",
|
||||
},
|
||||
{
|
||||
action: "delete-playlist",
|
||||
label: () => "Delete Playlist",
|
||||
@@ -149,15 +134,11 @@ function isActionIncluded(
|
||||
return false
|
||||
}
|
||||
|
||||
if (action === "remove-from-playlist") {
|
||||
return config.showRemoveFromPlaylist === true
|
||||
}
|
||||
|
||||
if (config.includeActions) {
|
||||
return config.includeActions.includes(action)
|
||||
}
|
||||
|
||||
if (action === "delete-playlist" || action === "change-cover") {
|
||||
if (action === "delete-playlist") {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -209,7 +190,6 @@ export function buildMediaMenuActions(
|
||||
id: item.action,
|
||||
title: item.label(countSuffix, favorited, playlistLabel),
|
||||
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||
...(item.destructive ? { attributes: { destructive: true } } : {}),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -344,7 +324,6 @@ const NativeContextMenuAction: ComponentType<{
|
||||
identifier: string
|
||||
title: string
|
||||
icon?: string
|
||||
destructive?: boolean
|
||||
onSelected: () => void
|
||||
}> | null =
|
||||
Platform.OS === "ios"
|
||||
@@ -398,7 +377,6 @@ function NativeMediaContextMenu({
|
||||
identifier={action.id ?? action.title}
|
||||
title={action.title}
|
||||
icon={typeof action.image === "string" ? action.image : undefined}
|
||||
destructive={action.attributes?.destructive}
|
||||
onSelected={() => handleAction(action.id as MediaAction)}
|
||||
/>
|
||||
))}
|
||||
|
||||
@@ -25,8 +25,6 @@ const actionIcons = {
|
||||
favorite: "star-outline",
|
||||
"go-artist": "person-outline",
|
||||
"go-album": "disc-outline",
|
||||
"remove-from-playlist": "remove-circle-outline",
|
||||
"change-cover": "image-outline",
|
||||
"delete-playlist": "trash-outline",
|
||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { useRouter } from "expo-router"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
@@ -65,7 +67,8 @@ function MiniPlayerContent({
|
||||
<View
|
||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -73,7 +76,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
@@ -83,7 +86,8 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={20}
|
||||
color={colors.foreground}
|
||||
@@ -101,7 +105,8 @@ function MiniPlayerContent({
|
||||
style={artworkStyle}
|
||||
/>
|
||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -109,8 +114,9 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
<Text
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||
{ color: colors.mutedForeground },
|
||||
@@ -118,7 +124,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
@@ -132,7 +138,12 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-back"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
@@ -143,7 +154,8 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
@@ -157,7 +169,12 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-forward"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
</Pressable>
|
||||
@@ -167,9 +184,10 @@ function MiniPlayerContent({
|
||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
const palette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
return (
|
||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
||||
{children}
|
||||
{hasArtworkPalette ? (
|
||||
<View
|
||||
@@ -187,7 +205,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ import {
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
@@ -110,16 +110,18 @@ export function NowPlayingQueue({
|
||||
tablet?: boolean
|
||||
fadeColor?: string
|
||||
}) {
|
||||
const { queueSongIds, queueHistorySongIds, shuffleEnabled, repeatEnabled } =
|
||||
usePlaybackQueue()
|
||||
const {
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
clearHistory,
|
||||
reorderQueue,
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
} = usePlaybackActions()
|
||||
} = usePlayback()
|
||||
const [viewportWidth, setViewportWidth] = useState(0)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const [scrollEnabled, setScrollEnabled] = useState(true)
|
||||
@@ -305,126 +307,100 @@ export function NowPlayingQueue({
|
||||
[drag]
|
||||
)
|
||||
|
||||
const lastIndex = queueSongIds.length - 1
|
||||
const renderItem = useCallback(
|
||||
({ item }: { item: QueueListItem }) => {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return (
|
||||
<View style={styles.historyHeader}>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
History
|
||||
</Text>
|
||||
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||
<Text
|
||||
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Clear
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
case "history":
|
||||
return (
|
||||
<HistoryRow
|
||||
songId={item.songId}
|
||||
historyIndex={item.historyIndex}
|
||||
colors={colors}
|
||||
onPress={skipToHistoryIndex}
|
||||
/>
|
||||
)
|
||||
case "current":
|
||||
return <View style={styles.current}>{currentHeader}</View>
|
||||
case "controls":
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{!tablet ? (
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
{item.showTitle ? (
|
||||
<Text
|
||||
style={[styles.sectionTitle, { color: colors.foreground }]}
|
||||
>
|
||||
Continue Playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
case "upcoming":
|
||||
return (
|
||||
<UpcomingRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={lastIndex}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
onPress={skipToQueueIndex}
|
||||
onRemove={handleRemove}
|
||||
onDragStart={handleDragStart}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
)
|
||||
case "empty":
|
||||
return (
|
||||
<View style={[styles.empty, { height: item.height }]}>
|
||||
const renderItem = ({ item }: { item: QueueListItem }) => {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return (
|
||||
<View style={styles.historyHeader}>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
History
|
||||
</Text>
|
||||
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||
<Text
|
||||
style={[
|
||||
styles.emptyText,
|
||||
{ color: colors.secondaryForeground },
|
||||
]}
|
||||
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Nothing else is queued.
|
||||
Clear
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
},
|
||||
[
|
||||
clearHistory,
|
||||
colors,
|
||||
currentHeader,
|
||||
cycleRepeat,
|
||||
drag,
|
||||
handleDragStart,
|
||||
handleDrop,
|
||||
handleRemove,
|
||||
lastIndex,
|
||||
repeatEnabled,
|
||||
shuffleEnabled,
|
||||
skipToHistoryIndex,
|
||||
skipToQueueIndex,
|
||||
swipeGroup,
|
||||
tablet,
|
||||
toggleShuffle,
|
||||
]
|
||||
)
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
case "history":
|
||||
return (
|
||||
<HistoryRow
|
||||
songId={item.songId}
|
||||
historyIndex={item.historyIndex}
|
||||
colors={colors}
|
||||
onPress={skipToHistoryIndex}
|
||||
/>
|
||||
)
|
||||
case "current":
|
||||
return <View style={styles.current}>{currentHeader}</View>
|
||||
case "controls":
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{!tablet ? (
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
{item.showTitle ? (
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Continue Playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
case "upcoming":
|
||||
return (
|
||||
<UpcomingRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={queueSongIds.length - 1}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
onPress={skipToQueueIndex}
|
||||
onRemove={handleRemove}
|
||||
onDragStart={handleDragStart}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
)
|
||||
case "empty":
|
||||
return (
|
||||
<View style={[styles.empty, { height: item.height }]}>
|
||||
<Text
|
||||
style={[styles.emptyText, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Nothing else is queued.
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<View
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import type { ComponentProps } from "react"
|
||||
import { Pressable, type TextProps } from "react-native"
|
||||
import { useRouter } from "expo-router"
|
||||
import Animated from "react-native-reanimated"
|
||||
|
||||
import {
|
||||
useAnimatedPaletteColor,
|
||||
type PaletteColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
|
||||
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
|
||||
|
||||
/** Keep artwork text colors on the same UI-thread animation as the background. */
|
||||
export function PaletteText({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: TextProps & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <Animated.Text {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
export function PaletteIcon({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <AnimatedIcon {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
function ArtworkBackButton() {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Navigate up"
|
||||
hitSlop={8}
|
||||
onPress={() => router.back()}
|
||||
>
|
||||
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
export function renderArtworkBackButton() {
|
||||
return <ArtworkBackButton />
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
import { useState, type ReactNode } from "react"
|
||||
import {
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type StyleProp,
|
||||
type TextStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { usePlaybackActions, usePlaybackProgress } from "@/contexts/playback"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
|
||||
/**
|
||||
* Position slider with elapsed and remaining labels. The only player piece
|
||||
* subscribed to the playback clock, so the rest of the player stays still
|
||||
* while audio plays.
|
||||
*/
|
||||
export function PlayerProgress({
|
||||
colors,
|
||||
center,
|
||||
timeStyle,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
/** Shown centered between the time labels. */
|
||||
center?: ReactNode
|
||||
timeStyle?: StyleProp<TextStyle>
|
||||
}) {
|
||||
const { currentTime, duration } = usePlaybackProgress()
|
||||
const { seekTo } = usePlaybackActions()
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const time = scrubTime ?? currentTime
|
||||
const timeColor =
|
||||
scrubTime === null ? colors.secondaryForeground : colors.foreground
|
||||
|
||||
return (
|
||||
<>
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={time}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.row}>
|
||||
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
|
||||
{formatDuration(time)}
|
||||
</Text>
|
||||
{center ? (
|
||||
<View style={styles.center} pointerEvents="none">
|
||||
{center}
|
||||
</View>
|
||||
) : null}
|
||||
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
|
||||
{formatRemainingDuration(time, duration).replace("-", "−")}
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
center: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
alignItems: "center",
|
||||
},
|
||||
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||
})
|
||||
@@ -1,5 +1,6 @@
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { collectionInset } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
@@ -15,7 +16,7 @@ import {
|
||||
useThemeColors,
|
||||
} from "@/lib/theme"
|
||||
import { memo, useCallback } from "react"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -44,8 +45,6 @@ export const SongRow = memo(function SongRow({
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
||||
@@ -63,22 +62,27 @@ export const SongRow = memo(function SongRow({
|
||||
const content = (
|
||||
<>
|
||||
<View style={styles.rowMeta}>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone={palette ? "foreground" : undefined}
|
||||
style={[styles.rowTitle, { color: foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.title}
|
||||
</Text>
|
||||
<Text
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.artist.name} · {song.album.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.duration, { color: secondaryForeground }]}
|
||||
>
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
{trailing}
|
||||
</>
|
||||
)
|
||||
@@ -103,12 +107,10 @@ export const SongRow = memo(function SongRow({
|
||||
? styles.insetRow
|
||||
: [styles.row, { borderBottomColor: divider }]
|
||||
const row =
|
||||
swipe && Platform.OS !== "web" ? (
|
||||
swipe && Platform.OS === "ios" ? (
|
||||
<SongSwipeRow
|
||||
group={swipe.group}
|
||||
onPlayNext={swipe.onPlayNext}
|
||||
onAddToQueue={swipe.onAddToQueue}
|
||||
onRemove={swipe.onRemove}
|
||||
backgroundColor={swipe.backgroundColor}
|
||||
onPress={onPress}
|
||||
style={rowStyle}
|
||||
@@ -154,7 +156,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
palette,
|
||||
inset,
|
||||
swipe,
|
||||
removable,
|
||||
onPlay,
|
||||
onAction,
|
||||
}: {
|
||||
@@ -166,12 +167,8 @@ export const SongListRow = memo(function SongListRow({
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Shows "Remove from Playlist" in the context menu. */
|
||||
removable?: boolean
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
@@ -199,7 +196,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
playlistLabel,
|
||||
showRemoveFromPlaylist: removable,
|
||||
navigation: {
|
||||
artist: { id: song.artist.id },
|
||||
album: { id: song.album.id },
|
||||
|
||||
@@ -4,15 +4,19 @@ import { Stack } from "expo-router"
|
||||
|
||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { filterSongs } from "@otunes/convex/client/song-search"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
export function usePlaylistSearch(songs: BrowseSong[]) {
|
||||
const search = useDebouncedSearch()
|
||||
const filteredSongs = useMemo(
|
||||
() => filterSongs(songs, search.searchQuery),
|
||||
[songs, search.searchQuery]
|
||||
)
|
||||
const filteredSongs = useMemo(() => {
|
||||
const query = search.searchQuery.toLowerCase()
|
||||
if (!query) return songs
|
||||
return songs.filter((song) =>
|
||||
[song.title, song.artist.name, song.album.title].some((value) =>
|
||||
value.toLowerCase().includes(query)
|
||||
)
|
||||
)
|
||||
}, [songs, search.searchQuery])
|
||||
|
||||
return { ...search, filteredSongs }
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import { Image } from "expo-image"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { radius, useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
@@ -14,7 +13,6 @@ export function ProfileHeaderButton() {
|
||||
const openSettings = useOpenSettings()
|
||||
const colors = useThemeColors()
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const imageUrl = useProfileImageUrl(user?.image)
|
||||
|
||||
if (tabletLayout) return null
|
||||
|
||||
@@ -35,9 +33,9 @@ export function ProfileHeaderButton() {
|
||||
},
|
||||
]}
|
||||
>
|
||||
{imageUrl ? (
|
||||
{user?.image ? (
|
||||
<Image
|
||||
source={{ uri: imageUrl }}
|
||||
source={{ uri: user.image }}
|
||||
style={styles.image}
|
||||
contentFit="cover"
|
||||
/>
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
CollectionDivider,
|
||||
collectionInset,
|
||||
} from "@/components/collection-list"
|
||||
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
|
||||
import { Link } from "expo-router"
|
||||
import { useHeaderHeight } from "expo-router/react-navigation"
|
||||
import Reanimated from "react-native-reanimated"
|
||||
import { type ComponentProps, type ReactNode } from "react"
|
||||
import { type ReactNode, type ComponentProps } from "react"
|
||||
import {
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
View,
|
||||
type DimensionValue,
|
||||
@@ -22,42 +17,34 @@ import {
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/**
|
||||
* Loading screens never scroll, so they cannot rely on scroll-view inset
|
||||
* adjustment. iOS headers are transparent and overlap the screen; Android
|
||||
* headers are opaque and already sit above it.
|
||||
*/
|
||||
function SkeletonScreen({
|
||||
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
||||
function SkeletonContent({
|
||||
children,
|
||||
style,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
embedded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
if (embedded) return <>{children}</>
|
||||
|
||||
return (
|
||||
<Reanimated.View
|
||||
onLayout={onLayout}
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.screen,
|
||||
{
|
||||
backgroundColor: backgroundColor ?? colors.background,
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
},
|
||||
style,
|
||||
]}
|
||||
>
|
||||
{children}
|
||||
</Reanimated.View>
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -74,103 +61,56 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
)
|
||||
}
|
||||
|
||||
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
|
||||
function TextLine({
|
||||
width,
|
||||
fontSize,
|
||||
height = 14,
|
||||
}: {
|
||||
width: DimensionValue
|
||||
fontSize: number
|
||||
height?: number
|
||||
}) {
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
width,
|
||||
height: Math.round(fontSize * 1.2),
|
||||
justifyContent: "center",
|
||||
}}
|
||||
>
|
||||
<Skeleton
|
||||
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
|
||||
/>
|
||||
</View>
|
||||
)
|
||||
return <Skeleton style={{ width, height, borderRadius: 4 }} />
|
||||
}
|
||||
|
||||
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
|
||||
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
|
||||
export function SongRowSkeleton() {
|
||||
const colors = useThemeColors()
|
||||
const meta = (
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" fontSize={16} />
|
||||
<View style={styles.songSubtitle}>
|
||||
<TextLine width="40%" fontSize={14} />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
if (inset) {
|
||||
return (
|
||||
<View style={styles.insetRow}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
<View
|
||||
style={[
|
||||
styles.insetSongContent,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
>
|
||||
{meta}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<View style={[styles.songRow, { borderBottomColor: colors.border }]}>
|
||||
<Skeleton style={styles.songArtwork} />
|
||||
{meta}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function TrackRowSkeleton() {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<View style={styles.trackRow}>
|
||||
<View style={styles.trackNumber}>
|
||||
<TextLine width={12} fontSize={16} />
|
||||
</View>
|
||||
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
|
||||
<TextLine width="55%" fontSize={16} />
|
||||
<View style={styles.songMeta}>
|
||||
<TextLine width="60%" height={16} />
|
||||
<TextLine width="40%" />
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
||||
return Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} inset={inset} />
|
||||
))
|
||||
}
|
||||
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
embedded = false,
|
||||
}: {
|
||||
rows?: number
|
||||
embedded?: boolean
|
||||
}) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<SongRows rows={rows} />
|
||||
</SkeletonScreen>
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
)
|
||||
}
|
||||
|
||||
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
|
||||
function CardSkeleton({
|
||||
width,
|
||||
minHeight,
|
||||
round = false,
|
||||
}: {
|
||||
width: number
|
||||
minHeight?: number
|
||||
round?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.card, { width, minHeight }]}>
|
||||
<View style={[styles.card, { width }]}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width,
|
||||
@@ -178,37 +118,35 @@ function CardSkeleton({
|
||||
borderRadius: round ? width / 2 : radius.md,
|
||||
}}
|
||||
/>
|
||||
<TextLine width="80%" fontSize={14} />
|
||||
{round ? null : <TextLine width="50%" fontSize={12} />}
|
||||
<TextLine width="80%" />
|
||||
{round ? null : <TextLine width="50%" height={12} />}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
|
||||
function MediaGridContent({
|
||||
items,
|
||||
contentInset,
|
||||
header,
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
embedded = false,
|
||||
}: {
|
||||
items: number
|
||||
contentInset: boolean
|
||||
header?: ReactNode
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||
useMediaGridLayout()
|
||||
return (
|
||||
<>
|
||||
{header}
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
{
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
// FlatList applies its content gap after the list header as well.
|
||||
marginTop: header && !tabletLayout ? gap : 0,
|
||||
gap,
|
||||
},
|
||||
]}
|
||||
@@ -216,47 +154,20 @@ function MediaGridContent({
|
||||
{Array.from(
|
||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||
(_, index) => (
|
||||
<CardSkeleton
|
||||
key={index}
|
||||
width={cardWidth}
|
||||
minHeight={
|
||||
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
|
||||
}
|
||||
/>
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
header,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
|
||||
header?: ReactNode
|
||||
}) {
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<MediaGridContent
|
||||
items={items}
|
||||
contentInset={contentInset}
|
||||
header={header}
|
||||
/>
|
||||
</SkeletonScreen>
|
||||
</SkeletonContent>
|
||||
)
|
||||
}
|
||||
|
||||
export function CarouselSkeleton() {
|
||||
return (
|
||||
<View style={styles.carousel}>
|
||||
<TextLine width={160} fontSize={22} />
|
||||
<TextLine width={160} height={22} />
|
||||
<View style={styles.carouselRow}>
|
||||
{Array.from({ length: 8 }, (_, index) => (
|
||||
{Array.from({ length: 3 }, (_, index) => (
|
||||
<CardSkeleton key={index} width={carouselCardWidth} />
|
||||
))}
|
||||
</View>
|
||||
@@ -265,148 +176,140 @@ export function CarouselSkeleton() {
|
||||
}
|
||||
|
||||
export function HomeSkeleton() {
|
||||
const headerHeight = useHeaderHeight()
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
<View style={styles.home}>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</View>
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
function HeroActions({
|
||||
favorite = true,
|
||||
reverse = false,
|
||||
}: {
|
||||
favorite?: boolean
|
||||
reverse?: boolean
|
||||
}) {
|
||||
return (
|
||||
<View style={[styles.actions, reverse && styles.actionsReverse]}>
|
||||
{favorite ? <Skeleton style={styles.iconAction} /> : null}
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.home,
|
||||
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
<CarouselSkeleton />
|
||||
<CarouselSkeleton />
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
||||
export function CollectionDetailSkeleton({
|
||||
variant,
|
||||
zoomCoverSize,
|
||||
style,
|
||||
round = false,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
variant: "album" | "playlist" | "favorites" | "artist"
|
||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||
zoomCoverSize?: number
|
||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
||||
round?: boolean
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
||||
|
||||
if (variant === "artist" || variant === "favorites") {
|
||||
const artist = variant === "artist"
|
||||
const coverSize = artist ? 180 : 200
|
||||
const hero = (
|
||||
<View style={styles.centeredHero}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: artist ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
<TextLine width={200} fontSize={artist ? 28 : 24} />
|
||||
<HeroActions favorite={artist} />
|
||||
</View>
|
||||
)
|
||||
return (
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
onLayout={onLayout}
|
||||
>
|
||||
{artist ? (
|
||||
<MediaGridContent items={4} contentInset={false} header={hero} />
|
||||
) : (
|
||||
<>
|
||||
{hero}
|
||||
<CollectionDivider />
|
||||
<SongRows rows={8} inset />
|
||||
</>
|
||||
)}
|
||||
</SkeletonScreen>
|
||||
)
|
||||
}
|
||||
|
||||
const album = variant === "album"
|
||||
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
|
||||
const coverSize =
|
||||
!round && landscape
|
||||
? tabletCoverSize!
|
||||
: (zoomCoverSize ?? (round ? 180 : 210))
|
||||
const actions = (
|
||||
<View style={styles.actions}>
|
||||
<Skeleton style={styles.iconAction} />
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
)
|
||||
const artwork = (
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
)
|
||||
return (
|
||||
<SkeletonScreen
|
||||
style={style}
|
||||
backgroundColor={backgroundColor}
|
||||
<Reanimated.ScrollView
|
||||
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
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: radius.lg,
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={<HeroActions favorite={album} reverse={landscape} />}
|
||||
>
|
||||
<TextLine
|
||||
width={landscape ? "85%" : 200}
|
||||
fontSize={landscape ? 22 : 24}
|
||||
/>
|
||||
<TextLine
|
||||
width={landscape ? "60%" : 120}
|
||||
fontSize={landscape ? 22 : 16}
|
||||
/>
|
||||
{album ? (
|
||||
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
|
||||
) : null}
|
||||
</CollectionHero>
|
||||
<CollectionDivider />
|
||||
{album ? (
|
||||
Array.from({ length: 10 }, (_, index) => (
|
||||
<TrackRowSkeleton key={index} />
|
||||
))
|
||||
{round ? (
|
||||
<View style={styles.artistHero}>
|
||||
{zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)}
|
||||
<TextLine width={200} height={24} />
|
||||
<TextLine width={120} height={16} />
|
||||
{actions}
|
||||
</View>
|
||||
) : (
|
||||
<SongRows rows={8} inset />
|
||||
<CollectionHero
|
||||
artwork={
|
||||
zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)
|
||||
}
|
||||
actions={actions}
|
||||
>
|
||||
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
|
||||
<TextLine
|
||||
width={landscape && !round ? "60%" : 120}
|
||||
height={landscape && !round ? 22 : 16}
|
||||
/>
|
||||
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
|
||||
</CollectionHero>
|
||||
)}
|
||||
</SkeletonScreen>
|
||||
{round ? (
|
||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||
) : (
|
||||
<SongListSkeleton rows={8} embedded />
|
||||
)}
|
||||
</Reanimated.ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonScreen>
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" fontSize={16} />
|
||||
</View>
|
||||
))}
|
||||
</SkeletonScreen>
|
||||
<SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" height={16} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
screen: { flex: 1, overflow: "hidden" },
|
||||
songRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
@@ -416,55 +319,22 @@ const styles = StyleSheet.create({
|
||||
paddingHorizontal: spacing.lg,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
insetRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
paddingLeft: collectionInset,
|
||||
},
|
||||
insetSongContent: {
|
||||
flex: 1,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
alignSelf: "stretch",
|
||||
minHeight: 64,
|
||||
paddingVertical: 10,
|
||||
marginRight: collectionInset,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
songArtwork: { width: 44, height: 44, borderRadius: 6 },
|
||||
songMeta: { flex: 1 },
|
||||
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,
|
||||
},
|
||||
songMeta: { flex: 1, gap: 6 },
|
||||
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" },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: spacing.sm,
|
||||
marginTop: spacing.sm,
|
||||
},
|
||||
actionsReverse: { flexDirection: "row-reverse" },
|
||||
iconAction: { width: 44, height: 44, borderRadius: 22 },
|
||||
playButton: { width: 160, height: 44, borderRadius: 999 },
|
||||
artistRow: {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { SymbolView } from "expo-symbols"
|
||||
import {
|
||||
@@ -9,7 +8,6 @@ import {
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
@@ -28,22 +26,14 @@ import Animated, {
|
||||
import { scheduleOnRN } from "react-native-worklets"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
|
||||
const IS_ANDROID = Platform.OS === "android"
|
||||
|
||||
const ACTION_WIDTH = 82
|
||||
/** Width of each action when two share a side. */
|
||||
const PAIRED_ACTION_WIDTH = 72
|
||||
const SPRING = { duration: 450, dampingRatio: 1 }
|
||||
|
||||
function impact() {
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium)
|
||||
}
|
||||
|
||||
/**
|
||||
* A tap competes with the swipe so dragging a moving row never starts playback.
|
||||
* A full swipe commits the outer action: Add to Queue on the leading side, and
|
||||
* Remove on the trailing side when `onRemove` is set.
|
||||
*/
|
||||
/** A tap competes with the swipe so dragging a moving row never starts playback. */
|
||||
export function SongSwipeRow({
|
||||
children,
|
||||
style,
|
||||
@@ -51,8 +41,6 @@ export function SongSwipeRow({
|
||||
group,
|
||||
onPress,
|
||||
onPlayNext,
|
||||
onAddToQueue,
|
||||
onRemove,
|
||||
}: {
|
||||
children: ReactNode
|
||||
style?: StyleProp<ViewStyle>
|
||||
@@ -60,11 +48,7 @@ export function SongSwipeRow({
|
||||
group: SwipeRowGroup
|
||||
onPress?: () => void
|
||||
onPlayNext: () => void
|
||||
onAddToQueue: () => void
|
||||
onRemove?: () => void
|
||||
}) {
|
||||
const hasRemove = !!onRemove
|
||||
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
|
||||
const x = useSharedValue(0)
|
||||
const startX = useSharedValue(0)
|
||||
const width = useSharedValue(0)
|
||||
@@ -94,11 +78,10 @@ export function SongSwipeRow({
|
||||
const activate = useCallback(
|
||||
(side: number) => {
|
||||
close()
|
||||
if (side > 0) onAddToQueue()
|
||||
// Without Remove, the trailing action is the Download placeholder.
|
||||
else onRemove?.()
|
||||
if (side > 0) onPlayNext()
|
||||
// Download is intentionally a placeholder.
|
||||
},
|
||||
[close, onAddToQueue, onRemove]
|
||||
[close, onPlayNext]
|
||||
)
|
||||
const tapRow = useCallback(() => {
|
||||
if (open) close()
|
||||
@@ -122,11 +105,7 @@ export function SongSwipeRow({
|
||||
Math.min(width.value, startX.value + event.translationX)
|
||||
)
|
||||
const commit =
|
||||
Math.abs(x.value) >
|
||||
Math.max(
|
||||
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth,
|
||||
width.value * 0.55
|
||||
)
|
||||
Math.abs(x.value) > Math.max(ACTION_WIDTH, width.value * 0.55)
|
||||
if (commit !== committed.value) {
|
||||
committed.value = commit
|
||||
commitProgress.value = withSpring(commit ? 1 : 0, SPRING)
|
||||
@@ -145,13 +124,10 @@ export function SongSwipeRow({
|
||||
Math.abs(x.value) > 10 && projected * side > ACTION_WIDTH / 2
|
||||
? side
|
||||
: 0
|
||||
x.value = withSpring(
|
||||
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth),
|
||||
{
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
}
|
||||
)
|
||||
x.value = withSpring(target * ACTION_WIDTH, {
|
||||
...SPRING,
|
||||
velocity: event.velocityX,
|
||||
})
|
||||
scheduleOnRN(settle, target)
|
||||
})
|
||||
.onFinalize((_event, success) => {
|
||||
@@ -176,21 +152,18 @@ export function SongSwipeRow({
|
||||
settle,
|
||||
startX,
|
||||
tapRow,
|
||||
trailingWidth,
|
||||
width,
|
||||
x,
|
||||
])
|
||||
|
||||
const rowStyle = useAnimatedStyle(() => ({
|
||||
transform: [{ translateX: x.value }],
|
||||
borderRadius: IS_ANDROID
|
||||
? 0
|
||||
: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, height.value / 2],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
borderRadius: interpolate(
|
||||
Math.abs(x.value),
|
||||
[0, 40],
|
||||
[0, height.value / 2],
|
||||
Extrapolation.CLAMP
|
||||
),
|
||||
}))
|
||||
const fillStyle = useAnimatedStyle(() => ({
|
||||
opacity: interpolate(
|
||||
@@ -217,60 +190,25 @@ export function SongSwipeRow({
|
||||
open={open === 1}
|
||||
onPress={() => activate(1)}
|
||||
/>
|
||||
<SwipeAction
|
||||
side={1}
|
||||
secondary
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === 1}
|
||||
onPress={() => {
|
||||
close()
|
||||
onPlayNext()
|
||||
}}
|
||||
/>
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
paired={hasRemove}
|
||||
remove={hasRemove}
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={() => activate(-1)}
|
||||
/>
|
||||
{hasRemove && (
|
||||
<SwipeAction
|
||||
side={-1}
|
||||
secondary
|
||||
paired
|
||||
x={x}
|
||||
height={height}
|
||||
progress={commitProgress}
|
||||
open={open === -1}
|
||||
onPress={close}
|
||||
/>
|
||||
)}
|
||||
<GestureDetector gesture={gesture}>
|
||||
<Animated.View
|
||||
accessible
|
||||
accessibilityRole="button"
|
||||
onAccessibilityTap={tapRow}
|
||||
accessibilityActions={[
|
||||
{ name: "addToQueue", label: "Add to Queue" },
|
||||
{ name: "playNext", label: "Play Next" },
|
||||
{ name: "download", label: "Download" },
|
||||
...(hasRemove
|
||||
? [{ name: "remove", label: "Remove from Playlist" }]
|
||||
: []),
|
||||
]}
|
||||
onAccessibilityAction={(event) => {
|
||||
if (event.nativeEvent.actionName === "remove") activate(-1)
|
||||
if (event.nativeEvent.actionName === "addToQueue") activate(1)
|
||||
if (event.nativeEvent.actionName === "playNext") {
|
||||
close()
|
||||
onPlayNext()
|
||||
}
|
||||
if (event.nativeEvent.actionName === "playNext") activate(1)
|
||||
}}
|
||||
style={[styles.row, { backgroundColor }, rowStyle]}
|
||||
>
|
||||
@@ -287,9 +225,6 @@ export function SongSwipeRow({
|
||||
|
||||
function SwipeAction({
|
||||
side,
|
||||
secondary = false,
|
||||
paired = side > 0,
|
||||
remove = false,
|
||||
x,
|
||||
height,
|
||||
progress,
|
||||
@@ -297,48 +232,22 @@ function SwipeAction({
|
||||
onPress,
|
||||
}: {
|
||||
side: 1 | -1
|
||||
secondary?: boolean
|
||||
paired?: boolean
|
||||
remove?: boolean
|
||||
x: SharedValue<number>
|
||||
height: SharedValue<number>
|
||||
progress: SharedValue<number>
|
||||
open: boolean
|
||||
onPress: () => void
|
||||
}) {
|
||||
const actionStyle = useAnimatedStyle(() => {
|
||||
const revealed = Math.max(0, x.value * side)
|
||||
const primaryWidth = (revealed * (1 + progress.value)) / 2
|
||||
return {
|
||||
width: !paired
|
||||
? revealed
|
||||
: secondary
|
||||
? revealed - primaryWidth
|
||||
: primaryWidth,
|
||||
...(secondary
|
||||
? side > 0
|
||||
? { left: primaryWidth }
|
||||
: { right: primaryWidth }
|
||||
: {}),
|
||||
}
|
||||
})
|
||||
const actionStyle = useAnimatedStyle(() => ({
|
||||
width: Math.max(0, x.value * side),
|
||||
}))
|
||||
const pillStyle = useAnimatedStyle(() => {
|
||||
const total = Math.max(0, x.value * side)
|
||||
const revealed = !paired
|
||||
? total
|
||||
: (total * (secondary ? 1 - progress.value : 1 + progress.value)) / 2
|
||||
if (IS_ANDROID) {
|
||||
return { width: revealed, height: height.value, borderRadius: 0 }
|
||||
}
|
||||
const revealed = Math.max(0, x.value * side)
|
||||
const resting = Math.max(
|
||||
0,
|
||||
Math.min(
|
||||
revealed - (paired ? 10 : 20),
|
||||
interpolate(
|
||||
revealed,
|
||||
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220],
|
||||
[0, 62, 200]
|
||||
)
|
||||
revealed - 20,
|
||||
interpolate(revealed, [24, ACTION_WIDTH, 220], [0, 62, 200])
|
||||
)
|
||||
)
|
||||
const pillWidth =
|
||||
@@ -383,65 +292,27 @@ function SwipeAction({
|
||||
>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={
|
||||
remove
|
||||
? "Remove from Playlist"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "Play Next"
|
||||
: "Add to Queue"
|
||||
: "Download"
|
||||
}
|
||||
accessibilityLabel={side > 0 ? "Play Next" : "Download"}
|
||||
onPress={onPress}
|
||||
style={styles.actionButton}
|
||||
>
|
||||
<Animated.View
|
||||
style={[
|
||||
styles.pill,
|
||||
{
|
||||
backgroundColor: remove
|
||||
? IS_ANDROID
|
||||
? "#d32f2f"
|
||||
: "#ff3b30"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "#6b5bff"
|
||||
: "#f29943"
|
||||
: "#008dff",
|
||||
},
|
||||
{ backgroundColor: side > 0 ? "#6b5bff" : "#008dff" },
|
||||
pillStyle,
|
||||
]}
|
||||
>
|
||||
<Animated.View style={iconStyle}>
|
||||
{IS_ANDROID ? (
|
||||
<Ionicons
|
||||
name={
|
||||
remove
|
||||
? "trash-outline"
|
||||
: side < 0
|
||||
? "arrow-down"
|
||||
: secondary
|
||||
? "play-forward"
|
||||
: "list"
|
||||
}
|
||||
size={22}
|
||||
color="white"
|
||||
/>
|
||||
) : (
|
||||
<SymbolView
|
||||
name={
|
||||
remove
|
||||
? "trash"
|
||||
: side > 0
|
||||
? secondary
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "text.line.last.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
/>
|
||||
)}
|
||||
<SymbolView
|
||||
name={
|
||||
side > 0
|
||||
? "text.line.first.and.arrowtriangle.forward"
|
||||
: "arrow.down"
|
||||
}
|
||||
size={22}
|
||||
tintColor="white"
|
||||
/>
|
||||
</Animated.View>
|
||||
</Animated.View>
|
||||
</Pressable>
|
||||
|
||||
@@ -3,13 +3,13 @@ import { SafeAreaView } from "react-native-safe-area-context"
|
||||
import { Platform } from "react-native"
|
||||
import type { ReactNode } from "react"
|
||||
|
||||
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||
|
||||
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
||||
export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
||||
return (
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
|
||||
@@ -19,9 +19,6 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** Height reserved under each tablet card's artwork for its title and subtitle. */
|
||||
export const tabletCardTextHeight = 48
|
||||
|
||||
type GridProps = {
|
||||
content: MediaItem[]
|
||||
paddingBottom: number
|
||||
@@ -51,7 +48,7 @@ export function TabletMediaGrid({
|
||||
const [headerHeight, setHeaderHeight] = useState(0)
|
||||
const [scrollY, setScrollY] = useState(0)
|
||||
const lastRequestedLength = useRef(-1)
|
||||
const rowHeight = cardWidth + tabletCardTextHeight + gap
|
||||
const rowHeight = cardWidth + 48 + gap
|
||||
const firstRow = Math.max(
|
||||
0,
|
||||
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||
|
||||
@@ -18,7 +18,7 @@ import {
|
||||
import { useTabletPlayerInsets } from "@/contexts/tablet-player-layout"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { MediaActionMenu } from "@/components/media-context-menu"
|
||||
import { MediaActionMenu } from "@/components/media-actions-sheet"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
|
||||
import { Pressable, StyleSheet, View, useWindowDimensions } from "react-native"
|
||||
import {
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
useWindowDimensions,
|
||||
} from "react-native"
|
||||
import Animated, {
|
||||
Easing,
|
||||
ReduceMotion,
|
||||
@@ -8,7 +14,7 @@ import Animated, {
|
||||
useSharedValue,
|
||||
withTiming,
|
||||
} from "react-native-reanimated"
|
||||
import { GestureDetector, type Gesture } from "react-native-gesture-handler"
|
||||
import { GestureDetector, Gesture } from "react-native-gesture-handler"
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
import { useRouter } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
@@ -16,12 +22,12 @@ import { StatusBar } from "expo-status-bar"
|
||||
import { AudioOutputButton } from "@/components/audio-output-button"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { NowPlayingQueue } from "@/components/now-playing-queue"
|
||||
import { PlayerProgress } from "@/components/player-progress"
|
||||
import { PlayerSlider } from "@/components/player-slider"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
|
||||
@@ -36,7 +42,7 @@ export function TabletNowPlaying({
|
||||
colors,
|
||||
backgroundStyle,
|
||||
dismissStyle,
|
||||
dismissGestures,
|
||||
dismissGesture,
|
||||
showQueue,
|
||||
toggleQueue,
|
||||
metadata,
|
||||
@@ -44,10 +50,7 @@ export function TabletNowPlaying({
|
||||
colors: NowPlayingColors
|
||||
backgroundStyle: ComponentProps<typeof Animated.View>["style"]
|
||||
dismissStyle: ComponentProps<typeof Animated.View>["style"]
|
||||
dismissGestures: {
|
||||
handle: ReturnType<typeof Gesture.Pan>
|
||||
artwork: ReturnType<typeof Gesture.Pan>
|
||||
}
|
||||
dismissGesture: () => ReturnType<typeof Gesture.Pan>
|
||||
showQueue: boolean
|
||||
toggleQueue: () => void
|
||||
metadata: ReactNode
|
||||
@@ -56,11 +59,22 @@ export function TabletNowPlaying({
|
||||
const insets = useSafeAreaInsets()
|
||||
const { width, height } = useWindowDimensions()
|
||||
const { config } = useServerConfig()
|
||||
const { currentSong, isPlaying, shuffleEnabled, repeatEnabled } =
|
||||
usePlaybackQueue()
|
||||
const { setIsPlaying, skipNext, skipPrevious, toggleShuffle, cycleRepeat } =
|
||||
usePlaybackActions()
|
||||
const {
|
||||
currentSong,
|
||||
currentTime,
|
||||
duration,
|
||||
isPlaying,
|
||||
setIsPlaying,
|
||||
seekTo,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
} = usePlayback()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const [queueHeight, setQueueHeight] = useState(0)
|
||||
const wideLayout = width >= 700
|
||||
const sideBySide = showQueue && wideLayout
|
||||
@@ -99,6 +113,7 @@ export function TabletNowPlaying({
|
||||
opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
|
||||
transform: [{ translateX: (1 - progress.value) * 48 }],
|
||||
}))
|
||||
const time = scrubTime ?? currentTime
|
||||
if (!currentSong || !config) return null
|
||||
const control = (
|
||||
label: string,
|
||||
@@ -135,7 +150,7 @@ export function TabletNowPlaying({
|
||||
return (
|
||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||
<GestureDetector gesture={dismissGestures.handle}>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<Pressable
|
||||
onPress={() => router.back()}
|
||||
accessibilityRole="button"
|
||||
@@ -149,7 +164,7 @@ export function TabletNowPlaying({
|
||||
</GestureDetector>
|
||||
<View style={styles.body}>
|
||||
<Animated.View style={[styles.main, mainMotion]}>
|
||||
<GestureDetector gesture={dismissGestures.artwork}>
|
||||
<GestureDetector gesture={dismissGesture()}>
|
||||
<View style={styles.artworkArea}>
|
||||
<Animated.View style={artworkMotion}>
|
||||
<CoverImage
|
||||
@@ -162,7 +177,31 @@ export function TabletNowPlaying({
|
||||
</GestureDetector>
|
||||
<Animated.View style={[styles.controls, controlsMotion]}>
|
||||
<View style={styles.meta}>{metadata}</View>
|
||||
<PlayerProgress colors={colors} />
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Playback position"
|
||||
value={time}
|
||||
maximumValue={duration}
|
||||
fillColor={colors.sliderFill}
|
||||
activeFillColor={colors.foreground}
|
||||
trackColor={colors.sliderTrack}
|
||||
onValueChange={setScrubTime}
|
||||
onSlidingComplete={(value) => {
|
||||
void seekTo(value)
|
||||
setScrubTime(null)
|
||||
}}
|
||||
/>
|
||||
<View style={styles.times}>
|
||||
<Text
|
||||
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
{formatDuration(time)}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
{formatRemainingDuration(time, duration).replace("-", "−")}
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.transport}>
|
||||
{control(
|
||||
"Shuffle",
|
||||
@@ -337,6 +376,12 @@ const styles = StyleSheet.create({
|
||||
},
|
||||
controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
|
||||
meta: { height: 48 },
|
||||
times: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-between",
|
||||
marginTop: -4,
|
||||
},
|
||||
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||
transport: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,19 +1,12 @@
|
||||
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||
import { requireNativeView } from "expo"
|
||||
import { useIsFocused, useRouter } from "expo-router"
|
||||
import { useMemo } from "react"
|
||||
import { useIsFocused } from "expo-router"
|
||||
import { Platform, type ViewProps } from "react-native"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||
import { tabPath } from "@/lib/app-navigation"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { playlistCoverUrl } from "@/lib/urls"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
|
||||
|
||||
const NativeSidebar =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
@@ -22,39 +15,15 @@ const NativeSidebar =
|
||||
initials: string
|
||||
imageURL?: string
|
||||
active: boolean
|
||||
playlists: SidebarPlaylist[]
|
||||
onProfilePress: () => void
|
||||
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
|
||||
}
|
||||
>("TabletSidebar")
|
||||
: null
|
||||
|
||||
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
|
||||
export function TabletSidebar() {
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
|
||||
const { config } = useServerConfig()
|
||||
const imageUrl = useProfileImageUrl(user?.image)
|
||||
const openSettings = useOpenSettings()
|
||||
const router = useRouter()
|
||||
const active = useIsFocused()
|
||||
const serverUrl = config?.serverUrl
|
||||
|
||||
const playlists = useMemo(
|
||||
() =>
|
||||
[
|
||||
...(sidebarPlaylists?.owned ?? []),
|
||||
...(sidebarPlaylists?.subscribed ?? []),
|
||||
].map((playlist): SidebarPlaylist => ({
|
||||
id: playlist.id,
|
||||
title: playlist.title,
|
||||
imageURL:
|
||||
serverUrl && playlist.cover
|
||||
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
|
||||
: undefined,
|
||||
})),
|
||||
[serverUrl, sidebarPlaylists]
|
||||
)
|
||||
|
||||
if (!NativeSidebar) return null
|
||||
return (
|
||||
@@ -62,13 +31,9 @@ export function TabletSidebar() {
|
||||
style={{ position: "absolute", width: 0, height: 0 }}
|
||||
accountName={user?.name ?? "Account"}
|
||||
initials={initialsFromName(user?.name ?? "Me")}
|
||||
imageURL={imageUrl}
|
||||
imageURL={user?.image}
|
||||
active={active}
|
||||
playlists={playlists}
|
||||
onProfilePress={openSettings}
|
||||
onPlaylistPress={({ nativeEvent }) =>
|
||||
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Platform,
|
||||
@@ -73,8 +74,20 @@ export function Button({
|
||||
<ActivityIndicator color={textColor} />
|
||||
) : (
|
||||
<View style={styles.buttonContent}>
|
||||
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
||||
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
||||
{icon ? (
|
||||
<PaletteIcon
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
name={icon}
|
||||
size={18}
|
||||
color={textColor}
|
||||
/>
|
||||
) : null}
|
||||
<PaletteText
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
style={[styles.buttonText, { color: textColor }]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
</View>
|
||||
)}
|
||||
</Pressable>
|
||||
|
||||
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
|
||||
{ artistId }
|
||||
)
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
setPendingSongIds(songIds.flat())
|
||||
setPendingSongIds(songIds)
|
||||
setOpen(true)
|
||||
} catch (error) {
|
||||
if (selectionRequestIdRef.current !== requestId) return
|
||||
|
||||
@@ -14,10 +14,14 @@ import {
|
||||
useState,
|
||||
type PropsWithChildren,
|
||||
} from "react"
|
||||
import { Platform } from "react-native"
|
||||
import {
|
||||
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
||||
import Reanimated, {
|
||||
useSharedValue,
|
||||
useAnimatedStyle,
|
||||
useAnimatedReaction,
|
||||
useAnimatedRef,
|
||||
setNativeProps,
|
||||
processColor,
|
||||
withTiming,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
@@ -25,17 +29,19 @@ import {
|
||||
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
|
||||
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
|
||||
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
|
||||
selectedColor: string
|
||||
}
|
||||
|
||||
type TabTheme = {
|
||||
palette: CoverPalette
|
||||
colors: SharedValue<PaletteColors>
|
||||
hasArtworkPalette: boolean
|
||||
tabletBackground: SharedValue<string>
|
||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||
}
|
||||
const AndroidTabTheme = createContext<TabTheme | null>(null)
|
||||
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette = Platform.OS === "android" || isTablet
|
||||
|
||||
function useDefaultPalette() {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
@@ -54,37 +60,52 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
palette.foreground !== defaultPalette.foreground ||
|
||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||
palette.accent !== defaultPalette.accent
|
||||
const tabletBackground = useSharedValue(defaultPalette.background)
|
||||
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
|
||||
const animatedColors = useSharedValue<PaletteColors>({
|
||||
...defaultColors,
|
||||
selectedColor: defaultPalette.accentText,
|
||||
})
|
||||
useLayoutEffect(() => {
|
||||
if (!isTablet) return
|
||||
tabletBackground.value = withTiming(palette.background, {
|
||||
duration: TABLET_FADE_MS,
|
||||
})
|
||||
}, [tabletBackground, palette.background])
|
||||
const { isDark: _isDark, ...colors } = palette
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: hasArtwork
|
||||
? palette.foreground
|
||||
: defaultPalette.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
}, [animatedColors, palette, defaultPalette, hasArtwork])
|
||||
const paletteOwner = useRef<string | null>(null)
|
||||
const setPalette = useCallback(
|
||||
(palette: CoverPalette | null, owner: string) => {
|
||||
if (!palette && paletteOwner.current !== owner) return
|
||||
paletteOwner.current = palette ? owner : null
|
||||
if (isTablet) {
|
||||
// React may defer commits while the iPad stack is animating.
|
||||
tabletBackground.value = withTiming(
|
||||
(palette ?? defaultPalette).background,
|
||||
{ duration: TABLET_FADE_MS }
|
||||
)
|
||||
}
|
||||
// Start on the UI thread immediately. React may defer commits while
|
||||
// the native stack is animating, including transitionStart state updates.
|
||||
const target = palette ?? defaultPalette
|
||||
const { isDark: _isDark, ...colors } = target
|
||||
animatedColors.value = withTiming(
|
||||
{
|
||||
...colors,
|
||||
selectedColor: palette ? target.foreground : target.accentText,
|
||||
},
|
||||
{ duration: PALETTE_FADE_MS }
|
||||
)
|
||||
setScreen(palette ? { palette, owner } : null)
|
||||
},
|
||||
[tabletBackground, defaultPalette]
|
||||
[animatedColors, defaultPalette]
|
||||
)
|
||||
const artworkPalette = hasArtwork ? palette : null
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
palette: hasArtwork ? palette : defaultPalette,
|
||||
hasArtworkPalette: hasArtwork,
|
||||
tabletBackground,
|
||||
palette: artworkPalette ?? defaultPalette,
|
||||
colors: animatedColors,
|
||||
hasArtworkPalette: artworkPalette !== null,
|
||||
setPalette,
|
||||
}),
|
||||
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground]
|
||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
||||
)
|
||||
return (
|
||||
<AndroidTabTheme.Provider value={value}>
|
||||
@@ -93,6 +114,50 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
|
||||
* directly so appearance updates stay on the UI thread with the page colors.
|
||||
*/
|
||||
export function useAndroidNativeTabColors() {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
const ref = useAnimatedRef<HostInstance>()
|
||||
const mounted = useSharedValue(false)
|
||||
const attach = useCallback(
|
||||
(host: HostInstance | null) => {
|
||||
if (host) ref(host)
|
||||
mounted.value = host !== null
|
||||
},
|
||||
[ref, mounted]
|
||||
)
|
||||
|
||||
useAnimatedReaction(
|
||||
() => ({ colors: colors?.value, mounted: mounted.value }),
|
||||
({ colors: palette, mounted: ready }) => {
|
||||
if (Platform.OS !== "android" || !ready || !palette) return
|
||||
const normal = processColor(palette.secondaryForeground)
|
||||
const selected = processColor(palette.selectedColor)
|
||||
setNativeProps(ref, {
|
||||
standardAppearance: {
|
||||
tabBarBackgroundColor: processColor("transparent"),
|
||||
tabBarItemRippleColor: selected,
|
||||
tabBarItemActiveIndicatorEnabled: false,
|
||||
tabBarItemTitleSmallLabelFontSize: 10,
|
||||
tabBarItemTitleLargeLabelFontSize: 10,
|
||||
normal: {
|
||||
tabBarItemTitleFontColor: normal,
|
||||
tabBarItemIconColor: normal,
|
||||
},
|
||||
selected: {
|
||||
tabBarItemTitleFontColor: selected,
|
||||
tabBarItemIconColor: selected,
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
)
|
||||
return { ref: attach, style: { backgroundColor: "transparent" } }
|
||||
}
|
||||
|
||||
export function useAndroidTabPalette() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
@@ -103,29 +168,53 @@ export function useAndroidTabHasArtworkPalette() {
|
||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||
}
|
||||
|
||||
/** iPad fades the sidebar and content pane together; other layouts skip it. */
|
||||
export function useTabletBackgroundStyle() {
|
||||
const background = useContext(AndroidTabTheme)?.tabletBackground
|
||||
export function useAndroidTabBackgroundStyle() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const fallback = useDefaultPalette().background
|
||||
const colors = theme?.colors
|
||||
return useAnimatedStyle(() =>
|
||||
isTablet && background ? { backgroundColor: background.value } : {}
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
? { backgroundColor: colors?.value.background ?? fallback }
|
||||
: {}
|
||||
)
|
||||
}
|
||||
|
||||
const TABLET_FADE_MS = 400
|
||||
/** Color tokens share the background's UI-thread timing. */
|
||||
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
|
||||
const colors = useContext(AndroidTabTheme)?.colors
|
||||
return useAnimatedStyle(() =>
|
||||
Platform.OS === "android" && tone && colors
|
||||
? { color: colors.value[tone] }
|
||||
: {}
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Artwork screens always paint their own palette so it slides with the page.
|
||||
* Shared chrome (tab bar, mini player) switches when the transition starts.
|
||||
*/
|
||||
/** Native headers draw this same UI-thread background as the page and bars. */
|
||||
function AndroidArtworkBackground() {
|
||||
const style = useAndroidTabBackgroundStyle()
|
||||
return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
|
||||
}
|
||||
|
||||
export function renderAndroidArtworkBackground() {
|
||||
return <AndroidArtworkBackground />
|
||||
}
|
||||
|
||||
const PALETTE_FADE_MS = 400
|
||||
|
||||
/** The focused artwork screen selects the shared background for page and bars. */
|
||||
export function useScreenPalette(palette: CoverPalette) {
|
||||
const isFocused = useIsFocused()
|
||||
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||
const sharesPalette =
|
||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||
const owner = useRoute().key
|
||||
const navigation =
|
||||
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
|
||||
const [laidOut, setLaidOut] = useState(false)
|
||||
const [closing, setClosing] = useState(false)
|
||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||
const setPalette = useContext(AndroidTabTheme)?.setPalette
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const setPalette = theme?.setPalette
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette) return
|
||||
const start = navigation.addListener("transitionStart", ({ data }) => {
|
||||
@@ -141,18 +230,20 @@ export function useScreenPalette(palette: CoverPalette) {
|
||||
start()
|
||||
cancel()
|
||||
}
|
||||
}, [navigation, setPalette, owner, palette])
|
||||
}, [navigation, sharesPalette, setPalette, owner, palette])
|
||||
const defaultPalette = useDefaultPalette()
|
||||
const ready = laidOut || isTablet
|
||||
const backgroundStyle = useTabletBackgroundStyle()
|
||||
const target = isFocused && ready && !closing ? palette : defaultPalette
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
||||
setPalette(palette, owner)
|
||||
return () => setPalette(null, owner)
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette])
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
||||
|
||||
return {
|
||||
palette,
|
||||
palette: Platform.OS === "android" ? target : palette,
|
||||
backgroundStyle,
|
||||
onLayout: sharesPalette ? onLayout : undefined,
|
||||
}
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
import { createContext, useContext, useMemo, type ReactNode } from "react"
|
||||
import { createContext, useContext, type ReactNode } from "react"
|
||||
|
||||
type ConvexAuthSessionContextValue = {
|
||||
invalidateSession: () => Promise<void>
|
||||
}
|
||||
|
||||
const ConvexAuthSessionContext =
|
||||
createContext<ConvexAuthSessionContextValue | null>(null)
|
||||
const ConvexAuthSessionContext = createContext<ConvexAuthSessionContextValue | null>(
|
||||
null
|
||||
)
|
||||
|
||||
export function ConvexAuthSessionProvider({
|
||||
children,
|
||||
@@ -14,9 +15,8 @@ export function ConvexAuthSessionProvider({
|
||||
children: ReactNode
|
||||
invalidateSession: () => Promise<void>
|
||||
}) {
|
||||
const value = useMemo(() => ({ invalidateSession }), [invalidateSession])
|
||||
return (
|
||||
<ConvexAuthSessionContext.Provider value={value}>
|
||||
<ConvexAuthSessionContext.Provider value={{ invalidateSession }}>
|
||||
{children}
|
||||
</ConvexAuthSessionContext.Provider>
|
||||
)
|
||||
@@ -25,9 +25,7 @@ export function ConvexAuthSessionProvider({
|
||||
export function useInvalidateAuthSession() {
|
||||
const context = useContext(ConvexAuthSessionContext)
|
||||
if (!context) {
|
||||
throw new Error(
|
||||
"useInvalidateAuthSession must be used within ConvexAuthSessionProvider"
|
||||
)
|
||||
throw new Error("useInvalidateAuthSession must be used within ConvexAppProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -12,28 +12,22 @@ import {
|
||||
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { favoriteOptimisticUpdates } from "@otunes/convex/client/favorites"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
/**
|
||||
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a
|
||||
* module-level update so it does not change between renders.
|
||||
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. The
|
||||
* update is captured on first render, so it must not close over render state.
|
||||
*/
|
||||
function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>(
|
||||
mutation: Mutation,
|
||||
optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>>
|
||||
): ReactMutation<Mutation> {
|
||||
const base = useMutation(mutation)
|
||||
return useMemo(
|
||||
() => base.withOptimisticUpdate(optimisticUpdate),
|
||||
[base, optimisticUpdate]
|
||||
)
|
||||
const updateRef = useRef(optimisticUpdate)
|
||||
return useMemo(() => base.withOptimisticUpdate(updateRef.current), [base])
|
||||
}
|
||||
|
||||
type FavoriteTables = { song: "songs"; album: "albums"; artist: "artists" }
|
||||
export type FavoriteKind = keyof FavoriteTables
|
||||
|
||||
type FavoritesContextValue = {
|
||||
isSongFavorite: (songId: string) => boolean
|
||||
isAlbumFavorite: (albumId: string) => boolean
|
||||
@@ -42,20 +36,6 @@ type FavoritesContextValue = {
|
||||
toggleAlbumFavorite: (albumId: Id<"albums">) => Promise<void>
|
||||
toggleArtistFavorite: (artistId: Id<"artists">) => Promise<void>
|
||||
favoriteSongs: (songIds: Id<"songs">[]) => Promise<void>
|
||||
/** Idempotent; throws so callers like Siri can report failures. */
|
||||
setFavorite: <Kind extends FavoriteKind>(
|
||||
kind: Kind,
|
||||
id: Id<FavoriteTables[Kind]>,
|
||||
favorite: boolean
|
||||
) => Promise<void>
|
||||
/** Throws so callers like Siri can report failures. */
|
||||
addFavoriteSongs: (songIds: Id<"songs">[]) => Promise<void>
|
||||
}
|
||||
|
||||
function showFavoritesError(error: unknown) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
|
||||
const FavoritesContext = createContext<FavoritesContextValue | null>(null)
|
||||
@@ -72,114 +52,191 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
const favorites = useCachedQuery(api.favorites.getUserFavorites)
|
||||
const favoriteSong = useOptimisticMutation(
|
||||
api.favorites.favoriteSong,
|
||||
favoriteOptimisticUpdates.favoriteSong
|
||||
(store, { songId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current || current.favoriteSongs.includes(songId)) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteSongs: [...current.favoriteSongs, songId],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const unfavoriteSong = useOptimisticMutation(
|
||||
api.favorites.unfavoriteSong,
|
||||
favoriteOptimisticUpdates.unfavoriteSong
|
||||
(store, { songId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteSongs: current.favoriteSongs.filter((id) => id !== songId),
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const favoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.favoriteAlbum,
|
||||
favoriteOptimisticUpdates.favoriteAlbum
|
||||
(store, { albumId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current || current.favoriteAlbums.includes(albumId)) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteAlbums: [...current.favoriteAlbums, albumId],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const unfavoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.unfavoriteAlbum,
|
||||
favoriteOptimisticUpdates.unfavoriteAlbum
|
||||
(store, { albumId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteAlbums: current.favoriteAlbums.filter((id) => id !== albumId),
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const favoriteArtist = useOptimisticMutation(
|
||||
api.favorites.favoriteArtist,
|
||||
favoriteOptimisticUpdates.favoriteArtist
|
||||
(store, { artistId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current || current.favoriteArtists.includes(artistId)) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteArtists: [...current.favoriteArtists, artistId],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const unfavoriteArtist = useOptimisticMutation(
|
||||
api.favorites.unfavoriteArtist,
|
||||
favoriteOptimisticUpdates.unfavoriteArtist
|
||||
(store, { artistId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteArtists: current.favoriteArtists.filter(
|
||||
(id) => id !== artistId
|
||||
),
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
const favoriteSongsMutation = useOptimisticMutation(
|
||||
api.favorites.favoriteSongs,
|
||||
favoriteOptimisticUpdates.favoriteSongs
|
||||
(store, { songIds }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (!current) return
|
||||
store.setQuery(
|
||||
api.favorites.getUserFavorites,
|
||||
{},
|
||||
{
|
||||
...current,
|
||||
favoriteSongs: [...new Set([...current.favoriteSongs, ...songIds])],
|
||||
}
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
const songIds = useMemo(
|
||||
() => new Set<string>(favorites?.favoriteSongs.flat()),
|
||||
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
|
||||
[favorites?.favoriteSongs]
|
||||
)
|
||||
const albumIds = useMemo(
|
||||
() => new Set<string>(favorites?.favoriteAlbums.flat()),
|
||||
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
|
||||
[favorites?.favoriteAlbums]
|
||||
)
|
||||
const artistIds = useMemo(
|
||||
() => new Set<string>(favorites?.favoriteArtists.flat()),
|
||||
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
|
||||
[favorites?.favoriteArtists]
|
||||
)
|
||||
const idsRef = useRef({ songIds, albumIds, artistIds })
|
||||
idsRef.current = { songIds, albumIds, artistIds }
|
||||
|
||||
const setFavorite = useCallback(
|
||||
async <Kind extends FavoriteKind>(
|
||||
kind: Kind,
|
||||
id: Id<FavoriteTables[Kind]>,
|
||||
favorite: boolean
|
||||
) => {
|
||||
if (kind === "song") {
|
||||
const songId = id as Id<"songs">
|
||||
await (favorite ? favoriteSong : unfavoriteSong)({ songId })
|
||||
} else if (kind === "album") {
|
||||
const albumId = id as Id<"albums">
|
||||
await (favorite ? favoriteAlbum : unfavoriteAlbum)({ albumId })
|
||||
} else {
|
||||
const artistId = id as Id<"artists">
|
||||
await (favorite ? favoriteArtist : unfavoriteArtist)({ artistId })
|
||||
const toggleSongFavorite = useCallback(
|
||||
async (songId: Id<"songs">) => {
|
||||
try {
|
||||
if (idsRef.current.songIds.has(songId)) {
|
||||
await unfavoriteSong({ songId })
|
||||
} else {
|
||||
await favoriteSong({ songId })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[
|
||||
favoriteSong,
|
||||
unfavoriteSong,
|
||||
favoriteAlbum,
|
||||
unfavoriteAlbum,
|
||||
favoriteArtist,
|
||||
unfavoriteArtist,
|
||||
]
|
||||
)
|
||||
|
||||
const toggleSongFavorite = useCallback(
|
||||
(songId: Id<"songs">) =>
|
||||
setFavorite("song", songId, !idsRef.current.songIds.has(songId)).catch(
|
||||
showFavoritesError
|
||||
),
|
||||
[setFavorite]
|
||||
[favoriteSong, unfavoriteSong]
|
||||
)
|
||||
|
||||
const toggleAlbumFavorite = useCallback(
|
||||
(albumId: Id<"albums">) =>
|
||||
setFavorite(
|
||||
"album",
|
||||
albumId,
|
||||
!idsRef.current.albumIds.has(albumId)
|
||||
).catch(showFavoritesError),
|
||||
[setFavorite]
|
||||
async (albumId: Id<"albums">) => {
|
||||
try {
|
||||
if (idsRef.current.albumIds.has(albumId)) {
|
||||
await unfavoriteAlbum({ albumId })
|
||||
} else {
|
||||
await favoriteAlbum({ albumId })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[favoriteAlbum, unfavoriteAlbum]
|
||||
)
|
||||
|
||||
const toggleArtistFavorite = useCallback(
|
||||
(artistId: Id<"artists">) =>
|
||||
setFavorite(
|
||||
"artist",
|
||||
artistId,
|
||||
!idsRef.current.artistIds.has(artistId)
|
||||
).catch(showFavoritesError),
|
||||
[setFavorite]
|
||||
)
|
||||
|
||||
const addFavoriteSongs = useCallback(
|
||||
async (ids: Id<"songs">[]) => {
|
||||
const unique = [...new Set(ids)]
|
||||
if (unique.length > 0) await favoriteSongsMutation({ songIds: unique })
|
||||
async (artistId: Id<"artists">) => {
|
||||
try {
|
||||
if (idsRef.current.artistIds.has(artistId)) {
|
||||
await unfavoriteArtist({ artistId })
|
||||
} else {
|
||||
await favoriteArtist({ artistId })
|
||||
}
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[favoriteSongsMutation]
|
||||
[favoriteArtist, unfavoriteArtist]
|
||||
)
|
||||
|
||||
const favoriteSongs = useCallback(
|
||||
(ids: Id<"songs">[]) => addFavoriteSongs(ids).catch(showFavoritesError),
|
||||
[addFavoriteSongs]
|
||||
async (ids: Id<"songs">[]) => {
|
||||
const unique = [...new Set(ids)]
|
||||
if (unique.length === 0) return
|
||||
try {
|
||||
await favoriteSongsMutation({ songIds: unique })
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update favorites"
|
||||
)
|
||||
}
|
||||
},
|
||||
[favoriteSongsMutation]
|
||||
)
|
||||
|
||||
const value = useMemo(
|
||||
@@ -191,8 +248,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
toggleAlbumFavorite,
|
||||
toggleArtistFavorite,
|
||||
favoriteSongs,
|
||||
setFavorite,
|
||||
addFavoriteSongs,
|
||||
}),
|
||||
[
|
||||
songIds,
|
||||
@@ -202,8 +257,6 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
|
||||
toggleAlbumFavorite,
|
||||
toggleArtistFavorite,
|
||||
favoriteSongs,
|
||||
setFavorite,
|
||||
addFavoriteSongs,
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { useAuthToken } from "@convex-dev/auth/react"
|
||||
import { userIdFromToken } from "@otunes/convex/client/auth-token"
|
||||
import { createContext, useContext, useMemo, type ReactNode } from "react"
|
||||
|
||||
import { loadPersistentCache } from "@/lib/persistent-cache"
|
||||
@@ -10,6 +9,21 @@ const CacheScopeContext = createContext(ANONYMOUS_CACHE_SCOPE)
|
||||
|
||||
void loadPersistentCache()
|
||||
|
||||
function userIdFromToken(token: string | null) {
|
||||
const payload = token?.split(".")[1]
|
||||
if (!payload) {
|
||||
return null
|
||||
}
|
||||
|
||||
try {
|
||||
const json = atob(payload.replace(/-/g, "+").replace(/_/g, "/"))
|
||||
const subject = (JSON.parse(json) as { sub?: unknown }).sub
|
||||
return typeof subject === "string" ? (subject.split("|")[0] ?? null) : null
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
/** Namespaces persisted client data by server and signed-in user. */
|
||||
export function PersistentCacheProvider({
|
||||
serverUrl,
|
||||
|
||||
+831
-184
File diff suppressed because it is too large.
Load diff
@@ -1,152 +0,0 @@
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
|
||||
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
||||
import { readCache, writeCache } from "@/lib/persistent-cache"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
import { withCoverImageSize } from "@/lib/urls"
|
||||
|
||||
// How long a screen holds its skeleton for the first extraction of a cover,
|
||||
// so rows render once with final colors instead of flashing from the theme.
|
||||
export const COVER_PALETTE_WAIT_MS = 400
|
||||
|
||||
export type CoverPaletteResult = { palette: CoverPalette; settled: boolean }
|
||||
|
||||
type CoverPaletteSourceOptions<Swatches> = {
|
||||
/** Persistent cache key for a 64px cover URI. */
|
||||
cacheKey: (colorSourceUri: string) => string
|
||||
extract: (colorSourceUri: string) => Promise<Swatches | null>
|
||||
derive: (swatches: Swatches, isDark: boolean) => CoverPalette | null
|
||||
/** Reject persisted entries written in an older shape. */
|
||||
isValidCache?: (swatches: Swatches) => boolean
|
||||
}
|
||||
|
||||
/**
|
||||
* One artwork color pipeline: an extractor and palette derivation with their
|
||||
* own memory cache, persistent cache and in-flight requests.
|
||||
*/
|
||||
export function createCoverPaletteSource<Swatches>({
|
||||
cacheKey,
|
||||
extract,
|
||||
derive,
|
||||
isValidCache,
|
||||
}: CoverPaletteSourceOptions<Swatches>) {
|
||||
const swatchesByKey = new Map<string, Swatches | null>()
|
||||
const pending = new Map<string, Promise<Swatches | null>>()
|
||||
|
||||
function cachedSwatches(key: string): Swatches | null | undefined {
|
||||
if (swatchesByKey.has(key)) return swatchesByKey.get(key)
|
||||
const cached = readCache<Swatches>(cacheKey(key))
|
||||
return cached && isValidCache && !isValidCache(cached) ? undefined : cached
|
||||
}
|
||||
|
||||
function extractSwatches(key: string) {
|
||||
const inFlight = pending.get(key)
|
||||
if (inFlight) return inFlight
|
||||
|
||||
const request = extract(key)
|
||||
.catch(() => null)
|
||||
.then((swatches) => {
|
||||
swatchesByKey.set(key, swatches)
|
||||
if (swatches) writeCache(cacheKey(key), swatches)
|
||||
pending.delete(key)
|
||||
return swatches
|
||||
})
|
||||
pending.set(key, request)
|
||||
return request
|
||||
}
|
||||
|
||||
function prefetch(uri: string) {
|
||||
const key = withCoverImageSize(uri, 64)
|
||||
if (cachedSwatches(key) !== undefined) return
|
||||
void extractSwatches(key)
|
||||
}
|
||||
|
||||
/**
|
||||
* Colors for a screen tinted by `uri`'s cover art. Pass `uri` as "" to skip
|
||||
* extraction. Pass `hasCover` as `undefined` while it isn't known yet so
|
||||
* extraction can start early.
|
||||
*
|
||||
* `settled` turns true once the palette is final or after
|
||||
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
|
||||
*/
|
||||
function usePalette(
|
||||
uri: string,
|
||||
hasCover: boolean | undefined
|
||||
): CoverPaletteResult {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
const key = uri ? withCoverImageSize(uri, 64) : ""
|
||||
const [resolved, setResolved] = useState(() => ({
|
||||
key,
|
||||
swatches: key ? cachedSwatches(key) : null,
|
||||
}))
|
||||
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||
|
||||
const swatches =
|
||||
resolved.key === key
|
||||
? resolved.swatches
|
||||
: key
|
||||
? cachedSwatches(key)
|
||||
: null
|
||||
|
||||
useEffect(() => {
|
||||
if (!key || hasCover === false) return
|
||||
let cancelled = false
|
||||
const known = cachedSwatches(key)
|
||||
const show = (next: Swatches | null) =>
|
||||
setResolved((prev) =>
|
||||
prev.key === key && sameSwatches(prev.swatches, next)
|
||||
? prev
|
||||
: { key, swatches: next }
|
||||
)
|
||||
if (known !== undefined && swatchesByKey.has(key)) {
|
||||
show(known)
|
||||
return
|
||||
}
|
||||
|
||||
// Persisted swatches render immediately; refresh them in the background
|
||||
// in case the cover changed.
|
||||
const timer =
|
||||
known === undefined
|
||||
? setTimeout(
|
||||
() => !cancelled && setWaitedKey(key),
|
||||
COVER_PALETTE_WAIT_MS
|
||||
)
|
||||
: null
|
||||
void extractSwatches(key).then((next) => {
|
||||
if (!cancelled) show(next ?? known ?? null)
|
||||
})
|
||||
return () => {
|
||||
cancelled = true
|
||||
if (timer) clearTimeout(timer)
|
||||
}
|
||||
}, [hasCover, key])
|
||||
|
||||
const palette = useMemo(() => {
|
||||
const fromArt =
|
||||
hasCover !== false && swatches ? derive(swatches, isDark) : null
|
||||
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||
}, [hasCover, isDark, swatches, theme])
|
||||
|
||||
return {
|
||||
palette,
|
||||
settled:
|
||||
!key ||
|
||||
hasCover === false ||
|
||||
swatches !== undefined ||
|
||||
waitedKey === key,
|
||||
}
|
||||
}
|
||||
|
||||
/** Forget in-memory swatches so covers are re-extracted. */
|
||||
function clear() {
|
||||
swatchesByKey.clear()
|
||||
pending.clear()
|
||||
}
|
||||
|
||||
return { prefetch, usePalette, clear }
|
||||
}
|
||||
|
||||
function sameSwatches(a: unknown, b: unknown) {
|
||||
return a === b || JSON.stringify(a) === JSON.stringify(b)
|
||||
}
|
||||
@@ -1,59 +1,147 @@
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import {
|
||||
createCoverPaletteSource,
|
||||
type CoverPaletteResult,
|
||||
} from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
clearLegacyCoverPaletteCache,
|
||||
prefetchLegacyCoverPalette,
|
||||
useLegacyCoverPalette,
|
||||
} from "@/hooks/use-legacy-cover-palette"
|
||||
import {
|
||||
loadArtworkColorsEnabled,
|
||||
artworkColorsEnabled,
|
||||
useArtworkColorsEnabled,
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { prefetchLegacyCoverPalette, useLegacyCoverPalette } from "@/hooks/use-legacy-cover-palette"
|
||||
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
||||
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
|
||||
import { clearCachePrefix } from "@/lib/persistent-cache"
|
||||
|
||||
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
deriveCoverPalette,
|
||||
themeCoverPalette,
|
||||
type CoverPalette,
|
||||
type CoverSwatches,
|
||||
} from "@/lib/cover-palette"
|
||||
import { readCache, writeCache } from "@/lib/persistent-cache"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
import { withCoverImageSize } from "@/lib/urls"
|
||||
|
||||
const region = createCoverPaletteSource<CoverSwatches>({
|
||||
cacheKey: (colorSourceUri) => `palette:v2:${colorSourceUri}`,
|
||||
extract: extractCoverSwatches,
|
||||
derive: (swatches) => deriveCoverPalette(swatches),
|
||||
})
|
||||
// How long a screen holds its skeleton for the first extraction of a cover,
|
||||
// so rows render once with final colors instead of flashing from the theme.
|
||||
export const COVER_PALETTE_WAIT_MS = 400
|
||||
|
||||
/**
|
||||
* Forget every extracted palette, in memory and on device, so covers are
|
||||
* re-extracted. Both pipelines share the `palette:` cache prefix.
|
||||
*/
|
||||
export function clearCoverPaletteCache() {
|
||||
region.clear()
|
||||
clearLegacyCoverPaletteCache()
|
||||
clearCachePrefix("palette")
|
||||
const swatchesByKey = new Map<string, CoverSwatches | null>()
|
||||
const pending = new Map<string, Promise<CoverSwatches | null>>()
|
||||
|
||||
function cacheKey(colorSourceUri: string) {
|
||||
return `palette:v2:${colorSourceUri}`
|
||||
}
|
||||
|
||||
function sameSwatches(
|
||||
a: CoverSwatches | null | undefined,
|
||||
b: CoverSwatches | null | undefined
|
||||
) {
|
||||
return a === b || JSON.stringify(a) === JSON.stringify(b)
|
||||
}
|
||||
|
||||
function cachedSwatches(key: string): CoverSwatches | null | undefined {
|
||||
if (swatchesByKey.has(key)) return swatchesByKey.get(key)
|
||||
return readCache<CoverSwatches>(cacheKey(key))
|
||||
}
|
||||
|
||||
function extractSwatches(key: string) {
|
||||
const inFlight = pending.get(key)
|
||||
if (inFlight) return inFlight
|
||||
|
||||
const request = extractCoverSwatches(key)
|
||||
.catch(() => null)
|
||||
.then((swatches) => {
|
||||
swatchesByKey.set(key, swatches)
|
||||
if (swatches) writeCache(cacheKey(key), swatches)
|
||||
pending.delete(key)
|
||||
return swatches
|
||||
})
|
||||
pending.set(key, request)
|
||||
return request
|
||||
}
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export function prefetchCoverPalette(uri: string) {
|
||||
void loadArtworkColorsEnabled().then((enabled) =>
|
||||
enabled ? region.prefetch(uri) : prefetchLegacyCoverPalette(uri)
|
||||
)
|
||||
if (!artworkColorsEnabled()) {
|
||||
prefetchLegacyCoverPalette(uri)
|
||||
return
|
||||
}
|
||||
const key = withCoverImageSize(uri, 64)
|
||||
if (cachedSwatches(key) !== undefined) return
|
||||
void extractSwatches(key)
|
||||
}
|
||||
|
||||
/**
|
||||
* Colors for a screen tinted by `uri`'s cover art, from whichever pipeline the
|
||||
* device preference selects. Nothing is extracted until the preference loads,
|
||||
* and the screen stays unsettled meanwhile so it doesn't flash theme colors.
|
||||
* Colors for a screen tinted by `uri`'s cover art. Extraction runs once per
|
||||
* cover and is cached on device. Pass `hasCover` as `undefined` while it isn't
|
||||
* known yet so extraction can start early.
|
||||
*
|
||||
* `settled` turns true once the palette is final or after
|
||||
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
|
||||
*/
|
||||
export function useCoverPalette(
|
||||
function useRegionCoverPalette(
|
||||
uri: string,
|
||||
hasCover: boolean | undefined
|
||||
): CoverPaletteResult {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const current = region.usePalette(enabled === true ? uri : "", hasCover)
|
||||
const legacy = useLegacyCoverPalette(enabled === false ? uri : "", hasCover)
|
||||
if (enabled === undefined) {
|
||||
return { palette: current.palette, settled: !uri || hasCover === false }
|
||||
): { palette: CoverPalette; settled: boolean } {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
const key = uri ? withCoverImageSize(uri, 64) : ""
|
||||
const [resolved, setResolved] = useState(() => ({
|
||||
key,
|
||||
swatches: key ? cachedSwatches(key) : null,
|
||||
}))
|
||||
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||
|
||||
const swatches =
|
||||
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
|
||||
|
||||
useEffect(() => {
|
||||
if (!key || hasCover === false) return
|
||||
let cancelled = false
|
||||
const known = cachedSwatches(key)
|
||||
const show = (next: CoverSwatches | null) =>
|
||||
setResolved((prev) =>
|
||||
prev.key === key && sameSwatches(prev.swatches, next)
|
||||
? prev
|
||||
: { key, swatches: next }
|
||||
)
|
||||
if (known !== undefined && swatchesByKey.has(key)) {
|
||||
show(known)
|
||||
return
|
||||
}
|
||||
|
||||
// Persisted swatches render immediately; refresh them in the background in
|
||||
// case the cover changed.
|
||||
const timer =
|
||||
known === undefined
|
||||
? setTimeout(
|
||||
() => !cancelled && setWaitedKey(key),
|
||||
COVER_PALETTE_WAIT_MS
|
||||
)
|
||||
: null
|
||||
void extractSwatches(key).then((next) => {
|
||||
if (!cancelled) show(next ?? known ?? null)
|
||||
})
|
||||
return () => {
|
||||
cancelled = true
|
||||
if (timer) clearTimeout(timer)
|
||||
}
|
||||
}, [hasCover, key])
|
||||
|
||||
const palette = useMemo(() => {
|
||||
const fromArt =
|
||||
hasCover !== false && swatches
|
||||
? deriveCoverPalette(swatches)
|
||||
: null
|
||||
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||
}, [hasCover, isDark, swatches, theme])
|
||||
|
||||
return {
|
||||
palette,
|
||||
settled:
|
||||
!key || hasCover === false || swatches !== undefined || waitedKey === key,
|
||||
}
|
||||
return enabled ? current : legacy
|
||||
}
|
||||
|
||||
/** Switch both extraction and palette derivation without mixing their caches. */
|
||||
export function useCoverPalette(uri: string, hasCover: boolean | undefined) {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const region = useRegionCoverPalette(enabled ? uri : "", hasCover)
|
||||
const legacy = useLegacyCoverPalette(enabled ? "" : uri, hasCover)
|
||||
return enabled ? region : legacy
|
||||
}
|
||||
@@ -1,14 +1,29 @@
|
||||
import { useEffect, useMemo, useState } from "react"
|
||||
import { getColors, type ImageColorsResult } from "react-native-image-colors"
|
||||
|
||||
import { createCoverPaletteSource } from "@/hooks/cover-palette-source"
|
||||
import {
|
||||
deriveCoverPalette,
|
||||
type LegacyCoverSwatches as CoverSwatches,
|
||||
} from "@/lib/legacy-cover-palette"
|
||||
themeCoverPalette,
|
||||
type CoverPalette,
|
||||
} from "@/lib/cover-palette"
|
||||
import { deriveCoverPalette, type LegacyCoverSwatches as CoverSwatches } from "@/lib/legacy-cover-palette"
|
||||
import { readCache, writeCache } from "@/lib/persistent-cache"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
import { withCoverImageSize } from "@/lib/urls"
|
||||
|
||||
// How long a screen holds its skeleton for the first extraction of a cover,
|
||||
// so rows render once with final colors instead of flashing from the theme.
|
||||
const COVER_PALETTE_WAIT_MS = 400
|
||||
|
||||
// image-colors substitutes this for swatches it couldn't find.
|
||||
const MISSING = "#010203"
|
||||
|
||||
const swatchesByKey = new Map<string, CoverSwatches | null>()
|
||||
const pending = new Map<string, Promise<CoverSwatches | null>>()
|
||||
|
||||
function cacheKey(colorSourceUri: string) {
|
||||
return `palette:${colorSourceUri}`
|
||||
}
|
||||
|
||||
function present(colors: (string | undefined)[]) {
|
||||
return colors.filter(
|
||||
(color): color is string => !!color && color.toLowerCase() !== MISSING
|
||||
@@ -44,26 +59,120 @@ function toSwatches(result: ImageColorsResult): CoverSwatches | null {
|
||||
}
|
||||
}
|
||||
|
||||
const legacy = createCoverPaletteSource<CoverSwatches>({
|
||||
cacheKey: (colorSourceUri) => `palette:${colorSourceUri}`,
|
||||
extract: (key) =>
|
||||
getColors(key, {
|
||||
fallback: MISSING,
|
||||
cache: true,
|
||||
key,
|
||||
quality: "low",
|
||||
pixelSpacing: 4,
|
||||
}).then(toSwatches),
|
||||
derive: deriveCoverPalette,
|
||||
function sameSwatches(
|
||||
a: CoverSwatches | null | undefined,
|
||||
b: CoverSwatches | null | undefined
|
||||
) {
|
||||
return a === b || JSON.stringify(a) === JSON.stringify(b)
|
||||
}
|
||||
|
||||
function cachedSwatches(key: string): CoverSwatches | null | undefined {
|
||||
if (swatchesByKey.has(key)) return swatchesByKey.get(key)
|
||||
const cached = readCache<CoverSwatches>(cacheKey(key))
|
||||
// Discard the background-only entries written by the tablet palette experiment.
|
||||
isValidCache: (cached) =>
|
||||
Array.isArray(cached.text) && Array.isArray(cached.accent),
|
||||
})
|
||||
return cached && (!Array.isArray(cached.text) || !Array.isArray(cached.accent))
|
||||
? undefined
|
||||
: cached
|
||||
}
|
||||
|
||||
function extractSwatches(key: string) {
|
||||
const inFlight = pending.get(key)
|
||||
if (inFlight) return inFlight
|
||||
|
||||
const request = getColors(key, {
|
||||
fallback: MISSING,
|
||||
cache: true,
|
||||
key,
|
||||
quality: "low",
|
||||
pixelSpacing: 4,
|
||||
})
|
||||
.then(toSwatches)
|
||||
.catch(() => null)
|
||||
.then((swatches) => {
|
||||
swatchesByKey.set(key, swatches)
|
||||
if (swatches) writeCache(cacheKey(key), swatches)
|
||||
pending.delete(key)
|
||||
return swatches
|
||||
})
|
||||
pending.set(key, request)
|
||||
return request
|
||||
}
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export const prefetchLegacyCoverPalette = legacy.prefetch
|
||||
export function prefetchLegacyCoverPalette(uri: string) {
|
||||
const key = withCoverImageSize(uri, 64)
|
||||
if (cachedSwatches(key) !== undefined) return
|
||||
void extractSwatches(key)
|
||||
}
|
||||
|
||||
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
|
||||
export const useLegacyCoverPalette = legacy.usePalette
|
||||
/**
|
||||
* Colors for a screen tinted by `uri`'s cover art. Extraction runs once per
|
||||
* cover and is cached on device. Pass `hasCover` as `undefined` while it isn't
|
||||
* known yet so extraction can start early.
|
||||
*
|
||||
* `settled` turns true once the palette is final or after
|
||||
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
|
||||
*/
|
||||
export function useLegacyCoverPalette(
|
||||
uri: string,
|
||||
hasCover: boolean | undefined
|
||||
): { palette: CoverPalette; settled: boolean } {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
const key = uri ? withCoverImageSize(uri, 64) : ""
|
||||
const [resolved, setResolved] = useState(() => ({
|
||||
key,
|
||||
swatches: key ? cachedSwatches(key) : null,
|
||||
}))
|
||||
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||
|
||||
export const clearLegacyCoverPaletteCache = legacy.clear
|
||||
const swatches =
|
||||
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
|
||||
|
||||
useEffect(() => {
|
||||
if (!key || hasCover === false) return
|
||||
let cancelled = false
|
||||
const known = cachedSwatches(key)
|
||||
const show = (next: CoverSwatches | null) =>
|
||||
setResolved((prev) =>
|
||||
prev.key === key && sameSwatches(prev.swatches, next)
|
||||
? prev
|
||||
: { key, swatches: next }
|
||||
)
|
||||
if (known !== undefined && swatchesByKey.has(key)) {
|
||||
show(known)
|
||||
return
|
||||
}
|
||||
|
||||
// Persisted swatches render immediately; refresh them in the background in
|
||||
// case the cover changed.
|
||||
const timer =
|
||||
known === undefined
|
||||
? setTimeout(
|
||||
() => !cancelled && setWaitedKey(key),
|
||||
COVER_PALETTE_WAIT_MS
|
||||
)
|
||||
: null
|
||||
void extractSwatches(key).then((next) => {
|
||||
if (!cancelled) show(next ?? known ?? null)
|
||||
})
|
||||
return () => {
|
||||
cancelled = true
|
||||
if (timer) clearTimeout(timer)
|
||||
}
|
||||
}, [hasCover, key])
|
||||
|
||||
const palette = useMemo(() => {
|
||||
const fromArt =
|
||||
hasCover !== false && swatches
|
||||
? deriveCoverPalette(swatches, isDark)
|
||||
: null
|
||||
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||
}, [hasCover, isDark, swatches, theme])
|
||||
|
||||
return {
|
||||
palette,
|
||||
settled:
|
||||
!key || hasCover === false || swatches !== undefined || waitedKey === key,
|
||||
}
|
||||
}
|
||||
@@ -173,7 +173,7 @@ export function useMediaMenuActions() {
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: artist.id as Id<"artists"> }
|
||||
)
|
||||
await runQueueAction(action, songIds.flat())
|
||||
await runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -1,725 +0,0 @@
|
||||
import { atmosEnabled } from "@/lib/playback-capabilities"
|
||||
import {
|
||||
createAudioPlaylist,
|
||||
setAudioModeAsync,
|
||||
setIsAudioActiveAsync,
|
||||
type AudioMetadata,
|
||||
type AudioPlaylist,
|
||||
type AudioPlaylistStatus,
|
||||
type AudioSource,
|
||||
} from "expo-audio"
|
||||
import { useConvex } from "convex/react"
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react"
|
||||
|
||||
import { useCacheScope } from "@/contexts/persistent-cache"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
|
||||
import * as playbackQueue from "@otunes/convex/client/playback-queue"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { getAuthCookieHeader } from "@/lib/auth-cookies"
|
||||
import { loadPlaybackSongs } from "@/lib/playback-files"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { albumCoverUrl, songAudioSource } from "@/lib/urls"
|
||||
import {
|
||||
activatePlaylistLockScreen,
|
||||
releaseAudioPlaylist,
|
||||
updatePlaylistLockScreenMetadata,
|
||||
} from "@/lib/audio-playlist-lock-screen"
|
||||
import {
|
||||
nativePlaylistEdits,
|
||||
nativePlaylistNeedsRebuild,
|
||||
nativePlaylistSongIds,
|
||||
repeatToPlaylistLoop,
|
||||
} from "@/lib/native-playlist-window"
|
||||
|
||||
const PLAYBACK_READY_TIMEOUT_MS = 20_000
|
||||
|
||||
function lockScreenMetadata(
|
||||
song: BrowseSong,
|
||||
serverUrl: string
|
||||
): AudioMetadata {
|
||||
return {
|
||||
title: song.title,
|
||||
artist: song.artist.name,
|
||||
albumTitle: song.album.title,
|
||||
artworkUrl: albumCoverUrl(serverUrl, song.album.id, 512),
|
||||
}
|
||||
}
|
||||
|
||||
type PlaybackWaiter = { playing?: boolean; resolve: () => void }
|
||||
|
||||
/** Where the last sync left the native player, and the queue it reflects. */
|
||||
type SyncedPosition = {
|
||||
index: number
|
||||
songId: Id<"songs"> | undefined
|
||||
historyLength: number
|
||||
}
|
||||
|
||||
/**
|
||||
* Keeps the native `AudioPlaylist` in step with the playback queue, and
|
||||
* feeds its status (position, playing, track changes) back into the queue.
|
||||
*/
|
||||
export function useNativePlaylistSync({
|
||||
store,
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
repeatEnabled,
|
||||
currentSong,
|
||||
queueStartVersion,
|
||||
}: {
|
||||
store: PlaybackStore
|
||||
queueSongIds: Id<"songs">[]
|
||||
queueHistorySongIds: Id<"songs">[]
|
||||
repeatEnabled: RepeatMode
|
||||
currentSong: BrowseSong | null
|
||||
queueStartVersion: number
|
||||
}) {
|
||||
const convex = useConvex()
|
||||
const { config } = useServerConfig()
|
||||
const cacheScope = useCacheScope()
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const storeRef = useRef(store)
|
||||
storeRef.current = store
|
||||
|
||||
const playlistRef = useRef<AudioPlaylist | null>(null)
|
||||
const statusSubscriptionRef = useRef<{ remove: () => void } | null>(null)
|
||||
const trackChangedSubscriptionRef = useRef<{ remove: () => void } | null>(
|
||||
null
|
||||
)
|
||||
const loadedSongIdsRef = useRef<Id<"songs">[]>([])
|
||||
const loadedLoadKeyRef = useRef<string | null>(null)
|
||||
const syncedPositionRef = useRef<SyncedPosition | null>(null)
|
||||
const waitersRef = useRef(new Map<Id<"songs">, Set<PlaybackWaiter>>())
|
||||
const autoPlayNextRef = useRef(false)
|
||||
const isPlayingRef = useRef(false)
|
||||
const currentTimeRef = useRef(0)
|
||||
const pendingSeekRef = useRef<number | null>(null)
|
||||
const seekInFlightRef = useRef(false)
|
||||
// Set while `play()` waits for a pending seek to land.
|
||||
const deferredPlayRef = useRef(false)
|
||||
const loadRequestIdRef = useRef(0)
|
||||
|
||||
const [isPlaying, setIsPlayingState] = useState(false)
|
||||
const [currentTime, setCurrentTime] = useState(0)
|
||||
const [measuredDuration, setDuration] = useState(0)
|
||||
|
||||
const currentSongId = queueSongIds[0] ?? null
|
||||
const duration =
|
||||
measuredDuration > 0
|
||||
? measuredDuration
|
||||
: (currentSong?.durationSeconds ?? 0)
|
||||
const durationRef = useRef(duration)
|
||||
durationRef.current = duration
|
||||
const queueSyncKey = useMemo(
|
||||
() => JSON.stringify(queueSongIds),
|
||||
[queueSongIds]
|
||||
)
|
||||
const historySyncKey = useMemo(
|
||||
() => JSON.stringify(queueHistorySongIds),
|
||||
[queueHistorySongIds]
|
||||
)
|
||||
const currentSongSyncKey = currentSong
|
||||
? JSON.stringify([
|
||||
currentSong.id,
|
||||
currentSong.title,
|
||||
currentSong.artist.name,
|
||||
currentSong.album.id,
|
||||
currentSong.album.title,
|
||||
currentSong.album.cover ?? "",
|
||||
])
|
||||
: ""
|
||||
const userPlaybackKey = user
|
||||
? JSON.stringify([user._id, user.playbackQuality, atmosEnabled(user)])
|
||||
: ""
|
||||
|
||||
const settleWaiters = useCallback(() => {
|
||||
const player = playlistRef.current
|
||||
if (waitersRef.current.size === 0 || !player) return
|
||||
const songId = loadedSongIdsRef.current[player.currentIndex]
|
||||
const waiters = songId && waitersRef.current.get(songId)
|
||||
if (!waiters || !player.isLoaded) return
|
||||
for (const waiter of waiters) {
|
||||
if (waiter.playing === undefined || player.playing === waiter.playing) {
|
||||
waiter.resolve()
|
||||
}
|
||||
}
|
||||
}, [])
|
||||
|
||||
const markSynced = useCallback(
|
||||
(playlist: AudioPlaylist, songId: Id<"songs">, historyLength: number) => {
|
||||
syncedPositionRef.current = {
|
||||
index: playlist.currentIndex,
|
||||
songId,
|
||||
historyLength,
|
||||
}
|
||||
settleWaiters()
|
||||
},
|
||||
[settleWaiters]
|
||||
)
|
||||
|
||||
const destroyPlaylist = useCallback(() => {
|
||||
statusSubscriptionRef.current?.remove()
|
||||
statusSubscriptionRef.current = null
|
||||
trackChangedSubscriptionRef.current?.remove()
|
||||
trackChangedSubscriptionRef.current = null
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
playlist.pause()
|
||||
releaseAudioPlaylist(playlist)
|
||||
}
|
||||
playlistRef.current = null
|
||||
loadedSongIdsRef.current = []
|
||||
loadedLoadKeyRef.current = null
|
||||
syncedPositionRef.current = null
|
||||
}, [])
|
||||
|
||||
const resetPosition = useCallback(() => {
|
||||
pendingSeekRef.current = null
|
||||
deferredPlayRef.current = false
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
setDuration(0)
|
||||
}, [])
|
||||
|
||||
// A new queue must not inherit the native player's position or a pending seek.
|
||||
const resetForNewQueue = useCallback(() => {
|
||||
loadRequestIdRef.current += 1
|
||||
destroyPlaylist()
|
||||
seekInFlightRef.current = false
|
||||
resetPosition()
|
||||
}, [destroyPlaylist, resetPosition])
|
||||
|
||||
/**
|
||||
* Starts the player, unless a seek (a restored position) is still pending.
|
||||
* Then the status handler starts it once the seek lands, so playback never
|
||||
* starts at 0:00 and jumps.
|
||||
*/
|
||||
const startPlayer = useCallback((playlist: AudioPlaylist) => {
|
||||
if (pendingSeekRef.current !== null && pendingSeekRef.current > 0) {
|
||||
deferredPlayRef.current = true
|
||||
return
|
||||
}
|
||||
playlist.play()
|
||||
}, [])
|
||||
|
||||
const handlePlaylistStatusUpdate = useCallback(
|
||||
(status: AudioPlaylistStatus) => {
|
||||
settleWaiters()
|
||||
// iOS may remove the finished item before delivering its final status.
|
||||
if (!status.isLoaded && !status.didJustFinish) return
|
||||
const state = storeRef.current.getState()
|
||||
if (loadedSongIdsRef.current[status.currentIndex] !== state.queue[0]) {
|
||||
return
|
||||
}
|
||||
|
||||
if (status.duration > 0) {
|
||||
setDuration(status.duration)
|
||||
}
|
||||
|
||||
if (pendingSeekRef.current !== null && pendingSeekRef.current > 0) {
|
||||
const seekSeconds =
|
||||
status.duration > 0
|
||||
? Math.min(pendingSeekRef.current, status.duration)
|
||||
: pendingSeekRef.current
|
||||
pendingSeekRef.current = null
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
// Statuses report the old position until the seek lands.
|
||||
seekInFlightRef.current = true
|
||||
void playlist.seekTo(seekSeconds).finally(() => {
|
||||
seekInFlightRef.current = false
|
||||
if (deferredPlayRef.current && playlistRef.current === playlist) {
|
||||
deferredPlayRef.current = false
|
||||
playlist.play()
|
||||
}
|
||||
})
|
||||
}
|
||||
currentTimeRef.current = seekSeconds
|
||||
setCurrentTime(seekSeconds)
|
||||
} else if (!seekInFlightRef.current) {
|
||||
currentTimeRef.current = status.currentTime
|
||||
setCurrentTime(status.currentTime)
|
||||
}
|
||||
|
||||
if (status.playing) {
|
||||
autoPlayNextRef.current = false
|
||||
if (!isPlayingRef.current) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
}
|
||||
} else if (
|
||||
isPlayingRef.current &&
|
||||
!status.didJustFinish &&
|
||||
!deferredPlayRef.current
|
||||
) {
|
||||
autoPlayNextRef.current = false
|
||||
isPlayingRef.current = false
|
||||
setIsPlayingState(false)
|
||||
}
|
||||
|
||||
if (!status.didJustFinish) return
|
||||
if (state.repeatEnabled === "once") return
|
||||
if (status.currentIndex < status.trackCount - 1) return
|
||||
|
||||
const shouldContinue =
|
||||
state.repeatEnabled !== "none" || state.queue.length > 1
|
||||
if (!shouldContinue) {
|
||||
autoPlayNextRef.current = false
|
||||
isPlayingRef.current = false
|
||||
setIsPlayingState(false)
|
||||
storeRef.current.update(playbackQueue.skipNext)
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
playlist.pause()
|
||||
// Reload the final item, which iOS removes when playback ends. The
|
||||
// index doesn't move, so handleTrackChanged treats it as ours.
|
||||
playlist.skipTo(status.currentIndex)
|
||||
}
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
return
|
||||
}
|
||||
|
||||
autoPlayNextRef.current = true
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
storeRef.current.update(playbackQueue.skipNext)
|
||||
if (storeRef.current.getState().queue[0] === state.queue[0]) {
|
||||
const playlist = playlistRef.current
|
||||
void playlist?.seekTo(0)
|
||||
playlist?.play()
|
||||
}
|
||||
},
|
||||
[settleWaiters]
|
||||
)
|
||||
|
||||
const handleTrackChanged = useCallback(() => {
|
||||
const playlist = playlistRef.current
|
||||
const synced = syncedPositionRef.current
|
||||
if (!playlist || !synced) return
|
||||
// Queue edits run synchronously, so an event can describe an index from
|
||||
// before them (Android's `previousIndex` also goes stale). The player's
|
||||
// live index is the one that matters; if it is where the last sync left
|
||||
// it, this change was ours.
|
||||
const index = playlist.currentIndex
|
||||
if (index === synced.index) return
|
||||
const state = storeRef.current.getState()
|
||||
// A queue change is still being applied and will move the player itself.
|
||||
if (
|
||||
state.queue[0] !== synced.songId ||
|
||||
state.history.length !== synced.historyLength
|
||||
) {
|
||||
return
|
||||
}
|
||||
// The window is history then queue, so the current track sits at
|
||||
// `history.length`.
|
||||
const steps = index - state.history.length
|
||||
if (steps === 0) return
|
||||
|
||||
autoPlayNextRef.current = true
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
|
||||
storeRef.current.update((state) => {
|
||||
if (steps === 1) return playbackQueue.skipNext(state)
|
||||
if (steps > 1) return playbackQueue.skipToQueueIndex(state, steps)
|
||||
let next = state
|
||||
for (let i = 0; i < -steps; i++) {
|
||||
next = playbackQueue.skipPrevious(next)
|
||||
}
|
||||
return next
|
||||
})
|
||||
const next = storeRef.current.getState()
|
||||
syncedPositionRef.current = {
|
||||
index,
|
||||
songId: next.queue[0],
|
||||
historyLength: next.history.length,
|
||||
}
|
||||
settleWaiters()
|
||||
}, [settleWaiters])
|
||||
|
||||
const ensurePlaylist = useCallback(
|
||||
(sources: AudioSource[]) => {
|
||||
if (playlistRef.current) {
|
||||
return playlistRef.current
|
||||
}
|
||||
|
||||
const playlist = createAudioPlaylist({
|
||||
sources,
|
||||
updateInterval: 500,
|
||||
loop: repeatToPlaylistLoop(storeRef.current.getState().repeatEnabled),
|
||||
})
|
||||
// System volume controls loudness; keep the player gain at full scale.
|
||||
playlist.volume = 1
|
||||
statusSubscriptionRef.current = playlist.addListener(
|
||||
"playlistStatusUpdate",
|
||||
handlePlaylistStatusUpdate
|
||||
)
|
||||
trackChangedSubscriptionRef.current = playlist.addListener(
|
||||
"trackChanged",
|
||||
handleTrackChanged
|
||||
)
|
||||
playlistRef.current = playlist
|
||||
return playlist
|
||||
},
|
||||
[handlePlaylistStatusUpdate, handleTrackChanged]
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false
|
||||
void setAudioModeAsync({
|
||||
playsInSilentMode: true,
|
||||
shouldPlayInBackground: true,
|
||||
interruptionMode: "doNotMix",
|
||||
}).catch(() => {
|
||||
if (!cancelled) {
|
||||
showError("Audio playback could not be initialized.")
|
||||
}
|
||||
})
|
||||
|
||||
return () => {
|
||||
cancelled = true
|
||||
destroyPlaylist()
|
||||
}
|
||||
}, [destroyPlaylist])
|
||||
|
||||
useEffect(() => {
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
}
|
||||
}, [repeatEnabled])
|
||||
|
||||
const setIsPlaying = useCallback(
|
||||
(playing: boolean) => {
|
||||
isPlayingRef.current = playing
|
||||
setIsPlayingState(playing)
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
if (playing) {
|
||||
startPlayer(playlist)
|
||||
} else {
|
||||
deferredPlayRef.current = false
|
||||
playlist.pause()
|
||||
}
|
||||
},
|
||||
[startPlayer]
|
||||
)
|
||||
|
||||
// Reads duration from a ref so seekTo, and every action built on it, stays
|
||||
// stable across track changes.
|
||||
const seekTo = useCallback(async (seconds: number) => {
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
const maxDuration = playlist.duration || durationRef.current || 0
|
||||
const clamped = Math.max(0, Math.min(seconds, maxDuration))
|
||||
await playlist.seekTo(clamped)
|
||||
currentTimeRef.current = clamped
|
||||
setCurrentTime(clamped)
|
||||
}, [])
|
||||
|
||||
const handlePlaybackLoadFailure = useCallback(() => {
|
||||
autoPlayNextRef.current = false
|
||||
isPlayingRef.current = false
|
||||
destroyPlaylist()
|
||||
setIsPlayingState(false)
|
||||
showError("Could not play this track. The queue has been cleared.")
|
||||
storeRef.current.update(playbackQueue.clearQueue)
|
||||
}, [destroyPlaylist])
|
||||
|
||||
useEffect(() => {
|
||||
const loadRequestId = ++loadRequestIdRef.current
|
||||
const isCurrentLoad = () => loadRequestIdRef.current === loadRequestId
|
||||
|
||||
async function syncPlaylist() {
|
||||
if (!config || !currentSongId || !user) {
|
||||
if (!currentSongId) {
|
||||
destroyPlaylist()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const windowSongIds = nativePlaylistSongIds(
|
||||
queueHistorySongIds,
|
||||
queueSongIds
|
||||
)
|
||||
const currentIndex = queueHistorySongIds.length
|
||||
const cookieHeader = await getAuthCookieHeader(
|
||||
config.serverUrl,
|
||||
config.convexUrl
|
||||
)
|
||||
if (!cookieHeader) {
|
||||
showError("Your session has expired. Please sign in again.")
|
||||
return
|
||||
}
|
||||
if (!isCurrentLoad()) return
|
||||
|
||||
const loadKey = `${user.playbackQuality}:${atmosEnabled(user)}:${cookieHeader}`
|
||||
const needsRebuild =
|
||||
loadedLoadKeyRef.current !== loadKey ||
|
||||
nativePlaylistNeedsRebuild(
|
||||
loadedSongIdsRef.current,
|
||||
queueHistorySongIds,
|
||||
queueSongIds
|
||||
)
|
||||
|
||||
const metadata = currentSong
|
||||
? lockScreenMetadata(currentSong, config.serverUrl)
|
||||
: null
|
||||
const shouldPlay = isPlayingRef.current || autoPlayNextRef.current
|
||||
|
||||
if (!needsRebuild) {
|
||||
const playlist = playlistRef.current
|
||||
if (!playlist) return
|
||||
if (playlist.currentIndex !== currentIndex) {
|
||||
playlist.skipTo(currentIndex)
|
||||
}
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
if (metadata) {
|
||||
updatePlaylistLockScreenMetadata(playlist, metadata)
|
||||
}
|
||||
markSynced(playlist, currentSongId, currentIndex)
|
||||
if (shouldPlay) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
startPlayer(playlist)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const buildSources = async (songIds: Id<"songs">[]) => {
|
||||
const songs = await loadPlaybackSongs(convex, cacheScope, songIds)
|
||||
const sources = new Map<Id<"songs">, AudioSource>()
|
||||
for (const song of songs) {
|
||||
if (!song) return null
|
||||
const plan = playbackStreamPlan(
|
||||
song.files,
|
||||
user.playbackQuality,
|
||||
atmosEnabled(user)
|
||||
)
|
||||
sources.set(
|
||||
song.id,
|
||||
songAudioSource(
|
||||
config.serverUrl,
|
||||
song.id,
|
||||
plan.playbackQuality,
|
||||
plan.preferAtmos,
|
||||
plan.useHls,
|
||||
{ cookieHeader, songTitle: song.title }
|
||||
)
|
||||
)
|
||||
}
|
||||
return sources
|
||||
}
|
||||
|
||||
// Queue and history edits around the playing track are applied in place
|
||||
// so playback isn't interrupted.
|
||||
const loadedPlaylist = playlistRef.current
|
||||
const edits =
|
||||
loadedPlaylist && loadedLoadKeyRef.current === loadKey
|
||||
? nativePlaylistEdits(
|
||||
loadedSongIdsRef.current,
|
||||
loadedPlaylist.currentIndex,
|
||||
windowSongIds,
|
||||
currentIndex
|
||||
)
|
||||
: null
|
||||
if (loadedPlaylist && edits) {
|
||||
const addedSongIds = edits.flatMap((edit) =>
|
||||
edit.type === "remove" ? [] : [edit.songId]
|
||||
)
|
||||
const sources = await buildSources([...new Set(addedSongIds)])
|
||||
if (!isCurrentLoad()) return
|
||||
if (!sources) {
|
||||
handlePlaybackLoadFailure()
|
||||
return
|
||||
}
|
||||
for (const edit of edits) {
|
||||
if (edit.type === "remove") {
|
||||
loadedPlaylist.remove(edit.index)
|
||||
} else if (edit.type === "insert") {
|
||||
loadedPlaylist.insert(sources.get(edit.songId)!, edit.index)
|
||||
} else {
|
||||
loadedPlaylist.add(sources.get(edit.songId)!)
|
||||
}
|
||||
}
|
||||
loadedSongIdsRef.current = windowSongIds
|
||||
loadedPlaylist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
markSynced(loadedPlaylist, currentSongId, currentIndex)
|
||||
if (shouldPlay && !loadedPlaylist.playing) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
startPlayer(loadedPlaylist)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const sourcesById = await buildSources(windowSongIds)
|
||||
if (!isCurrentLoad()) return
|
||||
if (!sourcesById) {
|
||||
handlePlaybackLoadFailure()
|
||||
return
|
||||
}
|
||||
const sources = windowSongIds.map((songId) => sourcesById.get(songId)!)
|
||||
|
||||
// Keep the position when only the stream settings changed.
|
||||
const resumeSeconds =
|
||||
loadedPlaylist &&
|
||||
loadedSongIdsRef.current[loadedPlaylist.currentIndex] === currentSongId
|
||||
? currentTimeRef.current
|
||||
: null
|
||||
|
||||
destroyPlaylist()
|
||||
|
||||
if (resumeSeconds !== null && resumeSeconds > 0) {
|
||||
pendingSeekRef.current = resumeSeconds
|
||||
}
|
||||
// Start at the current track and put history in front of it, so an
|
||||
// earlier song is never loaded first.
|
||||
const playlist = ensurePlaylist(sources.slice(currentIndex))
|
||||
for (let index = 0; index < currentIndex; index++) {
|
||||
playlist.insert(sources[index], index)
|
||||
}
|
||||
loadedSongIdsRef.current = windowSongIds
|
||||
loadedLoadKeyRef.current = loadKey
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
activatePlaylistLockScreen(
|
||||
playlist,
|
||||
metadata ?? { title: currentSong?.title }
|
||||
)
|
||||
markSynced(playlist, currentSongId, currentIndex)
|
||||
|
||||
if (shouldPlay) {
|
||||
isPlayingRef.current = true
|
||||
setIsPlayingState(true)
|
||||
startPlayer(playlist)
|
||||
} else {
|
||||
playlist.pause()
|
||||
// Enable audio for the restored queue without starting playback.
|
||||
try {
|
||||
await setIsAudioActiveAsync(true)
|
||||
} catch {
|
||||
if (isCurrentLoad()) {
|
||||
showError("Audio playback could not be initialized.")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void syncPlaylist().catch(() => {
|
||||
if (!isCurrentLoad()) return
|
||||
handlePlaybackLoadFailure()
|
||||
})
|
||||
|
||||
return () => {
|
||||
if (loadRequestIdRef.current === loadRequestId) {
|
||||
loadRequestIdRef.current += 1
|
||||
}
|
||||
}
|
||||
}, [
|
||||
cacheScope,
|
||||
config,
|
||||
convex,
|
||||
currentSongId,
|
||||
currentSongSyncKey,
|
||||
destroyPlaylist,
|
||||
ensurePlaylist,
|
||||
handlePlaybackLoadFailure,
|
||||
historySyncKey,
|
||||
markSynced,
|
||||
queueSyncKey,
|
||||
queueStartVersion,
|
||||
repeatEnabled,
|
||||
startPlayer,
|
||||
userPlaybackKey,
|
||||
])
|
||||
|
||||
/**
|
||||
* Resolves once the native player has `songId` loaded (and playing or
|
||||
* paused, if given). Rejects if the queue moves to another song first.
|
||||
*/
|
||||
const waitForSong = useCallback(
|
||||
(songId: Id<"songs">, playing?: boolean) =>
|
||||
new Promise<void>((resolve, reject) => {
|
||||
const store = storeRef.current
|
||||
const waiters = waitersRef.current
|
||||
let songWaiters = waiters.get(songId)
|
||||
if (!songWaiters) {
|
||||
songWaiters = new Set()
|
||||
waiters.set(songId, songWaiters)
|
||||
}
|
||||
const finish = (error?: Error) => {
|
||||
clearTimeout(timeout)
|
||||
unsubscribe()
|
||||
songWaiters.delete(waiter)
|
||||
if (songWaiters.size === 0 && waiters.get(songId) === songWaiters) {
|
||||
waiters.delete(songId)
|
||||
}
|
||||
if (error) reject(error)
|
||||
else resolve()
|
||||
}
|
||||
const waiter: PlaybackWaiter = { playing, resolve: () => finish() }
|
||||
const timeout = setTimeout(
|
||||
() =>
|
||||
finish(
|
||||
new Error(
|
||||
"The audio did not become ready. Check your connection and try again."
|
||||
)
|
||||
),
|
||||
PLAYBACK_READY_TIMEOUT_MS
|
||||
)
|
||||
// Starting a queue clears it and fills it in one go; only the
|
||||
// settled queue counts.
|
||||
const unsubscribe = store.subscribe(() => {
|
||||
queueMicrotask(() => {
|
||||
if (store.getState().queue[0] !== songId) {
|
||||
finish(
|
||||
new Error(
|
||||
"The playback queue changed before the request finished."
|
||||
)
|
||||
)
|
||||
}
|
||||
})
|
||||
})
|
||||
songWaiters.add(waiter)
|
||||
settleWaiters()
|
||||
}),
|
||||
[settleWaiters]
|
||||
)
|
||||
|
||||
/**
|
||||
* Starts the current song at `seconds` once it loads, and shows that
|
||||
* position right away. Playback waits for the seek (see `startPlayer`).
|
||||
*/
|
||||
const queueSeek = useCallback((seconds: number) => {
|
||||
pendingSeekRef.current = seconds
|
||||
currentTimeRef.current = seconds
|
||||
setCurrentTime(seconds)
|
||||
}, [])
|
||||
|
||||
const hasPlayer = useCallback(() => playlistRef.current !== null, [])
|
||||
|
||||
const requestAutoPlay = useCallback(() => {
|
||||
autoPlayNextRef.current = true
|
||||
}, [])
|
||||
|
||||
return {
|
||||
isPlaying,
|
||||
setIsPlaying,
|
||||
currentTime,
|
||||
currentTimeRef,
|
||||
duration,
|
||||
seekTo,
|
||||
queueSeek,
|
||||
hasPlayer,
|
||||
requestAutoPlay,
|
||||
resetPosition,
|
||||
resetForNewQueue,
|
||||
waitForSong,
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
|
||||
/**
|
||||
* Resolves `currentUser.image` to a loadable URI. Stored avatars come back as
|
||||
* paths on the oTunes web server; legacy ones are data URLs.
|
||||
*/
|
||||
export function useProfileImageUrl(image: string | undefined) {
|
||||
const { config } = useServerConfig()
|
||||
if (!image?.startsWith("/")) {
|
||||
return image
|
||||
}
|
||||
return config ? `${config.serverUrl.replace(/\/+$/, "")}${image}` : undefined
|
||||
}
|
||||
@@ -1,110 +0,0 @@
|
||||
import { useMutation } from "convex/react"
|
||||
import { useCallback, useEffect, useRef, type RefObject } from "react"
|
||||
import { AppState } from "react-native"
|
||||
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { PlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import { flushPersistentCache } from "@/lib/persistent-cache"
|
||||
|
||||
const PROGRESS_SAVE_INTERVAL_MS = 5000
|
||||
|
||||
/**
|
||||
* Restores the saved position when a song becomes current, and saves the
|
||||
* position while it plays, on pause, and when the app leaves the foreground.
|
||||
*/
|
||||
export function useProgressPersistence({
|
||||
store,
|
||||
currentSongId,
|
||||
isPlaying,
|
||||
queueStartVersion,
|
||||
currentTimeRef,
|
||||
hasPlayer,
|
||||
queueSeek,
|
||||
resetPosition,
|
||||
}: {
|
||||
store: PlaybackStore
|
||||
currentSongId: Id<"songs"> | null
|
||||
isPlaying: boolean
|
||||
queueStartVersion: number
|
||||
currentTimeRef: RefObject<number>
|
||||
hasPlayer: () => boolean
|
||||
queueSeek: (seconds: number) => void
|
||||
resetPosition: () => void
|
||||
}) {
|
||||
const updateSongProgressMutation = useMutation(
|
||||
api.playback.updateSongProgress
|
||||
)
|
||||
const storeRef = useRef(store)
|
||||
storeRef.current = store
|
||||
|
||||
const progressRestoredForSongRef = useRef<Id<"songs"> | null>(null)
|
||||
const lastSavedProgressRef = useRef(-1)
|
||||
const prevIsPlayingRef = useRef(false)
|
||||
|
||||
const saveProgress = useCallback(
|
||||
(seconds: number) => {
|
||||
const songId = storeRef.current.getState().queue[0]
|
||||
if (!songId) return
|
||||
const progressSeconds = Math.max(0, Math.floor(seconds))
|
||||
if (progressSeconds === lastSavedProgressRef.current) return
|
||||
lastSavedProgressRef.current = progressSeconds
|
||||
storeRef.current.setProgress(songId, progressSeconds)
|
||||
void updateSongProgressMutation({
|
||||
songId,
|
||||
progressSeconds,
|
||||
}).catch(() => {})
|
||||
},
|
||||
[updateSongProgressMutation]
|
||||
)
|
||||
|
||||
const resetProgress = useCallback(() => {
|
||||
progressRestoredForSongRef.current = null
|
||||
lastSavedProgressRef.current = -1
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
if (!currentSongId) {
|
||||
progressRestoredForSongRef.current = null
|
||||
return
|
||||
}
|
||||
|
||||
if (progressRestoredForSongRef.current === currentSongId) return
|
||||
progressRestoredForSongRef.current = currentSongId
|
||||
lastSavedProgressRef.current = -1
|
||||
resetPosition()
|
||||
// Queue the seek before the song loads, so playback starts there.
|
||||
const progressSeconds = store.getState().progressSeconds
|
||||
if (progressSeconds > 0) {
|
||||
queueSeek(progressSeconds)
|
||||
}
|
||||
}, [currentSongId, queueStartVersion, queueSeek, resetPosition, store])
|
||||
|
||||
useEffect(() => {
|
||||
if (!currentSongId) return
|
||||
if (prevIsPlayingRef.current === isPlaying) return
|
||||
prevIsPlayingRef.current = isPlaying
|
||||
saveProgress(currentTimeRef.current)
|
||||
}, [isPlaying, currentSongId, currentTimeRef, saveProgress])
|
||||
|
||||
useEffect(() => {
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") return
|
||||
if (currentSongId && hasPlayer()) {
|
||||
saveProgress(currentTimeRef.current)
|
||||
}
|
||||
flushPersistentCache()
|
||||
})
|
||||
return () => subscription.remove()
|
||||
}, [currentSongId, currentTimeRef, hasPlayer, saveProgress])
|
||||
|
||||
useEffect(() => {
|
||||
if (!isPlaying || !currentSongId) return
|
||||
const interval = setInterval(() => {
|
||||
saveProgress(currentTimeRef.current)
|
||||
}, PROGRESS_SAVE_INTERVAL_MS)
|
||||
return () => clearInterval(interval)
|
||||
}, [isPlaying, currentSongId, currentTimeRef, saveProgress])
|
||||
|
||||
return { resetProgress }
|
||||
}
|
||||
@@ -5,7 +5,6 @@ import { publishMusicCatalog } from "@/lib/app-intents"
|
||||
export const FAVORITES_PLAYLIST_ID = "otunes:favorites"
|
||||
|
||||
const HANDLED_KEY = "otunes:handled-app-intents"
|
||||
const CATALOG_CURSORS_KEY = "otunes:app-intent-catalog-cursors"
|
||||
const MAX_HANDLED = 200
|
||||
|
||||
const CATALOG_KINDS = [
|
||||
@@ -21,7 +20,6 @@ export async function clearAppIntentCatalogs() {
|
||||
return
|
||||
}
|
||||
const results = await Promise.allSettled([
|
||||
AsyncStorage.removeItem(CATALOG_CURSORS_KEY),
|
||||
AppIntents.deleteDonationsAsync({ intent: "playMusic" }),
|
||||
AppIntents.clearPendingInvocationsAsync(),
|
||||
...CATALOG_KINDS.map((kind) => publishMusicCatalog(kind, [])),
|
||||
@@ -30,39 +28,6 @@ export async function clearAppIntentCatalogs() {
|
||||
if (failed?.status === "rejected") throw failed.reason
|
||||
}
|
||||
|
||||
/**
|
||||
* Server `head` values the disk catalog is synced to, per library kind. A
|
||||
* missing kind means it has never synced and needs a full download.
|
||||
*/
|
||||
export type CatalogCursors = Partial<
|
||||
Record<"song" | "album" | "artist", number>
|
||||
>
|
||||
|
||||
/** Cursors for `scope`; another server or user's cursors read as empty. */
|
||||
export async function loadCatalogCursors(
|
||||
scope: string
|
||||
): Promise<CatalogCursors> {
|
||||
try {
|
||||
const raw = await AsyncStorage.getItem(CATALOG_CURSORS_KEY)
|
||||
const parsed = raw
|
||||
? (JSON.parse(raw) as { scope?: unknown; cursors?: CatalogCursors })
|
||||
: null
|
||||
return parsed?.scope === scope ? (parsed.cursors ?? {}) : {}
|
||||
} catch {
|
||||
return {}
|
||||
}
|
||||
}
|
||||
|
||||
export async function saveCatalogCursors(
|
||||
scope: string,
|
||||
cursors: CatalogCursors
|
||||
) {
|
||||
await AsyncStorage.setItem(
|
||||
CATALOG_CURSORS_KEY,
|
||||
JSON.stringify({ scope, cursors })
|
||||
)
|
||||
}
|
||||
|
||||
export async function loadHandledIntentIds() {
|
||||
const raw = await AsyncStorage.getItem(HANDLED_KEY)
|
||||
if (!raw) {
|
||||
|
||||
@@ -50,13 +50,6 @@ export function publishMusicCatalog(kind: string, entities: AppIntentEntity[]) {
|
||||
return write
|
||||
}
|
||||
|
||||
/** The full disk catalog for `kind`, as last published. */
|
||||
export async function readMusicCatalog(kind: string) {
|
||||
await publishing.catch(() => undefined)
|
||||
if (!native || !AppIntents.isAvailable()) return []
|
||||
return JSON.parse(await native.catalogJSON(kind)) as AppIntentEntity[]
|
||||
}
|
||||
|
||||
export async function completeMusicInvocation(
|
||||
token: string,
|
||||
error: string | null
|
||||
|
||||
@@ -3,8 +3,8 @@ import { useSyncExternalStore } from "react"
|
||||
|
||||
const STORAGE_KEY = "otunes:artwork-colors"
|
||||
const listeners = new Set<() => void>()
|
||||
// Undefined until storage has been read, so callers never act on a guess.
|
||||
let enabled: boolean | undefined
|
||||
let enabled = true
|
||||
let loaded = false
|
||||
let loading: Promise<void> | undefined
|
||||
|
||||
function notify() {
|
||||
@@ -13,40 +13,37 @@ function notify() {
|
||||
|
||||
function load() {
|
||||
return (loading ??= AsyncStorage.getItem(STORAGE_KEY)
|
||||
.then((value) => value !== "false")
|
||||
// Keep the default when local storage is unavailable.
|
||||
.catch(() => true)
|
||||
.then((value) => {
|
||||
enabled = value
|
||||
enabled = value !== "false"
|
||||
})
|
||||
.catch(() => {
|
||||
// Keep the default when local storage is unavailable.
|
||||
})
|
||||
.finally(() => {
|
||||
loaded = true
|
||||
notify()
|
||||
}))
|
||||
}
|
||||
|
||||
void load()
|
||||
|
||||
function subscribe(listener: () => void) {
|
||||
listeners.add(listener)
|
||||
void load()
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Device preference, kept outside account data and the disposable query cache.
|
||||
* `undefined` until it has loaded.
|
||||
*/
|
||||
/** Device preference, kept outside account data and the disposable query cache. */
|
||||
export function useArtworkColorsEnabled() {
|
||||
return useSyncExternalStore(
|
||||
subscribe,
|
||||
() => enabled,
|
||||
() => undefined
|
||||
)
|
||||
return useSyncExternalStore(subscribe, () => loaded && enabled, () => false)
|
||||
}
|
||||
|
||||
/** Resolves with the preference once it has loaded. */
|
||||
export async function loadArtworkColorsEnabled() {
|
||||
await load()
|
||||
return enabled ?? true
|
||||
export function useArtworkColorPreferenceLoaded() {
|
||||
return useSyncExternalStore(subscribe, () => loaded, () => false)
|
||||
}
|
||||
|
||||
export function artworkColorsEnabled() {
|
||||
return loaded && enabled
|
||||
}
|
||||
|
||||
export async function setArtworkColorsEnabled(value: boolean) {
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import { ConvexError, type Value } from "convex/values"
|
||||
|
||||
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"])
|
||||
const AUTH_ERROR_MESSAGES = new Set([
|
||||
"Not authenticated",
|
||||
"User not logged in",
|
||||
])
|
||||
|
||||
function matchesAuthMessage(message: string): boolean {
|
||||
if (AUTH_ERROR_MESSAGES.has(message)) {
|
||||
|
||||
@@ -37,9 +37,7 @@ export function authStorageKey(key: string, storageNamespace: string): string {
|
||||
return `${key}_${escapedNamespace}`
|
||||
}
|
||||
|
||||
export async function clearStoredAuthTokens(
|
||||
storageNamespace: string
|
||||
): Promise<void> {
|
||||
export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
|
||||
await Promise.all(
|
||||
AUTH_STORAGE_KEYS.map((key) =>
|
||||
secureRemoveItem(authStorageKey(key, storageNamespace))
|
||||
|
||||
@@ -5,10 +5,7 @@ export function formatDuration(seconds: number): string {
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
|
||||
export function formatRemainingDuration(
|
||||
current: number,
|
||||
total: number
|
||||
): string {
|
||||
export function formatRemainingDuration(current: number, total: number): string {
|
||||
const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
|
||||
return `-${formatDuration(remaining)}`
|
||||
}
|
||||
|
||||
@@ -79,9 +79,7 @@ export function deriveCoverPalette(
|
||||
secondaryForeground: toHex(secondaryForeground),
|
||||
accent: toHex(accent),
|
||||
accentForeground: toHex(accentForeground),
|
||||
accentText: toHex(
|
||||
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
|
||||
),
|
||||
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
|
||||
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
|
||||
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
|
||||
isDark: lightText,
|
||||
@@ -96,10 +94,7 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
|
||||
? withLightness(color, Math.min(lch.l, 0.86))
|
||||
: withLightness(color, Math.max(lch.l, 0.2))
|
||||
const y = luminance(clamped)
|
||||
if (
|
||||
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
|
||||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
|
||||
) {
|
||||
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
|
||||
return clamped
|
||||
}
|
||||
|
||||
@@ -130,10 +125,7 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
|
||||
}
|
||||
|
||||
function prefersLightText(background: Rgb) {
|
||||
return (
|
||||
contrastRatio([255, 255, 255], background) >=
|
||||
contrastRatio([0, 0, 0], background)
|
||||
)
|
||||
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
|
||||
}
|
||||
|
||||
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
|
||||
@@ -188,10 +180,7 @@ function withLuminance(color: Rgb, target: number): Rgb {
|
||||
high = mid
|
||||
}
|
||||
}
|
||||
return withLightness(
|
||||
color,
|
||||
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
|
||||
)
|
||||
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
|
||||
}
|
||||
|
||||
/** `amount` of `color` over `base`. */
|
||||
@@ -217,8 +206,7 @@ function toLinear(channel: number) {
|
||||
}
|
||||
|
||||
function fromLinear(value: number) {
|
||||
const c =
|
||||
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
||||
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
||||
return c * 255
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,40 @@
|
||||
import type { MediaShareTarget } from "@otunes/convex/client/media-links"
|
||||
export type MediaShareContext = (
|
||||
| { type: "album"; albumId: string }
|
||||
| { type: "song"; albumId: string; songId: string }
|
||||
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
|
||||
| { type: "artist"; artistId: string }
|
||||
) & { title: string }
|
||||
|
||||
export {
|
||||
mediaShareUrl,
|
||||
shouldShowShare,
|
||||
} from "@otunes/convex/client/media-links"
|
||||
export function shouldShowShare(
|
||||
share: MediaShareContext | undefined,
|
||||
selectedCount: number
|
||||
) {
|
||||
if (!share) {
|
||||
return false
|
||||
}
|
||||
if (share.type === "song") {
|
||||
return selectedCount === 1
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
/** A share target plus the title shown in the native share sheet. */
|
||||
export type MediaShareContext = MediaShareTarget & { title: string }
|
||||
export function mediaShareUrl(
|
||||
serverUrl: string,
|
||||
share: MediaShareContext
|
||||
): string {
|
||||
const origin = serverUrl.replace(/\/+$/, "")
|
||||
|
||||
switch (share.type) {
|
||||
case "album":
|
||||
return `${origin}/album/${share.albumId}`
|
||||
case "song":
|
||||
return `${origin}/album/${share.albumId}?s=${share.songId}`
|
||||
case "playlist":
|
||||
if (share.isFavorites) {
|
||||
return `${origin}/playlist/favorites`
|
||||
}
|
||||
return `${origin}/playlist/${share.playlistId}`
|
||||
case "artist":
|
||||
return `${origin}/artist/${share.artistId}`
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@ export function useStackScreenOptions(
|
||||
headerBackButtonDisplayMode: "minimal",
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
animation: "fade",
|
||||
animation: "slide_from_right",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: theme.background },
|
||||
|
||||
@@ -2,8 +2,3 @@ import { Platform } from "react-native"
|
||||
|
||||
// Android Dolby decoder reports do not reliably indicate working Atmos playback.
|
||||
export const dolbyAtmosSupported = Platform.OS === "ios"
|
||||
|
||||
/** Whether to stream Atmos for this user: they opted in and the device can play it. */
|
||||
export function atmosEnabled(user: { preferAtmos?: boolean }) {
|
||||
return dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
}
|
||||
@@ -13,10 +13,7 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
|
||||
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
|
||||
|
||||
function normalizeHostnameInput(input: string): string {
|
||||
return input
|
||||
.trim()
|
||||
.replace(/^https?:\/\//i, "")
|
||||
.replace(/\/+$/, "")
|
||||
return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
|
||||
}
|
||||
|
||||
function buildServerUrl(hostname: string): string {
|
||||
|
||||
@@ -5,10 +5,8 @@ import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import {
|
||||
getCachedSong,
|
||||
getSongSnapshot,
|
||||
getSongsVersion,
|
||||
requestSongs,
|
||||
songFromSnapshot,
|
||||
subscribeSongs,
|
||||
} from "@otunes/convex/client/song-cache"
|
||||
import { isPersistentCacheLoaded } from "@/lib/persistent-cache"
|
||||
@@ -52,10 +50,12 @@ export function useSongs(songIds: readonly Id<"songs">[]) {
|
||||
*/
|
||||
export function useSong(songId: Id<"songs"> | null): BrowseSong | null {
|
||||
const convex = useConvex()
|
||||
// While the song is missing the snapshot is the cache version, so every
|
||||
// cache change re-renders and retries the fetch below.
|
||||
const snapshot = useSyncExternalStore(subscribeSongs, () =>
|
||||
getSongSnapshot(songId)
|
||||
songId ? (getCachedSong(songId) ?? getSongsVersion()) : null
|
||||
)
|
||||
const song = songFromSnapshot(snapshot)
|
||||
const song = typeof snapshot === "object" ? snapshot : null
|
||||
|
||||
useEffect(() => {
|
||||
if (songId && !song && isPersistentCacheLoaded()) {
|
||||
|
||||
+34
-15
@@ -1,11 +1,9 @@
|
||||
import {
|
||||
type PlaybackQuality,
|
||||
songHlsPlaylistPath,
|
||||
songPlayPath,
|
||||
} from "@otunes/convex/playback-stream"
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { Platform } from "react-native"
|
||||
import type { AudioSource } from "expo-audio"
|
||||
|
||||
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
|
||||
|
||||
export const coverImageSizes = [64, 128, 192, 256, 384, 512, 768, 1024] as const
|
||||
|
||||
export type CoverImageSize = (typeof coverImageSizes)[number]
|
||||
@@ -39,15 +37,39 @@ export function albumCoverUrl(
|
||||
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
|
||||
}
|
||||
|
||||
/** `version` is the summary's `cover`; it changes with the artwork. */
|
||||
export function playlistCoverUrl(
|
||||
serverUrl: string,
|
||||
playlistId: string,
|
||||
version: string | null,
|
||||
size?: CoverImageSize
|
||||
) {
|
||||
const uri = `${serverUrl}/api/playlist/${playlistId}/cover`
|
||||
return sizedCoverUrl(version ? `${uri}?v=${version}` : uri, size)
|
||||
return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
|
||||
}
|
||||
|
||||
export function songPlayUrl(
|
||||
serverUrl: string,
|
||||
songId: string,
|
||||
quality: PlaybackQuality | undefined,
|
||||
preferAtmos: boolean | undefined
|
||||
) {
|
||||
const params = new URLSearchParams()
|
||||
if (Platform.OS === "ios") params.set("losslessFormat", "alac")
|
||||
if (quality) params.set("quality", quality)
|
||||
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
|
||||
const query = params.toString()
|
||||
return `${serverUrl}/api/song/${songId}/play${query ? `?${query}` : ""}`
|
||||
}
|
||||
|
||||
export function songHlsPlaylistUrl(
|
||||
serverUrl: string,
|
||||
songId: string,
|
||||
quality: PlaybackQuality | undefined,
|
||||
preferAtmos: boolean | undefined
|
||||
) {
|
||||
const params = new URLSearchParams()
|
||||
if (quality) params.set("quality", quality)
|
||||
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
|
||||
const query = params.toString()
|
||||
return `${serverUrl}/api/song/${songId}/play/hls${query ? `?${query}` : ""}`
|
||||
}
|
||||
|
||||
export function songAudioSource(
|
||||
@@ -58,12 +80,9 @@ export function songAudioSource(
|
||||
useHls: boolean,
|
||||
options?: { cookieHeader?: string | null; songTitle?: string }
|
||||
): AudioSource {
|
||||
const path = useHls
|
||||
? songHlsPlaylistPath(songId, quality, preferAtmos)
|
||||
: songPlayPath(songId, quality, preferAtmos, {
|
||||
losslessFormat: Platform.OS === "ios" ? "alac" : undefined,
|
||||
})
|
||||
const uri = `${serverUrl}${path}`
|
||||
const uri = useHls
|
||||
? songHlsPlaylistUrl(serverUrl, songId, quality, preferAtmos)
|
||||
: songPlayUrl(serverUrl, songId, quality, preferAtmos)
|
||||
|
||||
const headers = options?.cookieHeader
|
||||
? { Cookie: options.cookieHeader }
|
||||
|
||||
@@ -5,11 +5,7 @@ final class TabletSidebar: Module {
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("TabletSidebar")
|
||||
View(TabletSidebarView.self) {
|
||||
Events("onProfilePress", "onPlaylistPress")
|
||||
Prop("playlists") { (view: TabletSidebarView, value: [SidebarPlaylist]) in
|
||||
view.playlists = value
|
||||
view.configure()
|
||||
}
|
||||
Events("onProfilePress")
|
||||
Prop("accountName") { (view: TabletSidebarView, value: String) in
|
||||
view.accountName = value
|
||||
view.configure()
|
||||
@@ -30,23 +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.
|
||||
final class TabletSidebarView: ExpoView {
|
||||
let onProfilePress = EventDispatcher()
|
||||
let onPlaylistPress = EventDispatcher()
|
||||
var playlists: [SidebarPlaylist] = []
|
||||
private let selectionProxy = SidebarSelectionProxy()
|
||||
private var playlistTabs: [String: UITab] = [:]
|
||||
private var coverImages: [String: UIImage] = [:]
|
||||
private var coverTasks: [String: URLSessionDataTask] = [:]
|
||||
var accountName = ""
|
||||
var initials = ""
|
||||
var imageURL: String?
|
||||
@@ -100,13 +82,11 @@ final class TabletSidebarView: ExpoView {
|
||||
|
||||
deinit {
|
||||
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
|
||||
coverTasks.values.forEach { $0.cancel() }
|
||||
}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
private func configure(_ controller: UITabBarController) {
|
||||
configureGroups(controller)
|
||||
configurePlaylists(controller)
|
||||
|
||||
let footer: SidebarAccountButton
|
||||
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
|
||||
@@ -123,7 +103,6 @@ final class TabletSidebarView: ExpoView {
|
||||
@available(iOS 18.0, *)
|
||||
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
|
||||
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
|
||||
.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
|
||||
let selected = destinations.first { $0 === controller.selectedTab }
|
||||
let contextualTab = selected ?? footer.contextualTab ?? destinations.first
|
||||
footer.contextualTab = contextualTab
|
||||
@@ -181,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] ?? 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] { 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, *)
|
||||
private final class SidebarAccountButton: UIView {
|
||||
var onPress: (() -> Void)?
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
const fs = require("fs")
|
||||
const path = require("path")
|
||||
const { withDangerousMod } = require("expo/config-plugins")
|
||||
|
||||
// Overrides react-native-screens' 150ms crossfade for `animation: "fade"`.
|
||||
// App resources win over library resources with the same name, so the stack
|
||||
// fades through black in 100ms: the old page out, then the new page in.
|
||||
const anims = {
|
||||
"rns_fade_out.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromAlpha="1.0"
|
||||
android:toAlpha="0.0"
|
||||
android:duration="50" />
|
||||
`,
|
||||
"rns_fade_in.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:fromAlpha="0.0"
|
||||
android:toAlpha="1.0"
|
||||
android:startOffset="50"
|
||||
android:duration="50" />
|
||||
`,
|
||||
}
|
||||
|
||||
module.exports = (config) =>
|
||||
withDangerousMod(config, [
|
||||
"android",
|
||||
(config) => {
|
||||
const dir = path.join(
|
||||
config.modRequest.platformProjectRoot,
|
||||
"app/src/main/res/anim"
|
||||
)
|
||||
fs.mkdirSync(dir, { recursive: true })
|
||||
for (const [name, xml] of Object.entries(anims)) {
|
||||
fs.writeFileSync(path.join(dir, name), `<?xml version="1.0" encoding="utf-8"?>\n${xml}`)
|
||||
}
|
||||
return config
|
||||
},
|
||||
])
|
||||
@@ -1,4 +1,5 @@
|
||||
const {
|
||||
withEntitlementsPlist,
|
||||
withPodfile,
|
||||
withPodfileProperties,
|
||||
withXcodeProject,
|
||||
@@ -26,6 +27,15 @@ module.exports = (config) => {
|
||||
return config
|
||||
})
|
||||
|
||||
// macOS rejects expo-secure-store's Keychain writes without an access group,
|
||||
// and requesting one makes Xcode provision the Mac app with a profile.
|
||||
config = withEntitlementsPlist(config, (config) => {
|
||||
config.modResults["keychain-access-groups"] = [
|
||||
`$(AppIdentifierPrefix)${config.ios.bundleIdentifier}`,
|
||||
]
|
||||
return config
|
||||
})
|
||||
|
||||
config = withPodfile(config, (config) => {
|
||||
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
||||
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/
|
||||
|
||||
@@ -32,7 +32,7 @@ export default function Page() {
|
||||
<ContentCarousel
|
||||
title="Recently Added"
|
||||
href="/recently-added"
|
||||
content={recentlyAdded.flat()}
|
||||
content={recentlyAdded}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -18,7 +18,7 @@ export default function Page() {
|
||||
) : (
|
||||
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
||||
<div className={albumGridClassName}>
|
||||
{albums.flat().map((album) => (
|
||||
{albums.map((album) => (
|
||||
<AlbumCard key={album.id} album={album} />
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { fetchQuery } from "convex/nextjs"
|
||||
import { convexServerOptions } from "@/lib/convex-server"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { Metadata } from "next"
|
||||
|
||||
interface PageProps {
|
||||
@@ -12,12 +11,12 @@ export async function generateMetadata({
|
||||
params,
|
||||
}: PageProps): Promise<Metadata> {
|
||||
const { id } = await params
|
||||
const detail = await fetchQuery(
|
||||
api.library.browseArtistDetail,
|
||||
{ id: id as Id<"artists"> },
|
||||
const artists = await fetchQuery(
|
||||
api.library.browseArtists,
|
||||
{},
|
||||
convexServerOptions()
|
||||
).catch(() => null)
|
||||
const selectedArtist = detail?.artist
|
||||
)
|
||||
const selectedArtist = artists.find((artist) => artist.id === id)
|
||||
|
||||
return {
|
||||
title: `${selectedArtist ? `${selectedArtist.name}` : "oTunes"}`,
|
||||
|
||||
@@ -18,7 +18,7 @@ export default function Page() {
|
||||
) : (
|
||||
<div className="flex-1 overflow-y-auto p-6 pb-28">
|
||||
<div className={albumGridClassName}>
|
||||
{albums.flat().map((album) => (
|
||||
{albums.map((album) => (
|
||||
<AlbumCard key={album.id} album={album} />
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -8,7 +8,11 @@ import { albumGridClassName } from "@/lib/album-grid-classes"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
|
||||
|
||||
function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) {
|
||||
function RecentlyPlayedCard({
|
||||
item,
|
||||
}: {
|
||||
item: BrowseAlbum | PlaylistSummary
|
||||
}) {
|
||||
if ("owner" in item) {
|
||||
return <PlaylistCard playlist={item} />
|
||||
}
|
||||
|
||||
@@ -9,10 +9,7 @@ import { ContentCarousel } from "@/components/content-carousel"
|
||||
import { SearchResultsSkeleton } from "@/components/library-skeletons"
|
||||
import { SearchPrompt } from "@/components/search-prompt"
|
||||
import { SearchSongItem } from "@/components/search-song-item"
|
||||
import {
|
||||
SearchTopResultCard,
|
||||
type TopResult,
|
||||
} from "@/components/search-top-result-card"
|
||||
import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
@@ -110,7 +107,10 @@ function SearchResults({ query }: { query: string }) {
|
||||
)}
|
||||
|
||||
{showPlaylists && (
|
||||
<ContentCarousel title="Playlists" content={playlistResults ?? []} />
|
||||
<ContentCarousel
|
||||
title="Playlists"
|
||||
content={playlistResults ?? []}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -10,10 +10,10 @@ export async function GET(
|
||||
const { id } = await params
|
||||
|
||||
try {
|
||||
const cover = await getConvexClient().query(api.library.getAlbumCover, {
|
||||
const album = await getConvexClient().query(api.library.getAlbum, {
|
||||
id: id as Id<"albums">,
|
||||
})
|
||||
return serveCoverFile(cover, request)
|
||||
return serveCoverFile(album?.cover, request)
|
||||
} catch {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
@@ -10,10 +10,10 @@ export async function GET(
|
||||
const { id } = await params
|
||||
|
||||
try {
|
||||
const cover = await getConvexClient().query(api.library.getArtistCover, {
|
||||
const artist = await getConvexClient().query(api.library.getArtist, {
|
||||
id: id as Id<"artists">,
|
||||
})
|
||||
return serveCoverFile(cover, request)
|
||||
return serveCoverFile(artist?.cover, request)
|
||||
} catch {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
@@ -1,23 +1,18 @@
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
|
||||
import { serveCoverFile, serveStoredCover } from "@/lib/serve-cover"
|
||||
import { getConvexClient } from "@/lib/convex-server"
|
||||
import { serveCoverFile } from "@/lib/serve-cover"
|
||||
|
||||
/** Playlist artwork, drawn or uploaded ahead of time into Convex storage. */
|
||||
export async function GET(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
try {
|
||||
const storageUrl = await getConvexClient().query(
|
||||
api.library.getPlaylistCover,
|
||||
{ id: id as Id<"playlists"> }
|
||||
)
|
||||
const image = storageUrl ? await fetchConvexStorageFile(storageUrl) : null
|
||||
return image
|
||||
? await serveStoredCover(image, request)
|
||||
: await serveCoverFile(null, request)
|
||||
const playlist = await getConvexClient().query(api.library.getPlaylist, {
|
||||
id: id as Id<"playlists">,
|
||||
})
|
||||
return serveCoverFile(playlist?.cover, request)
|
||||
} catch {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import { getSongSource } from "@/lib/server-song"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { getConvexClient } from "@/lib/convex-server"
|
||||
import { ensureHlsJob, HLS_SEGMENT_SECONDS } from "@/lib/server-hls"
|
||||
import { NextRequest } from "next/server"
|
||||
|
||||
@@ -15,7 +17,9 @@ export async function GET(
|
||||
const { id } = await params
|
||||
|
||||
try {
|
||||
const song = await getSongSource(id)
|
||||
const song = (await getConvexClient().query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
}))!
|
||||
|
||||
const quality = request.nextUrl.searchParams.get("quality")
|
||||
const preferAtmos =
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import { getSongSource } from "@/lib/server-song"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { getConvexClient } from "@/lib/convex-server"
|
||||
import {
|
||||
ensureHlsJob,
|
||||
getExistingHlsJob,
|
||||
@@ -34,11 +36,16 @@ export async function GET(
|
||||
const quality = request.nextUrl.searchParams.get("quality")
|
||||
const preferAtmos =
|
||||
request.nextUrl.searchParams.get("preferAtmos") === "true"
|
||||
// Resolve the source even when a job is cached so every segment is authorized.
|
||||
const song = await getSongSource(id)
|
||||
const existingJob = getExistingHlsJob(id, quality, preferAtmos)
|
||||
const job =
|
||||
getExistingHlsJob(id, quality, preferAtmos) ??
|
||||
(await ensureHlsJob(song, quality, preferAtmos))
|
||||
existingJob ??
|
||||
(await ensureHlsJob(
|
||||
(await getConvexClient().query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
}))!,
|
||||
quality,
|
||||
preferAtmos
|
||||
))
|
||||
if (segmentIndex >= job.segmentCount) {
|
||||
return new Response("Segment not found", { status: 404 })
|
||||
}
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
import {
|
||||
parsePlaybackQuality,
|
||||
playbackStreamPlan,
|
||||
} from "@otunes/convex/playback-stream"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { audioContentTypeForPath } from "@/lib/audio-content-type"
|
||||
import { seekableLosslessFile } from "@/lib/server-lossless"
|
||||
import { getSongSource } from "@/lib/server-song"
|
||||
import { audioInfo } from "@/lib/server-audio-info"
|
||||
import { getConvexClient } from "@/lib/convex-server"
|
||||
import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream"
|
||||
import { spawnFfmpeg } from "@/lib/server-ffmpeg"
|
||||
import { NextRequest, NextResponse, userAgent } from "next/server"
|
||||
import { spawn } from "node:child_process"
|
||||
import fs from "node:fs/promises"
|
||||
import * as music from "music-metadata"
|
||||
|
||||
function parseByteRange(rangeHeader: string | null, fileSize: number) {
|
||||
if (!rangeHeader) {
|
||||
@@ -120,29 +118,47 @@ export async function GET(
|
||||
const { browser } = userAgent(request)
|
||||
|
||||
try {
|
||||
const song = await getSongSource(id)
|
||||
const song = (await getConvexClient().query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
}))!
|
||||
|
||||
const {
|
||||
source: originalCodec,
|
||||
kbps,
|
||||
transcodeNeeded,
|
||||
} = playbackStreamPlan(
|
||||
song.files,
|
||||
// Without a quality, serve the original file as this route always has.
|
||||
parsePlaybackQuality(request.nextUrl.searchParams.get("quality")) ??
|
||||
"lossless",
|
||||
const quality = request.nextUrl.searchParams.get("quality") as
|
||||
"low" | "medium" | "high" | "lossless" | null
|
||||
|
||||
const preferAtmos =
|
||||
request.nextUrl.searchParams.get("preferAtmos") === "true"
|
||||
)
|
||||
|
||||
let kbps = 0
|
||||
if (quality === "low") {
|
||||
kbps = 64
|
||||
} else if (quality === "medium") {
|
||||
kbps = 128
|
||||
} else if (quality === "high") {
|
||||
kbps = 256
|
||||
}
|
||||
|
||||
let originalCodec = "lossless" in song.files ? "lossless" : "normal"
|
||||
|
||||
let transcodeNeeded = true
|
||||
if (preferAtmos && "atmos" in song.files) {
|
||||
originalCodec = "atmos"
|
||||
transcodeNeeded = false
|
||||
} else if (kbps === 0 && "lossless" in song.files) {
|
||||
originalCodec = "lossless"
|
||||
transcodeNeeded = false
|
||||
} else if (kbps === 0 || (kbps === 256 && "normal" in song.files)) {
|
||||
originalCodec = "normal"
|
||||
transcodeNeeded = false
|
||||
}
|
||||
|
||||
const metadata = await music.parseFile(song.files[originalCodec])
|
||||
|
||||
if (!transcodeNeeded && originalCodec === "lossless") {
|
||||
// Native iOS playback does not identify itself as Safari.
|
||||
const acceptsAlac =
|
||||
browser.name === "Safari" ||
|
||||
request.nextUrl.searchParams.get("losslessFormat") === "alac"
|
||||
if (
|
||||
acceptsAlac &&
|
||||
(await audioInfo(song.files[originalCodec])).codec === "ALAC"
|
||||
) {
|
||||
if (acceptsAlac && metadata.format.codec === "ALAC") {
|
||||
try {
|
||||
return await streamFileResponse(
|
||||
request,
|
||||
@@ -167,6 +183,11 @@ export async function GET(
|
||||
(originalCodec === "atmos" || originalCodec === "normal")
|
||||
) {
|
||||
// TODO: Dolby Atmos doesn't work on Google Chrome
|
||||
console.log(
|
||||
metadata.format.codec,
|
||||
metadata.format.container,
|
||||
metadata.format.codecProfile
|
||||
)
|
||||
try {
|
||||
return await streamFileResponse(
|
||||
request,
|
||||
@@ -179,6 +200,7 @@ export async function GET(
|
||||
}
|
||||
|
||||
const ffmpegArgs = [
|
||||
"-nostdin",
|
||||
"-i",
|
||||
song.files[originalCodec],
|
||||
"-c:a",
|
||||
@@ -192,8 +214,8 @@ export async function GET(
|
||||
|
||||
try {
|
||||
// TODO: Fix seeking for this
|
||||
const ffmpeg = await spawnFfmpeg(ffmpegArgs, request.signal)
|
||||
const stream = ffmpegToReadableStream(ffmpeg)
|
||||
const ffmpegProcess = spawn("ffmpeg", ffmpegArgs)
|
||||
const stream = ffmpegToReadableStream(ffmpegProcess)
|
||||
|
||||
return new NextResponse(stream, {
|
||||
status: 200,
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import sharp from "sharp"
|
||||
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
|
||||
|
||||
const AVATAR_SIZE = 256
|
||||
|
||||
/**
|
||||
* Serves a profile photo from Convex storage, downscaled. URLs carry the
|
||||
* storage id (`?v=`), so a new photo gets a new URL and responses can be
|
||||
* cached for good.
|
||||
*/
|
||||
export async function GET(
|
||||
_request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const { id } = await params
|
||||
try {
|
||||
const storageUrl = await getConvexClient().query(
|
||||
api.users.getProfileImageUrl,
|
||||
{ userId: id as Id<"users"> }
|
||||
)
|
||||
if (!storageUrl) {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
const image = await fetchConvexStorageFile(storageUrl)
|
||||
if (!image) {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
|
||||
const data = await sharp(image)
|
||||
.rotate()
|
||||
.resize(AVATAR_SIZE, AVATAR_SIZE, {
|
||||
fit: "cover",
|
||||
withoutEnlargement: true,
|
||||
})
|
||||
.webp({ quality: 85 })
|
||||
.toBuffer()
|
||||
|
||||
return new Response(new Uint8Array(data), {
|
||||
headers: {
|
||||
"Content-Type": "image/webp",
|
||||
"Cache-Control": "public, max-age=31536000, immutable",
|
||||
},
|
||||
})
|
||||
} catch {
|
||||
return new Response("Not found", { status: 404 })
|
||||
}
|
||||
}
|
||||
@@ -42,9 +42,7 @@ function formatAddToPlaylistToast(
|
||||
}
|
||||
|
||||
const addedLabel =
|
||||
addedCount > 1
|
||||
? `Added ${addedCount} songs to ${title}`
|
||||
: `Added to ${title}`
|
||||
addedCount > 1 ? `Added ${addedCount} songs to ${title}` : `Added to ${title}`
|
||||
|
||||
if (skippedCount === 0) {
|
||||
return addedLabel
|
||||
@@ -66,15 +64,14 @@ type AddToPlaylistContextValue = {
|
||||
openCreatePlaylist: () => void
|
||||
}
|
||||
|
||||
const AddToPlaylistContext =
|
||||
React.createContext<AddToPlaylistContextValue | null>(null)
|
||||
const AddToPlaylistContext = React.createContext<AddToPlaylistContextValue | null>(
|
||||
null
|
||||
)
|
||||
|
||||
export function useAddToPlaylist() {
|
||||
const context = React.useContext(AddToPlaylistContext)
|
||||
if (!context) {
|
||||
throw new Error(
|
||||
"useAddToPlaylist must be used within AddToPlaylistProvider"
|
||||
)
|
||||
throw new Error("useAddToPlaylist must be used within AddToPlaylistProvider")
|
||||
}
|
||||
return context
|
||||
}
|
||||
@@ -184,7 +181,7 @@ export function AddToPlaylistProvider({
|
||||
}
|
||||
)
|
||||
if (requestId === selectionRequestRef.current) {
|
||||
showAddToPlaylist(songIds.flat())
|
||||
showAddToPlaylist(songIds)
|
||||
}
|
||||
} catch (error) {
|
||||
if (requestId === selectionRequestRef.current) {
|
||||
@@ -204,10 +201,7 @@ export function AddToPlaylistProvider({
|
||||
setCreateOpen(true)
|
||||
}, [])
|
||||
|
||||
async function handleAddToPlaylist(
|
||||
playlistId: Id<"playlists">,
|
||||
title: string
|
||||
) {
|
||||
async function handleAddToPlaylist(playlistId: Id<"playlists">, title: string) {
|
||||
setIsSubmitting(true)
|
||||
try {
|
||||
const { addedCount, skippedCount } = await addSongs({
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
MediaContextMenuItems,
|
||||
type MediaContextAction,
|
||||
} from "@/components/media-context-menu"
|
||||
import { usePlaybackActions } from "@/components/playback-provider"
|
||||
import { usePlayback } from "@/components/playback-provider"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { Button } from "@/components/ui/button"
|
||||
@@ -48,7 +48,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
const cacheScope = useCacheScope()
|
||||
const { openAddAlbumToPlaylist } = useAddToPlaylist()
|
||||
const { isAlbumFavorite, toggleAlbumFavorite } = useFavorites()
|
||||
const { playAlbum } = usePlaybackActions()
|
||||
const { playAlbum } = usePlayback()
|
||||
const { runQueueAction, createStation } = useQueueMediaActions()
|
||||
const [menuOpen, setMenuOpen] = React.useState(false)
|
||||
const [hovered, setHovered] = React.useState(false)
|
||||
@@ -104,7 +104,10 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
onMouseEnter={() => setHovered(true)}
|
||||
onMouseLeave={() => setHovered(false)}
|
||||
>
|
||||
<Link className="absolute inset-0" href={"/album/" + album.id}>
|
||||
<Link
|
||||
className="absolute inset-0"
|
||||
href={"/album/" + album.id}
|
||||
>
|
||||
<Image
|
||||
src={albumCoverUrl(album.id)}
|
||||
alt={album.title}
|
||||
@@ -173,7 +176,9 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
|
||||
href={"/artist/" + album.artist.id}
|
||||
className="text-muted-foreground decoration-muted-foreground hover:underline"
|
||||
>
|
||||
<p className="truncate text-xs">{album.artist.name}</p>
|
||||
<p className="truncate text-xs">
|
||||
{album.artist.name}
|
||||
</p>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
+276
-100
@@ -4,50 +4,54 @@ import { PageHeader } from "@/components/library-skeletons"
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import Link from "next/link"
|
||||
import { Play, Share2, Shuffle } from "lucide-react"
|
||||
import { Play, Share2, Shuffle, Star } from "lucide-react"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { MediaCollectionFooter } from "@/components/media-collection-footer"
|
||||
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
|
||||
|
||||
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
|
||||
import { FavoriteMediaButton } from "@/components/favorite-media-button"
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
import {
|
||||
useCurrentSongId,
|
||||
usePlaybackActions,
|
||||
} from "@/components/playback-provider"
|
||||
import { usePlayback } from "@/components/playback-provider"
|
||||
import { copyAlbumLink } from "@/lib/media-links"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
type MediaContextAction,
|
||||
} from "@/components/media-context-menu"
|
||||
import { TrackRow } from "@/components/track-row"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { ScrollArea } from "@/components/ui/scroll-area"
|
||||
import {
|
||||
useMediaActions,
|
||||
useTrackListMediaAction,
|
||||
} from "@/hooks/use-media-actions"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { useTrackSelection } from "@/hooks/use-track-selection"
|
||||
import { cn } from "@/lib/utils"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type {
|
||||
BrowseAlbumDetail,
|
||||
BrowseAlbumTrack,
|
||||
BrowseSong,
|
||||
} from "@otunes/convex/types"
|
||||
import type { BrowseAlbumDetail, BrowseAlbumTrack } from "@otunes/convex/types"
|
||||
import {
|
||||
getSelectionRangePositions,
|
||||
isInSelectionRange,
|
||||
ALBUM_TRACK_ROW,
|
||||
ALBUM_TRACK_TITLE,
|
||||
SelectionRangeHighlight,
|
||||
TRACK_LIST_CONTAINER,
|
||||
TrackRowActiveHighlight,
|
||||
TrackRowHoverHighlight,
|
||||
TRACK_ROW_PADDING,
|
||||
type SelectionRangePosition,
|
||||
} from "@/lib/selection-range-styles"
|
||||
import { albumCoverUrl } from "@/lib/cover-urls"
|
||||
import { sumDurationSeconds } from "@/lib/media-summary"
|
||||
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
|
||||
|
||||
function formatMetadata(
|
||||
genre: string | null,
|
||||
year: number | null
|
||||
): string | null {
|
||||
function formatDuration(seconds: number): string {
|
||||
const minutes = Math.floor(seconds / 60)
|
||||
const remainingSeconds = seconds % 60
|
||||
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
|
||||
}
|
||||
|
||||
function formatMetadata(genre: string | null, year: number | null): string | null {
|
||||
const parts: string[] = []
|
||||
if (genre) {
|
||||
parts.push(genre)
|
||||
@@ -63,9 +67,7 @@ type AlbumTrackSection = {
|
||||
tracks: BrowseAlbumTrack[]
|
||||
}
|
||||
|
||||
function groupAlbumTracksByDisk(
|
||||
tracks: BrowseAlbumTrack[]
|
||||
): AlbumTrackSection[] {
|
||||
function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[] {
|
||||
const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null)
|
||||
if (!hasDiskNumbers) {
|
||||
return [{ label: null, tracks }]
|
||||
@@ -98,6 +100,159 @@ function groupAlbumTracksByDisk(
|
||||
return sections
|
||||
}
|
||||
|
||||
function TrackRow({
|
||||
track,
|
||||
sectionIndex,
|
||||
artist,
|
||||
isActive,
|
||||
isSelected,
|
||||
selectionPosition,
|
||||
isFavorite,
|
||||
selectedCount,
|
||||
onSelect,
|
||||
onPointerDown,
|
||||
onToggleFavorite,
|
||||
onPrepareContextMenu,
|
||||
onMediaAction,
|
||||
isNowPlaying,
|
||||
onPlay,
|
||||
albumId,
|
||||
}: {
|
||||
track: BrowseAlbumTrack
|
||||
sectionIndex: number
|
||||
artist: BrowseAlbumDetail["artist"]
|
||||
albumId: string
|
||||
isActive: boolean
|
||||
isSelected: boolean
|
||||
selectionPosition: SelectionRangePosition
|
||||
isFavorite: boolean
|
||||
selectedCount: number
|
||||
onSelect: (event: React.MouseEvent) => void
|
||||
onPointerDown: (event: React.MouseEvent) => void
|
||||
onToggleFavorite: () => void
|
||||
onPrepareContextMenu: () => void
|
||||
onMediaAction: (action: MediaContextAction, trackId: string) => void
|
||||
isNowPlaying: boolean
|
||||
onPlay: () => void
|
||||
}) {
|
||||
const displayTrack =
|
||||
track.track > 0 ? track.track : sectionIndex + 1
|
||||
const inRange = isInSelectionRange(selectionPosition)
|
||||
|
||||
return (
|
||||
<div
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
onMouseDown={onPointerDown}
|
||||
onClick={onSelect}
|
||||
onDoubleClick={(event) => {
|
||||
event.preventDefault()
|
||||
onPlay()
|
||||
}}
|
||||
onKeyDown={(event) => {
|
||||
if (event.key === "Enter" || event.key === " ") {
|
||||
event.preventDefault()
|
||||
onSelect(event as unknown as React.MouseEvent)
|
||||
}
|
||||
}}
|
||||
className={cn(
|
||||
"group relative w-full cursor-pointer select-none py-2.5 text-left text-sm transition-colors",
|
||||
inRange && "text-primary-foreground"
|
||||
)}
|
||||
>
|
||||
<SelectionRangeHighlight position={selectionPosition} />
|
||||
{!inRange && isActive ? <TrackRowActiveHighlight /> : null}
|
||||
{!inRange && !isActive ? <TrackRowHoverHighlight /> : null}
|
||||
<div
|
||||
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
|
||||
>
|
||||
<div className="flex shrink-0 items-center justify-center">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon-sm"
|
||||
className={cn(
|
||||
"size-8 opacity-0 transition-opacity group-hover:opacity-100",
|
||||
inRange
|
||||
? "text-primary-foreground hover:bg-white/15 hover:text-primary-foreground"
|
||||
: "text-primary hover:text-primary",
|
||||
(isFavorite || isActive || isSelected) && "opacity-100"
|
||||
)}
|
||||
aria-label={
|
||||
isFavorite
|
||||
? `Remove ${track.title} from favorites`
|
||||
: `Favorite ${track.title}`
|
||||
}
|
||||
onClick={(event) => {
|
||||
event.stopPropagation()
|
||||
onToggleFavorite()
|
||||
}}
|
||||
>
|
||||
<Star
|
||||
className={cn(
|
||||
"size-4",
|
||||
isFavorite && (inRange ? "fill-current" : "fill-primary")
|
||||
)}
|
||||
/>
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<TrackNumberPlayButton
|
||||
displayTrack={displayTrack}
|
||||
title={track.title}
|
||||
isActive={isActive}
|
||||
isNowPlaying={isNowPlaying}
|
||||
inRange={inRange}
|
||||
onPlay={onPlay}
|
||||
/>
|
||||
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className={ALBUM_TRACK_TITLE}>{track.title}</div>
|
||||
{track.artists ? (
|
||||
<p
|
||||
className={cn(
|
||||
"truncate text-xs",
|
||||
inRange
|
||||
? "text-primary-foreground/80"
|
||||
: "text-muted-foreground"
|
||||
)}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</p>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
<span
|
||||
className={cn(
|
||||
"shrink-0 text-right tabular-nums",
|
||||
inRange ? "text-primary-foreground" : "text-muted-foreground"
|
||||
)}
|
||||
>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</span>
|
||||
|
||||
<MediaContextMenu
|
||||
label={`More options for ${track.title}`}
|
||||
stationArtistId={artist.id}
|
||||
selectedCount={selectedCount}
|
||||
inSelectionRange={inRange}
|
||||
onOpenMenu={onPrepareContextMenu}
|
||||
onAction={(action) => onMediaAction(action, track.id)}
|
||||
favorited={isFavorite}
|
||||
navigation={{
|
||||
artist: { id: artist.id },
|
||||
album: { id: albumId },
|
||||
}}
|
||||
share={{
|
||||
type: "song",
|
||||
albumId,
|
||||
songId: track.id,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export function AlbumView({
|
||||
album,
|
||||
highlightedSongId,
|
||||
@@ -105,20 +260,36 @@ export function AlbumView({
|
||||
album: BrowseAlbumDetail
|
||||
highlightedSongId?: string
|
||||
}) {
|
||||
const { openAddToPlaylist } = useAddToPlaylist()
|
||||
const {
|
||||
isSongFavorite,
|
||||
isAlbumFavorite,
|
||||
toggleSongFavorite,
|
||||
toggleAlbumFavorite,
|
||||
favoriteSongs,
|
||||
} = useFavorites()
|
||||
const currentSongId = useCurrentSongId()
|
||||
const { playFromSong, playAlbum, playAlbumShuffled } = usePlaybackActions()
|
||||
const { runSongsAction } = useMediaActions()
|
||||
const { currentSong, playFromSong, playAlbum, playAlbumShuffled } =
|
||||
usePlayback()
|
||||
const { runQueueAction, createStation } = useQueueMediaActions()
|
||||
const albumSongIds = React.useMemo(
|
||||
() => album.tracks.map((track) => track.id as Id<"songs">),
|
||||
[album.tracks]
|
||||
)
|
||||
|
||||
// Older servers do not include album format availability yet.
|
||||
const formatTracks = useCachedQuery(
|
||||
api.library.getSongsForPlayback,
|
||||
album.hasLossless === undefined || album.hasAtmos === undefined
|
||||
? { ids: albumSongIds }
|
||||
: "skip"
|
||||
)
|
||||
const hasLossless =
|
||||
album.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
|
||||
React.useEffect(() => {
|
||||
rememberSongs(albumDetailSongs(album))
|
||||
}, [album])
|
||||
@@ -137,17 +308,14 @@ export function AlbumView({
|
||||
const {
|
||||
selectedIds,
|
||||
selectedCount,
|
||||
isSelected,
|
||||
handleSelect,
|
||||
handlePointerDown,
|
||||
prepareContextMenu,
|
||||
} = useTrackSelection(album.tracks, validHighlightedSongId)
|
||||
|
||||
const selectionPositions = React.useMemo(
|
||||
() =>
|
||||
getSelectionRangePositions(
|
||||
album.tracks.map((track) => track.id),
|
||||
selectedIds
|
||||
),
|
||||
() => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds),
|
||||
[album.tracks, selectedIds]
|
||||
)
|
||||
|
||||
@@ -168,59 +336,55 @@ export function AlbumView({
|
||||
return indexById
|
||||
}, [album.tracks])
|
||||
|
||||
const trackSongs = React.useMemo(
|
||||
() =>
|
||||
new Map<string, BrowseSong>(
|
||||
album.tracks.map((track) => [
|
||||
track.id,
|
||||
{
|
||||
id: track.id,
|
||||
title: track.title,
|
||||
durationSeconds: track.durationSeconds,
|
||||
artist: album.artist,
|
||||
album: { id: album.id, title: album.title, cover: album.cover },
|
||||
},
|
||||
])
|
||||
),
|
||||
[album.tracks, album.artist, album.id, album.title, album.cover]
|
||||
)
|
||||
|
||||
const handleMediaAction = useTrackListMediaAction({
|
||||
selectedIds,
|
||||
artistId: album.artist.id,
|
||||
})
|
||||
|
||||
const handleRowSelect = React.useCallback(
|
||||
(index: number, event: React.MouseEvent) => {
|
||||
const trackId = album.tracks[index].id
|
||||
handleSelect(trackId, index, event)
|
||||
setActiveTrackId(trackId)
|
||||
},
|
||||
[album.tracks, handleSelect]
|
||||
)
|
||||
|
||||
const handleRowPlay = React.useCallback(
|
||||
(index: number) => {
|
||||
void playFromSong(
|
||||
album.tracks[index].id,
|
||||
albumSongIds,
|
||||
`album:${album.id}`
|
||||
)
|
||||
},
|
||||
[album.tracks, album.id, albumSongIds, playFromSong]
|
||||
)
|
||||
|
||||
const handleToggleFavorite = React.useCallback(
|
||||
(songId: string) => void toggleSongFavorite(songId as Id<"songs">),
|
||||
[toggleSongFavorite]
|
||||
)
|
||||
function handleMediaAction(
|
||||
action: MediaContextAction,
|
||||
fallbackTrackId?: string
|
||||
) {
|
||||
const targetIds =
|
||||
selectedIds.size > 0
|
||||
? Array.from(selectedIds)
|
||||
: fallbackTrackId
|
||||
? [fallbackTrackId]
|
||||
: activeTrackId
|
||||
? [activeTrackId]
|
||||
: []
|
||||
switch (action) {
|
||||
case "create-station":
|
||||
void createStation(album.artist.id)
|
||||
break
|
||||
case "favorite":
|
||||
void favoriteSongs(targetIds as Id<"songs">[])
|
||||
break
|
||||
case "playlist":
|
||||
openAddToPlaylist(targetIds as Id<"songs">[])
|
||||
break
|
||||
case "play-next":
|
||||
case "play-last":
|
||||
case "shuffle":
|
||||
void runQueueAction(action, targetIds as Id<"songs">[])
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
function handleAlbumMediaAction(action: MediaContextAction) {
|
||||
if (action === "favorite") {
|
||||
void toggleAlbumFavorite(album.id as Id<"albums">)
|
||||
return
|
||||
const targetIds = album.tracks.map((track) => track.id as Id<"songs">)
|
||||
|
||||
switch (action) {
|
||||
case "create-station":
|
||||
void createStation(album.artist.id)
|
||||
break
|
||||
case "favorite":
|
||||
void toggleAlbumFavorite(album.id as Id<"albums">)
|
||||
break
|
||||
case "playlist":
|
||||
openAddToPlaylist(targetIds)
|
||||
break
|
||||
case "play-next":
|
||||
case "play-last":
|
||||
case "shuffle":
|
||||
void runQueueAction(action, targetIds)
|
||||
break
|
||||
}
|
||||
runSongsAction(action, albumSongIds, album.artist.id)
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -228,7 +392,7 @@ export function AlbumView({
|
||||
<PageHeader openApp />
|
||||
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full max-w-9/10 min-w-0">
|
||||
<div className="mx-auto w-full min-w-0 max-w-9/10">
|
||||
<div className="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end">
|
||||
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
|
||||
<Image
|
||||
@@ -257,15 +421,15 @@ export function AlbumView({
|
||||
</Link>
|
||||
<div className="flex flex-wrap items-center justify-center gap-2 text-sm text-muted-foreground sm:justify-start">
|
||||
{metadata ? <span>{metadata}</span> : null}
|
||||
{album.hasLossless ? (
|
||||
{hasLossless ? (
|
||||
<>
|
||||
{metadata ? <span aria-hidden>·</span> : null}
|
||||
<AudioFormatBadge format="lossless" />
|
||||
</>
|
||||
) : null}
|
||||
{album.hasAtmos ? (
|
||||
{hasAtmos ? (
|
||||
<>
|
||||
{metadata || album.hasLossless ? (
|
||||
{metadata || hasLossless ? (
|
||||
<span aria-hidden>·</span>
|
||||
) : null}
|
||||
<AudioFormatBadge format="atmos" />
|
||||
@@ -354,27 +518,39 @@ export function AlbumView({
|
||||
return (
|
||||
<TrackRow
|
||||
key={track.id}
|
||||
variant="album"
|
||||
song={trackSongs.get(track.id)!}
|
||||
index={listIndex}
|
||||
trackNumber={
|
||||
track.track > 0
|
||||
? track.track
|
||||
: sectionTrackIndex + 1
|
||||
}
|
||||
subtitle={track.artists?.join(", ")}
|
||||
track={track}
|
||||
sectionIndex={sectionTrackIndex}
|
||||
artist={album.artist}
|
||||
albumId={album.id}
|
||||
isActive={track.id === activeTrackId}
|
||||
isSelected={isSelected(track.id)}
|
||||
selectionPosition={selectionPositions[listIndex]}
|
||||
isFavorite={isSongFavorite(track.id)}
|
||||
selectedCount={selectedCount}
|
||||
selectionStationArtistId={album.artist.id}
|
||||
isNowPlaying={currentSongId === track.id}
|
||||
selectedCount={
|
||||
isSelected(track.id) && selectedCount > 0
|
||||
? selectedCount
|
||||
: 1
|
||||
}
|
||||
onPointerDown={handlePointerDown}
|
||||
onSelect={handleRowSelect}
|
||||
onPlay={handleRowPlay}
|
||||
onToggleFavorite={handleToggleFavorite}
|
||||
onPrepareContextMenu={prepareContextMenu}
|
||||
onSelect={(event) => {
|
||||
handleSelect(track.id, listIndex, event)
|
||||
setActiveTrackId(track.id)
|
||||
}}
|
||||
onToggleFavorite={() =>
|
||||
void toggleSongFavorite(track.id as Id<"songs">)
|
||||
}
|
||||
onPrepareContextMenu={() =>
|
||||
prepareContextMenu(track.id)
|
||||
}
|
||||
onMediaAction={handleMediaAction}
|
||||
isNowPlaying={currentSong?.id === track.id}
|
||||
onPlay={() =>
|
||||
void playFromSong(
|
||||
track.id as Id<"songs">,
|
||||
albumSongIds,
|
||||
`album:${album.id}`
|
||||
)
|
||||
}
|
||||
/>
|
||||
)
|
||||
})}
|
||||
|
||||
@@ -43,7 +43,6 @@ import Link from "next/link"
|
||||
import { useTheme } from "next-themes"
|
||||
import * as React from "react"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { playlistCoverUrl } from "@/lib/cover-urls"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useMounted } from "@/hooks/use-mounted"
|
||||
import { clearPersistentCache } from "@/lib/persistent-cache"
|
||||
@@ -87,28 +86,17 @@ export function AppSidebar() {
|
||||
const isDark = mounted && resolvedTheme === "dark"
|
||||
|
||||
const playlistNav = [
|
||||
{
|
||||
title: "All Playlists",
|
||||
path: "/playlists",
|
||||
icon: <LayoutGrid />,
|
||||
},
|
||||
{ title: "Favorites", path: "/playlist/favorites", icon: <Star /> },
|
||||
...[
|
||||
...(sidebarPlaylists?.owned ?? []),
|
||||
...(sidebarPlaylists?.subscribed ?? []),
|
||||
].map((playlist) => ({
|
||||
{ title: "All Playlists", path: "/playlists", icon: LayoutGrid },
|
||||
{ title: "Favorites", path: "/playlist/favorites", icon: Star },
|
||||
...(sidebarPlaylists?.owned ?? []).map((playlist) => ({
|
||||
title: playlist.title,
|
||||
path: `/playlist/${playlist.id}`,
|
||||
icon: playlist.cover ? (
|
||||
// eslint-disable-next-line @next/next/no-img-element -- versioned cover, already sized by the route
|
||||
<img
|
||||
src={playlistCoverUrl(playlist.id, playlist.cover, 64)}
|
||||
alt=""
|
||||
className="size-4 shrink-0 rounded-[3px] object-cover"
|
||||
/>
|
||||
) : (
|
||||
<ListMusic />
|
||||
),
|
||||
icon: ListMusic,
|
||||
})),
|
||||
...(sidebarPlaylists?.subscribed ?? []).map((playlist) => ({
|
||||
title: playlist.title,
|
||||
path: `/playlist/${playlist.id}`,
|
||||
icon: ListMusic,
|
||||
})),
|
||||
]
|
||||
|
||||
@@ -177,7 +165,7 @@ export function AppSidebar() {
|
||||
<SidebarMenuItem key={item.path}>
|
||||
<SidebarMenuButton isActive={pathname === item.path} asChild>
|
||||
<Link href={item.path} onClick={() => setOpenMobile(false)}>
|
||||
{item.icon}
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</Link>
|
||||
</SidebarMenuButton>
|
||||
|
||||
@@ -4,19 +4,27 @@ import { PageHeader } from "@/components/library-skeletons"
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import { Play, Shuffle } from "lucide-react"
|
||||
import { useConvex } from "convex/react"
|
||||
|
||||
import { useCacheScope } from "@/components/persistent-cache-provider"
|
||||
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
import { usePlaybackActions } from "@/components/playback-provider"
|
||||
import { useMediaActions } from "@/hooks/use-media-actions"
|
||||
import { usePlayback } from "@/components/playback-provider"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { AlbumCard } from "@/components/album-card"
|
||||
import { FavoriteMediaButton } from "@/components/favorite-media-button"
|
||||
import { MediaContextMenu } from "@/components/media-context-menu"
|
||||
import {
|
||||
MediaContextMenu,
|
||||
type MediaContextAction,
|
||||
} from "@/components/media-context-menu"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { ScrollArea } from "@/components/ui/scroll-area"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types"
|
||||
import { albumGridClassName } from "@/lib/album-grid-classes"
|
||||
import { artistCoverUrl } from "@/lib/cover-urls"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
|
||||
export function ArtistView({
|
||||
artist,
|
||||
@@ -26,8 +34,34 @@ export function ArtistView({
|
||||
albums: BrowseAlbum[]
|
||||
}) {
|
||||
const { isArtistFavorite, toggleArtistFavorite } = useFavorites()
|
||||
const { playArtist, playArtistShuffled } = usePlaybackActions()
|
||||
const { runArtistAction } = useMediaActions()
|
||||
const { openAddArtistToPlaylist } = useAddToPlaylist()
|
||||
const { playArtist, playArtistShuffled } = usePlayback()
|
||||
const { runQueueAction } = useQueueMediaActions()
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
|
||||
async function handleMediaAction(action: MediaContextAction) {
|
||||
switch (action) {
|
||||
case "favorite":
|
||||
void toggleArtistFavorite(artist.id as Id<"artists">)
|
||||
break
|
||||
case "playlist":
|
||||
void openAddArtistToPlaylist(artist.id as Id<"artists">)
|
||||
break
|
||||
case "play-next":
|
||||
case "play-last":
|
||||
case "shuffle": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: artist.id as Id<"artists"> }
|
||||
)
|
||||
void runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
@@ -84,7 +118,7 @@ export function ArtistView({
|
||||
label={`More options for ${artist.name}`}
|
||||
selectedCount={albums.length}
|
||||
onOpenMenu={() => {}}
|
||||
onAction={(action) => void runArtistAction(action, artist.id)}
|
||||
onAction={handleMediaAction}
|
||||
favorited={isArtistFavorite(artist.id)}
|
||||
trackRowTrigger={false}
|
||||
triggerVariant="secondary"
|
||||
|
||||
@@ -32,8 +32,8 @@ export function ArtistsPage() {
|
||||
<ArtistsSkeleton />
|
||||
) : (
|
||||
<ArtistsView
|
||||
artists={artists.flat()}
|
||||
albums={albums.flat()}
|
||||
artists={artists}
|
||||
albums={albums}
|
||||
artistId={artistIdFromPathname(pathname)}
|
||||
onSelectArtist={selectArtist}
|
||||
/>
|
||||
|
||||
@@ -4,24 +4,27 @@ import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import Link from "next/link"
|
||||
import { ChevronRightIcon, Play, Shuffle } from "lucide-react"
|
||||
import { useConvex } from "convex/react"
|
||||
|
||||
import { useCacheScope } from "@/components/persistent-cache-provider"
|
||||
import { AlbumCard } from "@/components/album-card"
|
||||
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
|
||||
import { FavoriteMediaButton } from "@/components/favorite-media-button"
|
||||
import { useFavorites } from "@/components/favorites-provider"
|
||||
import {
|
||||
MediaContextMenu,
|
||||
type MediaContextAction,
|
||||
MediaContextMenuArea,
|
||||
type MediaContextMenuProps,
|
||||
} from "@/components/media-context-menu"
|
||||
import { usePlaybackActions } from "@/components/playback-provider"
|
||||
import { useMediaActions } from "@/hooks/use-media-actions"
|
||||
import { usePlayback } from "@/components/playback-provider"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { ScrollArea } from "@/components/ui/scroll-area"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { cn } from "@/lib/utils"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseAlbum, BrowseArtist } from "@otunes/convex/types"
|
||||
import { artistCoverUrl } from "@/lib/cover-urls"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
|
||||
function ArtistAvatar({ artist }: { artist: BrowseArtist }) {
|
||||
return (
|
||||
@@ -52,42 +55,36 @@ function ArtistListItem({
|
||||
onSelect: () => void
|
||||
onMediaAction: (action: MediaContextAction) => void
|
||||
}) {
|
||||
const menu: MediaContextMenuProps = {
|
||||
label: `More options for ${artist.name}`,
|
||||
selectedCount: albumCount,
|
||||
inSelectionRange: isSelected,
|
||||
onOpenMenu: () => {},
|
||||
onAction: onMediaAction,
|
||||
favorited: isFavorite,
|
||||
share: { type: "artist", artistId: artist.id },
|
||||
}
|
||||
|
||||
return (
|
||||
<MediaContextMenuArea menu={menu}>
|
||||
<div
|
||||
<div
|
||||
className={cn(
|
||||
"group flex w-full min-w-0 items-center gap-1 overflow-hidden pr-1",
|
||||
isSelected ? "bg-primary text-primary-foreground" : "hover:bg-muted/50"
|
||||
)}
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onSelect}
|
||||
className={cn(
|
||||
"group flex w-full min-w-0 items-center gap-1 overflow-hidden pr-1",
|
||||
isSelected
|
||||
? "bg-primary text-primary-foreground"
|
||||
: "hover:bg-muted/50"
|
||||
"flex min-w-0 flex-1 items-center gap-3 overflow-hidden px-4 py-2.5 text-left text-sm transition-colors",
|
||||
isSelected ? "text-primary-foreground" : ""
|
||||
)}
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onSelect}
|
||||
className={cn(
|
||||
"flex min-w-0 flex-1 items-center gap-3 overflow-hidden px-4 py-2.5 text-left text-sm transition-colors",
|
||||
isSelected ? "text-primary-foreground" : ""
|
||||
)}
|
||||
>
|
||||
<ArtistAvatar artist={artist} />
|
||||
<span className="min-w-0 flex-1 truncate font-medium">
|
||||
{artist.name}
|
||||
</span>
|
||||
</button>
|
||||
<MediaContextMenu {...menu} />
|
||||
</div>
|
||||
</MediaContextMenuArea>
|
||||
<ArtistAvatar artist={artist} />
|
||||
<span className="min-w-0 flex-1 truncate font-medium">
|
||||
{artist.name}
|
||||
</span>
|
||||
</button>
|
||||
<MediaContextMenu
|
||||
label={`More options for ${artist.name}`}
|
||||
selectedCount={albumCount}
|
||||
inSelectionRange={isSelected}
|
||||
onOpenMenu={() => {}}
|
||||
onAction={onMediaAction}
|
||||
favorited={isFavorite}
|
||||
share={{ type: "artist", artistId: artist.id }}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -113,9 +110,12 @@ export function ArtistsView({
|
||||
}
|
||||
return sortedArtists[0]?.id ?? ""
|
||||
}, [artistId, sortedArtists])
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const { openAddArtistToPlaylist } = useAddToPlaylist()
|
||||
const { isArtistFavorite, toggleArtistFavorite } = useFavorites()
|
||||
const { playArtist, playArtistShuffled } = usePlaybackActions()
|
||||
const { runArtistAction } = useMediaActions()
|
||||
const { playArtist, playArtistShuffled } = usePlayback()
|
||||
const { runQueueAction } = useQueueMediaActions()
|
||||
|
||||
const selectedArtist = sortedArtists.find(
|
||||
(artist) => artist.id === selectedId
|
||||
@@ -130,6 +130,32 @@ export function ArtistsView({
|
||||
return counts
|
||||
}, [albums])
|
||||
|
||||
async function handleMediaAction(
|
||||
artistId: string,
|
||||
action: MediaContextAction
|
||||
) {
|
||||
switch (action) {
|
||||
case "favorite":
|
||||
void toggleArtistFavorite(artistId as Id<"artists">)
|
||||
break
|
||||
case "playlist":
|
||||
void openAddArtistToPlaylist(artistId as Id<"artists">)
|
||||
break
|
||||
case "play-next":
|
||||
case "play-last":
|
||||
case "shuffle": {
|
||||
const songIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: artistId as Id<"artists"> }
|
||||
)
|
||||
void runQueueAction(action, songIds)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex min-h-0 flex-1">
|
||||
<ScrollArea className="w-72 shrink-0 border-r">
|
||||
@@ -143,7 +169,7 @@ export function ArtistsView({
|
||||
isFavorite={isArtistFavorite(artist.id)}
|
||||
onSelect={() => onSelectArtist(artist.id)}
|
||||
onMediaAction={(action) =>
|
||||
void runArtistAction(action, artist.id)
|
||||
void handleMediaAction(artist.id, action)
|
||||
}
|
||||
/>
|
||||
))}
|
||||
@@ -199,7 +225,7 @@ export function ArtistsView({
|
||||
selectedCount={artistAlbums.length}
|
||||
onOpenMenu={() => {}}
|
||||
onAction={(action) =>
|
||||
void runArtistAction(action, selectedArtist.id)
|
||||
void handleMediaAction(selectedArtist.id, action)
|
||||
}
|
||||
favorited={isArtistFavorite(selectedArtist.id)}
|
||||
trackRowTrigger={false}
|
||||
|
||||
@@ -1,28 +1,35 @@
|
||||
import {
|
||||
DOLBY_PATHS,
|
||||
DOLBY_VIEW_BOX,
|
||||
DOLBY_WIDTH,
|
||||
LOSSLESS_FALL,
|
||||
LOSSLESS_FALL_GAP,
|
||||
LOSSLESS_PEAKS,
|
||||
LOSSLESS_STROKES,
|
||||
LOSSLESS_THIN_WIDTH,
|
||||
LOSSLESS_VIEW_BOX,
|
||||
LOSSLESS_WIDTH,
|
||||
MARK_HEIGHT,
|
||||
} from "@otunes/convex/client/audio-format-marks"
|
||||
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
|
||||
|
||||
const MARK_HEIGHT = 11
|
||||
|
||||
function DolbyMark({ color }: { color: string }) {
|
||||
return (
|
||||
<svg width={DOLBY_WIDTH} height={MARK_HEIGHT} viewBox={DOLBY_VIEW_BOX}>
|
||||
{DOLBY_PATHS.map((d) => (
|
||||
<path key={d} d={d} fill={color} />
|
||||
))}
|
||||
<svg
|
||||
width={(MARK_HEIGHT * 23) / 16}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="0 0 23 16"
|
||||
>
|
||||
<path d="M0 0H2.5A8 8 0 0 1 2.5 16H0Z" fill={color} />
|
||||
<path d="M23 0H20.5A8 8 0 0 0 20.5 16H23Z" fill={color} />
|
||||
</svg>
|
||||
)
|
||||
}
|
||||
|
||||
const LOSSLESS_PEAKS = [110, 215, 320]
|
||||
const LOSSLESS_THIN_WIDTH = 24
|
||||
const LOSSLESS_STROKES: [peak: number, d: string][] = [
|
||||
[110, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[215, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[320, "M-30 185C-22 173 -11 166 0 166"],
|
||||
[110, "M166 413C176 413 186 406 194 395"],
|
||||
[215, "M166 413C200 413 226 340 240 275"],
|
||||
[320, "M166 413C200 413 226 340 240 275"],
|
||||
]
|
||||
const LOSSLESS_FALL =
|
||||
"M0 178L4 179L8 181L12 184L16 189L20 196L23 204L27 213L30 223L34 233L39 243L43 254L48 266L53 278L58 289L62 301L66 313L71 325L75 336L79 347L83 357L86 364L89 370L93 377L97 382L101 387L105 392L109 397L113 401L117 405L121 408L126 412L130 415L134 417L139 419L143 421L148 423L152 424L157 424L161 425L166 425L166 401L163 401L161 400L159 400L157 399L154 397L152 396L151 394L149 392L147 389L145 386L143 383L142 380L140 376L138 371L137 367L135 362L134 357L132 351L130 345L127 339L124 330L120 319L116 308L111 297L107 285L102 272L98 260L93 248L88 235L82 223L76 212L69 201L61 192L53 183L45 175L37 168L28 163L19 158L10 155L0 154Z"
|
||||
const LOSSLESS_FALL_GAP =
|
||||
"M0 178L4 180L6 184L8 190L9 197L11 203L14 210L17 219L21 228L24 238L29 248L33 259L38 270L43 282L47 293L52 305L56 317L60 328L64 340L68 351L73 361L76 368L79 375L83 381L87 387L91 393L95 398L100 403L104 408L109 412L113 416L118 419L124 422L130 424L135 425L141 426L147 426L152 426L157 425L161 425L166 425L166 401L163 401L161 399L159 398L158 395L157 393L156 390L155 387L155 384L154 381L153 379L152 376L150 373L149 369L148 366L146 361L145 357L143 352L142 347L140 341L137 335L134 326L130 315L126 304L122 293L117 281L113 268L108 256L103 243L98 231L92 219L86 207L79 196L71 186L62 177L53 168L44 161L32 157L21 155L10 154L0 154Z"
|
||||
|
||||
/**
|
||||
* Three overlapping waves. Each thick downstroke is outlined in the
|
||||
* background color so it reads as passing over the strokes behind it.
|
||||
@@ -36,9 +43,9 @@ function LosslessMark({
|
||||
}) {
|
||||
return (
|
||||
<svg
|
||||
width={LOSSLESS_WIDTH}
|
||||
width={(MARK_HEIGHT * 544) / 271}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox={LOSSLESS_VIEW_BOX}
|
||||
viewBox="28 154 544 271"
|
||||
>
|
||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||
<path
|
||||
|
||||
@@ -13,12 +13,7 @@ import {
|
||||
CardHeader,
|
||||
CardTitle,
|
||||
} from "@/components/ui/card"
|
||||
import {
|
||||
Field,
|
||||
FieldError,
|
||||
FieldGroup,
|
||||
FieldLabel,
|
||||
} from "@/components/ui/field"
|
||||
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
|
||||
import { Input } from "@/components/ui/input"
|
||||
import { Spinner } from "@/components/ui/spinner"
|
||||
|
||||
@@ -106,64 +101,64 @@ export function AuthForm({
|
||||
administrator if you need access.
|
||||
</p>
|
||||
) : (
|
||||
<form onSubmit={handleSubmit}>
|
||||
<FieldGroup>
|
||||
{flow === "signUp" && (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="name">Name</FieldLabel>
|
||||
<Input
|
||||
id="name"
|
||||
name="name"
|
||||
type="text"
|
||||
autoComplete="name"
|
||||
placeholder="Ada Lovelace"
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
)}
|
||||
<form onSubmit={handleSubmit}>
|
||||
<FieldGroup>
|
||||
{flow === "signUp" && (
|
||||
<Field>
|
||||
<FieldLabel htmlFor="email">Email</FieldLabel>
|
||||
<FieldLabel htmlFor="name">Name</FieldLabel>
|
||||
<Input
|
||||
id="email"
|
||||
name="email"
|
||||
type="email"
|
||||
autoComplete="email"
|
||||
placeholder="you@example.com"
|
||||
id="name"
|
||||
name="name"
|
||||
type="text"
|
||||
autoComplete="name"
|
||||
placeholder="Ada Lovelace"
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel htmlFor="password">Password</FieldLabel>
|
||||
<Input
|
||||
id="password"
|
||||
name="password"
|
||||
type="password"
|
||||
autoComplete={
|
||||
flow === "signIn" ? "current-password" : "new-password"
|
||||
}
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
{error && <FieldError>{error}</FieldError>}
|
||||
<Field>
|
||||
<Button type="submit" disabled={submitting}>
|
||||
{submitting && <Spinner />}
|
||||
{text.submit}
|
||||
</Button>
|
||||
</Field>
|
||||
{!hideSignUpLink ? (
|
||||
<p className="text-center text-sm text-muted-foreground">
|
||||
{text.switchPrompt}{" "}
|
||||
<Link
|
||||
href={text.switchHref}
|
||||
className="text-primary underline-offset-4 hover:underline"
|
||||
>
|
||||
{text.switchLabel}
|
||||
</Link>
|
||||
</p>
|
||||
) : null}
|
||||
</FieldGroup>
|
||||
</form>
|
||||
)}
|
||||
<Field>
|
||||
<FieldLabel htmlFor="email">Email</FieldLabel>
|
||||
<Input
|
||||
id="email"
|
||||
name="email"
|
||||
type="email"
|
||||
autoComplete="email"
|
||||
placeholder="you@example.com"
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel htmlFor="password">Password</FieldLabel>
|
||||
<Input
|
||||
id="password"
|
||||
name="password"
|
||||
type="password"
|
||||
autoComplete={
|
||||
flow === "signIn" ? "current-password" : "new-password"
|
||||
}
|
||||
required
|
||||
/>
|
||||
</Field>
|
||||
{error && <FieldError>{error}</FieldError>}
|
||||
<Field>
|
||||
<Button type="submit" disabled={submitting}>
|
||||
{submitting && <Spinner />}
|
||||
{text.submit}
|
||||
</Button>
|
||||
</Field>
|
||||
{!hideSignUpLink ? (
|
||||
<p className="text-center text-sm text-muted-foreground">
|
||||
{text.switchPrompt}{" "}
|
||||
<Link
|
||||
href={text.switchHref}
|
||||
className="text-primary underline-offset-4 hover:underline"
|
||||
>
|
||||
{text.switchLabel}
|
||||
</Link>
|
||||
</p>
|
||||
) : null}
|
||||
</FieldGroup>
|
||||
</form>
|
||||
)}
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
@@ -39,7 +39,6 @@ export function ConvexClientProvider({
|
||||
}) {
|
||||
return (
|
||||
<ConvexAuthNextjsProvider client={getConvexClient(convexUrl)}>
|
||||
<PersistentCacheProvider>{children}</PersistentCacheProvider>{" "}
|
||||
</ConvexAuthNextjsProvider>
|
||||
<PersistentCacheProvider>{children}</PersistentCacheProvider> </ConvexAuthNextjsProvider>
|
||||
)
|
||||
}
|
||||
@@ -29,7 +29,7 @@ export function FavoriteMediaButton({
|
||||
className={cn(
|
||||
"rounded-full",
|
||||
!isFavorite &&
|
||||
"hover:border-transparent hover:bg-primary hover:text-primary-foreground",
|
||||
"hover:bg-primary hover:text-primary-foreground hover:border-transparent",
|
||||
className
|
||||
)}
|
||||
aria-label={isFavorite ? favoritedLabel : unfavoritedLabel}
|
||||
|
||||
@@ -1,31 +1,13 @@
|
||||
"use client"
|
||||
|
||||
import * as React from "react"
|
||||
import type { OptimisticUpdate } from "convex/browser"
|
||||
import { useMutation, type ReactMutation } from "convex/react"
|
||||
import type { FunctionArgs, FunctionReference } from "convex/server"
|
||||
import { useMutation } from "convex/react"
|
||||
import { toast } from "sonner"
|
||||
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { favoriteOptimisticUpdates } from "@otunes/convex/client/favorites"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
/**
|
||||
* `useMutation(...).withOptimisticUpdate(...)` with a stable identity. Pass a
|
||||
* module-level update so it does not change between renders.
|
||||
*/
|
||||
function useOptimisticMutation<Mutation extends FunctionReference<"mutation">>(
|
||||
mutation: Mutation,
|
||||
optimisticUpdate: OptimisticUpdate<FunctionArgs<Mutation>>
|
||||
): ReactMutation<Mutation> {
|
||||
const base = useMutation(mutation)
|
||||
return React.useMemo(
|
||||
() => base.withOptimisticUpdate(optimisticUpdate),
|
||||
[base, optimisticUpdate]
|
||||
)
|
||||
}
|
||||
|
||||
type FavoritesContextValue = {
|
||||
isSongFavorite: (songId: string) => boolean
|
||||
isAlbumFavorite: (albumId: string) => boolean
|
||||
@@ -52,49 +34,108 @@ export function useFavorites() {
|
||||
|
||||
export function FavoritesProvider({ children }: { children: React.ReactNode }) {
|
||||
const favorites = useCachedQuery(api.favorites.getUserFavorites)
|
||||
const favoriteSong = useOptimisticMutation(
|
||||
api.favorites.favoriteSong,
|
||||
favoriteOptimisticUpdates.favoriteSong
|
||||
)
|
||||
const favoriteSongsMutation = useOptimisticMutation(
|
||||
api.favorites.favoriteSongs,
|
||||
favoriteOptimisticUpdates.favoriteSongs
|
||||
)
|
||||
const unfavoriteSong = useOptimisticMutation(
|
||||
api.favorites.unfavoriteSong,
|
||||
favoriteOptimisticUpdates.unfavoriteSong
|
||||
)
|
||||
const unfavoriteSongs = useOptimisticMutation(
|
||||
api.favorites.unfavoriteSongs,
|
||||
favoriteOptimisticUpdates.unfavoriteSongs
|
||||
)
|
||||
const favoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.favoriteAlbum,
|
||||
favoriteOptimisticUpdates.favoriteAlbum
|
||||
)
|
||||
const unfavoriteAlbum = useOptimisticMutation(
|
||||
api.favorites.unfavoriteAlbum,
|
||||
favoriteOptimisticUpdates.unfavoriteAlbum
|
||||
)
|
||||
const favoriteArtist = useOptimisticMutation(
|
||||
api.favorites.favoriteArtist,
|
||||
favoriteOptimisticUpdates.favoriteArtist
|
||||
)
|
||||
const unfavoriteArtist = useOptimisticMutation(
|
||||
api.favorites.unfavoriteArtist,
|
||||
favoriteOptimisticUpdates.unfavoriteArtist
|
||||
const favoriteSong = useMutation(api.favorites.favoriteSong).withOptimisticUpdate(
|
||||
(store, { songId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current && !current.favoriteSongs.includes(songId)) {
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteSongs: [...current.favoriteSongs, songId],
|
||||
})
|
||||
}
|
||||
}
|
||||
)
|
||||
const favoriteSongsMutation = useMutation(
|
||||
api.favorites.favoriteSongs
|
||||
).withOptimisticUpdate((store, { songIds }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current) {
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteSongs: [...new Set([...current.favoriteSongs, ...songIds])],
|
||||
})
|
||||
}
|
||||
})
|
||||
const unfavoriteSong = useMutation(
|
||||
api.favorites.unfavoriteSong
|
||||
).withOptimisticUpdate((store, { songId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current) {
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteSongs: current.favoriteSongs.filter((id) => id !== songId),
|
||||
})
|
||||
}
|
||||
})
|
||||
const unfavoriteSongs = useMutation(
|
||||
api.favorites.unfavoriteSongs
|
||||
).withOptimisticUpdate((store, { songIds }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current) {
|
||||
const removed = new Set(songIds)
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteSongs: current.favoriteSongs.filter((id) => !removed.has(id)),
|
||||
})
|
||||
}
|
||||
})
|
||||
const favoriteAlbum = useMutation(
|
||||
api.favorites.favoriteAlbum
|
||||
).withOptimisticUpdate((store, { albumId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current && !current.favoriteAlbums.includes(albumId)) {
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteAlbums: [...current.favoriteAlbums, albumId],
|
||||
})
|
||||
}
|
||||
})
|
||||
const unfavoriteAlbum = useMutation(
|
||||
api.favorites.unfavoriteAlbum
|
||||
).withOptimisticUpdate((store, { albumId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current) {
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteAlbums: current.favoriteAlbums.filter((id) => id !== albumId),
|
||||
})
|
||||
}
|
||||
})
|
||||
const favoriteArtist = useMutation(
|
||||
api.favorites.favoriteArtist
|
||||
).withOptimisticUpdate((store, { artistId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current && !current.favoriteArtists.includes(artistId)) {
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteArtists: [...current.favoriteArtists, artistId],
|
||||
})
|
||||
}
|
||||
})
|
||||
const unfavoriteArtist = useMutation(
|
||||
api.favorites.unfavoriteArtist
|
||||
).withOptimisticUpdate((store, { artistId }) => {
|
||||
const current = store.getQuery(api.favorites.getUserFavorites, {})
|
||||
if (current) {
|
||||
store.setQuery(api.favorites.getUserFavorites, {}, {
|
||||
...current,
|
||||
favoriteArtists: current.favoriteArtists.filter(
|
||||
(id) => id !== artistId
|
||||
),
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
const songIds = React.useMemo(
|
||||
() => new Set<string>(favorites?.favoriteSongs.flat()),
|
||||
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
|
||||
[favorites?.favoriteSongs]
|
||||
)
|
||||
const albumIds = React.useMemo(
|
||||
() => new Set<string>(favorites?.favoriteAlbums.flat()),
|
||||
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
|
||||
[favorites?.favoriteAlbums]
|
||||
)
|
||||
const artistIds = React.useMemo(
|
||||
() => new Set<string>(favorites?.favoriteArtists.flat()),
|
||||
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
|
||||
[favorites?.favoriteArtists]
|
||||
)
|
||||
|
||||
@@ -247,8 +288,6 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
|
||||
)
|
||||
|
||||
return (
|
||||
<FavoritesContext.Provider value={value}>
|
||||
{children}
|
||||
</FavoritesContext.Provider>
|
||||
<FavoritesContext.Provider value={value}>{children}</FavoritesContext.Provider>
|
||||
)
|
||||
}
|
||||
Loaded 100 of 204 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user