Compare commits

..
52 changed files with 1715 additions and 2069 deletions

No files matched your search

+4 -9
View File
@@ -73,15 +73,10 @@ select your signing team, then build and run. For a Release build, use Xcode's
Archive action with the Catalyst destination. EAS's existing iOS profiles still
build iPhone/iPad apps.
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
raises pod deployment targets to the app's, and disables precompiled React
Native and Expo modules so dependencies can compile for Catalyst. System volume
stays under macOS control.
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
same team. Handoff only pairs apps with a matching team and activity type, which
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
patches. It disables precompiled React Native and Expo modules so dependencies
can compile for Catalyst. The Mac app derives a separate bundle identifier with
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
To return a checkout to ordinary iOS builds, rerun prebuild without
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
+2 -5
View File
@@ -26,8 +26,6 @@ export default ({ config }: ConfigContext): ExpoConfig => {
production: "oTunes",
}[variant]
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
return {
...config,
plugins: [
@@ -42,12 +40,11 @@ export default ({ config }: ConfigContext): ExpoConfig => {
icon: `./assets/icon${iconSuffix}.png`,
ios: {
...config.ios,
bundleIdentifier,
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
icon: `./assets/${composer}.icon`,
infoPlist: {
...config.ios?.infoPlist,
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
NSUserActivityTypes: [`${bundleIdentifier}.media`],
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
},
},
android: {
-1
View File
@@ -54,7 +54,6 @@
"expo-status-bar",
"expo-app-intents",
"./plugins/with-android-colors",
"./plugins/with-android-fast-fade",
[
"expo-navigation-bar",
{
+24 -13
View File
@@ -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)
@@ -138,6 +140,9 @@ function TabsContent() {
<NativeTabs.Trigger
name="home"
unstable_nativeProps={
Platform.OS === "android" ? homeColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
@@ -147,6 +152,9 @@ function TabsContent() {
<NativeTabs.Trigger
name="library"
unstable_nativeProps={
Platform.OS === "android" ? libraryColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
@@ -161,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,
@@ -90,12 +97,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 +111,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 +123,7 @@ export default function AlbumScreen() {
handleAlbumTrackAction,
isSongFavorite,
palette,
playTrack,
playFromSong,
songIds,
swipeGroup,
]
@@ -135,14 +138,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 +169,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 +192,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 +217,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 +279,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 +306,8 @@ export default function AlbumScreen() {
{ backgroundColor: palette.surface },
]}
>
<Ionicons
<PaletteIcon
tone="foreground"
name="shuffle"
size={24}
color={palette.foreground}
@@ -304,7 +316,8 @@ export default function AlbumScreen() {
</View>
}
>
<Text
<PaletteText
tone="foreground"
style={[
styles.title,
heroLayout.landscape && styles.titleLandscape,
@@ -312,12 +325,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 +339,7 @@ export default function AlbumScreen() {
]}
>
{album.artist.name}
</Text>
</PaletteText>
</Pressable>
<View
style={{
@@ -339,18 +353,25 @@ export default function AlbumScreen() {
}}
>
{metadata ? (
<Text style={{ color: palette.secondaryForeground }}>
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
{metadata}
</Text>
</PaletteText>
) : null}
{album.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}
@@ -360,11 +381,15 @@ export default function AlbumScreen() {
{album.hasAtmos ? (
<>
{metadata || album.hasLossless ? (
<Text style={{ color: palette.secondaryForeground }}>
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
·
</Text>
</PaletteText>
) : null}
<AudioFormatBadge
artwork
format="atmos"
color={palette.secondaryForeground}
backgroundColor={palette.background}
@@ -488,11 +513,12 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
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 +526,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>
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
headerLargeTitle: false,
}}
/>
<CollectionDetailSkeleton variant="artist" />
<CollectionDetailSkeleton round />
</>
)
}
@@ -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"
@@ -105,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={
@@ -133,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>
</>
)
@@ -170,7 +179,6 @@ function PlaylistContent({
}) {
const router = useRouter()
const isFocused = useIsFocused()
const colors = useThemeColors()
const { playPlaylist, playPlaylistShuffled, playFromSong } =
usePlaybackActions()
const { isSongFavorite } = useFavorites()
@@ -194,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
@@ -212,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])
@@ -271,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),
@@ -290,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>
@@ -301,7 +311,6 @@ function PlaylistContent({
}
}, [
canEdit,
colors.foreground,
deletePlaylist,
handlePlaylistDetailAction,
palette.foreground,
@@ -361,14 +370,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
@@ -422,7 +432,6 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
playlistLabel={PLAYLIST_LABEL}
palette={palette}
inset
removable={removable}
swipe={
Platform.OS !== "web"
? {
@@ -430,7 +439,12 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
backgroundColor: palette.background,
onPlayNext: () => onAction(song, "play-next"),
onAddToQueue: () => onAction(song, "play-last"),
onRemove: removable ? () => void handleRemove() : undefined,
onRemove:
Platform.OS === "android" && removable
? () => {
void onRemove(song.id)
}
: undefined,
}
: undefined
}
@@ -461,15 +475,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>
)}
>
@@ -549,7 +567,8 @@ const PlaylistHero = memo(function PlaylistHero({
},
]}
>
<Ionicons
<PaletteIcon
tone={isSubscribed ? "foreground" : "accentForeground"}
name={isSubscribed ? "checkmark" : "add"}
size={24}
color={
@@ -575,12 +594,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,
@@ -588,15 +613,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>
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
<CollectionDetailSkeleton variant="favorites" />
<CollectionDetailSkeleton />
</>
)
}
@@ -26,7 +26,6 @@ import {
} from "@/lib/artwork-color-preference"
import { initialsFromName } from "@/lib/format"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { changeServer, signOut } from "@/lib/session"
import { radius, spacing, useThemeColors } from "@/lib/theme"
@@ -186,7 +185,6 @@ function AppearanceSection() {
setSaving(true)
try {
await setArtworkColorsEnabled(checked)
clearCoverPaletteCache()
} catch {
showError("Could not save artwork colors preference.")
} finally {
@@ -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 (
+140 -117
View File
@@ -6,7 +6,7 @@ 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,
@@ -45,16 +45,16 @@ import {
QUEUE_HORIZONTAL_INSET,
} from "@/components/now-playing-queue"
import { PlayerArtistMenu } from "@/components/player-artist-menu"
import { PlayerProgress } from "@/components/player-progress"
import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites"
import { 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,
@@ -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",
@@ -8,7 +8,7 @@ import {
ANONYMOUS_CACHE_SCOPE,
useCacheScope,
} from "@/contexts/persistent-cache"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { usePlayback } from "@/contexts/playback"
import {
FAVORITES_PLAYLIST_ID,
loadHandledIntentIds,
@@ -113,7 +113,7 @@ function isTransient(error: unknown) {
export function useIntentDispatch() {
const convex = useConvex()
const cacheScope = useCacheScope()
const playback = { ...usePlaybackQueue(), ...usePlaybackActions() }
const playback = usePlayback()
const favorites = useFavorites()
const navigation = useAppNavigation()
const store = useMemo(
@@ -2,12 +2,10 @@ import * as AppIntents from "expo-app-intents"
import type { AppIntentEntity } from "expo-app-intents"
import { useEffect } from "react"
import { usePlaybackQueue } from "@/contexts/playback"
import { usePlayback } from "@/contexts/playback"
import { publishMusicCatalog } from "@/lib/app-intents"
type CurrentSong = NonNullable<
ReturnType<typeof usePlaybackQueue>["currentSong"]
>
type CurrentSong = NonNullable<ReturnType<typeof usePlayback>["currentSong"]>
function nowPlayingEntity(song: CurrentSong): AppIntentEntity {
const artistName = song.artist.name
@@ -46,7 +44,7 @@ export async function publishNowPlaying(
/** Keeps the "nowPlaying" catalog in step with the playback queue. */
export function useNowPlayingCatalog() {
const playback = usePlaybackQueue()
const playback = usePlayback()
const queueHeadId = playback.queueSongIds[0] ?? null
const song = playback.currentSong
+10 -2
View File
@@ -1,4 +1,5 @@
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 {
@@ -68,10 +69,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 +87,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>
)
}
+7 -3
View File
@@ -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>
)
})
+1 -5
View File
@@ -35,11 +35,7 @@ export function HandoffBridge() {
if (!active || !activity) return
try {
const source = new URL(activity.server)
if (!config) {
showError("Connect to an oTunes server to continue this activity.")
return
}
if (source.origin !== new URL(config.serverUrl).origin) {
if (!config || source.origin !== new URL(config.serverUrl).origin) {
showError("This activity belongs to a different oTunes server.")
return
}
@@ -32,7 +32,6 @@ export type MediaAction =
| "favorite"
| "go-artist"
| "go-album"
| "remove-from-playlist"
| "delete-playlist"
export type MediaNavigation = {
@@ -55,7 +54,6 @@ export type MediaMenuConfig = {
playlistLabel?: string
favorited?: boolean
showFavorite?: boolean
showRemoveFromPlaylist?: boolean
stationArtistId?: string
navigation?: MediaNavigation
share?: MediaShareContext
@@ -78,7 +76,6 @@ const MEDIA_ACTION_ITEMS: {
playlistLabel: string
) => string
image: NonNullable<MenuAction["image"]> & string
destructive?: boolean
}[] = [
{
action: "playlist",
@@ -122,12 +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: "delete-playlist",
label: () => "Delete Playlist",
@@ -143,10 +134,6 @@ function isActionIncluded(
return false
}
if (action === "remove-from-playlist") {
return config.showRemoveFromPlaylist === true
}
if (config.includeActions) {
return config.includeActions.includes(action)
}
@@ -203,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 } } : {}),
})
}
@@ -338,7 +324,6 @@ const NativeContextMenuAction: ComponentType<{
identifier: string
title: string
icon?: string
destructive?: boolean
onSelected: () => void
}> | null =
Platform.OS === "ios"
@@ -392,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,7 +25,6 @@ const actionIcons = {
favorite: "star-outline",
"go-artist": "person-outline",
"go-album": "disc-outline",
"remove-from-playlist": "remove-circle-outline",
"delete-playlist": "trash-outline",
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
+32 -14
View File
@@ -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>
)
}
+97 -121
View File
@@ -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
+49
View File
@@ -0,0 +1,49 @@
import { Ionicons } from "@expo/vector-icons"
import type { ComponentProps } from "react"
import { Pressable, type TextProps } from "react-native"
import { useRouter } from "expo-router"
import Animated from "react-native-reanimated"
import {
useAnimatedPaletteColor,
type PaletteColor,
} from "@/contexts/android-tab-theme"
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
/** Keep artwork text colors on the same UI-thread animation as the background. */
export function PaletteText({
tone,
style,
...props
}: TextProps & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <Animated.Text {...props} style={[style, colorStyle]} />
}
export function PaletteIcon({
tone,
style,
...props
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <AnimatedIcon {...props} style={[style, colorStyle]} />
}
function ArtworkBackButton() {
const router = useRouter()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel="Navigate up"
hitSlop={8}
onPress={() => router.back()}
>
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
</Pressable>
)
}
export function renderArtworkBackButton() {
return <ArtworkBackButton />
}
@@ -1,83 +0,0 @@
import { useState, type ReactNode } from "react"
import {
StyleSheet,
Text,
View,
type StyleProp,
type TextStyle,
} from "react-native"
import { PlayerSlider } from "@/components/player-slider"
import { usePlaybackActions, usePlaybackProgress } from "@/contexts/playback"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
/**
* Position slider with elapsed and remaining labels. The only player piece
* subscribed to the playback clock, so the rest of the player stays still
* while audio plays.
*/
export function PlayerProgress({
colors,
center,
timeStyle,
}: {
colors: NowPlayingColors
/** Shown centered between the time labels. */
center?: ReactNode
timeStyle?: StyleProp<TextStyle>
}) {
const { currentTime, duration } = usePlaybackProgress()
const { seekTo } = usePlaybackActions()
const [scrubTime, setScrubTime] = useState<number | null>(null)
const time = scrubTime ?? currentTime
const timeColor =
scrubTime === null ? colors.secondaryForeground : colors.foreground
return (
<>
<PlayerSlider
accessibilityLabel="Playback position"
value={time}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.row}>
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
{formatDuration(time)}
</Text>
{center ? (
<View style={styles.center} pointerEvents="none">
{center}
</View>
) : null}
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
{formatRemainingDuration(time, duration).replace("-", "−")}
</Text>
</View>
</>
)
}
const styles = StyleSheet.create({
row: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
marginTop: -4,
},
center: {
position: "absolute",
left: 0,
right: 0,
alignItems: "center",
},
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
})
+13 -11
View File
@@ -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,
@@ -63,22 +64,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}
</>
)
@@ -154,7 +160,6 @@ export const SongListRow = memo(function SongListRow({
palette,
inset,
swipe,
removable,
onPlay,
onAction,
}: {
@@ -170,8 +175,6 @@ export const SongListRow = memo(function SongListRow({
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 +202,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 },
+167 -297
View File
@@ -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: {
+41 -41
View File
@@ -31,19 +31,14 @@ 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 LEADING_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,
@@ -63,8 +58,7 @@ export function SongSwipeRow({
onAddToQueue: () => void
onRemove?: () => void
}) {
const hasRemove = !!onRemove
const trailingWidth = hasRemove ? PAIRED_ACTION_WIDTH * 2 : ACTION_WIDTH
const hasRemove = IS_ANDROID && !!onRemove
const x = useSharedValue(0)
const startX = useSharedValue(0)
const width = useSharedValue(0)
@@ -95,10 +89,9 @@ export function SongSwipeRow({
(side: number) => {
close()
if (side > 0) onAddToQueue()
// Without Remove, the trailing action is the Download placeholder.
else onRemove?.()
// Download is intentionally a placeholder.
},
[close, onAddToQueue, onRemove]
[close, onAddToQueue]
)
const tapRow = useCallback(() => {
if (open) close()
@@ -124,7 +117,9 @@ export function SongSwipeRow({
const commit =
Math.abs(x.value) >
Math.max(
x.value > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth,
x.value > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1),
width.value * 0.55
)
if (commit !== committed.value) {
@@ -146,7 +141,10 @@ export function SongSwipeRow({
? side
: 0
x.value = withSpring(
target * (target > 0 ? PAIRED_ACTION_WIDTH * 2 : trailingWidth),
target *
(target > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
{
...SPRING,
velocity: event.velocityX,
@@ -169,6 +167,7 @@ export function SongSwipeRow({
return Gesture.Exclusive(pan, tap)
}, [
activate,
hasRemove,
begin,
close,
commitProgress,
@@ -176,7 +175,6 @@ export function SongSwipeRow({
settle,
startX,
tapRow,
trailingWidth,
width,
x,
])
@@ -229,28 +227,31 @@ export function SongSwipeRow({
onPlayNext()
}}
/>
{hasRemove && (
<SwipeAction
side={-1}
secondary
paired
remove
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => {
close()
onRemove?.()
}}
/>
)}
<SwipeAction
side={-1}
paired={hasRemove}
remove={hasRemove}
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
@@ -265,7 +266,10 @@ export function SongSwipeRow({
: []),
]}
onAccessibilityAction={(event) => {
if (event.nativeEvent.actionName === "remove") activate(-1)
if (event.nativeEvent.actionName === "remove" && hasRemove) {
close()
onRemove?.()
}
if (event.nativeEvent.actionName === "addToQueue") activate(1)
if (event.nativeEvent.actionName === "playNext") {
close()
@@ -333,10 +337,10 @@ function SwipeAction({
const resting = Math.max(
0,
Math.min(
revealed - (paired ? 10 : 20),
revealed - (side > 0 ? 10 : 20),
interpolate(
revealed,
[24, paired ? PAIRED_ACTION_WIDTH : ACTION_WIDTH, 220],
[24, side > 0 ? LEADING_ACTION_WIDTH : ACTION_WIDTH, 220],
[0, 62, 200]
)
)
@@ -400,9 +404,7 @@ function SwipeAction({
styles.pill,
{
backgroundColor: remove
? IS_ANDROID
? "#d32f2f"
: "#ff3b30"
? "#d32f2f"
: side > 0
? secondary
? "#6b5bff"
@@ -430,13 +432,11 @@ function SwipeAction({
) : (
<SymbolView
name={
remove
? "trash"
: side > 0
? secondary
? "text.line.first.and.arrowtriangle.forward"
: "text.line.last.and.arrowtriangle.forward"
: "arrow.down"
side > 0
? secondary
? "text.line.first.and.arrowtriangle.forward"
: "text.line.last.and.arrowtriangle.forward"
: "arrow.down"
}
size={22}
tintColor="white"
@@ -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]}>
+1 -4
View File
@@ -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
+61 -16
View File
@@ -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",
+15 -2
View File
@@ -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>
+129 -38
View File
@@ -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,
}
+33 -23
View File
@@ -97,8 +97,6 @@ type PlaybackContextValue = {
type PlaybackActionsValue = Pick<
PlaybackContextValue,
| "seekTo"
| "waitForPlaybackReady"
| "setIsPlaying"
| "playInOrder"
| "playShuffled"
@@ -138,11 +136,6 @@ type PlaybackQueueValue = Pick<
| "repeatEnabled"
>
type PlaybackProgressValue = Pick<
PlaybackContextValue,
"currentTime" | "duration"
>
type CollectionPlayers = Pick<
PlaybackActionsValue,
| "playAlbum"
@@ -164,17 +157,14 @@ type CollectionPlay = {
recorded: RecordedPlay
}
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
const PlaybackActionsContext = createContext<PlaybackActionsValue | null>(null)
const PlaybackQueueContext = createContext<PlaybackQueueValue | null>(null)
const PlaybackProgressContext = createContext<PlaybackProgressValue | null>(
null
)
/** Ticks while audio plays. Keep consumers small (slider and time labels). */
export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext)
export function usePlayback() {
const context = useContext(PlaybackContext)
if (!context) {
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
throw new Error("usePlayback must be used within PlaybackProvider")
}
return context
}
@@ -641,8 +631,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const actionsValue = useMemo<PlaybackActionsValue>(
() => ({
seekTo,
waitForPlaybackReady,
...collectionPlayers,
setIsPlaying,
playInOrder,
@@ -683,14 +671,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playInOrder,
playShuffled,
reorderQueue,
seekTo,
setIsPlaying,
skipNext,
skipPrevious,
skipToHistoryIndex,
skipToQueueIndex,
toggleShuffle,
waitForPlaybackReady,
]
)
@@ -715,17 +701,41 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
]
)
const progressValue = useMemo<PlaybackProgressValue>(
() => ({ currentTime, duration }),
[currentTime, duration]
const value = useMemo<PlaybackContextValue>(
() => ({
...actionsValue,
waitForPlaybackReady,
queueSongIds,
queueHistorySongIds,
currentSong,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled,
isPlaying: isPlaybackActive,
currentTime,
duration,
seekTo,
}),
[
actionsValue,
waitForPlaybackReady,
currentSong,
currentTime,
duration,
isPlaybackActive,
playback.shuffleEnabled,
queueHistorySongIds,
queueSongIds,
repeatEnabled,
seekTo,
]
)
return (
<PlaybackActionsContext.Provider value={actionsValue}>
<PlaybackQueueContext.Provider value={queueValue}>
<PlaybackProgressContext.Provider value={progressValue}>
<PlaybackContext.Provider value={value}>
{children}
</PlaybackProgressContext.Provider>
</PlaybackContext.Provider>
</PlaybackQueueContext.Provider>
</PlaybackActionsContext.Provider>
)
+1 -7
View File
@@ -134,13 +134,7 @@ export function createCoverPaletteSource<Swatches>({
}
}
/** Forget in-memory swatches so covers are re-extracted. */
function clear() {
swatchesByKey.clear()
pending.clear()
}
return { prefetch, usePalette, clear }
return { prefetch, usePalette }
}
function sameSwatches(a: unknown, b: unknown) {
-12
View File
@@ -3,7 +3,6 @@ import {
type CoverPaletteResult,
} from "@/hooks/cover-palette-source"
import {
clearLegacyCoverPaletteCache,
prefetchLegacyCoverPalette,
useLegacyCoverPalette,
} from "@/hooks/use-legacy-cover-palette"
@@ -13,7 +12,6 @@ import {
} from "@/lib/artwork-color-preference"
import { extractCoverSwatches } from "@/lib/artwork-colors"
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
import { clearCachePrefix } from "@/lib/persistent-cache"
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
@@ -23,16 +21,6 @@ const region = createCoverPaletteSource<CoverSwatches>({
derive: (swatches) => deriveCoverPalette(swatches),
})
/**
* Forget every extracted palette, in memory and on device, so covers are
* re-extracted. Both pipelines share the `palette:` cache prefix.
*/
export function clearCoverPaletteCache() {
region.clear()
clearLegacyCoverPaletteCache()
clearCachePrefix("palette")
}
/** Warm visible artwork colors before a detail page is pushed. */
export function prefetchCoverPalette(uri: string) {
void loadArtworkColorsEnabled().then((enabled) =>
@@ -65,5 +65,3 @@ export const prefetchLegacyCoverPalette = legacy.prefetch
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
export const useLegacyCoverPalette = legacy.usePalette
export const clearLegacyCoverPaletteCache = legacy.clear
+12 -13
View File
@@ -113,8 +113,6 @@ export function useNativePlaylistSync({
measuredDuration > 0
? measuredDuration
: (currentSong?.durationSeconds ?? 0)
const durationRef = useRef(duration)
durationRef.current = duration
const queueSyncKey = useMemo(
() => JSON.stringify(queueSongIds),
[queueSongIds]
@@ -411,17 +409,18 @@ export function useNativePlaylistSync({
[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 seekTo = useCallback(
async (seconds: number) => {
const playlist = playlistRef.current
if (!playlist) return
const maxDuration = playlist.duration || duration || 0
const clamped = Math.max(0, Math.min(seconds, maxDuration))
await playlist.seekTo(clamped)
currentTimeRef.current = clamped
setCurrentTime(clamped)
},
[duration]
)
const handlePlaybackLoadFailure = useCallback(() => {
autoPlayNextRef.current = false
+1 -1
View File
@@ -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 },
@@ -7,15 +7,11 @@ private enum HandoffState {
static var pending: [String: String]?
static var notify: (() -> Void)?
// app.config.ts declares the one `.media` type per build profile; iOS and
// Catalyst must publish the same string for Handoff to pair them. Other
// plugins (expo-router) append their own types, so match by suffix.
static let activityType =
(Bundle.main.object(forInfoDictionaryKey: "NSUserActivityTypes") as! [String])
.first { $0.hasSuffix(".media") }!
static var activityType: String {
"\(Bundle.main.bundleIdentifier!).media"
}
}
// ExpoAppSceneDelegate forwards scene(_:continue:) and cold-start activities here.
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
public func application(
_ application: UIApplication,
@@ -1,36 +0,0 @@
const fs = require("fs")
const path = require("path")
const { withDangerousMod } = require("expo/config-plugins")
// Overrides react-native-screens' 150ms crossfade for `animation: "fade"`.
// App resources win over library resources with the same name, so the stack
// fades through black in 100ms: the old page out, then the new page in.
const anims = {
"rns_fade_out.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:duration="50" />
`,
"rns_fade_in.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:startOffset="50"
android:duration="50" />
`,
}
module.exports = (config) =>
withDangerousMod(config, [
"android",
(config) => {
const dir = path.join(
config.modRequest.platformProjectRoot,
"app/src/main/res/anim"
)
fs.mkdirSync(dir, { recursive: true })
for (const [name, xml] of Object.entries(anims)) {
fs.writeFileSync(path.join(dir, name), `<?xml version="1.0" encoding="utf-8"?>\n${xml}`)
}
return config
},
])
+7 -23
View File
@@ -4,20 +4,6 @@ const {
withXcodeProject,
} = require("expo/config-plugins")
// Pods left at React Native's iOS 15.1 minimum map to a macOS target below what
// current Xcode accepts for Catalyst, so raise them to the app's own target.
const raisePodDeploymentTargets = `
app_target = installer.aggregate_targets.first.platform.deployment_target
installer.pods_project.targets.each do |target|
target.build_configurations.each do |build|
current = build.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
if current.nil? || Pod::Version.new(current) < app_target
build.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = app_target.to_s
end
end
end
`
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
module.exports = (config) => {
config = withPodfileProperties(config, (config) => {
@@ -27,15 +13,14 @@ module.exports = (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)/
let contents = config.modResults.contents
if (!flag.test(contents) || !postInstall.test(contents)) {
const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
if (!pattern.test(config.modResults.contents)) {
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
}
contents = contents.replace(flag, ":mac_catalyst_enabled => true")
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`)
config.modResults.contents = contents
config.modResults.contents = config.modResults.contents.replace(
pattern,
":mac_catalyst_enabled => true"
)
return config
})
@@ -47,8 +32,7 @@ module.exports = (config) => {
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
const settings = configurations[value].buildSettings
settings.SUPPORTS_MACCATALYST = "YES"
// Share the iOS bundle ID so Handoff and the App ID match across devices.
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
}
return config
+1 -5
View File
@@ -22,11 +22,7 @@
"pnpm": {
"patchedDependencies": {
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch",
"react-native-reanimated@4.7.1": "patches/react-native-reanimated@4.7.1.patch",
"expo-modules-core@58.0.24": "patches/expo-modules-core@58.0.24.patch",
"expo-file-system@58.0.10": "patches/expo-file-system@58.0.10.patch",
"@react-native-community/slider@5.2.1": "patches/@react-native-community__slider@5.2.1.patch"
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch"
}
}
}
@@ -198,15 +198,6 @@ export async function clearPersistentCache() {
}
}
/** Deletes every entry whose key starts with `<prefix>:`. */
export function clearCachePrefix(prefix: string) {
for (const key of [...memory.keys()]) {
if (entryPrefix(key) !== prefix) continue
removeFromMemory(key)
scheduleWrite(key, null)
}
}
export function subscribeCache(key: string, listener: () => void) {
let keyListeners = listeners.get(key)
if (!keyListeners) {
+482 -470
View File
@@ -61,494 +61,512 @@ async function cleanHlsStreamsOlderThan(maxIdleMs: number) {
return { checked, removed, failed }
}
const SCAN_PAGE_SIZE = 2000
/** Outlives the 10 minute action timeout so a crashed scan frees the lock. */
const SCAN_LOCK_LEASE_MS = 15 * 60 * 1000
/** New files left unparsed after this are picked up by the next scan. */
const SCAN_PARSE_BUDGET_MS = 6 * 60 * 1000
const SCAN_BATCH_SIZE = 200
const FS_CONCURRENCY = 16
type Page<T> = { page: T[]; isDone: boolean; continueCursor: string }
/** Reads every page of an internal paginated query. */
async function collectPages<T>(
load: (cursor: string | null) => Promise<Page<T>>
): Promise<T[]> {
const items: T[] = []
let cursor: string | null = null
for (;;) {
const result = await load(cursor)
items.push(...result.page)
if (result.isDone) {
return items
}
cursor = result.continueCursor
}
async function coverPathIfExists(path: string): Promise<string | null> {
return fs
.access(path)
.then(() => path)
.catch(() => null)
}
/** Like `Promise.all(items.map(fn))` with at most `limit` calls in flight. */
async function mapLimit<T, R>(
items: T[],
limit: number,
fn: (item: T) => Promise<R>
): Promise<R[]> {
const results = new Array<R>(items.length)
let next = 0
const worker = async () => {
while (next < items.length) {
const index = next++
results[index] = await fn(items[index])
}
}
await Promise.all(
Array.from({ length: Math.min(limit, items.length) }, worker)
)
return results
}
function chunk<T>(items: T[], size: number): T[][] {
const chunks: T[][] = []
for (let i = 0; i < items.length; i += size) {
chunks.push(items.slice(i, i + size))
}
return chunks
}
async function readDirents(dir: string): Promise<fsSync.Dirent[]> {
try {
return await fs.readdir(dir, { withFileTypes: true })
} catch (error) {
if ((error as NodeJS.ErrnoException).code === "ENOENT") {
return []
}
throw error
}
}
type DiskAlbum = {
codec: string
artistFolder: string
albumFolder: string
files: string[]
}
type DiskLibrary = {
/** Every audio file path. */
files: Set<string>
/** Every `folder.jpg` / `cover.jpg` path. */
covers: Set<string>
albums: DiskAlbum[]
}
/** Lists `DATA_DIR/<codec>/<artist>/<album>/<file>` with one readdir per directory. */
async function walkLibrary(codecs: string[]): Promise<DiskLibrary> {
const files = new Set<string>()
const covers = new Set<string>()
const artistDirs = (
await Promise.all(
codecs.map(async (codec) =>
(await readDirents(`${DATA_DIR}/${codec}`))
.filter((dirent) => dirent.isDirectory())
.map((dirent) => ({ codec, artistFolder: dirent.name }))
)
)
).flat()
const albumDirs = (
await mapLimit(
artistDirs,
FS_CONCURRENCY,
async ({ codec, artistFolder }) => {
const artistPath = `${DATA_DIR}/${codec}/${artistFolder}`
const dirents = await readDirents(artistPath)
if (dirents.some((d) => !d.isDirectory() && d.name === "folder.jpg")) {
covers.add(`${artistPath}/folder.jpg`)
}
return dirents
.filter((dirent) => dirent.isDirectory())
.map((dirent) => ({ codec, artistFolder, albumFolder: dirent.name }))
}
)
).flat()
const albums = await mapLimit(albumDirs, FS_CONCURRENCY, async (album) => {
const albumPath = `${DATA_DIR}/${album.codec}/${album.artistFolder}/${album.albumFolder}`
const albumFiles: string[] = []
for (const dirent of await readDirents(albumPath)) {
if (dirent.isDirectory()) {
continue
}
const filePath = `${albumPath}/${dirent.name}`
if (dirent.name === "cover.jpg") {
covers.add(filePath)
} else {
files.add(filePath)
albumFiles.push(filePath)
}
}
return { ...album, files: albumFiles }
})
return { files, covers, albums }
}
/**
* Keeps the current cover while its file exists, otherwise the first codec's
* cover on disk. Covers outside the data directory are left alone.
*/
function pickCover(
current: string | null,
candidates: string[],
covers: Set<string>
): string | null {
if (
current !== null &&
(covers.has(current) || !current.startsWith(`${DATA_DIR}/`))
) {
return current
}
return candidates.find((candidate) => covers.has(candidate)) ?? null
}
/** Untagged years are stored as 0 / "", which both clients treat as unknown. */
function releaseDate(common: music.ICommonTagsResult) {
if (common.date) {
return common.date
}
return common.year ? `01-01-${common.year}` : ""
}
type NewSong = {
name: string
files: Record<string, string>
artist: string | string[]
length: number
diskNumber: number | null
track: number
year: number
date: string
genres: string[]
}
type ImportEntry = {
artist: { name: string; folder: string; cover: string | null }
album: {
name: string
folder: string
cover: string | null
year: number
date: string
}
songs: Map<string, NewSong>
}
/**
* Reconciles the database with the files on disk. Reads the library once in
* pages, walks the disk once, parses only untracked files and writes only
* what changed, so re-scanning an unchanged library makes no writes.
*/
async function scanLibrary(ctx: ActionCtx) {
const startedAt = Date.now()
const codecs = (await fs.readdir(DATA_DIR, { withFileTypes: true }))
.filter((dirent) => dirent.isDirectory())
.map((dirent) => dirent.name)
const [artists, albums, songs, disk] = await Promise.all([
collectPages((cursor) =>
ctx.runQuery(internal.library.scanArtistsPage, {
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
async function syncArtistCover(
ctx: ActionCtx,
codec: string,
dbCover: string | null,
diskPath: string,
id: Id<"artists">
) {
const onDisk = await coverPathIfExists(diskPath)
if (onDisk !== null) {
if (dbCover !== onDisk) {
await ctx.runMutation(internal.library.updateArtistCover, {
id,
cover: onDisk,
})
),
collectPages((cursor) =>
ctx.runQuery(internal.library.scanAlbumsPage, {
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
})
),
collectPages((cursor) =>
ctx.runQuery(internal.library.scanSongsPage, {
paginationOpts: { numItems: SCAN_PAGE_SIZE, cursor },
})
),
walkLibrary(codecs),
])
if (disk.files.size === 0 && songs.length > 0) {
throw new Error(
`No audio files found under ${DATA_DIR}; refusing to empty the library`
)
}
// Drop file paths that are gone from disk (including removed codecs). Songs
// left without files are deleted below unless a new file matches them.
const songFiles = new Map<Id<"songs">, Record<string, string>>()
const changedSongs = new Set<Id<"songs">>()
const songsByAlbum = new Map<Id<"albums">, Map<string, Id<"songs">>>()
const tracked = new Set<string>()
for (const song of songs) {
const entries = Object.entries(song.files)
const kept = entries.filter(([, filePath]) => disk.files.has(filePath))
if (kept.length !== entries.length) {
changedSongs.add(song._id)
}
songFiles.set(song._id, Object.fromEntries(kept))
for (const [, filePath] of kept) {
tracked.add(filePath)
}
const byName = songsByAlbum.get(song.album) ?? new Map()
if (!byName.has(song.name)) {
byName.set(song.name, song._id)
}
songsByAlbum.set(song.album, byName)
}
// Parse untracked files only.
const untracked = disk.albums.flatMap((album) =>
album.files
.filter((filePath) => !tracked.has(filePath))
.map((filePath) => ({ ...album, filePath }))
)
const deadline = startedAt + SCAN_PARSE_BUDGET_MS
const parsed = await mapLimit(untracked, FS_CONCURRENCY, async (file) => {
if (Date.now() > deadline) {
return null
}
try {
const metadata = await music.parseFile(file.filePath, {
skipCovers: true,
})
return { ...file, metadata }
} catch {
return null
}
})
const skipped = parsed.filter((file) => file === null).length
const artistByFolder = new Map(
artists.map((artist) => [artist.folder, artist])
)
const albumByKey = new Map(
albums.map((album) => [`${album.artist}/${album.folder}`, album])
)
const imports = new Map<string, ImportEntry>()
for (const file of parsed) {
if (file === null) {
continue
}
const { codec, artistFolder, albumFolder, filePath, metadata } = file
const common = metadata.common
const title = common.title || path.parse(filePath).name
const dbArtist = artistByFolder.get(artistFolder)
const dbAlbum = dbArtist
? albumByKey.get(`${dbArtist._id}/${albumFolder}`)
: undefined
const existingId = dbAlbum && songsByAlbum.get(dbAlbum._id)?.get(title)
if (existingId) {
// A same-titled sibling must not steal a path that still exists.
const files = songFiles.get(existingId)!
if (!(codec in files)) {
songFiles.set(existingId, { ...files, [codec]: filePath })
changedSongs.add(existingId)
}
continue
}
const key = `${artistFolder}/${albumFolder}`
let entry = imports.get(key)
if (!entry) {
entry = {
artist: {
name: common.albumartist || artistFolder,
folder: artistFolder,
cover: pickCover(
null,
codecs.map((c) => `${DATA_DIR}/${c}/${artistFolder}/folder.jpg`),
disk.covers
),
},
album: {
name: common.album || albumFolder,
folder: albumFolder,
cover: pickCover(
null,
codecs.map(
(c) => `${DATA_DIR}/${c}/${artistFolder}/${albumFolder}/cover.jpg`
),
disk.covers
),
year: common.year || 0,
date: releaseDate(common),
},
songs: new Map(),
}
imports.set(key, entry)
}
const pending = entry.songs.get(title)
if (pending) {
pending.files[codec] ??= filePath
continue
}
entry.songs.set(title, {
name: title,
files: { [codec]: filePath },
artist:
common.artist ?? common.artists ?? dbArtist?.name ?? entry.artist.name,
length: Math.round(metadata.format.duration || 0),
diskNumber: common.disk.of === 1 ? null : common.disk.no,
track: common.track.no || 0,
year: common.year || 0,
date: releaseDate(common),
genres: common.genre || [],
} else if (dbCover !== null && dbCover.includes(codec)) {
await ctx.runMutation(internal.library.updateArtistCover, {
id,
cover: null,
})
}
}
const deletedSongs = songs.flatMap((song) =>
Object.keys(songFiles.get(song._id)!).length === 0 ? [song._id] : []
)
const deletedSongSet = new Set(deletedSongs)
const updatedSongs = [...changedSongs].filter((id) => !deletedSongSet.has(id))
async function syncAlbumCover(
ctx: ActionCtx,
codec: string,
dbCover: string | null,
diskPath: string,
id: Id<"albums">
) {
const onDisk = await coverPathIfExists(diskPath)
if (onDisk !== null) {
if (dbCover !== onDisk) {
await ctx.runMutation(internal.library.updateAlbumCover, {
id,
cover: onDisk,
})
}
} else if (dbCover !== null && dbCover.includes(codec)) {
await ctx.runMutation(internal.library.updateAlbumCover, {
id,
cover: null,
})
}
}
async function purgeRemovedSongs(ctx: ActionCtx, ids: Id<"songs">[]) {
if (ids.length === 0) {
return
}
await ctx.runMutation(internal.library.purgeSongsFromUsersAndPlaylists, {
ids,
})
}
async function purgeRemovedAlbums(ctx: ActionCtx, ids: Id<"albums">[]) {
if (ids.length === 0) {
return
}
await ctx.runMutation(internal.library.purgeAlbumsFromUsers, { ids })
}
async function purgeRemovedArtists(ctx: ActionCtx, ids: Id<"artists">[]) {
if (ids.length === 0) {
return
}
await ctx.runMutation(internal.library.purgeArtistsFromUsers, { ids })
}
async function removeCodecFromDatabase(ctx: ActionCtx, codec: string) {
const allSongs = await ctx.runQuery(internal.library.getSongs)
const songsToRemove: Id<"songs">[] = []
const songsToUpdate: { id: Id<"songs">; files: Record<string, string> }[] = []
for (const song of allSongs) {
if (!(codec in song.files)) {
continue
}
const { [codec]: _, ...update } = song.files
if (Object.keys(update).length === 0) {
songsToRemove.push(song._id)
} else {
songsToUpdate.push({
id: song._id,
files: update,
})
}
}
await ctx.runMutation(internal.library.changeFilesForSongs, {
songs: songsToUpdate,
})
await purgeRemovedSongs(ctx, songsToRemove)
await ctx.runMutation(internal.library.removeSongs, { ids: songsToRemove })
const allAlbums = await ctx.runQuery(internal.library.getAlbums)
const removedSongIds = new Set(songsToRemove)
const albumsWithSongs = new Set(
songs.flatMap((song) => (deletedSongSet.has(song._id) ? [] : [song.album]))
allSongs.flatMap((song) =>
removedSongIds.has(song._id) ? [] : [song.album]
)
)
const emptyAlbums = albums
const albumsToRemove = allAlbums
.filter((album) => !albumsWithSongs.has(album._id))
.map((album) => album._id)
const emptyAlbumSet = new Set(emptyAlbums)
await purgeRemovedAlbums(ctx, albumsToRemove)
await ctx.runMutation(internal.library.removeAlbums, { ids: albumsToRemove })
const allArtists = await ctx.runQuery(internal.library.getArtists)
const removedAlbumIds = new Set(albumsToRemove)
const artistsWithAlbums = new Set(
albums.flatMap((album) =>
emptyAlbumSet.has(album._id) ? [] : [album.artist]
allAlbums.flatMap((album) =>
removedAlbumIds.has(album._id) ? [] : [album.artist]
)
)
const emptyArtists = artists
const artistsToRemove = allArtists
.filter((artist) => !artistsWithAlbums.has(artist._id))
.map((artist) => artist._id)
const emptyArtistSet = new Set(emptyArtists)
// Albums and artists about to be deleted keep their cover.
const artistById = new Map(artists.map((artist) => [artist._id, artist]))
const artistCovers = artists.flatMap((artist) => {
if (emptyArtistSet.has(artist._id)) {
return []
}
const cover = pickCover(
artist.cover,
codecs.map((c) => `${DATA_DIR}/${c}/${artist.folder}/folder.jpg`),
disk.covers
)
return cover === artist.cover ? [] : [{ id: artist._id, cover }]
await purgeRemovedArtists(ctx, artistsToRemove)
await ctx.runMutation(internal.library.removeArtists, {
ids: artistsToRemove,
})
const albumCovers = albums.flatMap((album) => {
const artist = artistById.get(album.artist)
if (!artist || emptyAlbumSet.has(album._id)) {
return []
}
const cover = pickCover(
album.cover,
codecs.map(
(c) => `${DATA_DIR}/${c}/${artist.folder}/${album.folder}/cover.jpg`
),
disk.covers
)
return cover === album.cover ? [] : [{ id: album._id, cover }]
})
// Writes. Imports run before the empty-album/artist sweeps, and those
// mutations re-check emptiness, so nothing that gained songs is deleted.
for (const batch of chunk(updatedSongs, SCAN_BATCH_SIZE)) {
await ctx.runMutation(internal.library.changeFilesForSongs, {
songs: batch.map((id) => ({ id, files: songFiles.get(id)! })),
})
}
for (const batch of chunk(deletedSongs, SCAN_BATCH_SIZE)) {
await ctx.runMutation(internal.library.deleteSongs, { ids: batch })
}
let importBatch: ImportEntry[] = []
let importBatchSongs = 0
const flushImports = async () => {
if (importBatch.length === 0) {
return
}
await ctx.runMutation(internal.library.importAlbums, {
albums: importBatch.map((entry) => ({
...entry,
songs: [...entry.songs.values()],
})),
})
importBatch = []
importBatchSongs = 0
}
for (const entry of imports.values()) {
importBatch.push(entry)
importBatchSongs += entry.songs.size
if (importBatchSongs >= SCAN_BATCH_SIZE) {
await flushImports()
}
}
await flushImports()
for (const batch of chunk(artistCovers, SCAN_BATCH_SIZE)) {
await ctx.runMutation(internal.library.updateArtistCovers, {
artists: batch,
})
}
for (const batch of chunk(albumCovers, SCAN_BATCH_SIZE)) {
await ctx.runMutation(internal.library.updateAlbumCovers, {
albums: batch,
})
}
let removedAlbums = 0
for (const batch of chunk(emptyAlbums, SCAN_BATCH_SIZE)) {
removedAlbums += await ctx.runMutation(internal.library.deleteEmptyAlbums, {
ids: batch,
})
}
let removedArtists = 0
for (const batch of chunk(emptyArtists, SCAN_BATCH_SIZE)) {
removedArtists += await ctx.runMutation(
internal.library.deleteEmptyArtists,
{ ids: batch }
)
}
const importedSongs = [...imports.values()].reduce(
(total, entry) => total + entry.songs.size,
0
)
const summary =
`songs: ${importedSongs} added, ${updatedSongs.length} updated, ` +
`${deletedSongs.length} removed; albums removed: ${removedAlbums}; ` +
`artists removed: ${removedArtists}; covers updated: ` +
`${artistCovers.length + albumCovers.length}; ` +
`files deferred: ${skipped}; ${Date.now() - startedAt}ms`
console.log(`library scan: ${summary}`)
return summary
}
/** Runs one scan under the library scan lock; `null` if one is already running. */
export const scheduledUpdateLibrary = internalAction({
args: {},
handler: async (ctx): Promise<string | null> => {
const token = crypto.randomUUID()
const acquired: boolean = await ctx.runMutation(
internal.library.acquireLibraryScanLock,
{ token, leaseMs: SCAN_LOCK_LEASE_MS }
handler: async (ctx) => {
const codecs = (await fs.readdir(DATA_DIR, { withFileTypes: true }))
.filter((dirent) => dirent.isDirectory())
.map((dirent) => dirent.name)
const dbCodecs = Array.from(
new Map(
(await ctx.runQuery(internal.library.getSongs))
.map((song) => {
return Object.keys(song.files)
})
.flat()
.map((codec) => [codec, codec])
).values()
)
if (!acquired) {
console.log("library scan: already running, skipped")
return null
for (const dbCodec of dbCodecs) {
if (!codecs.includes(dbCodec)) {
await removeCodecFromDatabase(ctx, dbCodec)
}
}
try {
return await scanLibrary(ctx)
} finally {
await ctx.runMutation(internal.library.releaseLibraryScanLock, { token })
// Removals
for (const codec of codecs) {
const dbArtists = await ctx.runQuery(internal.library.getArtists)
const dbAlbums = await ctx.runQuery(internal.library.getAlbums)
const dbSongs = await ctx.runQuery(internal.library.getSongs)
const dirtySongs = dbSongs
.filter((song) => {
return codec in song.files && !fsSync.existsSync(song.files[codec])
})
.map((song) => {
const { [codec]: _, ...update } = song.files
return { id: song._id, files: update }
})
const songsToDelete = dirtySongs.filter(
(song) => Object.keys(song.files).length === 0
)
const songsToUpdate = dirtySongs.filter(
(song) => Object.keys(song.files).length !== 0
)
const songsToDeleteIDs = songsToDelete.map((song) => song.id)
await purgeRemovedSongs(ctx, songsToDeleteIDs)
await ctx.runMutation(internal.library.removeSongs, {
ids: songsToDeleteIDs,
})
await ctx.runMutation(internal.library.changeFilesForSongs, {
songs: songsToUpdate,
})
const deletedSongIds = new Set(songsToDeleteIDs)
const albumsWithSongs = new Set(
dbSongs.flatMap((song) =>
deletedSongIds.has(song._id) ? [] : [song.album]
)
)
const albumsToDelete = dbAlbums
.filter((album) => !albumsWithSongs.has(album._id))
.map((album) => album._id)
await purgeRemovedAlbums(ctx, albumsToDelete)
await ctx.runMutation(internal.library.removeAlbums, {
ids: albumsToDelete,
})
const deletedAlbumIds = new Set(albumsToDelete)
const artistsWithAlbums = new Set(
dbAlbums.flatMap((album) =>
deletedAlbumIds.has(album._id) ? [] : [album.artist]
)
)
const artistsToDelete = dbArtists
.filter((artist) => !artistsWithAlbums.has(artist._id))
.map((artist) => artist._id)
await purgeRemovedArtists(ctx, artistsToDelete)
await ctx.runMutation(internal.library.removeArtists, {
ids: artistsToDelete,
})
}
// Additions
for (const codec of codecs) {
// Artists
console.log(`${codec}: artists`)
let dbArtists = await ctx.runQuery(internal.library.getArtists)
const dbArtistFolders = dbArtists.map((artist) => artist.folder)
const artists = (
await fs.readdir(`${DATA_DIR}/${codec}`, { withFileTypes: true })
)
.filter((dirent) => dirent.isDirectory())
.map((dirent) => dirent.name)
const potentialArtists = artists.filter(
(artist) => !dbArtistFolders.includes(artist)
)
const newArtists = []
for (const folder of potentialArtists) {
const albums = (
await fs.readdir(`${DATA_DIR}/${codec}/${folder}`, {
withFileTypes: true,
})
)
.filter((dirent) => dirent.isDirectory())
.map((dirent) => dirent.name)
if (albums.length === 0) {
continue
}
for (let i = 0; i < albums.length; i++) {
const songs = (
await fs.readdir(`${DATA_DIR}/${codec}/${folder}/${albums[i]}`, {
withFileTypes: true,
})
)
.filter(
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
)
.map((dirent) => dirent.name)
if (songs.length === 0) {
continue
}
try {
const metadata = await music.parseFile(
`${DATA_DIR}/${codec}/${folder}/${albums[i]}/${songs[0]}`,
{ skipCovers: true }
)
const artistCoverPath = `${DATA_DIR}/${codec}/${folder}/folder.jpg`
const cover = await coverPathIfExists(artistCoverPath)
newArtists.push({
name: metadata.common.albumartist || folder,
folder,
cover,
})
break
} catch {}
}
}
await ctx.runMutation(internal.library.createArtists, {
artists: newArtists,
})
dbArtists = await ctx.runQuery(internal.library.getArtists)
// Albums
console.log(`${codec}: albums`)
let dbAlbums = await ctx.runQuery(internal.library.getAlbums)
const newAlbums = []
for (const dbArtist of dbArtists) {
const dbAlbumsInArtist = dbAlbums.filter(
(album) => album.artist === dbArtist._id
)
const dbAlbumFolders = dbAlbumsInArtist.map((album) => album.folder)
if (!fsSync.existsSync(`${DATA_DIR}/${codec}/${dbArtist.folder}`)) {
continue
}
const albums = (
await fs.readdir(`${DATA_DIR}/${codec}/${dbArtist.folder}`, {
withFileTypes: true,
})
)
.filter((dirent) => dirent.isDirectory())
.map((dirent) => dirent.name)
const potentialAlbums = albums.filter(
(album) => !dbAlbumFolders.includes(album)
)
for (const potentialAlbum of potentialAlbums) {
const potentialAlbumPath = `${DATA_DIR}/${codec}/${dbArtist.folder}/${potentialAlbum}`
if (!fsSync.existsSync(potentialAlbumPath)) {
continue
}
const songs = (
await fs.readdir(potentialAlbumPath, {
withFileTypes: true,
})
)
.filter(
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
)
.map((dirent) => dirent.name)
if (songs.length === 0) {
continue
}
try {
const metadata = await music.parseFile(
`${potentialAlbumPath}/${songs[0]}`,
{ skipCovers: true }
)
const albumCoverPath = `${DATA_DIR}/${codec}/${dbArtist.folder}/${potentialAlbum}/cover.jpg`
const cover = await coverPathIfExists(albumCoverPath)
newAlbums.push({
name: metadata.common.album || potentialAlbum,
folder: potentialAlbum,
cover,
year: metadata.common.year || 2026,
date:
metadata.common.date || `01-01-${metadata.common.year || 2026}`,
artist: dbArtist._id,
})
} catch {}
}
}
await ctx.runMutation(internal.library.createAlbums, {
albums: newAlbums,
})
dbAlbums = await ctx.runQuery(internal.library.getAlbums)
const dbSongs = await ctx.runQuery(internal.library.getSongs)
const dbAlbumsArtists = dbAlbums.map((album) => {
return {
...album,
artist: dbArtists.find((artist) => artist._id === album.artist)!,
}
})
// Covers
console.log(`${codec}: covers`)
for (const dbArtist of dbArtists) {
const artistPath = `${DATA_DIR}/${codec}/${dbArtist.folder}`
if (!fsSync.existsSync(artistPath)) {
continue
}
await syncArtistCover(
ctx,
codec,
dbArtist.cover,
`${artistPath}/folder.jpg`,
dbArtist._id
)
}
for (const dbAlbum of dbAlbumsArtists) {
const artistPath = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}`
const albumPath = `${artistPath}/${dbAlbum.folder}`
if (!fsSync.existsSync(artistPath) || !fsSync.existsSync(albumPath)) {
continue
}
await syncAlbumCover(
ctx,
codec,
dbAlbum.cover,
`${albumPath}/cover.jpg`,
dbAlbum._id
)
}
// Songs
console.log(`${codec}: songs`)
const newSongs = []
const updateSongs = []
for (const dbAlbum of dbAlbumsArtists) {
const dbSongsInAlbum = dbSongs.filter(
(song) => song.album === dbAlbum._id
)
const dbAlreadyTracked = dbSongsInAlbum
.filter((song) => codec in song.files)
.map((song) => song.files[codec])
const artistPath = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}`
const albumPath = `${artistPath}/${dbAlbum.folder}`
if (!fsSync.existsSync(artistPath) || !fsSync.existsSync(albumPath)) {
continue
}
const songs = (await fs.readdir(albumPath, { withFileTypes: true }))
.filter(
(dirent) => !dirent.isDirectory() && dirent.name !== "cover.jpg"
)
.map((dirent) => dirent.name)
.filter((song) => !dbAlreadyTracked.includes(`${albumPath}/${song}`))
for (const song of songs) {
try {
const path = `${DATA_DIR}/${codec}/${dbAlbum.artist.folder}/${dbAlbum.folder}/${song}`
const metadata = await music.parseFile(path, { skipCovers: true })
if (!metadata.common.title) {
continue
}
const existingSong = dbSongsInAlbum.find(
(dbSong) => dbSong.name === metadata.common.title
)
if (existingSong) {
if (
!(codec in existingSong.files) ||
existingSong.files[codec] !== path
) {
const update = { [codec]: path, ...existingSong.files }
updateSongs.push({
id: existingSong._id,
files: update,
})
}
} else {
let files = { [codec]: path }
if (codec !== "atmos") {
const artistPath = `${DATA_DIR}/atmos/${dbAlbum.artist.folder}`
const albumPath = `${artistPath}/${dbAlbum.folder}`
const path = `${albumPath}/${song}`
if (fsSync.existsSync(path)) {
files = { atmos: path, ...files }
}
}
if (codec !== "lossless") {
const artistPath = `${DATA_DIR}/lossless/${dbAlbum.artist.folder}`
const albumPath = `${artistPath}/${dbAlbum.folder}`
const path = `${albumPath}/${song}`
if (fsSync.existsSync(path)) {
files = { lossless: path, ...files }
}
}
if (codec !== "normal") {
const artistPath = `${DATA_DIR}/normal/${dbAlbum.artist.folder}`
const albumPath = `${artistPath}/${dbAlbum.folder}`
const path = `${albumPath}/${song}`
if (fsSync.existsSync(path)) {
files = { normal: path, ...files }
}
}
newSongs.push({
name: metadata.common.title,
files,
album: dbAlbum._id,
artist:
metadata.common.artist ??
metadata.common.artists ??
dbAlbum.artist.name,
albumArtist: dbAlbum.artist._id,
length: Math.round(metadata.format.duration || 0),
diskNumber:
metadata.common.disk.of === 1
? null
: metadata.common.disk.no,
track: metadata.common.track.no || 0,
year: metadata.common.year || 2026,
date:
metadata.common.date ||
`01-01-${metadata.common.year || 2026}`,
genres: metadata.common.genre || [],
})
}
} catch {}
}
}
await ctx.runMutation(internal.library.createSongs, { songs: newSongs })
await ctx.runMutation(internal.library.changeFilesForSongs, {
songs: updateSongs,
})
}
return "success"
},
})
@@ -556,13 +574,7 @@ export const updateLibrary = action({
args: {},
handler: async (ctx): Promise<string> => {
await requireAdmin(ctx)
const result: string | null = await ctx.runAction(
internal.actions.scheduledUpdateLibrary
)
if (result === null) {
throw new ConvexError("A library scan is already running")
}
return result
return ctx.runAction(internal.actions.scheduledUpdateLibrary)
},
})
+2 -2
View File
@@ -86,7 +86,7 @@ async function songEntities(ctx: QueryCtx, songs: Doc<"songs">[]) {
albumId: album._id,
duration: String(Math.max(0, Math.round(song.length))),
genres: song.genres.join(", "),
year: song.year ? String(song.year) : "",
year: String(song.year),
track: String(song.track),
disk: String(song.diskNumber ?? ""),
},
@@ -112,7 +112,7 @@ async function albumEntities(ctx: QueryCtx, albums: Doc<"albums">[]) {
metadata: {
artistName: artist.name,
artistId: artist._id,
year: album.year ? String(album.year) : "",
year: String(album.year),
},
},
]
@@ -1,138 +0,0 @@
const { test } = require("node:test")
const assert = require("node:assert/strict")
const fs = require("node:fs/promises")
const path = require("node:path")
const os = require("node:os")
const vm = require("node:vm")
const ts = require("typescript")
// Exercise the action against real directory listings without a backend or
// audio decoder. Metadata is fixed so renames and same-title copies match.
async function scanner(root) {
const module = { exports: {} }
const source = ts.transpileModule(
await fs.readFile(`${__dirname}/actions.ts`, "utf8"),
{
compilerOptions: {
module: ts.ModuleKind.CommonJS,
target: ts.ScriptTarget.ES2022,
},
}
).outputText
const library = new Proxy({}, { get: (_, name) => name })
vm.runInNewContext(source, {
module,
exports: module.exports,
process: { env: { DATA: root } },
crypto: require("node:crypto"),
console: { log() {} },
require(name) {
if (name.startsWith("node:")) return require(name)
if (name === "convex/values") return require(name)
if (name === "./_generated/api") return { api: {}, internal: { library } }
if (name === "./_generated/server")
return { action: (x) => x, internalAction: (x) => x }
if (name === "music-metadata")
return {
parseFile: async () => ({
common: { title: "Song", disk: {}, track: {} },
format: { duration: 60 },
}),
}
throw new Error(`Unexpected import ${name}`)
},
})
return module.exports.scheduledUpdateLibrary.handler
}
test("rescans keep tracked songs and covers stable, and a rename keeps the song ID", async (t) => {
const root = await fs.mkdtemp(path.join(os.tmpdir(), "otunes-scan-"))
t.after(() => fs.rm(root, { recursive: true, force: true }))
const folder = (codec) => path.join(root, codec, "The Abnormals", "Album")
for (const codec of ["normal", "lossless"]) {
await fs.mkdir(folder(codec), { recursive: true })
await fs.writeFile(path.join(folder(codec), "song.mp3"), "audio")
await fs.writeFile(path.join(folder(codec), "cover.jpg"), "cover")
await fs.writeFile(path.join(folder(codec), "..", "folder.jpg"), "cover")
}
const artists = [
{
_id: "artist",
name: "The Abnormals",
folder: "The Abnormals",
cover: path.join(root, "lossless", "The Abnormals", "folder.jpg"),
},
]
const albums = [
{
_id: "album",
artist: "artist",
folder: "Album",
cover: path.join(folder("lossless"), "cover.jpg"),
},
]
const songs = [
{
_id: "song",
name: "Song",
album: "album",
files: Object.fromEntries(
["normal", "lossless"].map((c) => [c, path.join(folder(c), "song.mp3")])
),
},
]
const writes = []
let locked = false
const ctx = {
async runQuery(name) {
const page = {
scanArtistsPage: artists,
scanAlbumsPage: albums,
scanSongsPage: songs,
}[name]
assert.ok(page, name)
return { page, isDone: true, continueCursor: "" }
},
async runMutation(name, args) {
if (name === "acquireLibraryScanLock") return !locked
if (name === "releaseLibraryScanLock") return
writes.push({ name, args })
if (name === "changeFilesForSongs") {
for (const update of args.songs)
songs.find((s) => s._id === update.id).files = update.files
return
}
throw new Error(`Unexpected write ${name}`)
},
}
const scan = await scanner(root)
await scan(ctx)
assert.equal(writes.length, 0)
await fs.writeFile(path.join(folder("normal"), "copy.mp3"), "audio")
await scan(ctx)
await scan(ctx)
assert.equal(writes.length, 0)
await fs.rm(path.join(folder("normal"), "copy.mp3"))
await fs.rename(
path.join(folder("normal"), "song.mp3"),
path.join(folder("normal"), "renamed.mp3")
)
await scan(ctx)
assert.equal(writes.length, 1)
assert.equal(writes[0].args.songs[0].id, "song")
assert.equal(
songs[0].files.normal,
path.join(folder("normal"), "renamed.mp3")
)
await scan(ctx)
assert.equal(writes.length, 1)
locked = true
assert.equal(await scan(ctx), null)
assert.equal(writes.length, 1)
locked = false
for (const codec of ["normal", "lossless"]) {
await fs.rm(folder(codec), { recursive: true })
}
await assert.rejects(scan(ctx), /refusing to empty the library/)
assert.equal(writes.length, 1)
})
+218 -319
View File
@@ -3,7 +3,7 @@ import { getAuthUserId } from "@convex-dev/auth/server"
import { internalMutation, internalQuery, query } from "./_generated/server"
import { ConvexError, v } from "convex/values"
import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx, QueryCtx } from "./_generated/server"
import type { QueryCtx } from "./_generated/server"
import type { PaginationOptions, PaginationResult } from "convex/server"
import type {
BrowseAlbum,
@@ -545,7 +545,7 @@ export const browseAlbumDetail = query({
return {
...toBrowseAlbum(album, artist),
year: primarySong?.year || null,
year: primarySong?.year ?? null,
genre: primarySong?.genres[0] ?? null,
releaseDate: album.date,
hasLossless: songs.some((song) => "lossless" in song.files),
@@ -845,55 +845,27 @@ export const browseRecentlyPlayedPaginated = query({
},
})
export const scanArtistsPage = internalQuery({
args: { paginationOpts: paginationOptsValidator },
handler: async (ctx, args) => {
const result = await ctx.db.query("artists").paginate(args.paginationOpts)
return {
...result,
page: result.page.map(({ _id, name, folder, cover }) => ({
_id,
name,
folder,
cover,
})),
}
export const getArtists = internalQuery({
args: {},
handler: async (ctx) => {
return await ctx.db.query("artists").collect()
},
})
export const scanAlbumsPage = internalQuery({
args: { paginationOpts: paginationOptsValidator },
handler: async (ctx, args) => {
const result = await ctx.db.query("albums").paginate(args.paginationOpts)
return {
...result,
page: result.page.map(({ _id, folder, cover, artist }) => ({
_id,
folder,
cover,
artist,
})),
}
export const getAlbums = internalQuery({
args: {},
handler: async (ctx) => {
return await ctx.db.query("albums").collect()
},
})
export const scanSongsPage = internalQuery({
args: { paginationOpts: paginationOptsValidator },
handler: async (ctx, args) => {
const result = await ctx.db.query("songs").paginate(args.paginationOpts)
return {
...result,
page: result.page.map(({ _id, name, files, album }) => ({
_id,
name,
files,
album,
})),
}
export const getSongs = internalQuery({
args: {},
handler: async (ctx) => {
return await ctx.db.query("songs").collect()
},
})
/** Public: share-link previews load covers without a session. */
export const getArtistCover = query({
args: { id: v.id("artists") },
@@ -990,260 +962,225 @@ export const getSongsForPlayback = query({
},
})
/**
* Creates (or reuses, matched by folder) the artist and album for each entry
* together with its songs, so an album never exists without songs.
*/
export const importAlbums = internalMutation({
export const createArtists = internalMutation({
args: {
albums: v.array(
artists: v.array(
v.object({
artist: v.object({
name: v.string(),
folder: v.string(),
cover: v.nullable(v.string()),
}),
album: v.object({
name: v.string(),
folder: v.string(),
cover: v.nullable(v.string()),
year: v.number(),
date: v.string(),
}),
songs: v.array(
v.object({
name: v.string(),
files: v.record(v.string(), v.string()),
artist: v.union(v.string(), v.array(v.string())),
length: v.number(),
diskNumber: v.nullable(v.number()),
track: v.number(),
year: v.number(),
date: v.string(),
genres: v.array(v.string()),
})
),
name: v.string(),
folder: v.string(),
cover: v.nullable(v.string()),
})
),
},
handler: async (ctx, args) => {
for (const entry of args.albums) {
if (entry.songs.length === 0) {
for (const artist of args.artists) {
const existing = await ctx.db
.query("artists")
.withIndex("by_folder", (q) => q.eq("folder", artist.folder))
.first()
if (existing) {
continue
}
await ctx.db.insert("artists", artist)
}
},
})
const artistId =
(
await ctx.db
.query("artists")
.withIndex("by_folder", (q) => q.eq("folder", entry.artist.folder))
.first()
)?._id ?? (await ctx.db.insert("artists", entry.artist))
export const createAlbums = internalMutation({
args: {
albums: v.array(
v.object({
name: v.string(),
folder: v.string(),
cover: v.nullable(v.string()),
year: v.number(),
date: v.string(),
artist: v.id("artists"),
})
),
},
handler: async (ctx, args) => {
for (const album of args.albums) {
const existing = await ctx.db
.query("albums")
.withIndex("by_all", (q) =>
q.eq("artist", album.artist).eq("folder", album.folder)
)
.first()
if (existing) {
continue
}
await ctx.db.insert("albums", album)
}
},
})
const albumId =
(
await ctx.db
.query("albums")
.withIndex("by_all", (q) =>
q.eq("artist", artistId).eq("folder", entry.album.folder)
)
.first()
)?._id ??
(await ctx.db.insert("albums", { ...entry.album, artist: artistId }))
export const createSongs = internalMutation({
args: {
songs: v.array(
v.object({
name: v.string(),
files: v.record(v.string(), v.string()),
album: v.id("albums"),
artist: v.union(v.string(), v.array(v.string())),
albumArtist: v.id("artists"),
length: v.number(),
diskNumber: v.nullable(v.number()),
track: v.number(),
year: v.number(),
date: v.string(),
genres: v.array(v.string()),
})
),
},
handler: async (ctx, args) => {
for (const song of args.songs) {
const existing = await ctx.db
.query("songs")
.withIndex("by_all", (q) =>
q
.eq("name", song.name)
.eq("albumArtist", song.albumArtist)
.eq("album", song.album)
)
.first()
if (existing) {
await ctx.db.patch(existing._id, {
files: { ...existing.files, ...song.files },
})
continue
}
await ctx.db.insert("songs", song)
}
for (const song of entry.songs) {
const existing = await ctx.db
.query("songs")
.withIndex("by_all", (q) =>
q
.eq("name", song.name)
.eq("albumArtist", artistId)
.eq("album", albumId)
)
.first()
if (existing) {
await ctx.db.patch(existing._id, {
files: { ...existing.files, ...song.files },
})
continue
return
},
})
export const purgeSongsFromUsersAndPlaylists = internalMutation({
args: { ids: v.array(v.id("songs")) },
handler: async (ctx, args) => {
const remove = new Set(args.ids)
if (remove.size === 0) {
return
}
for (const playlist of await ctx.db.query("playlists").collect()) {
if (playlist.songs.some((songId) => remove.has(songId))) {
await ctx.db.patch(playlist._id, {
songs: playlist.songs.filter((songId) => !remove.has(songId)),
})
}
}
for (const user of await ctx.db.query("users").collect()) {
const favoriteSongs = user.favoriteSongs
const songQueue = user.songQueue
const queueHistory = user.queueHistory
const patch: Partial<
Pick<
Doc<"users">,
"favoriteSongs" | "songQueue" | "queueHistory" | "currentSongProgress"
>
> = {}
if (favoriteSongs?.some((songId) => remove.has(songId))) {
patch.favoriteSongs = favoriteSongs.filter(
(songId) => !remove.has(songId)
)
}
if (songQueue?.some((songId) => remove.has(songId))) {
const currentRemoved = remove.has(songQueue[0])
patch.songQueue = songQueue.filter((songId) => !remove.has(songId))
if (currentRemoved) {
patch.currentSongProgress = 0
}
await ctx.db.insert("songs", {
...song,
album: albumId,
albumArtist: artistId,
}
if (queueHistory?.some((songId) => remove.has(songId))) {
patch.queueHistory = queueHistory.filter(
(songId) => !remove.has(songId)
)
}
if (Object.keys(patch).length > 0) {
await ctx.db.patch(user._id, patch)
}
}
},
})
export const purgeAlbumsFromUsers = internalMutation({
args: { ids: v.array(v.id("albums")) },
handler: async (ctx, args) => {
const remove = new Set(args.ids)
if (remove.size === 0) {
return
}
for (const user of await ctx.db.query("users").collect()) {
const favoriteAlbums = user.favoriteAlbums
const recentlyPlayed = user.recentlyPlayed
const patch: Partial<
Pick<Doc<"users">, "favoriteAlbums" | "recentlyPlayed">
> = {}
if (favoriteAlbums?.some((albumId) => remove.has(albumId))) {
patch.favoriteAlbums = favoriteAlbums.filter(
(albumId) => !remove.has(albumId)
)
}
if (
recentlyPlayed?.some((itemId) => remove.has(itemId as Id<"albums">))
) {
patch.recentlyPlayed = recentlyPlayed.filter(
(itemId) => !remove.has(itemId as Id<"albums">)
)
}
if (Object.keys(patch).length > 0) {
await ctx.db.patch(user._id, patch)
}
}
},
})
export const purgeArtistsFromUsers = internalMutation({
args: { ids: v.array(v.id("artists")) },
handler: async (ctx, args) => {
const remove = new Set(args.ids)
if (remove.size === 0) {
return
}
for (const user of await ctx.db.query("users").collect()) {
const favoriteArtists = user.favoriteArtists
if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
await ctx.db.patch(user._id, {
favoriteArtists: favoriteArtists.filter(
(artistId) => !remove.has(artistId)
),
})
}
}
},
})
/** Deletes songs and removes them from every playlist, favorite and queue. */
export const deleteSongs = internalMutation({
args: { ids: v.array(v.id("songs")) },
handler: async (ctx, args) => {
for (const id of args.ids) {
await ctx.db.delete("songs", id)
}
await purgeSongsFromUsersAndPlaylists(ctx, new Set(args.ids))
await recordIntentCatalogChanges(ctx, "song", args.ids, true)
},
})
/** Deletes the albums that still have no songs when this mutation runs. */
export const deleteEmptyAlbums = internalMutation({
args: { ids: v.array(v.id("albums")) },
handler: async (ctx, args) => {
const deleted = new Set<Id<"albums">>()
for (const id of args.ids) {
const song = await ctx.db
.query("songs")
.withIndex("by_album", (q) => q.eq("album", id))
.first()
if (song === null && (await ctx.db.get("albums", id)) !== null) {
await ctx.db.delete("albums", id)
deleted.add(id)
}
}
await purgeAlbumsFromUsers(ctx, deleted)
await recordIntentCatalogChanges(ctx, "album", [...deleted], true)
return deleted.size
},
})
/** Deletes the artists that still have no albums when this mutation runs. */
export const deleteEmptyArtists = internalMutation({
export const removeArtists = internalMutation({
args: { ids: v.array(v.id("artists")) },
handler: async (ctx, args) => {
const deleted = new Set<Id<"artists">>()
for (const id of args.ids) {
const album = await ctx.db
.query("albums")
.withIndex("by_artist", (q) => q.eq("artist", id))
.first()
if (album === null && (await ctx.db.get("artists", id)) !== null) {
await ctx.db.delete("artists", id)
deleted.add(id)
}
await ctx.db.delete("artists", id)
}
await purgeArtistsFromUsers(ctx, deleted)
await recordIntentCatalogChanges(ctx, "artist", [...deleted], true)
return deleted.size
await recordIntentCatalogChanges(ctx, "artist", args.ids, true)
},
})
async function purgeSongsFromUsersAndPlaylists(
ctx: MutationCtx,
remove: Set<Id<"songs">>
) {
if (remove.size === 0) {
return
}
for (const playlist of await ctx.db.query("playlists").collect()) {
if (playlist.songs.some((songId) => remove.has(songId))) {
await ctx.db.patch(playlist._id, {
songs: playlist.songs.filter((songId) => !remove.has(songId)),
})
export const removeAlbums = internalMutation({
args: { ids: v.array(v.id("albums")) },
handler: async (ctx, args) => {
for (const id of args.ids) {
await ctx.db.delete("albums", id)
}
}
for (const state of await ctx.db.query("playbackStates").collect()) {
if (
state.songQueue.some((songId) => remove.has(songId)) ||
state.queueHistory.some((songId) => remove.has(songId))
) {
await ctx.db.patch(state._id, {
songQueue: state.songQueue.filter((songId) => !remove.has(songId)),
queueHistory: state.queueHistory.filter(
(songId) => !remove.has(songId)
),
revision: state.revision + 1,
})
}
}
// Legacy queue fields stay until `migrations.migrateUsers` clears them.
for (const user of await ctx.db.query("users").collect()) {
const favoriteSongs = user.favoriteSongs
const songQueue = user.songQueue
const queueHistory = user.queueHistory
const patch: Partial<
Pick<
Doc<"users">,
"favoriteSongs" | "songQueue" | "queueHistory" | "currentSongProgress"
>
> = {}
if (favoriteSongs?.some((songId) => remove.has(songId))) {
patch.favoriteSongs = favoriteSongs.filter(
(songId) => !remove.has(songId)
)
}
if (songQueue?.some((songId) => remove.has(songId))) {
const currentRemoved = remove.has(songQueue[0])
patch.songQueue = songQueue.filter((songId) => !remove.has(songId))
if (currentRemoved) {
patch.currentSongProgress = 0
}
}
if (queueHistory?.some((songId) => remove.has(songId))) {
patch.queueHistory = queueHistory.filter((songId) => !remove.has(songId))
}
if (Object.keys(patch).length > 0) {
await ctx.db.patch(user._id, patch)
}
}
}
async function purgeAlbumsFromUsers(
ctx: MutationCtx,
remove: Set<Id<"albums">>
) {
if (remove.size === 0) {
return
}
for (const user of await ctx.db.query("users").collect()) {
const favoriteAlbums = user.favoriteAlbums
const recentlyPlayed = user.recentlyPlayed
const patch: Partial<
Pick<Doc<"users">, "favoriteAlbums" | "recentlyPlayed">
> = {}
if (favoriteAlbums?.some((albumId) => remove.has(albumId))) {
patch.favoriteAlbums = favoriteAlbums.filter(
(albumId) => !remove.has(albumId)
)
}
if (recentlyPlayed?.some((itemId) => remove.has(itemId as Id<"albums">))) {
patch.recentlyPlayed = recentlyPlayed.filter(
(itemId) => !remove.has(itemId as Id<"albums">)
)
}
if (Object.keys(patch).length > 0) {
await ctx.db.patch(user._id, patch)
}
}
}
async function purgeArtistsFromUsers(
ctx: MutationCtx,
remove: Set<Id<"artists">>
) {
if (remove.size === 0) {
return
}
for (const user of await ctx.db.query("users").collect()) {
const favoriteArtists = user.favoriteArtists
if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
await ctx.db.patch(user._id, {
favoriteArtists: favoriteArtists.filter(
(artistId) => !remove.has(artistId)
),
})
}
}
}
await recordIntentCatalogChanges(ctx, "album", args.ids, true)
},
})
export const changeFilesForSongs = internalMutation({
args: {
@@ -1259,64 +1196,26 @@ export const changeFilesForSongs = internalMutation({
},
})
export const updateArtistCovers = internalMutation({
args: {
artists: v.array(
v.object({ id: v.id("artists"), cover: v.nullable(v.string()) })
),
},
export const updateArtistCover = internalMutation({
args: { id: v.id("artists"), cover: v.nullable(v.string()) },
handler: async (ctx, args) => {
for (const { id, cover } of args.artists) {
if ((await ctx.db.get("artists", id)) !== null) {
await ctx.db.patch("artists", id, { cover })
}
}
return await ctx.db.patch("artists", args.id, { cover: args.cover })
},
})
export const updateAlbumCovers = internalMutation({
args: {
albums: v.array(
v.object({ id: v.id("albums"), cover: v.nullable(v.string()) })
),
},
export const updateAlbumCover = internalMutation({
args: { id: v.id("albums"), cover: v.nullable(v.string()) },
handler: async (ctx, args) => {
for (const { id, cover } of args.albums) {
if ((await ctx.db.get("albums", id)) !== null) {
await ctx.db.patch("albums", id, { cover })
}
}
return await ctx.db.patch("albums", args.id, { cover: args.cover })
},
})
/**
* Takes the single library scan lease if it is free or expired. The lease
* outlives the action timeout so a crashed scan cannot hold it forever.
*/
export const acquireLibraryScanLock = internalMutation({
args: { token: v.string(), leaseMs: v.number() },
export const removeSongs = internalMutation({
args: { ids: v.array(v.id("songs")) },
handler: async (ctx, args) => {
const now = Date.now()
const lock = await ctx.db.query("libraryScanLock").first()
if (lock && lock.token !== args.token && lock.expiresAt > now) {
return false
}
const expiresAt = now + args.leaseMs
if (lock) {
await ctx.db.patch(lock._id, { token: args.token, expiresAt })
} else {
await ctx.db.insert("libraryScanLock", { token: args.token, expiresAt })
}
return true
},
})
export const releaseLibraryScanLock = internalMutation({
args: { token: v.string() },
handler: async (ctx, args) => {
const lock = await ctx.db.query("libraryScanLock").first()
if (lock?.token === args.token) {
await ctx.db.delete(lock._id)
for (const id of args.ids) {
await ctx.db.delete("songs", id)
}
await recordIntentCatalogChanges(ctx, "song", args.ids, true)
},
})
-4
View File
@@ -78,10 +78,6 @@ export default defineSchema({
appSettings: defineTable({
disableAccountCreation: v.boolean(),
}),
libraryScanLock: defineTable({
token: v.string(),
expiresAt: v.number(),
}),
artists: defineTable({
name: v.string(),
folder: v.string(),
-2
View File
@@ -33,10 +33,8 @@ export type BrowseAlbumTrack = {
}
export type BrowseAlbumDetail = BrowseAlbum & {
/** `null` when the files have no year tag; clients hide it. */
year: number | null
genre: string | null
/** Empty when unknown; clients hide it. */
releaseDate: string
hasLossless: boolean
hasAtmos: boolean
@@ -1,14 +0,0 @@
diff --git a/ios/RNCSliderComponentView.mm b/ios/RNCSliderComponentView.mm
index aa9eb66a486a53762490ed720c5dd2f3a618a166..feb786dce183fff6ee326aa949ee90820cf80c96 100644
--- a/ios/RNCSliderComponentView.mm
+++ b/ios/RNCSliderComponentView.mm
@@ -24,7 +24,8 @@ using namespace facebook::react;
{
RNCSlider *slider;
UIImage *_image;
- BOOL _isSliding;
+ // Match the protocol's C++ bool; BOOL is signed char on x86_64 Catalyst.
+ bool _isSliding;
}
+ (ComponentDescriptorProvider)componentDescriptorProvider
-36
View File
@@ -1,36 +0,0 @@
diff --git a/ios/FileSystemModule.swift b/ios/FileSystemModule.swift
index 3bc078d127da36062b3df214ca92db981793cf12..dd1c89213260e21b3b3e4021cb8b8b7a5562f758 100644
--- a/ios/FileSystemModule.swift
+++ b/ios/FileSystemModule.swift
@@ -61,12 +61,21 @@ public final class FileSystemModule: Module {
}
#if os(iOS)
+ // canPreview is unavailable on Mac Catalyst; Quick Look reports unsupported files itself.
+ private func isPreviewable(_ item: QLPreviewItem) -> Bool {
+ #if targetEnvironment(macCatalyst)
+ return true
+ #else
+ return QLPreviewController.canPreview(item)
+ #endif
+ }
+
private func canPreview(file: FileSystemFile) throws -> Bool {
return try file.withCorrectTypeAndScopedAccess(permission: .read) {
guard file.exists else {
return false
}
- return QLPreviewController.canPreview(FileSystemPreviewItem(url: file.url, title: nil))
+ return isPreviewable(FileSystemPreviewItem(url: file.url, title: nil))
}
}
@@ -98,7 +107,7 @@ public final class FileSystemModule: Module {
throw FilePreviewFileNotFoundException(file.url)
}
let item = FileSystemPreviewItem(url: file.url, title: options?.title)
- guard QLPreviewController.canPreview(item) else {
+ guard isPreviewable(item) else {
throw FilePreviewUnsupportedException(file.url)
}
items.append(item)
-14
View File
@@ -1,14 +0,0 @@
diff --git a/ios/Core/Functions/AsyncFunctionDefinition.swift b/ios/Core/Functions/AsyncFunctionDefinition.swift
index 48ee585ff3c7c5f71eceda36a3384619834e6e6e..81ca378035663da2db30ab6007daa2546189507b 100644
--- a/ios/Core/Functions/AsyncFunctionDefinition.swift
+++ b/ios/Core/Functions/AsyncFunctionDefinition.swift
@@ -197,7 +197,8 @@ public class AsyncFunctionDefinition<Args, FirstArgType, ReturnType>: AnyAsyncFu
switch consume result {
case .success(let value):
promise.resolve(value)
- case .failure(let error as any Error):
+ // Swift 6.4.2 crashes lowering `let error as any Error` when compiled from source.
+ case .failure(let error):
promise.reject(error)
}
}
@@ -1,17 +0,0 @@
diff --git a/apple/reanimated/apple/REAReducedMotion.h b/apple/reanimated/apple/REAReducedMotion.h
index 5e22e18c7abe91f6ca6b1a58a5ff14a0f4e97647..7eabe9952af372982eb24595f999321b966996f7 100644
--- a/apple/reanimated/apple/REAReducedMotion.h
+++ b/apple/reanimated/apple/REAReducedMotion.h
@@ -1,10 +1,9 @@
#import <Foundation/Foundation.h>
+// Mac Catalyst can see AppKit too, but its Quickdraw types clash with React's.
#if __has_include(<UIKit/UIAccessibility.h>)
#import <UIKit/UIAccessibility.h>
-#endif
-
-#if __has_include(<AppKit/AppKit.h>)
+#elif __has_include(<AppKit/AppKit.h>)
#import <AppKit/AppKit.h>
#endif
+19 -31
View File
@@ -5,21 +5,9 @@ settings:
excludeLinksFromLockfile: false
patchedDependencies:
'@react-native-community/slider@5.2.1':
hash: 73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4
path: patches/@react-native-community__slider@5.2.1.patch
expo-audio@58.0.10:
hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
path: patches/expo-audio@58.0.10.patch
expo-file-system@58.0.10:
hash: 8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c
path: patches/expo-file-system@58.0.10.patch
expo-modules-core@58.0.24:
hash: c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed
path: patches/expo-modules-core@58.0.24.patch
react-native-reanimated@4.7.1:
hash: badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3
path: patches/react-native-reanimated@4.7.1.patch
react-native-screens@4.30.0:
hash: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
path: patches/react-native-screens@4.30.0.patch
@@ -60,7 +48,7 @@ importers:
version: 2.2.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
'@react-native-community/slider':
specifier: 5.2.1
version: 5.2.1(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)
version: 5.2.1
'@react-native/metro-config':
specifier: 0.88.0
version: 0.88.0(@babel/core@7.29.7)
@@ -111,7 +99,7 @@ importers:
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-router:
specifier: ~58.0.25
version: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
version: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
expo-secure-store:
specifier: ~58.0.2
version: 58.0.2(expo@58.0.17)
@@ -147,7 +135,7 @@ importers:
version: 2.6.0(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated:
specifier: 4.7.1
version: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
version: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-safe-area-context:
specifier: ~5.10.1
version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
@@ -162,7 +150,7 @@ importers:
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
sonner-native:
specifier: ^0.26.2
version: 0.26.4(9d30290a128c046b3db5fe7a9d46b005)
version: 0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a)
devDependencies:
'@types/node':
specifier: ^20
@@ -7562,7 +7550,7 @@ snapshots:
ws: 8.21.0
zod: 3.25.76
optionalDependencies:
expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
transitivePeerDependencies:
- '@expo/dom-webview'
@@ -7863,7 +7851,7 @@ snapshots:
react: 19.3.0
optionalDependencies:
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
react-dom: 19.3.0(react@19.3.0)
transitivePeerDependencies:
- supports-color
@@ -9247,7 +9235,7 @@ snapshots:
merge-options: 3.0.4
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
'@react-native-community/slider@5.2.1(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)': {}
'@react-native-community/slider@5.2.1': {}
'@react-native-masked-view/masked-view@0.3.2(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)':
dependencies:
@@ -11167,7 +11155,7 @@ snapshots:
expo-dev-menu-interface: 58.0.1(expo@58.0.17)
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
expo-file-system@58.0.10(patch_hash=8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)):
expo-file-system@58.0.10(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)):
dependencies:
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
@@ -11242,7 +11230,7 @@ snapshots:
dependencies:
arg: 5.0.2
expo-modules-core@58.0.24(patch_hash=c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
expo-modules-core@58.0.24(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
dependencies:
expo-modules-jsi: 58.0.17(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
expo-modules-macros: 0.22.0
@@ -11272,7 +11260,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
expo-router@58.0.25(8aefb264c8a29c1f36eeb4f71100c585):
expo-router@58.0.25(88877fdcf2b70b064063b5f62591c4ab):
dependencies:
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
@@ -11292,7 +11280,7 @@ snapshots:
react-fast-compare: 3.2.2
react-is: 19.2.7
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
react-native-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
server-only: 0.0.1
@@ -11303,7 +11291,7 @@ snapshots:
expo-symbols: 58.0.4(expo-font@58.0.9)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-dom: 19.3.0(react@19.3.0)
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-worklets: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
transitivePeerDependencies:
- '@types/react'
@@ -11382,12 +11370,12 @@ snapshots:
babel-preset-expo: 58.0.19(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@58.0.17)(react-refresh@0.14.2)
expo-asset: 58.0.18(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
expo-constants: 58.0.13(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(typescript@6.0.3)
expo-file-system: 58.0.10(patch_hash=8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
expo-file-system: 58.0.10(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))
expo-font: 58.0.9(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-keep-awake: 58.0.3(expo@58.0.17)(react@19.3.0)
expo-modules-autolinking: 58.0.14(typescript@6.0.3)
expo-modules-cli: 0.3.1
expo-modules-core: 58.0.24(patch_hash=c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
expo-modules-core: 58.0.24(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
pretty-format: 29.7.0
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
@@ -12953,13 +12941,13 @@ snapshots:
react-is@19.2.7: {}
react-native-drawer-layout@4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
react-native-drawer-layout@4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
dependencies:
color: 4.2.3
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
use-latest-callback: 0.2.6(react@19.3.0)
react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
@@ -12983,7 +12971,7 @@ snapshots:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
react-native-reanimated@4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
dependencies:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
@@ -13545,12 +13533,12 @@ snapshots:
slugify@1.6.9: {}
sonner-native@0.26.4(9d30290a128c046b3db5fe7a9d46b005):
sonner-native@0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a):
dependencies:
react: 19.3.0
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
react-native-svg: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)