Compare commits

..
2 changed files with 78 additions and 18 deletions

No files matched your search

@@ -39,7 +39,10 @@ import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { useCoverPalette } from "@/hooks/use-cover-palette"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { api } from "@otunes/convex/_generated/api"
@@ -52,6 +55,7 @@ import { showError } from "@/lib/toast"
import { playlistCoverUrl } from "@/lib/urls"
import { radius, spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 50
const PLAYLIST_LABEL = "Add to Another Playlist"
const OWNER_MENU_ACTIONS: MediaAction[] = [
"share",
@@ -70,9 +74,27 @@ export default function PlaylistScreen() {
const playlistId = typeof id === "string" ? (id as Id<"playlists">) : null
const playlist = useCachedQuery(
api.playlists.browsePlaylistDetail,
playlistId ? { id: playlistId } : "skip"
playlistId
? {
id: playlistId,
includeSongs: false,
}
: "skip"
)
const {
results: songs,
status,
loadMore,
isCached,
} = useCachedPaginatedQuery(
api.playlists.browsePlaylistSongsPaginated,
playlistId ? { id: playlistId } : "skip",
{ initialNumItems: PAGE_SIZE }
)
const allSongIds = useCachedQuery(
api.playlists.getPlaylistSongIds,
playlistId ? { playlistId } : "skip"
)
const songs = playlist?.songs
const coverUri =
config && playlistId
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
@@ -84,10 +106,15 @@ export default function PlaylistScreen() {
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
useEffect(() => {
if (songs) rememberSongs(songs)
rememberSongs(songs)
}, [songs])
if (playlist === undefined || !config || !settled) {
if (
playlist === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config ||
!settled
) {
return (
<>
<Stack.Screen
@@ -123,9 +150,13 @@ export default function PlaylistScreen() {
<PlaylistContent
onLayout={onLayout}
playlist={playlist}
songs={playlist.songs}
songs={songs}
allSongIds={allSongIds}
coverUri={coverUri}
palette={palette}
onEndReached={() => {
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
}}
/>
)
}
@@ -134,14 +165,18 @@ function PlaylistContent({
onLayout,
playlist,
songs,
allSongIds,
coverUri,
palette,
onEndReached,
}: {
onLayout?: () => void
playlist: BrowsePlaylistDetail
songs: BrowseSong[]
allSongIds: Id<"songs">[] | undefined
coverUri: string
palette: CoverPalette
onEndReached: () => void
}) {
const router = useRouter()
const isFocused = useIsFocused()
@@ -157,7 +192,8 @@ function PlaylistContent({
const playlistId = playlist.id
const isSubscribed = playlist.isSubscribed
const canEdit = playlist.isOwner && playlistId !== null
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const songIds = allSongIds ?? loadedSongIds
const swipeGroup = useSwipeRowGroup()
const handlePlaySong = useCallback(
@@ -190,12 +226,12 @@ function PlaylistContent({
)
const handlePlay = useCallback(() => {
if (playlistId) void playPlaylist(playlistId, songIds)
}, [playPlaylist, playlistId, songIds])
if (playlistId) void playPlaylist(playlistId, allSongIds)
}, [allSongIds, playPlaylist, playlistId])
const handleShuffle = useCallback(() => {
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
}, [playPlaylistShuffled, playlistId, songIds])
if (playlistId) void playPlaylistShuffled(playlistId, allSongIds)
}, [allSongIds, playPlaylistShuffled, playlistId])
const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return
@@ -319,6 +355,8 @@ function PlaylistContent({
indicatorStyle={palette.isDark ? "white" : "black"}
contentContainerStyle={styles.listContent}
contentInsetAdjustmentBehavior="automatic"
onEndReached={onEndReached}
onEndReachedThreshold={0.5}
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListHeaderComponent={
<PlaylistHero
@@ -15,7 +15,10 @@ import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { api } from "@otunes/convex/_generated/api"
import type { MediaAction } from "@/components/media-context-menu"
@@ -26,21 +29,32 @@ import { radius, spacing, useThemeColors } from "@/lib/theme"
import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
const PAGE_SIZE = 50
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
export default function FavoritesScreen() {
const colors = useThemeColors()
const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = favorites?.songs ?? []
const favorites = useCachedQuery(api.favorites.browseFavoritesSummary)
const {
results: songs,
status,
loadMore,
isCached,
} = useCachedPaginatedQuery(
api.favorites.browseFavoritesSongsPaginated,
{},
{ initialNumItems: PAGE_SIZE }
)
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const songIds = favorites?.songIds ?? loadedSongIds
useEffect(() => {
if (favorites) rememberSongs(favorites.songs)
}, [favorites])
rememberSongs(songs)
}, [songs])
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds),
@@ -74,7 +88,11 @@ export default function FavoritesScreen() {
[handlePlaySong, handleSongMenuAction, isSongFavorite]
)
if (favorites === undefined || !config) {
if (
favorites === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config
) {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
@@ -107,6 +125,10 @@ export default function FavoritesScreen() {
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={styles.listContent}
contentInsetAdjustmentBehavior="automatic"
onEndReached={() => {
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
}}
onEndReachedThreshold={0.5}
ListHeaderComponent={
<FavoritesHero
title={favorites.title}