Compare commits

..
6 changed files with 24 additions and 109 deletions

No files matched your search

@@ -39,10 +39,7 @@ import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { 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"
@@ -55,7 +52,6 @@ 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",
@@ -74,27 +70,9 @@ export default function PlaylistScreen() {
const playlistId = typeof id === "string" ? (id as Id<"playlists">) : null
const playlist = useCachedQuery(
api.playlists.browsePlaylistDetail,
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"
playlistId ? { id: playlistId } : "skip"
)
const songs = playlist?.songs
const coverUri =
config && playlistId
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
@@ -106,15 +84,10 @@ export default function PlaylistScreen() {
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
useEffect(() => {
rememberSongs(songs)
if (songs) rememberSongs(songs)
}, [songs])
if (
playlist === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config ||
!settled
) {
if (playlist === undefined || !config || !settled) {
return (
<>
<Stack.Screen
@@ -150,13 +123,9 @@ export default function PlaylistScreen() {
<PlaylistContent
onLayout={onLayout}
playlist={playlist}
songs={songs}
allSongIds={allSongIds}
songs={playlist.songs}
coverUri={coverUri}
palette={palette}
onEndReached={() => {
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
}}
/>
)
}
@@ -165,18 +134,14 @@ 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()
@@ -192,8 +157,7 @@ function PlaylistContent({
const playlistId = playlist.id
const isSubscribed = playlist.isSubscribed
const canEdit = playlist.isOwner && playlistId !== null
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const songIds = allSongIds ?? loadedSongIds
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const swipeGroup = useSwipeRowGroup()
const handlePlaySong = useCallback(
@@ -226,12 +190,12 @@ function PlaylistContent({
)
const handlePlay = useCallback(() => {
if (playlistId) void playPlaylist(playlistId, allSongIds)
}, [allSongIds, playPlaylist, playlistId])
if (playlistId) void playPlaylist(playlistId, songIds)
}, [playPlaylist, playlistId, songIds])
const handleShuffle = useCallback(() => {
if (playlistId) void playPlaylistShuffled(playlistId, allSongIds)
}, [allSongIds, playPlaylistShuffled, playlistId])
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
}, [playPlaylistShuffled, playlistId, songIds])
const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return
@@ -355,8 +319,6 @@ function PlaylistContent({
indicatorStyle={palette.isDark ? "white" : "black"}
contentContainerStyle={styles.listContent}
contentInsetAdjustmentBehavior="automatic"
onEndReached={onEndReached}
onEndReachedThreshold={0.5}
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListHeaderComponent={
<PlaylistHero
@@ -15,10 +15,7 @@ import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { 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"
@@ -29,32 +26,21 @@ 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.browseFavoritesSummary)
const {
results: songs,
status,
loadMore,
isCached,
} = useCachedPaginatedQuery(
api.favorites.browseFavoritesSongsPaginated,
{},
{ initialNumItems: PAGE_SIZE }
)
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = favorites?.songs ?? []
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const songIds = favorites?.songIds ?? loadedSongIds
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
useEffect(() => {
rememberSongs(songs)
}, [songs])
if (favorites) rememberSongs(favorites.songs)
}, [favorites])
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds),
@@ -88,11 +74,7 @@ export default function FavoritesScreen() {
[handlePlaySong, handleSongMenuAction, isSongFavorite]
)
if (
favorites === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config
) {
if (favorites === undefined || !config) {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
@@ -125,10 +107,6 @@ 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}
@@ -382,7 +382,7 @@ function QualitySection({ user }: { user: CurrentUser }) {
: "This device does not support Dolby Atmos playback."
}
disabled={!dolbyAtmosSupported}
value={user.preferAtmos ?? false}
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
onValueChange={(checked) =>
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
showError(error.message)
+2 -17
View File
@@ -1,19 +1,4 @@
import { requireOptionalNativeModule } from "expo"
import { Platform } from "react-native"
// E-AC-3 support varies by Android device. Older native builds fail closed.
function supportsDolbyAtmos(): boolean {
if (Platform.OS === "ios") return true
if (Platform.OS !== "android") return false
try {
return (
requireOptionalNativeModule<{
supportsDolbyAtmos?: () => boolean
}>("AudioOutput")?.supportsDolbyAtmos?.() ?? false
)
} catch {
return false
}
}
export const dolbyAtmosSupported = supportsDolbyAtmos()
// Android Dolby decoder reports do not reliably indicate working Atmos playback.
export const dolbyAtmosSupported = Platform.OS === "ios"
+3 -2
View File
@@ -1,3 +1,4 @@
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { Platform } from "react-native"
import type { AudioSource } from "expo-audio"
@@ -53,7 +54,7 @@ export function songPlayUrl(
const params = new URLSearchParams()
if (Platform.OS === "ios") params.set("losslessFormat", "alac")
if (quality) params.set("quality", quality)
if (preferAtmos) params.set("preferAtmos", "true")
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
const query = params.toString()
return `${serverUrl}/api/song/${songId}/play${query ? `?${query}` : ""}`
}
@@ -66,7 +67,7 @@ export function songHlsPlaylistUrl(
) {
const params = new URLSearchParams()
if (quality) params.set("quality", quality)
if (preferAtmos) params.set("preferAtmos", "true")
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
const query = params.toString()
return `${serverUrl}/api/song/${songId}/play/hls${query ? `?${query}` : ""}`
}
@@ -1,6 +1,5 @@
package expo.modules.audiooutput
import android.media.MediaCodecList
import android.os.Build
import androidx.mediarouter.app.SystemOutputSwitcherDialogController
import expo.modules.kotlin.functions.Queues
@@ -11,16 +10,6 @@ class AudioOutputModule : Module() {
override fun definition() = ModuleDefinition {
Name("AudioOutput")
Function("supportsDolbyAtmos") {
// Library Atmos tracks use E-AC-3. ExoPlayer needs a device decoder.
MediaCodecList(MediaCodecList.REGULAR_CODECS).codecInfos.any { codec ->
!codec.isEncoder && codec.supportedTypes.any { type ->
type.equals("audio/eac3", ignoreCase = true) ||
type.equals("audio/eac3-joc", ignoreCase = true)
}
}
}
AsyncFunction("showPicker") {
val activity = appContext.currentActivity
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || activity == null) {