fix(mobile): stop the player re-rendering on every playback tick (#104)

This commit was merged in pull request #104.
This commit is contained in:
joshuafhiggins committed 2026-11-16 22:02:57 -05:00
1 parent ddc43a9286
commit f58342f64e
9 files changed
+388 -352

No files matched your search

@@ -97,6 +97,12 @@ 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") {
@@ -111,9 +117,7 @@ export default function AlbumScreen() {
songIds={songIds}
palette={palette}
favorited={isSongFavorite(item.track.id)}
onPlay={(songId, ids) =>
playFromSong(songId, ids, `album:${album.id}`)
}
onPlay={playTrack}
onAction={handleAlbumTrackAction}
/>
) : null
@@ -123,7 +127,7 @@ export default function AlbumScreen() {
handleAlbumTrackAction,
isSongFavorite,
palette,
playFromSong,
playTrack,
songIds,
swipeGroup,
]
+117 -140
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 { useEffect, useRef, useState } from "react"
import { useCallback, useEffect, useMemo, useRef, useState } from "react"
import { Gesture, GestureDetector } from "react-native-gesture-handler"
import {
Platform,
@@ -45,16 +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 { usePlayback } from "@/contexts/playback"
import { usePlaybackActions, usePlaybackQueue } 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,20 +90,13 @@ export default function PlayerScreen() {
isPlaying,
shuffleEnabled,
repeatEnabled,
currentTime,
duration,
queueSongIds,
setIsPlaying,
seekTo,
skipNext,
skipPrevious,
} = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
} = usePlaybackQueue()
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
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,
@@ -126,7 +119,7 @@ export default function PlayerScreen() {
coverUri,
currentSong ? currentSong.album.cover != null : undefined
)
const colors = nowPlayingColors(palette)
const colors = useMemo(() => nowPlayingColors(palette), [palette])
const background = useSharedValue(colors.background)
useEffect(() => {
@@ -159,33 +152,65 @@ export default function PlayerScreen() {
}))
// The player covers the status bar, so it can't use the native sheet's
// swipe to dismiss.
function dismissGesture() {
return Gesture.Pan()
.activeOffsetY(12)
.failOffsetY(-12)
.failOffsetX([-20, 20])
.onUpdate((event) => {
dismissY.value = Math.max(0, event.translationY)
})
.onEnd((event) => {
if (
event.translationY > DISMISS_DISTANCE ||
event.velocityY > DISMISS_VELOCITY
) {
scheduleOnRN(setIsDismissing, true)
dismissY.value = withTiming(
windowHeight,
{ duration: 220 },
(finished) => {
if (finished) scheduleOnRN(router.back)
}
)
} else {
dismissY.value = withSpring(0, { duration: 350, dampingRatio: 0.85 })
}
})
}
// swipe to dismiss. Each GestureDetector needs its own gesture instance.
const makeDismissGesture = useCallback(
() =>
Gesture.Pan()
.activeOffsetY(12)
.failOffsetY(-12)
.failOffsetX([-20, 20])
.onUpdate((event) => {
dismissY.value = Math.max(0, event.translationY)
})
.onEnd((event) => {
if (
event.translationY > DISMISS_DISTANCE ||
event.velocityY > DISMISS_VELOCITY
) {
scheduleOnRN(setIsDismissing, true)
dismissY.value = withTiming(
windowHeight,
{ duration: 220 },
(finished) => {
if (finished) scheduleOnRN(router.back)
}
)
} else {
dismissY.value = withSpring(0, {
duration: 350,
dampingRatio: 0.85,
})
}
}),
[dismissY, router, windowHeight]
)
const handleGesture = useMemo(makeDismissGesture, [makeDismissGesture])
const controlsGesture = useMemo(makeDismissGesture, [makeDismissGesture])
const stageGesture = useMemo(
() => makeDismissGesture().enabled(!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]
)
const hasQueue = queueSongIds.length > 0
@@ -204,7 +229,6 @@ export default function PlayerScreen() {
return null
}
const hasCover = currentSong.album.cover != null
const bottomInset = Math.max(insets.bottom, spacing.md)
const artworkSize = Math.max(
0,
@@ -213,9 +237,6 @@ 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)
@@ -234,10 +255,10 @@ export default function PlayerScreen() {
colors={colors}
backgroundStyle={backgroundStyle}
dismissStyle={dismissStyle}
dismissGesture={dismissGesture}
dismissGestures={{ handle: handleGesture, artwork: controlsGesture }}
showQueue={showQueue}
toggleQueue={toggleQueue}
metadata={<SongMeta song={currentSong} colors={colors} />}
metadata={songMeta}
/>
</MusicEntityView>
)
@@ -264,7 +285,7 @@ export default function PlayerScreen() {
id={currentSong.id}
style={[styles.safe, { paddingTop: insets.top }]}
>
<GestureDetector gesture={dismissGesture()}>
<GestureDetector gesture={handleGesture}>
<Pressable
onPress={() => router.back()}
hitSlop={12}
@@ -278,7 +299,7 @@ export default function PlayerScreen() {
</Pressable>
</GestureDetector>
<GestureDetector gesture={dismissGesture().enabled(!showQueue)}>
<GestureDetector gesture={stageGesture}>
<View
style={styles.stage}
onLayout={(event) =>
@@ -297,20 +318,7 @@ export default function PlayerScreen() {
<NowPlayingQueue
colors={colors}
viewportHeight={stageHeight}
currentHeader={
<View style={styles.queueHeader}>
<CoverImage
uri={coverUri}
hasCover={hasCover}
style={styles.queueArtwork}
/>
<SongMeta
song={currentSong}
colors={colors}
compact
/>
</View>
}
currentHeader={queueHeader}
/>
</Animated.View>
) : null
@@ -334,50 +342,28 @@ export default function PlayerScreen() {
/>
</Animated.View>
</View>
<View style={styles.meta}>
<SongMeta song={currentSong} colors={colors} />
</View>
<View style={styles.meta}>{songMeta}</View>
</Animated.View>
)}
</LayoutAnimationConfig>
</View>
</GestureDetector>
<GestureDetector gesture={dismissGesture()}>
<GestureDetector gesture={controlsGesture}>
<View style={[styles.controls, { paddingBottom: bottomInset }]}>
<PlayerSlider
accessibilityLabel="Playback position"
value={displayedTime}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.timeRow}>
<Text style={[styles.time, { color: timeColor }]}>
{formatDuration(displayedTime)}
</Text>
{format ? (
<View style={styles.format} pointerEvents="none">
<PlayerProgress
colors={colors}
timeStyle={styles.time}
center={
format ? (
<AudioFormatBadge
format={format}
color={colors.secondaryForeground}
backgroundColor={colors.background}
/>
</View>
) : null}
<Text style={[styles.time, { color: timeColor }]}>
{formatRemainingDuration(displayedTime, duration).replace(
"-",
"\u2212"
)}
</Text>
</View>
) : null
}
/>
<View style={styles.transport}>
<TransportButton
@@ -419,35 +405,7 @@ export default function PlayerScreen() {
</TransportButton>
</View>
{volumeAvailable ? (
<PlayerSlider
accessibilityLabel="Volume"
commitHoldMs={0}
animateValueChanges
value={volume}
maximumValue={1}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setVolume}
leading={
<PlayerSymbol
name="speaker.fill"
fallback="volume-low"
size={14}
color={colors.secondaryForeground}
/>
}
trailing={
<PlayerSymbol
name="speaker.wave.3.fill"
fallback="volume-high"
size={14}
color={colors.secondaryForeground}
/>
}
/>
) : null}
<VolumeSlider colors={colors} />
<View style={styles.footer}>
<Pressable
@@ -517,6 +475,41 @@ export default function PlayerScreen() {
)
}
/** Phone volume slider. Owns the volume listener so volume changes stay local. */
function VolumeSlider({ colors }: { colors: NowPlayingColors }) {
const { volume, setVolume, available } = useSystemVolume()
if (!available) return null
return (
<PlayerSlider
accessibilityLabel="Volume"
commitHoldMs={0}
animateValueChanges
value={volume}
maximumValue={1}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setVolume}
leading={
<PlayerSymbol
name="speaker.fill"
fallback="volume-low"
size={14}
color={colors.secondaryForeground}
/>
}
trailing={
<PlayerSymbol
name="speaker.wave.3.fill"
fallback="volume-high"
size={14}
color={colors.secondaryForeground}
/>
}
/>
)
}
/** Title and artist with the favorite and more buttons. */
function SongMeta({
song,
@@ -739,23 +732,7 @@ const styles = StyleSheet.create({
paddingHorizontal: HORIZONTAL_INSET,
paddingTop: spacing.md,
},
timeRow: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
marginTop: -4,
},
format: {
position: "absolute",
left: 0,
right: 0,
alignItems: "center",
},
time: {
fontSize: 12,
fontWeight: "600",
fontVariant: ["tabular-nums"],
},
time: { fontWeight: "600" },
transport: {
flexDirection: "row",
alignItems: "center",
@@ -8,7 +8,7 @@ import {
ANONYMOUS_CACHE_SCOPE,
useCacheScope,
} from "@/contexts/persistent-cache"
import { usePlayback } from "@/contexts/playback"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import {
FAVORITES_PLAYLIST_ID,
loadHandledIntentIds,
@@ -113,7 +113,7 @@ function isTransient(error: unknown) {
export function useIntentDispatch() {
const convex = useConvex()
const cacheScope = useCacheScope()
const playback = usePlayback()
const playback = { ...usePlaybackQueue(), ...usePlaybackActions() }
const favorites = useFavorites()
const navigation = useAppNavigation()
const store = useMemo(
@@ -2,10 +2,12 @@ import * as AppIntents from "expo-app-intents"
import type { AppIntentEntity } from "expo-app-intents"
import { useEffect } from "react"
import { usePlayback } from "@/contexts/playback"
import { usePlaybackQueue } from "@/contexts/playback"
import { publishMusicCatalog } from "@/lib/app-intents"
type CurrentSong = NonNullable<ReturnType<typeof usePlayback>["currentSong"]>
type CurrentSong = NonNullable<
ReturnType<typeof usePlaybackQueue>["currentSong"]
>
function nowPlayingEntity(song: CurrentSong): AppIntentEntity {
const artistName = song.artist.name
@@ -44,7 +46,7 @@ export async function publishNowPlaying(
/** Keeps the "nowPlaying" catalog in step with the playback queue. */
export function useNowPlayingCatalog() {
const playback = usePlayback()
const playback = usePlaybackQueue()
const queueHeadId = playback.queueSongIds[0] ?? null
const song = playback.currentSong
+121 -97
View File
@@ -38,7 +38,7 @@ import {
type SwipeRowGroup,
} from "@/components/ios-swipe-to-remove-row"
import { PlayerSymbol } from "@/components/player-symbol"
import { usePlayback } from "@/contexts/playback"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
@@ -110,18 +110,16 @@ export function NowPlayingQueue({
tablet?: boolean
fadeColor?: string
}) {
const { queueSongIds, queueHistorySongIds, shuffleEnabled, repeatEnabled } =
usePlaybackQueue()
const {
queueSongIds,
queueHistorySongIds,
shuffleEnabled,
repeatEnabled,
toggleShuffle,
cycleRepeat,
clearHistory,
reorderQueue,
skipToQueueIndex,
skipToHistoryIndex,
} = usePlayback()
} = usePlaybackActions()
const [viewportWidth, setViewportWidth] = useState(0)
const swipeGroup = useSwipeRowGroup()
const [scrollEnabled, setScrollEnabled] = useState(true)
@@ -307,100 +305,126 @@ export function NowPlayingQueue({
[drag]
)
const renderItem = ({ item }: { item: QueueListItem }) => {
switch (item.type) {
case "history-header":
return (
<View style={styles.historyHeader}>
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
History
</Text>
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
<Text
style={[styles.clear, { color: colors.secondaryForeground }]}
>
Clear
</Text>
</Pressable>
</View>
)
case "history":
return (
<HistoryRow
songId={item.songId}
historyIndex={item.historyIndex}
colors={colors}
onPress={skipToHistoryIndex}
/>
)
case "current":
return <View style={styles.current}>{currentHeader}</View>
case "controls":
return (
<View
style={[
styles.controls,
{
height: itemHeight(item),
backgroundColor: tablet ? "transparent" : colors.background,
},
]}
>
{!tablet ? (
<View style={styles.toggles}>
<QueueToggle
colors={colors}
selected={shuffleEnabled}
label="Shuffle"
symbol="shuffle"
fallback="shuffle"
onPress={toggleShuffle}
/>
<QueueToggle
colors={colors}
selected={repeatEnabled !== "none"}
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
fallback="repeat"
onPress={cycleRepeat}
/>
</View>
) : null}
{item.showTitle ? (
const lastIndex = queueSongIds.length - 1
const renderItem = useCallback(
({ item }: { item: QueueListItem }) => {
switch (item.type) {
case "history-header":
return (
<View style={styles.historyHeader}>
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Continue Playing
History
</Text>
) : null}
</View>
)
case "upcoming":
return (
<UpcomingRow
songId={item.songId}
queueIndex={item.queueIndex}
lastIndex={queueSongIds.length - 1}
tablet={tablet}
colors={colors}
drag={drag}
swipeGroup={swipeGroup}
onPress={skipToQueueIndex}
onRemove={handleRemove}
onDragStart={handleDragStart}
onDrop={handleDrop}
/>
)
case "empty":
return (
<View style={[styles.empty, { height: item.height }]}>
<Text
style={[styles.emptyText, { color: colors.secondaryForeground }]}
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
<Text
style={[styles.clear, { color: colors.secondaryForeground }]}
>
Clear
</Text>
</Pressable>
</View>
)
case "history":
return (
<HistoryRow
songId={item.songId}
historyIndex={item.historyIndex}
colors={colors}
onPress={skipToHistoryIndex}
/>
)
case "current":
return <View style={styles.current}>{currentHeader}</View>
case "controls":
return (
<View
style={[
styles.controls,
{
height: itemHeight(item),
backgroundColor: tablet ? "transparent" : colors.background,
},
]}
>
Nothing else is queued.
</Text>
</View>
)
}
}
{!tablet ? (
<View style={styles.toggles}>
<QueueToggle
colors={colors}
selected={shuffleEnabled}
label="Shuffle"
symbol="shuffle"
fallback="shuffle"
onPress={toggleShuffle}
/>
<QueueToggle
colors={colors}
selected={repeatEnabled !== "none"}
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
fallback="repeat"
onPress={cycleRepeat}
/>
</View>
) : null}
{item.showTitle ? (
<Text
style={[styles.sectionTitle, { color: colors.foreground }]}
>
Continue Playing
</Text>
) : null}
</View>
)
case "upcoming":
return (
<UpcomingRow
songId={item.songId}
queueIndex={item.queueIndex}
lastIndex={lastIndex}
tablet={tablet}
colors={colors}
drag={drag}
swipeGroup={swipeGroup}
onPress={skipToQueueIndex}
onRemove={handleRemove}
onDragStart={handleDragStart}
onDrop={handleDrop}
/>
)
case "empty":
return (
<View style={[styles.empty, { height: item.height }]}>
<Text
style={[
styles.emptyText,
{ color: colors.secondaryForeground },
]}
>
Nothing else is queued.
</Text>
</View>
)
}
},
[
clearHistory,
colors,
currentHeader,
cycleRepeat,
drag,
handleDragStart,
handleDrop,
handleRemove,
lastIndex,
repeatEnabled,
shuffleEnabled,
skipToHistoryIndex,
skipToQueueIndex,
swipeGroup,
tablet,
toggleShuffle,
]
)
return (
<View
@@ -0,0 +1,83 @@
import { useState, type ReactNode } from "react"
import {
StyleSheet,
Text,
View,
type StyleProp,
type TextStyle,
} from "react-native"
import { PlayerSlider } from "@/components/player-slider"
import { usePlaybackActions, usePlaybackProgress } from "@/contexts/playback"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
/**
* Position slider with elapsed and remaining labels. The only player piece
* subscribed to the playback clock, so the rest of the player stays still
* while audio plays.
*/
export function PlayerProgress({
colors,
center,
timeStyle,
}: {
colors: NowPlayingColors
/** Shown centered between the time labels. */
center?: ReactNode
timeStyle?: StyleProp<TextStyle>
}) {
const { currentTime, duration } = usePlaybackProgress()
const { seekTo } = usePlaybackActions()
const [scrubTime, setScrubTime] = useState<number | null>(null)
const time = scrubTime ?? currentTime
const timeColor =
scrubTime === null ? colors.secondaryForeground : colors.foreground
return (
<>
<PlayerSlider
accessibilityLabel="Playback position"
value={time}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.row}>
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
{formatDuration(time)}
</Text>
{center ? (
<View style={styles.center} pointerEvents="none">
{center}
</View>
) : null}
<Text style={[styles.time, timeStyle, { color: timeColor }]}>
{formatRemainingDuration(time, duration).replace("-", "−")}
</Text>
</View>
</>
)
}
const styles = StyleSheet.create({
row: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
marginTop: -4,
},
center: {
position: "absolute",
left: 0,
right: 0,
alignItems: "center",
},
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
})
+16 -61
View File
@@ -1,11 +1,5 @@
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
import {
Pressable,
StyleSheet,
Text,
View,
useWindowDimensions,
} from "react-native"
import { Pressable, StyleSheet, View, useWindowDimensions } from "react-native"
import Animated, {
Easing,
ReduceMotion,
@@ -14,7 +8,7 @@ import Animated, {
useSharedValue,
withTiming,
} from "react-native-reanimated"
import { GestureDetector, Gesture } from "react-native-gesture-handler"
import { GestureDetector, type Gesture } from "react-native-gesture-handler"
import { useSafeAreaInsets } from "react-native-safe-area-context"
import { useRouter } from "expo-router"
import { StatusBar } from "expo-status-bar"
@@ -22,12 +16,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 { usePlayback } from "@/contexts/playback"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { useSystemVolume } from "@/hooks/use-system-volume"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
import { albumCoverUrl } from "@/lib/urls"
@@ -42,7 +36,7 @@ export function TabletNowPlaying({
colors,
backgroundStyle,
dismissStyle,
dismissGesture,
dismissGestures,
showQueue,
toggleQueue,
metadata,
@@ -50,7 +44,10 @@ export function TabletNowPlaying({
colors: NowPlayingColors
backgroundStyle: ComponentProps<typeof Animated.View>["style"]
dismissStyle: ComponentProps<typeof Animated.View>["style"]
dismissGesture: () => ReturnType<typeof Gesture.Pan>
dismissGestures: {
handle: ReturnType<typeof Gesture.Pan>
artwork: ReturnType<typeof Gesture.Pan>
}
showQueue: boolean
toggleQueue: () => void
metadata: ReactNode
@@ -59,22 +56,11 @@ export function TabletNowPlaying({
const insets = useSafeAreaInsets()
const { width, height } = useWindowDimensions()
const { config } = useServerConfig()
const {
currentSong,
currentTime,
duration,
isPlaying,
setIsPlaying,
seekTo,
skipNext,
skipPrevious,
shuffleEnabled,
repeatEnabled,
toggleShuffle,
cycleRepeat,
} = usePlayback()
const { currentSong, isPlaying, shuffleEnabled, repeatEnabled } =
usePlaybackQueue()
const { setIsPlaying, skipNext, skipPrevious, toggleShuffle, cycleRepeat } =
usePlaybackActions()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const [scrubTime, setScrubTime] = useState<number | null>(null)
const [queueHeight, setQueueHeight] = useState(0)
const wideLayout = width >= 700
const sideBySide = showQueue && wideLayout
@@ -113,7 +99,6 @@ export function TabletNowPlaying({
opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
transform: [{ translateX: (1 - progress.value) * 48 }],
}))
const time = scrubTime ?? currentTime
if (!currentSong || !config) return null
const control = (
label: string,
@@ -150,7 +135,7 @@ export function TabletNowPlaying({
return (
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
<StatusBar style={colors.isDark ? "light" : "dark"} />
<GestureDetector gesture={dismissGesture()}>
<GestureDetector gesture={dismissGestures.handle}>
<Pressable
onPress={() => router.back()}
accessibilityRole="button"
@@ -164,7 +149,7 @@ export function TabletNowPlaying({
</GestureDetector>
<View style={styles.body}>
<Animated.View style={[styles.main, mainMotion]}>
<GestureDetector gesture={dismissGesture()}>
<GestureDetector gesture={dismissGestures.artwork}>
<View style={styles.artworkArea}>
<Animated.View style={artworkMotion}>
<CoverImage
@@ -177,31 +162,7 @@ export function TabletNowPlaying({
</GestureDetector>
<Animated.View style={[styles.controls, controlsMotion]}>
<View style={styles.meta}>{metadata}</View>
<PlayerSlider
accessibilityLabel="Playback position"
value={time}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.times}>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatDuration(time)}
</Text>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatRemainingDuration(time, duration).replace("-", "−")}
</Text>
</View>
<PlayerProgress colors={colors} />
<View style={styles.transport}>
{control(
"Shuffle",
@@ -376,12 +337,6 @@ const styles = StyleSheet.create({
},
controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
meta: { height: 48 },
times: {
flexDirection: "row",
justifyContent: "space-between",
marginTop: -4,
},
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
transport: {
flexDirection: "row",
alignItems: "center",
+23 -33
View File
@@ -97,6 +97,8 @@ type PlaybackContextValue = {
type PlaybackActionsValue = Pick<
PlaybackContextValue,
| "seekTo"
| "waitForPlaybackReady"
| "setIsPlaying"
| "playInOrder"
| "playShuffled"
@@ -136,6 +138,11 @@ type PlaybackQueueValue = Pick<
| "repeatEnabled"
>
type PlaybackProgressValue = Pick<
PlaybackContextValue,
"currentTime" | "duration"
>
type CollectionPlayers = Pick<
PlaybackActionsValue,
| "playAlbum"
@@ -157,14 +164,17 @@ type CollectionPlay = {
recorded: RecordedPlay
}
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
const PlaybackActionsContext = createContext<PlaybackActionsValue | null>(null)
const PlaybackQueueContext = createContext<PlaybackQueueValue | null>(null)
const PlaybackProgressContext = createContext<PlaybackProgressValue | null>(
null
)
export function usePlayback() {
const context = useContext(PlaybackContext)
/** Ticks while audio plays. Keep consumers small (slider and time labels). */
export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext)
if (!context) {
throw new Error("usePlayback must be used within PlaybackProvider")
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
}
return context
}
@@ -631,6 +641,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const actionsValue = useMemo<PlaybackActionsValue>(
() => ({
seekTo,
waitForPlaybackReady,
...collectionPlayers,
setIsPlaying,
playInOrder,
@@ -671,12 +683,14 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playInOrder,
playShuffled,
reorderQueue,
seekTo,
setIsPlaying,
skipNext,
skipPrevious,
skipToHistoryIndex,
skipToQueueIndex,
toggleShuffle,
waitForPlaybackReady,
]
)
@@ -701,41 +715,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
]
)
const value = useMemo<PlaybackContextValue>(
() => ({
...actionsValue,
waitForPlaybackReady,
queueSongIds,
queueHistorySongIds,
currentSong,
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled,
isPlaying: isPlaybackActive,
currentTime,
duration,
seekTo,
}),
[
actionsValue,
waitForPlaybackReady,
currentSong,
currentTime,
duration,
isPlaybackActive,
playback.shuffleEnabled,
queueHistorySongIds,
queueSongIds,
repeatEnabled,
seekTo,
]
const progressValue = useMemo<PlaybackProgressValue>(
() => ({ currentTime, duration }),
[currentTime, duration]
)
return (
<PlaybackActionsContext.Provider value={actionsValue}>
<PlaybackQueueContext.Provider value={queueValue}>
<PlaybackContext.Provider value={value}>
<PlaybackProgressContext.Provider value={progressValue}>
{children}
</PlaybackContext.Provider>
</PlaybackProgressContext.Provider>
</PlaybackQueueContext.Provider>
</PlaybackActionsContext.Provider>
)
+13 -12
View File
@@ -113,6 +113,8 @@ export function useNativePlaylistSync({
measuredDuration > 0
? measuredDuration
: (currentSong?.durationSeconds ?? 0)
const durationRef = useRef(duration)
durationRef.current = duration
const queueSyncKey = useMemo(
() => JSON.stringify(queueSongIds),
[queueSongIds]
@@ -409,18 +411,17 @@ export function useNativePlaylistSync({
[startPlayer]
)
const seekTo = useCallback(
async (seconds: number) => {
const playlist = playlistRef.current
if (!playlist) return
const maxDuration = playlist.duration || duration || 0
const clamped = Math.max(0, Math.min(seconds, maxDuration))
await playlist.seekTo(clamped)
currentTimeRef.current = clamped
setCurrentTime(clamped)
},
[duration]
)
// Reads duration from a ref so seekTo, and every action built on it, stays
// stable across track changes.
const seekTo = useCallback(async (seconds: number) => {
const playlist = playlistRef.current
if (!playlist) return
const maxDuration = playlist.duration || durationRef.current || 0
const clamped = Math.max(0, Math.min(seconds, maxDuration))
await playlist.seekTo(clamped)
currentTimeRef.current = clamped
setCurrentTime(clamped)
}, [])
const handlePlaybackLoadFailure = useCallback(() => {
autoPlayNextRef.current = false