Compare commits
No files matched your search
@@ -1,7 +1,7 @@
|
||||
/ios/
|
||||
/android/
|
||||
ios/
|
||||
android/
|
||||
# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb
|
||||
# The following patterns were generated by expo-cli
|
||||
|
||||
expo-env.d.ts
|
||||
# @end expo-cli
|
||||
# @end expo-cli
|
||||
@@ -1,25 +0,0 @@
|
||||
# Mobile build variants
|
||||
|
||||
EAS profiles set `APP_VARIANT` to select the app identity in `app.config.ts`.
|
||||
Both iOS bundle identifiers and Android package names use these values:
|
||||
|
||||
| Profile | App name | Identifier |
|
||||
| --- | --- | --- |
|
||||
| development | oTunes (Development) | com.abunchofknowitalls.otunes.development |
|
||||
| preview | oTunes (Preview) | com.abunchofknowitalls.otunes.preview |
|
||||
| production | oTunes | com.abunchofknowitalls.otunes |
|
||||
|
||||
Build with `eas build --profile development`, `--profile preview`, or
|
||||
`--profile production` from this directory.
|
||||
|
||||
For local builds and Metro, select the same variant explicitly:
|
||||
|
||||
```sh
|
||||
APP_VARIANT=development pnpm ios
|
||||
APP_VARIANT=development pnpm android
|
||||
APP_VARIANT=development pnpm start
|
||||
```
|
||||
|
||||
An unset `APP_VARIANT` keeps the production identity. Unknown variants fail
|
||||
configuration. URL schemes are `otunes-development`, `otunes-preview`, and
|
||||
`otunes` respectively, allowing the apps to be installed together.
|
||||
@@ -1,50 +0,0 @@
|
||||
import type { ConfigContext, ExpoConfig } from "expo/config"
|
||||
|
||||
export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
const variant: string =
|
||||
process.env.APP_VARIANT ?? process.env.EAS_BUILD_PROFILE ?? "production"
|
||||
if (
|
||||
variant !== "development" &&
|
||||
variant !== "preview" &&
|
||||
variant !== "production"
|
||||
) {
|
||||
throw new Error(`Unsupported APP_VARIANT: ${variant}`)
|
||||
}
|
||||
|
||||
const suffix = variant === "production" ? "" : `.${variant}`
|
||||
const iconSuffix = variant === "production" ? "" : `-${variant}`
|
||||
const nameSuffix =
|
||||
variant === "development"
|
||||
? " (Development)"
|
||||
: variant === "preview"
|
||||
? " (Preview)"
|
||||
: ""
|
||||
const composer = {
|
||||
development: "oTunes Dev",
|
||||
preview: "oTunes Preview",
|
||||
production: "oTunes",
|
||||
}[variant]
|
||||
|
||||
return {
|
||||
...config,
|
||||
name: `${config.name}${nameSuffix}`,
|
||||
slug: config.slug!,
|
||||
scheme: variant === "production" ? "otunes" : `otunes-${variant}`,
|
||||
icon: `./assets/icon${iconSuffix}.png`,
|
||||
ios: {
|
||||
...config.ios,
|
||||
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
||||
icon: `./assets/${composer}.icon`,
|
||||
},
|
||||
android: {
|
||||
...config.android,
|
||||
package: `${config.android!.package}${suffix}`,
|
||||
icon: `./assets/android-icon${iconSuffix}.png`,
|
||||
adaptiveIcon: {
|
||||
monochromeImage: "./assets/android-icon-monochrome.png",
|
||||
foregroundImage: `./assets/android-icon-foreground${iconSuffix}.png`,
|
||||
backgroundImage: `./assets/android-icon-background${iconSuffix}.png`,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -26,11 +26,8 @@
|
||||
"adaptiveIcon": {
|
||||
"monochromeImage": "./assets/android-icon-monochrome.png",
|
||||
"foregroundImage": "./assets/android-icon-foreground.png",
|
||||
"backgroundImage": "./assets/android-icon-background.png"
|
||||
},
|
||||
"userInterfaceStyle": "dark",
|
||||
"softwareKeyboardLayoutMode": "resize",
|
||||
"icon": "./assets/android-icon.png"
|
||||
"backgroundColor": "#C60322"
|
||||
}
|
||||
},
|
||||
"plugins": [
|
||||
"expo-router",
|
||||
@@ -52,23 +49,12 @@
|
||||
],
|
||||
"expo-image",
|
||||
"expo-status-bar",
|
||||
"expo-app-intents",
|
||||
"./plugins/with-android-colors",
|
||||
[
|
||||
"expo-navigation-bar",
|
||||
{
|
||||
"enforceContrast": false,
|
||||
"style": "light"
|
||||
}
|
||||
]
|
||||
"expo-app-intents"
|
||||
],
|
||||
"experiments": {
|
||||
"typedRoutes": true,
|
||||
"inlineModules": {
|
||||
"watchedDirectories": [
|
||||
"app-intents",
|
||||
"native"
|
||||
]
|
||||
"watchedDirectories": ["app-intents"]
|
||||
}
|
||||
},
|
||||
"extra": {
|
||||
|
||||
@@ -1,50 +1,37 @@
|
||||
import { NavigationBar } from "expo-navigation-bar"
|
||||
import {
|
||||
AndroidTabThemeProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabSelectedColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { DynamicColorIOS, Platform, View } from "react-native"
|
||||
import { DynamicColorIOS, Platform, useColorScheme } from "react-native"
|
||||
import { useMemo } from "react"
|
||||
|
||||
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
|
||||
import { useAndroidKeyboardVisible } from "@/hooks/use-android-keyboard-visible"
|
||||
import { TabBottomAccessory } from "@/components/mini-player"
|
||||
import { usePlaybackQueue } from "@/contexts/playback"
|
||||
import { appleMusic, colors, miniPlayerHeight, useIsDark } from "@/lib/theme"
|
||||
import { appleMusic, colors } from "@/lib/theme"
|
||||
|
||||
export const unstable_settings = { anchor: "library" }
|
||||
|
||||
function useRouterTheme() {
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const isDark = useColorScheme() === "dark"
|
||||
|
||||
return useMemo(() => {
|
||||
const palette = isDark ? colors.dark : colors.light
|
||||
const android = Platform.OS === "android" ? androidPalette : null
|
||||
const base = isDark ? DarkTheme : DefaultTheme
|
||||
|
||||
return {
|
||||
...base,
|
||||
colors: {
|
||||
...base.colors,
|
||||
background: android?.background ?? palette.background,
|
||||
card: android?.surface ?? palette.card,
|
||||
text: android?.foreground ?? palette.foreground,
|
||||
border: android?.divider ?? palette.border,
|
||||
primary: android?.accentText ?? palette.primary,
|
||||
background: palette.background,
|
||||
card: palette.card,
|
||||
text: palette.foreground,
|
||||
border: palette.border,
|
||||
primary: palette.primary,
|
||||
},
|
||||
}
|
||||
}, [isDark, androidPalette])
|
||||
}, [isDark])
|
||||
}
|
||||
|
||||
function useNativeTabColors() {
|
||||
const selectedColor = useAndroidTabSelectedColor()
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const isDark = useColorScheme() === "dark"
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -54,23 +41,24 @@ function useNativeTabColors() {
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
: {
|
||||
default: androidPalette.secondaryForeground,
|
||||
selected: selectedColor,
|
||||
default: isDark ? inactive : "#636366",
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
|
||||
const labelColor =
|
||||
Platform.OS === "ios"
|
||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||
: androidPalette.secondaryForeground
|
||||
: isDark
|
||||
? inactive
|
||||
: "#636366"
|
||||
|
||||
return {
|
||||
isDark,
|
||||
tintColor: Platform.OS === "android" ? selectedColor : appleMusic.pink,
|
||||
iconColor,
|
||||
labelStyle: {
|
||||
default: { color: labelColor, fontSize: 10 },
|
||||
selected: {
|
||||
color: Platform.OS === "android" ? selectedColor : appleMusic.pink,
|
||||
color: appleMusic.pink,
|
||||
fontSize: 10,
|
||||
fontWeight: "600" as const,
|
||||
},
|
||||
@@ -79,93 +67,57 @@ function useNativeTabColors() {
|
||||
? "systemChromeMaterialDark"
|
||||
: "systemChromeMaterialLight",
|
||||
backgroundColor:
|
||||
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||
Platform.OS === "ios"
|
||||
? undefined
|
||||
: isDark
|
||||
? appleMusic.background
|
||||
: colors.light.background,
|
||||
}
|
||||
}
|
||||
|
||||
function TabsContent() {
|
||||
const keyboardVisible = useAndroidKeyboardVisible()
|
||||
export default function TabsLayout() {
|
||||
const routerTheme = useRouterTheme()
|
||||
const tabColors = useNativeTabColors()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||
|
||||
// NativeTabs already owns the tab bar and system navigation insets.
|
||||
const androidContentStyle =
|
||||
Platform.OS === "android"
|
||||
? {
|
||||
paddingBottom:
|
||||
showBottomAccessory && !keyboardVisible ? miniPlayerHeight : 0,
|
||||
}
|
||||
: undefined
|
||||
|
||||
return (
|
||||
<ThemeProvider value={routerTheme}>
|
||||
<View style={{ flex: 1 }}>
|
||||
{Platform.OS === "android" ? (
|
||||
<NavigationBar style={tabColors.isDark ? "light" : "dark"} />
|
||||
<NativeTabs
|
||||
blurEffect={
|
||||
tabColors.blurEffect as
|
||||
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
||||
}
|
||||
backgroundColor={tabColors.backgroundColor}
|
||||
iconColor={tabColors.iconColor}
|
||||
labelStyle={tabColors.labelStyle}
|
||||
tintColor={appleMusic.pink}
|
||||
minimizeBehavior="onScrollDown"
|
||||
>
|
||||
{showBottomAccessory ? (
|
||||
<NativeTabs.BottomAccessory>
|
||||
<TabBottomAccessory />
|
||||
</NativeTabs.BottomAccessory>
|
||||
) : null}
|
||||
<NativeTabs
|
||||
blurEffect={
|
||||
tabColors.blurEffect as
|
||||
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
||||
}
|
||||
backgroundColor={tabColors.backgroundColor}
|
||||
iconColor={tabColors.iconColor}
|
||||
labelStyle={tabColors.labelStyle}
|
||||
tintColor={tabColors.tintColor}
|
||||
minimizeBehavior="onScrollDown"
|
||||
{...(Platform.OS === "android"
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && showBottomAccessory ? (
|
||||
<NativeTabs.BottomAccessory>
|
||||
<TabBottomAccessory />
|
||||
</NativeTabs.BottomAccessory>
|
||||
) : null}
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="house.fill" md="home" />
|
||||
<NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger name="home" disableTransparentOnScrollEdge>
|
||||
<NativeTabs.Trigger.Icon sf="house.fill" md="home" />
|
||||
<NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon
|
||||
sf="music.note.square.stack.fill"
|
||||
md="library_music"
|
||||
/>
|
||||
<NativeTabs.Trigger.Label>Library</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger name="library" disableTransparentOnScrollEdge>
|
||||
<NativeTabs.Trigger.Icon
|
||||
sf="music.note.square.stack.fill"
|
||||
md="library_music"
|
||||
/>
|
||||
<NativeTabs.Trigger.Label>Library</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
||||
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
</NativeTabs>
|
||||
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
|
||||
</View>
|
||||
<NativeTabs.Trigger name="search" disableTransparentOnScrollEdge>
|
||||
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
||||
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
</NativeTabs>
|
||||
</ThemeProvider>
|
||||
)
|
||||
}
|
||||
|
||||
export default function TabsLayout() {
|
||||
if (Platform.OS !== "android") return <TabsContent />
|
||||
return (
|
||||
<AndroidTabThemeProvider>
|
||||
<TabsContent />
|
||||
</AndroidTabThemeProvider>
|
||||
)
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -15,10 +14,6 @@ export default function HomeLayout() {
|
||||
<Stack
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
|
||||
@@ -1,16 +1,8 @@
|
||||
import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import {
|
||||
@@ -18,7 +10,6 @@ import {
|
||||
collectionInset,
|
||||
DiscHeader,
|
||||
} from "@/components/collection-list"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import {
|
||||
@@ -66,30 +57,15 @@ export default function AlbumScreen() {
|
||||
const isFocused = useIsFocused()
|
||||
const coverUri =
|
||||
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
const { palette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
album ? album.cover != null : album === null ? false : undefined
|
||||
)
|
||||
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
|
||||
const songIds = useMemo(
|
||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||
[album]
|
||||
)
|
||||
|
||||
// Older servers do not include album format availability yet.
|
||||
const formatTracks = useCachedQuery(
|
||||
api.library.getSongsForPlayback,
|
||||
album && (album.hasLossless === undefined || album.hasAtmos === undefined)
|
||||
? { ids: songIds }
|
||||
: "skip"
|
||||
)
|
||||
const hasLossless =
|
||||
album?.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album?.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
rememberSongs(albumDetailSongs(album))
|
||||
@@ -111,9 +87,7 @@ export default function AlbumScreen() {
|
||||
songIds={songIds}
|
||||
palette={palette}
|
||||
favorited={isSongFavorite(item.track.id)}
|
||||
onPlay={(songId, ids) =>
|
||||
playFromSong(songId, ids, `album:${album.id}`)
|
||||
}
|
||||
onPlay={playFromSong}
|
||||
onAction={handleAlbumTrackAction}
|
||||
/>
|
||||
) : null
|
||||
@@ -173,14 +147,6 @@ export default function AlbumScreen() {
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
}
|
||||
: {}),
|
||||
headerRight: () => (
|
||||
<MediaActionMenu
|
||||
stationArtistId={album.artist.id}
|
||||
@@ -200,7 +166,7 @@ export default function AlbumScreen() {
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -208,7 +174,6 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={listItems}
|
||||
keyExtractor={albumListItemKey}
|
||||
@@ -235,49 +200,11 @@ export default function AlbumScreen() {
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 8,
|
||||
}}
|
||||
>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata}
|
||||
</Text>
|
||||
) : null}
|
||||
{hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{hasAtmos ? (
|
||||
<>
|
||||
{metadata || hasLossless ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
·
|
||||
</Text>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata}
|
||||
</Text>
|
||||
) : null}
|
||||
<View style={styles.actions}>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
@@ -39,7 +38,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 +54,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,24 +73,46 @@ 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)
|
||||
: ""
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
const { palette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
playlist ? playlist.cover != null : playlist === null ? false : undefined
|
||||
)
|
||||
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
|
||||
@@ -121,27 +146,32 @@ export default function PlaylistScreen() {
|
||||
|
||||
return (
|
||||
<PlaylistContent
|
||||
onLayout={onLayout}
|
||||
playlist={playlist}
|
||||
songs={playlist.songs}
|
||||
songs={songs}
|
||||
allSongIds={allSongIds}
|
||||
coverUri={coverUri}
|
||||
palette={palette}
|
||||
onEndReached={() => {
|
||||
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
|
||||
}}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
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,13 +187,13 @@ 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(
|
||||
(song: BrowseSong) =>
|
||||
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
|
||||
[playFromSong, songIds, playlistId]
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
[playFromSong, songIds]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
@@ -191,12 +221,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
|
||||
@@ -239,14 +269,6 @@ function PlaylistContent({
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
}
|
||||
: {}),
|
||||
headerRight: () => (
|
||||
<MediaActionMenu
|
||||
selectedCount={songIds.length}
|
||||
@@ -262,7 +284,7 @@ function PlaylistContent({
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -273,8 +295,6 @@ function PlaylistContent({
|
||||
deletePlaylist,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
router,
|
||||
songIds,
|
||||
@@ -311,7 +331,6 @@ function PlaylistContent({
|
||||
) : null}
|
||||
<Stack.Screen options={screenOptions} />
|
||||
<FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={songs}
|
||||
keyExtractor={songKey}
|
||||
@@ -320,6 +339,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}
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { useState } from "react"
|
||||
import { router } from "expo-router"
|
||||
import {
|
||||
Platform,
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
@@ -376,13 +373,8 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
<SettingsCard title="Spatial Audio">
|
||||
<SwitchRow
|
||||
title="Prefer Dolby Atmos"
|
||||
subtitle={
|
||||
dolbyAtmosSupported
|
||||
? "Use Atmos versions when they are available."
|
||||
: "This device does not support Dolby Atmos playback."
|
||||
}
|
||||
disabled={!dolbyAtmosSupported}
|
||||
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
|
||||
subtitle="Use Atmos versions when they are available."
|
||||
value={user.preferAtmos ?? false}
|
||||
onValueChange={(checked) =>
|
||||
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
|
||||
showError(error.message)
|
||||
@@ -466,7 +458,7 @@ function UsersSection({
|
||||
<SettingsCard title="Sign Up">
|
||||
<SwitchRow
|
||||
title="Disable account creation"
|
||||
subtitle="Stop people from registering themselves. Admins can still create accounts."
|
||||
subtitle="Stop people from registering themselves. Admins can still create accounts from the web app."
|
||||
value={appSettings?.disableAccountCreation ?? false}
|
||||
onValueChange={(checked) =>
|
||||
void setDisableCreation({ disabled: checked }).catch(
|
||||
@@ -480,10 +472,6 @@ function UsersSection({
|
||||
title="People"
|
||||
subtitle="Manage who can access this server."
|
||||
>
|
||||
<Button
|
||||
title="Create account"
|
||||
onPress={() => router.push("/(app)/create-account")}
|
||||
/>
|
||||
<View style={styles.userList}>
|
||||
{users.map((user, index) => (
|
||||
<View
|
||||
@@ -507,10 +495,7 @@ function UsersSection({
|
||||
</Text>
|
||||
{user.isAdmin ? (
|
||||
<View
|
||||
style={[
|
||||
styles.badge,
|
||||
{ backgroundColor: colors.muted },
|
||||
]}
|
||||
style={[styles.badge, { backgroundColor: colors.muted }]}
|
||||
>
|
||||
<Text
|
||||
style={[
|
||||
@@ -647,12 +632,10 @@ function SwitchRow({
|
||||
subtitle,
|
||||
value,
|
||||
onValueChange,
|
||||
disabled,
|
||||
}: {
|
||||
title: string
|
||||
subtitle?: string
|
||||
value: boolean
|
||||
disabled?: boolean
|
||||
onValueChange: (checked: boolean) => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
@@ -667,17 +650,7 @@ function SwitchRow({
|
||||
<Text style={{ color: colors.mutedForeground }}>{subtitle}</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<Switch
|
||||
value={value}
|
||||
disabled={disabled}
|
||||
onValueChange={onValueChange}
|
||||
{...(Platform.OS === "android"
|
||||
? {
|
||||
trackColor: { false: colors.muted, true: colors.primary },
|
||||
thumbColor: colors.foreground,
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
<Switch value={value} onValueChange={onValueChange} />
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -15,10 +14,6 @@ export default function LibraryLayout() {
|
||||
<Stack
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Library",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -15,10 +14,6 @@ export default function SearchLayout() {
|
||||
<Stack
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import { Platform } from "react-native"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { Stack } from "expo-router"
|
||||
import { useCallback } from "react"
|
||||
|
||||
@@ -7,7 +5,6 @@ import { SearchResults } from "@/components/search-results"
|
||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||
|
||||
export default function SearchScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { searchQuery, onQueryChange, onSearchSubmit } = useDebouncedSearch()
|
||||
|
||||
const handleChangeText = useCallback(
|
||||
@@ -24,15 +21,6 @@ export default function SearchScreen() {
|
||||
onChangeText={handleChangeText}
|
||||
onSearchButtonPress={onSearchSubmit}
|
||||
autoCapitalize="none"
|
||||
{...(Platform.OS === "android"
|
||||
? {
|
||||
barTintColor: colors.background,
|
||||
textColor: colors.foreground,
|
||||
tintColor: colors.primary,
|
||||
hintTextColor: colors.mutedForeground,
|
||||
headerIconColor: colors.foreground,
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
|
||||
<SearchResults searchQuery={searchQuery} />
|
||||
|
||||
@@ -66,8 +66,7 @@ export default function AppLayout() {
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
headerShown: false,
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
@@ -75,25 +74,14 @@ export default function AppLayout() {
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
presentation:
|
||||
Platform.OS === "ios"
|
||||
? "transparentModal"
|
||||
: "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
|
||||
@@ -1,199 +0,0 @@
|
||||
import { useAction, useQuery } from "convex/react"
|
||||
import { ConvexError } from "convex/values"
|
||||
import { router, Stack } from "expo-router"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Switch,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
import { toast } from "sonner-native"
|
||||
|
||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||
import { colors, spacing } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
export default function CreateAccountScreen() {
|
||||
const user = useQuery(api.auth.currentUser)
|
||||
const createUser = useAction(api.users.adminCreateUser)
|
||||
const [name, setName] = useState("")
|
||||
const [email, setEmail] = useState("")
|
||||
const [password, setPassword] = useState("")
|
||||
const [isAdmin, setIsAdmin] = useState(false)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const pending = useRef(false)
|
||||
const mounted = useRef(true)
|
||||
|
||||
useEffect(() => {
|
||||
mounted.current = true
|
||||
return () => {
|
||||
mounted.current = false
|
||||
}
|
||||
}, [])
|
||||
|
||||
async function handleCreate() {
|
||||
if (pending.current || !user?.isAdmin) return
|
||||
setError(null)
|
||||
if (!name.trim() || !email.trim().includes("@") || password.length < 8) {
|
||||
setError(
|
||||
"Enter a name, valid email, and password of at least 8 characters."
|
||||
)
|
||||
return
|
||||
}
|
||||
pending.current = true
|
||||
setSubmitting(true)
|
||||
try {
|
||||
await createUser({
|
||||
name: name.trim(),
|
||||
email: email.trim().toLowerCase(),
|
||||
password,
|
||||
isAdmin,
|
||||
})
|
||||
toast.success("Account created")
|
||||
if (mounted.current) router.back()
|
||||
} catch (error) {
|
||||
if (!mounted.current) return
|
||||
setError(
|
||||
error instanceof ConvexError && typeof error.data === "string"
|
||||
? error.data
|
||||
: "Could not create account. Try again."
|
||||
)
|
||||
} finally {
|
||||
pending.current = false
|
||||
if (mounted.current) setSubmitting(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<SafeAreaView edges={["bottom", "left", "right"]} style={styles.screen}>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
gestureEnabled: !submitting,
|
||||
}}
|
||||
/>
|
||||
{user === undefined ? (
|
||||
<LoadingView />
|
||||
) : !user?.isAdmin ? (
|
||||
<Text style={[styles.text, styles.message]}>
|
||||
Admin access required.
|
||||
</Text>
|
||||
) : (
|
||||
<KeyboardAvoidingView
|
||||
style={styles.screen}
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
keyboardVerticalOffset={Platform.OS === "ios" ? 100 : 0}
|
||||
>
|
||||
<ScrollView
|
||||
contentContainerStyle={styles.form}
|
||||
keyboardShouldPersistTaps="handled"
|
||||
keyboardDismissMode="on-drag"
|
||||
>
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>Name</Text>
|
||||
<Input
|
||||
accessibilityLabel="Name"
|
||||
value={name}
|
||||
onChangeText={setName}
|
||||
autoCapitalize="words"
|
||||
autoComplete="off"
|
||||
editable={!submitting}
|
||||
style={styles.input}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>Email</Text>
|
||||
<Input
|
||||
accessibilityLabel="Email"
|
||||
value={email}
|
||||
onChangeText={setEmail}
|
||||
keyboardType="email-address"
|
||||
autoCapitalize="none"
|
||||
autoCorrect={false}
|
||||
autoComplete="off"
|
||||
editable={!submitting}
|
||||
style={styles.input}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>Password</Text>
|
||||
<Input
|
||||
accessibilityLabel="Password"
|
||||
value={password}
|
||||
onChangeText={setPassword}
|
||||
secureTextEntry
|
||||
autoCapitalize="none"
|
||||
autoCorrect={false}
|
||||
autoComplete="new-password"
|
||||
placeholder="At least 8 characters"
|
||||
editable={!submitting}
|
||||
style={styles.input}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.row}>
|
||||
<Text style={styles.text}>Grant admin access</Text>
|
||||
<Switch
|
||||
accessibilityLabel="Grant admin access"
|
||||
trackColor={{
|
||||
false: colors.dark.muted,
|
||||
true: colors.dark.primary,
|
||||
}}
|
||||
thumbColor={colors.dark.foreground}
|
||||
value={isAdmin}
|
||||
onValueChange={setIsAdmin}
|
||||
disabled={submitting}
|
||||
/>
|
||||
</View>
|
||||
{error ? (
|
||||
<Text accessibilityRole="alert" style={styles.error}>
|
||||
{error}
|
||||
</Text>
|
||||
) : null}
|
||||
<Button
|
||||
title={submitting ? "Creating account…" : "Create account"}
|
||||
disabled={submitting}
|
||||
onPress={() => void handleCreate()}
|
||||
tint={{
|
||||
background: colors.dark.primary,
|
||||
foreground: colors.dark.primaryForeground,
|
||||
}}
|
||||
/>
|
||||
</ScrollView>
|
||||
</KeyboardAvoidingView>
|
||||
)}
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
screen: { flex: 1, backgroundColor: "#000" },
|
||||
form: { padding: spacing.lg, gap: spacing.lg },
|
||||
field: { gap: spacing.sm },
|
||||
label: {
|
||||
color: colors.dark.mutedForeground,
|
||||
fontSize: 12,
|
||||
fontWeight: "600",
|
||||
textTransform: "uppercase",
|
||||
letterSpacing: 0.6,
|
||||
},
|
||||
text: { color: colors.dark.foreground, fontSize: 16, flexShrink: 1 },
|
||||
input: {
|
||||
backgroundColor: colors.dark.muted,
|
||||
color: colors.dark.foreground,
|
||||
borderColor: colors.dark.border,
|
||||
},
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
gap: spacing.md,
|
||||
minHeight: 48,
|
||||
},
|
||||
message: { padding: spacing.lg },
|
||||
error: { color: colors.dark.destructive, fontSize: 14, lineHeight: 20 },
|
||||
})
|
||||
@@ -1,7 +1,5 @@
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { NavigationBar } from "expo-navigation-bar"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Stack, useRouter } from "expo-router"
|
||||
import { useRouter } from "expo-router"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
@@ -31,7 +29,6 @@ import { api } from "@otunes/convex/_generated/api"
|
||||
import { playbackFormat } from "@otunes/convex/playback-stream"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { AudioOutputButton } from "@/components/audio-output-button"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { MarqueeText } from "@/components/marquee-text"
|
||||
import {
|
||||
@@ -50,7 +47,6 @@ 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,
|
||||
@@ -84,15 +80,15 @@ export default function PlayerScreen() {
|
||||
repeatEnabled,
|
||||
currentTime,
|
||||
duration,
|
||||
volume,
|
||||
queueSongIds,
|
||||
setIsPlaying,
|
||||
setVolume,
|
||||
seekTo,
|
||||
skipNext,
|
||||
skipPrevious,
|
||||
} = usePlayback()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const [showQueue, setShowQueue] = useState(false)
|
||||
const [isDismissing, setIsDismissing] = useState(false)
|
||||
const [stageHeight, setStageHeight] = useState(0)
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
@@ -105,7 +101,7 @@ export default function PlayerScreen() {
|
||||
? playbackFormat(
|
||||
playbackInfo.files,
|
||||
user.playbackQuality,
|
||||
dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
user.preferAtmos ?? false
|
||||
)
|
||||
: null
|
||||
|
||||
@@ -164,7 +160,6 @@ export default function PlayerScreen() {
|
||||
event.translationY > DISMISS_DISTANCE ||
|
||||
event.velocityY > DISMISS_VELOCITY
|
||||
) {
|
||||
scheduleOnRN(setIsDismissing, true)
|
||||
dismissY.value = withTiming(
|
||||
windowHeight,
|
||||
{ duration: 220 },
|
||||
@@ -221,18 +216,6 @@ export default function PlayerScreen() {
|
||||
return (
|
||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||
{Platform.OS === "android" ? (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
statusBarStyle: colors.isDark ? "light" : "dark",
|
||||
// The swipe already animates the player offscreen.
|
||||
animation: isDismissing ? "none" : "slide_from_bottom",
|
||||
}}
|
||||
/>
|
||||
<NavigationBar style={colors.isDark ? "light" : "dark"} />
|
||||
</>
|
||||
) : null}
|
||||
|
||||
<MusicEntityView
|
||||
kind="song"
|
||||
@@ -394,35 +377,31 @@ 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}
|
||||
<PlayerSlider
|
||||
accessibilityLabel="Volume"
|
||||
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}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
|
||||
<View style={styles.footer}>
|
||||
<Pressable
|
||||
@@ -440,10 +419,21 @@ export default function PlayerScreen() {
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<AudioOutputButton
|
||||
color={colors.foreground}
|
||||
style={styles.queueButton}
|
||||
/>
|
||||
<Pressable
|
||||
disabled
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={Platform.OS === "ios" ? "AirPlay" : "Cast"}
|
||||
accessibilityState={{ disabled: true }}
|
||||
style={[styles.queueButton, styles.unavailable]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="airplay.audio"
|
||||
fallback={{ material: "cast" }}
|
||||
size={27}
|
||||
weight="semibold"
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Pressable
|
||||
onPress={toggleQueue}
|
||||
hitSlop={8}
|
||||
|
||||
@@ -1,16 +1 @@
|
||||
import { Platform } from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
|
||||
import SettingsScreen from "./(tabs)/home/settings"
|
||||
|
||||
export default function Settings() {
|
||||
if (Platform.OS !== "android") return <SettingsScreen />
|
||||
return (
|
||||
<SafeAreaView
|
||||
edges={["bottom", "left", "right"]}
|
||||
style={{ flex: 1, backgroundColor: "#000" }}
|
||||
>
|
||||
<SettingsScreen />
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
export { default } from "./(tabs)/home/settings"
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { DarkTheme, Stack, ThemeProvider } from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { useIsDark } from "@/lib/theme"
|
||||
import { useColorScheme } from "react-native"
|
||||
import { GestureHandlerRootView } from "react-native-gesture-handler"
|
||||
import { SafeAreaProvider } from "react-native-safe-area-context"
|
||||
|
||||
@@ -47,14 +47,14 @@ function RootNavigator() {
|
||||
}
|
||||
|
||||
export default function RootLayout() {
|
||||
const isDark = useIsDark()
|
||||
const colorScheme = useColorScheme()
|
||||
|
||||
return (
|
||||
<GestureHandlerRootView style={{ flex: 1, backgroundColor: "#000" }}>
|
||||
<SafeAreaProvider>
|
||||
<ServerConfigProvider>
|
||||
<ConvexAppProvider>
|
||||
<StatusBar style={isDark ? "light" : "dark"} />
|
||||
<StatusBar style={colorScheme === "dark" ? "light" : "dark"} />
|
||||
<ThemeProvider value={navigationTheme}>
|
||||
<RootNavigator />
|
||||
</ThemeProvider>
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
import { useState } from "react"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
|
||||
import { KeyboardForm } from "@/components/keyboard-form"
|
||||
|
||||
import { Button, Card, Input } from "@/components/ui/primitives"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
@@ -37,7 +41,10 @@ export default function ServerScreen() {
|
||||
|
||||
return (
|
||||
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
|
||||
<KeyboardForm style={styles.container}>
|
||||
<KeyboardAvoidingView
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
style={styles.container}
|
||||
>
|
||||
<View style={styles.hero}>
|
||||
<Text style={[styles.brand, { color: colors.foreground }]}>
|
||||
oTunes
|
||||
@@ -75,7 +82,7 @@ export default function ServerScreen() {
|
||||
onPress={() => void handleContinue()}
|
||||
/>
|
||||
</Card>
|
||||
</KeyboardForm>
|
||||
</KeyboardAvoidingView>
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 310 KiB |
|
Before Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 963 KiB |
|
Before Width: | Height: | Size: 8.8 KiB |
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"fill" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.00000,0.55106,0.91748,1.00000",
|
||||
"display-p3:0.00320,0.24546,0.91602,1.00000"
|
||||
]
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : "automatic"
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.00000,0.55106,0.91748,1.00000",
|
||||
"display-p3:0.00320,0.24546,0.91602,1.00000"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.6
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : false,
|
||||
"value" : 0.2
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 8.8 KiB |
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"fill" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.03297,0.65562,0.91748,1.00000",
|
||||
"display-p3:0.01787,0.85470,0.91602,1.00000"
|
||||
]
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : "automatic"
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.03297,0.65562,0.91748,1.00000",
|
||||
"display-p3:0.01787,0.85470,0.91602,1.00000"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.6
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : false,
|
||||
"value" : 0.2
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"scale" : 1,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
import type { PropsWithChildren } from "react"
|
||||
import { KeyboardAvoidingView, Platform } from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
|
||||
/** RN modals have their own window; protect their actions from navigation and IME. */
|
||||
export function AndroidSheet({ children }: PropsWithChildren) {
|
||||
if (Platform.OS !== "android") return children
|
||||
return (
|
||||
<KeyboardAvoidingView behavior="height" style={{ flex: 1 }}>
|
||||
<SafeAreaView edges={["bottom", "left", "right"]} style={{ flex: 1 }}>
|
||||
{children}
|
||||
</SafeAreaView>
|
||||
</KeyboardAvoidingView>
|
||||
)
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
import {
|
||||
requireNativeView,
|
||||
requireOptionalNativeModule,
|
||||
type NativeModule,
|
||||
} from "expo"
|
||||
import {
|
||||
Platform,
|
||||
Pressable,
|
||||
type StyleProp,
|
||||
type ViewProps,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
type AudioOutputModule = NativeModule & {
|
||||
showPicker: () => Promise<boolean>
|
||||
}
|
||||
|
||||
const audioOutput =
|
||||
requireOptionalNativeModule<AudioOutputModule>("AudioOutput")
|
||||
const AirPlayPicker =
|
||||
Platform.OS === "ios" && audioOutput
|
||||
? requireNativeView<ViewProps & { tint: string }>("AudioOutput")
|
||||
: null
|
||||
|
||||
export function AudioOutputButton({
|
||||
color,
|
||||
style,
|
||||
}: {
|
||||
color: string
|
||||
style: StyleProp<ViewStyle>
|
||||
}) {
|
||||
if (AirPlayPicker) {
|
||||
return <AirPlayPicker tint={color} style={style} />
|
||||
}
|
||||
|
||||
const available =
|
||||
Platform.OS === "android" && Platform.Version >= 33 && audioOutput !== null
|
||||
|
||||
async function showPicker() {
|
||||
try {
|
||||
if (!(await audioOutput?.showPicker())) {
|
||||
showError("Audio output selection is unavailable on this device.")
|
||||
}
|
||||
} catch {
|
||||
showError("Audio output selection could not be opened.")
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<Pressable
|
||||
onPress={showPicker}
|
||||
disabled={!available}
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={Platform.OS === "ios" ? "AirPlay" : "Audio output"}
|
||||
accessibilityState={{ disabled: !available }}
|
||||
style={[style, !available && { opacity: 0.35 }]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="airplay.audio"
|
||||
fallback={{ material: "cast" }}
|
||||
size={27}
|
||||
weight="semibold"
|
||||
color={color}
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
@@ -2,11 +2,16 @@ import { useAuthActions } from "@convex-dev/auth/react"
|
||||
import { Link } from "expo-router"
|
||||
import { useQuery } from "convex/react"
|
||||
import { useState } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
|
||||
import { KeyboardForm } from "@/components/keyboard-form"
|
||||
|
||||
import { Button, Card, Input } from "@/components/ui/primitives"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
@@ -87,15 +92,14 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
|
||||
return (
|
||||
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
|
||||
<KeyboardForm style={styles.container}>
|
||||
<KeyboardAvoidingView
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
style={styles.container}
|
||||
>
|
||||
<Card>
|
||||
<View style={styles.header}>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
{text.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.description, { color: colors.mutedForeground }]}
|
||||
>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>{text.title}</Text>
|
||||
<Text style={[styles.description, { color: colors.mutedForeground }]}>
|
||||
{text.description}
|
||||
</Text>
|
||||
{config ? (
|
||||
@@ -107,8 +111,8 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
|
||||
{signupsDisabled ? (
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
New account registration is currently disabled. Contact an
|
||||
administrator if you need access.
|
||||
New account registration is currently disabled. Contact an administrator if you need
|
||||
access.
|
||||
</Text>
|
||||
) : (
|
||||
<View style={styles.form}>
|
||||
@@ -133,28 +137,16 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
onChangeText={setPassword}
|
||||
placeholder="Password"
|
||||
secureTextEntry
|
||||
autoComplete={
|
||||
flow === "signIn" ? "current-password" : "new-password"
|
||||
}
|
||||
/>
|
||||
{error ? (
|
||||
<Text style={{ color: colors.destructive }}>{error}</Text>
|
||||
) : null}
|
||||
<Button
|
||||
title={text.submit}
|
||||
loading={submitting}
|
||||
onPress={() => void handleSubmit()}
|
||||
autoComplete={flow === "signIn" ? "current-password" : "new-password"}
|
||||
/>
|
||||
{error ? <Text style={{ color: colors.destructive }}>{error}</Text> : null}
|
||||
<Button title={text.submit} loading={submitting} onPress={() => void handleSubmit()} />
|
||||
{!hideSignUpLink ? (
|
||||
<View style={styles.switchRow}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
{text.switchPrompt}{" "}
|
||||
</Text>
|
||||
<Text style={{ color: colors.mutedForeground }}>{text.switchPrompt} </Text>
|
||||
<Link href={text.switchHref} asChild>
|
||||
<Pressable>
|
||||
<Text
|
||||
style={{ color: colors.foreground, fontWeight: "600" }}
|
||||
>
|
||||
<Text style={{ color: colors.foreground, fontWeight: "600" }}>
|
||||
{text.switchLabel}
|
||||
</Text>
|
||||
</Pressable>
|
||||
@@ -175,7 +167,7 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
>
|
||||
<Text style={{ color: colors.mutedForeground }}>Change server</Text>
|
||||
</Pressable>
|
||||
</KeyboardForm>
|
||||
</KeyboardAvoidingView>
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
import type { PropsWithChildren } from "react"
|
||||
import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
ScrollView,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
/** Android resizes for the IME; scrolling keeps tall forms and actions reachable. */
|
||||
export function KeyboardForm({
|
||||
children,
|
||||
style,
|
||||
}: PropsWithChildren<{ style?: StyleProp<ViewStyle> }>) {
|
||||
if (Platform.OS === "android") {
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1 }}
|
||||
contentContainerStyle={[style, { flex: undefined, flexGrow: 1 }]}
|
||||
keyboardShouldPersistTaps="handled"
|
||||
keyboardDismissMode="on-drag"
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<KeyboardAvoidingView behavior="padding" style={style}>
|
||||
{children}
|
||||
</KeyboardAvoidingView>
|
||||
)
|
||||
}
|
||||
@@ -3,9 +3,7 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { memo, useCallback, type ReactElement } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
@@ -35,7 +33,6 @@ import {
|
||||
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
|
||||
|
||||
const GRID_INITIAL_ROWS = 5
|
||||
const MAX_NON_VIRTUAL_CAROUSEL_ITEMS = 10
|
||||
|
||||
export const AlbumCard = memo(function AlbumCard({
|
||||
album,
|
||||
@@ -309,30 +306,14 @@ function ContentCarouselBody({
|
||||
/>
|
||||
) : null}
|
||||
</Pressable>
|
||||
{Platform.OS === "android" &&
|
||||
content.length <= MAX_NON_VIRTUAL_CAROUSEL_ITEMS ? (
|
||||
<ScrollView
|
||||
horizontal
|
||||
style={styles.androidCarousel}
|
||||
showsHorizontalScrollIndicator={false}
|
||||
contentContainerStyle={styles.carouselContent}
|
||||
>
|
||||
{content.map((item) => (
|
||||
<View key={mediaItemKey(item)}>
|
||||
<CarouselCard item={item} width={carouselCardWidth} />
|
||||
</View>
|
||||
))}
|
||||
</ScrollView>
|
||||
) : (
|
||||
<FlatList
|
||||
data={content}
|
||||
keyExtractor={mediaItemKey}
|
||||
renderItem={renderCarouselItem}
|
||||
horizontal
|
||||
showsHorizontalScrollIndicator={false}
|
||||
contentContainerStyle={styles.carouselContent}
|
||||
/>
|
||||
)}
|
||||
<FlatList
|
||||
data={content}
|
||||
keyExtractor={mediaItemKey}
|
||||
renderItem={renderCarouselItem}
|
||||
horizontal
|
||||
showsHorizontalScrollIndicator={false}
|
||||
contentContainerStyle={styles.carouselContent}
|
||||
/>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -362,10 +343,6 @@ const styles = StyleSheet.create({
|
||||
fontSize: 22,
|
||||
fontWeight: "700",
|
||||
},
|
||||
androidCarousel: {
|
||||
// Horizontal lists should measure their cards, not stretch the Home sections.
|
||||
flexGrow: 0,
|
||||
},
|
||||
carouselContent: {
|
||||
gap: spacing.md,
|
||||
},
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import type { MenuAction } from "@expo/ui/community/menu"
|
||||
import { MenuView } from "@/components/media-menu"
|
||||
import { MenuView, type MenuAction } from "@expo/ui/community/menu"
|
||||
import { requireNativeView } from "expo"
|
||||
import type { ComponentType, ReactNode } from "react"
|
||||
import {
|
||||
@@ -172,7 +171,8 @@ export function buildMediaMenuActions(
|
||||
actions.push({
|
||||
id: item.action,
|
||||
title: item.label(countSuffix, favorited, playlistLabel),
|
||||
image: item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||
image:
|
||||
item.action === "favorite" && favorited ? "star.fill" : item.image,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -1,137 +0,0 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import type { ComponentProps } from "react"
|
||||
import type { MediaAction } from "@/components/media-context-menu"
|
||||
import type { MenuComponentProps } from "@expo/ui/community/menu"
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuItem,
|
||||
Host,
|
||||
RNHostView,
|
||||
Text,
|
||||
} from "@expo/ui/jetpack-compose"
|
||||
import { useState } from "react"
|
||||
import { Pressable, View } from "react-native"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
|
||||
import { appleMusic } from "@/lib/theme"
|
||||
|
||||
const actionIcons = {
|
||||
share: "share-outline",
|
||||
playlist: "list-outline",
|
||||
"play-next": "play-forward-outline",
|
||||
"play-last": "list",
|
||||
shuffle: "shuffle",
|
||||
"create-station": "radio-outline",
|
||||
favorite: "star-outline",
|
||||
"go-artist": "person-outline",
|
||||
"go-album": "disc-outline",
|
||||
"delete-playlist": "trash-outline",
|
||||
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
|
||||
|
||||
// The community MenuView creates a dynamic-color Host internally. Own this
|
||||
// Android host so menus use the same fixed palette as the rest of the app.
|
||||
export function MenuView({
|
||||
actions,
|
||||
children,
|
||||
style,
|
||||
shouldOpenOnLongPress,
|
||||
onPressAction,
|
||||
}: MenuComponentProps) {
|
||||
const [expanded, setExpanded] = useState(false)
|
||||
const longPress = Gesture.LongPress()
|
||||
.runOnJS(true)
|
||||
.onStart(() => setExpanded(true))
|
||||
return (
|
||||
<View style={style}>
|
||||
<Host
|
||||
colorScheme="dark"
|
||||
seedColor={appleMusic.pink}
|
||||
colorOverrides={{
|
||||
primary: appleMusic.pink,
|
||||
onPrimary: "#FFFFFF",
|
||||
surface: "#000000",
|
||||
onSurface: "#FFFFFF",
|
||||
onSurfaceVariant: "#FFFFFF",
|
||||
surfaceContainer: "#1C1C1E",
|
||||
surfaceContainerHigh: "#1C1C1E",
|
||||
surfaceTint: "#000000",
|
||||
outline: "#545458",
|
||||
outlineVariant: "#545458",
|
||||
error: "#FF453A",
|
||||
}}
|
||||
matchContents
|
||||
>
|
||||
<DropdownMenu
|
||||
expanded={expanded}
|
||||
onDismissRequest={() => setExpanded(false)}
|
||||
color={appleMusic.elevated}
|
||||
cornerRadius={4}
|
||||
shadowElevation={0}
|
||||
properties={{ clippingEnabled: false }}
|
||||
>
|
||||
<DropdownMenu.Trigger>
|
||||
<RNHostView matchContents>
|
||||
{shouldOpenOnLongPress ? (
|
||||
<GestureDetector gesture={longPress}>
|
||||
<View collapsable={false}>{children}</View>
|
||||
</GestureDetector>
|
||||
) : (
|
||||
<Pressable
|
||||
onPress={() => setExpanded(true)}
|
||||
accessible={false}
|
||||
focusable={false}
|
||||
android_disableSound
|
||||
>
|
||||
<View pointerEvents="none">{children}</View>
|
||||
</Pressable>
|
||||
)}
|
||||
</RNHostView>
|
||||
</DropdownMenu.Trigger>
|
||||
<DropdownMenu.Items>
|
||||
{actions
|
||||
.filter((action) => !action.attributes?.hidden)
|
||||
.map((action) => (
|
||||
<DropdownMenuItem
|
||||
key={action.id ?? action.title}
|
||||
enabled={!action.attributes?.disabled}
|
||||
elementColors={{
|
||||
textColor: action.attributes?.destructive
|
||||
? "#FF453A"
|
||||
: "#FFFFFF",
|
||||
}}
|
||||
onClick={() => {
|
||||
setExpanded(false)
|
||||
onPressAction?.({
|
||||
nativeEvent: { event: action.id ?? action.title },
|
||||
})
|
||||
}}
|
||||
>
|
||||
<DropdownMenuItem.LeadingIcon>
|
||||
<RNHostView matchContents>
|
||||
<Ionicons
|
||||
name={
|
||||
action.id === "favorite" &&
|
||||
action.image === "star.fill"
|
||||
? "star"
|
||||
: (actionIcons[action.id as MediaAction] ??
|
||||
"ellipsis-horizontal")
|
||||
}
|
||||
size={20}
|
||||
color={
|
||||
action.attributes?.destructive ? "#FF453A" : "#FFFFFF"
|
||||
}
|
||||
accessible={false}
|
||||
/>
|
||||
</RNHostView>
|
||||
</DropdownMenuItem.LeadingIcon>
|
||||
<DropdownMenuItem.Text>
|
||||
<Text>{action.title}</Text>
|
||||
</DropdownMenuItem.Text>
|
||||
</DropdownMenuItem>
|
||||
))}
|
||||
</DropdownMenu.Items>
|
||||
</DropdownMenu>
|
||||
</Host>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
export { MenuView } from "@expo/ui/community/menu"
|
||||
@@ -1,20 +1,20 @@
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
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 { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
import { miniPlayerHeight, tabBarHeight, useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
miniPlayerHeight,
|
||||
tabBarHeight,
|
||||
useBlurTint,
|
||||
useMiniPlayerBackground,
|
||||
useThemeColors,
|
||||
} from "@/lib/theme"
|
||||
|
||||
function MiniPlayerContent({
|
||||
placement,
|
||||
@@ -25,19 +25,10 @@ function MiniPlayerContent({
|
||||
variant: "bar" | "accessory"
|
||||
onOpenPlayer: () => void
|
||||
}) {
|
||||
const theme = useThemeColors()
|
||||
const palette = useAndroidTabPalette()
|
||||
const colors =
|
||||
Platform.OS === "android"
|
||||
? {
|
||||
...theme,
|
||||
foreground: palette.foreground,
|
||||
mutedForeground: palette.secondaryForeground,
|
||||
}
|
||||
: theme
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const { currentSong, isPlaying } = usePlaybackQueue()
|
||||
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
|
||||
const { setIsPlaying, skipNext } = usePlaybackActions()
|
||||
|
||||
if (!currentSong || !config) {
|
||||
return null
|
||||
@@ -121,20 +112,6 @@ function MiniPlayerContent({
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Previous track"
|
||||
onPress={(event) => {
|
||||
event.stopPropagation()
|
||||
void skipPrevious()
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
onPress={(event) => {
|
||||
@@ -165,28 +142,13 @@ function MiniPlayerContent({
|
||||
}
|
||||
|
||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
const palette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const colors = useThemeColors()
|
||||
const backgroundColor = useMiniPlayerBackground()
|
||||
|
||||
return (
|
||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||
<View style={[styles.androidBar, { backgroundColor }]}>
|
||||
<View style={[styles.topBorder, { backgroundColor: colors.border }]} />
|
||||
{children}
|
||||
{hasArtworkPalette ? (
|
||||
<View
|
||||
style={[
|
||||
styles.separator,
|
||||
styles.topBorder,
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
) : null}
|
||||
<View
|
||||
style={[
|
||||
styles.separator,
|
||||
styles.bottomBorder,
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -216,31 +178,43 @@ export function TabBottomAccessory() {
|
||||
|
||||
return content
|
||||
}
|
||||
/** NativeTabs.BottomAccessory only renders on iOS. */
|
||||
export function AndroidMiniPlayer() {
|
||||
const router = useRouter()
|
||||
const insets = useSafeAreaInsets()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
if (Platform.OS !== "android" || !currentSong || queueSongIds.length === 0) {
|
||||
return null
|
||||
}
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.floatingContainer,
|
||||
{ bottom: tabBarHeight + insets.bottom },
|
||||
]}
|
||||
>
|
||||
<MiniPlayerChrome>
|
||||
<MiniPlayerContent
|
||||
placement="regular"
|
||||
variant="bar"
|
||||
onOpenPlayer={() => router.push("/player")}
|
||||
/>
|
||||
</MiniPlayerChrome>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
//
|
||||
// function useFloatingMiniPlayerLayout() {
|
||||
// const segments = useSegments() as string[]
|
||||
// const insets = useSafeAreaInsets()
|
||||
//
|
||||
// const onPlayerModal = segments.includes("player")
|
||||
// const onAuthFlow =
|
||||
// segments.includes("signin") ||
|
||||
// segments.includes("signup") ||
|
||||
// segments.includes("server")
|
||||
// const onTabs = segments.includes("(tabs)")
|
||||
//
|
||||
// const bottom = insets.bottom + (onTabs ? 0 : 0)
|
||||
//
|
||||
// return {
|
||||
// bottom,
|
||||
// hidden: onPlayerModal || onAuthFlow || onTabs,
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// export function FloatingMiniPlayer() {
|
||||
// const router = useRouter()
|
||||
// const { bottom, hidden } = useFloatingMiniPlayerLayout()
|
||||
// const { currentSong, queueSongIds } = usePlayback()
|
||||
//
|
||||
// if (hidden || !currentSong || queueSongIds.length === 0) {
|
||||
// return null
|
||||
// }
|
||||
//
|
||||
// return (
|
||||
// <View pointerEvents="box-none" style={[styles.floatingContainer, { bottom }]}>
|
||||
// <MiniPlayerChrome>
|
||||
// <MiniPlayerContent onOpenPlayer={() => router.push("/player")} />
|
||||
// </MiniPlayerChrome>
|
||||
// </View>
|
||||
// )
|
||||
// }
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
floatingContainer: {
|
||||
@@ -260,15 +234,9 @@ const styles = StyleSheet.create({
|
||||
androidBar: {
|
||||
overflow: "hidden",
|
||||
},
|
||||
separator: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
height: 1,
|
||||
zIndex: 1,
|
||||
topBorder: {
|
||||
height: StyleSheet.hairlineWidth,
|
||||
},
|
||||
topBorder: { top: 0 },
|
||||
bottomBorder: { bottom: 0 },
|
||||
content: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -2,7 +2,6 @@ import { useEffect, useMemo, useRef, type ReactNode } from "react"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
import Animated, {
|
||||
cancelAnimation,
|
||||
interpolate,
|
||||
interpolateColor,
|
||||
useAnimatedStyle,
|
||||
@@ -35,8 +34,6 @@ export function PlayerSlider({
|
||||
leading,
|
||||
trailing,
|
||||
accessibilityLabel,
|
||||
commitHoldMs = COMMIT_HOLD_MS,
|
||||
animateValueChanges = false,
|
||||
}: {
|
||||
value: number
|
||||
maximumValue: number
|
||||
@@ -49,9 +46,6 @@ export function PlayerSlider({
|
||||
leading?: ReactNode
|
||||
trailing?: ReactNode
|
||||
accessibilityLabel: string
|
||||
animateValueChanges?: boolean
|
||||
/** Seeking needs a hold while playback catches up; system volume does not. */
|
||||
commitHoldMs?: number
|
||||
}) {
|
||||
const max = maximumValue > 0 ? maximumValue : 1
|
||||
const fraction = useSharedValue(clamp(value / max))
|
||||
@@ -63,38 +57,23 @@ export function PlayerSlider({
|
||||
|
||||
useEffect(() => {
|
||||
if (dragging.value || Date.now() < holdUntil.current) return
|
||||
const next = clamp(value / max)
|
||||
fraction.value = animateValueChanges
|
||||
? withTiming(next, { duration: 160 })
|
||||
: next
|
||||
}, [animateValueChanges, dragging, fraction, max, value])
|
||||
fraction.value = clamp(value / max)
|
||||
}, [dragging, fraction, max, value])
|
||||
|
||||
const callbacks = useRef({
|
||||
onValueChange,
|
||||
onSlidingStart,
|
||||
onSlidingComplete,
|
||||
value,
|
||||
commitHoldMs,
|
||||
max,
|
||||
})
|
||||
callbacks.current = {
|
||||
onValueChange,
|
||||
onSlidingStart,
|
||||
onSlidingComplete,
|
||||
value,
|
||||
commitHoldMs,
|
||||
max,
|
||||
}
|
||||
callbacks.current = { onValueChange, onSlidingStart, onSlidingComplete, max }
|
||||
|
||||
const gesture = useMemo(() => {
|
||||
const start = () => callbacks.current.onSlidingStart?.()
|
||||
const change = (next: number) =>
|
||||
callbacks.current.onValueChange?.(next * callbacks.current.max)
|
||||
const complete = (next: number) => {
|
||||
holdUntil.current = Date.now() + callbacks.current.commitHoldMs
|
||||
if (callbacks.current.commitHoldMs === 0) {
|
||||
fraction.value = clamp(callbacks.current.value / callbacks.current.max)
|
||||
}
|
||||
holdUntil.current = Date.now() + COMMIT_HOLD_MS
|
||||
callbacks.current.onSlidingComplete?.(next * callbacks.current.max)
|
||||
}
|
||||
|
||||
@@ -106,7 +85,6 @@ export function PlayerSlider({
|
||||
active.value = withSpring(1, { duration: 250, dampingRatio: 0.8 })
|
||||
})
|
||||
.onStart(() => {
|
||||
cancelAnimation(fraction)
|
||||
dragging.value = true
|
||||
startFraction.value = fraction.value
|
||||
scheduleOnRN(start)
|
||||
|
||||
@@ -8,7 +8,7 @@ import { formatDuration } from "@/lib/format"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { memo, useCallback } from "react"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -155,8 +155,7 @@ export const SongListRow = memo(function SongListRow({
|
||||
})
|
||||
|
||||
export const tabContentBottomInset = spacing.lg
|
||||
export const contentBottomInset =
|
||||
Platform.OS === "android" ? spacing.lg : miniPlayerHeight + spacing.lg
|
||||
export const contentBottomInset = miniPlayerHeight + spacing.lg
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useRef, type ReactNode } from "react"
|
||||
import { useEffect, useRef } from "react"
|
||||
import {
|
||||
Animated,
|
||||
ScrollView,
|
||||
@@ -18,30 +18,6 @@ import {
|
||||
useTwoColumnCardWidth,
|
||||
} from "@/lib/theme"
|
||||
|
||||
/** Match the inset-adjusted lists used once screen data is available. */
|
||||
function SkeletonContent({
|
||||
children,
|
||||
embedded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
if (embedded) return <>{children}</>
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
const colors = useThemeColors()
|
||||
const opacity = useRef(new Animated.Value(1)).current
|
||||
@@ -98,21 +74,13 @@ export function SongRowSkeleton() {
|
||||
)
|
||||
}
|
||||
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
embedded = false,
|
||||
}: {
|
||||
rows?: number
|
||||
embedded?: boolean
|
||||
}) {
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -141,28 +109,24 @@ function CardSkeleton({
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
embedded = false,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
]}
|
||||
>
|
||||
{Array.from({ length: items }, (_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
]}
|
||||
>
|
||||
{Array.from({ length: items }, (_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -228,9 +192,9 @@ export function CollectionDetailSkeleton({
|
||||
</View>
|
||||
</View>
|
||||
{round ? (
|
||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||
<MediaGridSkeleton items={4} contentInset={false} />
|
||||
) : (
|
||||
<SongListSkeleton rows={8} embedded />
|
||||
<SongListSkeleton rows={8} />
|
||||
)}
|
||||
</ScrollView>
|
||||
)
|
||||
@@ -239,19 +203,17 @@ export function CollectionDetailSkeleton({
|
||||
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<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>
|
||||
<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>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -271,7 +233,7 @@ const styles = StyleSheet.create({
|
||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
||||
gridInset: { padding: spacing.lg },
|
||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carousel: { gap: spacing.md },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
home: { padding: spacing.lg, gap: spacing.xl },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Platform,
|
||||
Pressable,
|
||||
PressableProps,
|
||||
StyleProp,
|
||||
@@ -86,13 +85,6 @@ export function Input({ style, ...props }: TextInputProps) {
|
||||
return (
|
||||
<TextInput
|
||||
{...props}
|
||||
{...(Platform.OS === "android"
|
||||
? {
|
||||
selectionColor: colors.primary,
|
||||
cursorColor: colors.primary,
|
||||
selectionHandleColor: colors.primary,
|
||||
}
|
||||
: {})}
|
||||
placeholderTextColor={colors.mutedForeground}
|
||||
style={[
|
||||
styles.input,
|
||||
@@ -110,12 +102,7 @@ export function Input({ style, ...props }: TextInputProps) {
|
||||
export function Card({ children }: { children: React.ReactNode }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.card,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
>
|
||||
<View style={[styles.card, { backgroundColor: colors.card, borderColor: colors.border }]}>
|
||||
{children}
|
||||
</View>
|
||||
)
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
import { Toaster as SonnerToaster } from "sonner-native"
|
||||
import { useColorScheme } from "react-native"
|
||||
|
||||
import { radius, useIsDark, useThemeColors } from "@/lib/theme"
|
||||
import { colors, radius } from "@/lib/theme"
|
||||
|
||||
export function Toaster() {
|
||||
const isDark = useIsDark()
|
||||
const themeColors = useThemeColors()
|
||||
const scheme = useColorScheme()
|
||||
const themeColors = scheme === "dark" ? colors.dark : colors.light
|
||||
|
||||
return (
|
||||
<SonnerToaster
|
||||
position="top-center"
|
||||
theme={isDark ? "dark" : "light"}
|
||||
theme={scheme === "dark" ? "dark" : "light"}
|
||||
toastOptions={{
|
||||
style: {
|
||||
backgroundColor: themeColors.card,
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { AndroidSheet } from "@/components/android-sheet"
|
||||
import { useConvex, useMutation } from "convex/react"
|
||||
import {
|
||||
createContext,
|
||||
@@ -247,53 +246,51 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
|
||||
transparent
|
||||
onRequestClose={closeAddToPlaylist}
|
||||
>
|
||||
<AndroidSheet>
|
||||
<Pressable style={styles.overlay} onPress={closeAddToPlaylist}>
|
||||
<Pressable
|
||||
style={[
|
||||
styles.sheet,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={(event) => event.stopPropagation()}
|
||||
>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
Add to Playlist
|
||||
</Text>
|
||||
<FlatList
|
||||
style={styles.list}
|
||||
data={ownedPlaylists ?? []}
|
||||
keyExtractor={(playlist) => playlist.id}
|
||||
renderItem={({
|
||||
item: playlist,
|
||||
}: {
|
||||
item: OwnedPlaylistForAdd
|
||||
}) => (
|
||||
<Pressable
|
||||
style={[styles.row, { borderBottomColor: colors.border }]}
|
||||
disabled={addingToPlaylistId !== null}
|
||||
onPress={() =>
|
||||
void handleAddToPlaylist(playlist.id, playlist.songIds)
|
||||
}
|
||||
>
|
||||
<Text style={{ color: colors.foreground }}>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)}
|
||||
/>
|
||||
<Button
|
||||
title="New Playlist"
|
||||
variant="secondary"
|
||||
onPress={() => {
|
||||
selectionRequestIdRef.current += 1
|
||||
setOpen(false)
|
||||
setNewPlaylistName("")
|
||||
setCreateOpen(true)
|
||||
}}
|
||||
/>
|
||||
</Pressable>
|
||||
<Pressable style={styles.overlay} onPress={closeAddToPlaylist}>
|
||||
<Pressable
|
||||
style={[
|
||||
styles.sheet,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={(event) => event.stopPropagation()}
|
||||
>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
Add to Playlist
|
||||
</Text>
|
||||
<FlatList
|
||||
style={styles.list}
|
||||
data={ownedPlaylists ?? []}
|
||||
keyExtractor={(playlist) => playlist.id}
|
||||
renderItem={({
|
||||
item: playlist,
|
||||
}: {
|
||||
item: OwnedPlaylistForAdd
|
||||
}) => (
|
||||
<Pressable
|
||||
style={styles.row}
|
||||
disabled={addingToPlaylistId !== null}
|
||||
onPress={() =>
|
||||
void handleAddToPlaylist(playlist.id, playlist.songIds)
|
||||
}
|
||||
>
|
||||
<Text style={{ color: colors.foreground }}>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)}
|
||||
/>
|
||||
<Button
|
||||
title="New Playlist"
|
||||
variant="secondary"
|
||||
onPress={() => {
|
||||
selectionRequestIdRef.current += 1
|
||||
setOpen(false)
|
||||
setNewPlaylistName("")
|
||||
setCreateOpen(true)
|
||||
}}
|
||||
/>
|
||||
</Pressable>
|
||||
</AndroidSheet>
|
||||
</Pressable>
|
||||
</Modal>
|
||||
|
||||
<Modal
|
||||
@@ -302,43 +299,38 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
|
||||
transparent
|
||||
onRequestClose={() => setCreateOpen(false)}
|
||||
>
|
||||
<AndroidSheet>
|
||||
<Pressable style={styles.overlay} onPress={() => setCreateOpen(false)}>
|
||||
<Pressable
|
||||
style={styles.overlay}
|
||||
onPress={() => setCreateOpen(false)}
|
||||
style={[
|
||||
styles.createSheet,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={(event) => event.stopPropagation()}
|
||||
>
|
||||
<Pressable
|
||||
style={[
|
||||
styles.createSheet,
|
||||
{ backgroundColor: colors.card, borderColor: colors.border },
|
||||
]}
|
||||
onPress={(event) => event.stopPropagation()}
|
||||
>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
New Playlist
|
||||
</Text>
|
||||
<Input
|
||||
value={newPlaylistName}
|
||||
onChangeText={setNewPlaylistName}
|
||||
placeholder="Playlist name"
|
||||
autoFocus
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
New Playlist
|
||||
</Text>
|
||||
<Input
|
||||
value={newPlaylistName}
|
||||
onChangeText={setNewPlaylistName}
|
||||
placeholder="Playlist name"
|
||||
autoFocus
|
||||
/>
|
||||
<View style={styles.createActions}>
|
||||
<Button
|
||||
title="Cancel"
|
||||
variant="ghost"
|
||||
onPress={() => setCreateOpen(false)}
|
||||
/>
|
||||
<View style={styles.createActions}>
|
||||
<Button
|
||||
title="Cancel"
|
||||
variant="ghost"
|
||||
onPress={() => setCreateOpen(false)}
|
||||
/>
|
||||
<Button
|
||||
title="Create"
|
||||
loading={submitting}
|
||||
disabled={!newPlaylistName.trim()}
|
||||
onPress={() => void handleCreatePlaylist()}
|
||||
/>
|
||||
</View>
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Create"
|
||||
loading={submitting}
|
||||
disabled={!newPlaylistName.trim()}
|
||||
onPress={() => void handleCreatePlaylist()}
|
||||
/>
|
||||
</View>
|
||||
</Pressable>
|
||||
</AndroidSheet>
|
||||
</Pressable>
|
||||
</Modal>
|
||||
</AddToPlaylistContext.Provider>
|
||||
)
|
||||
|
||||
@@ -1,137 +0,0 @@
|
||||
import {
|
||||
useIsFocused,
|
||||
useNavigation,
|
||||
usePreventRemove,
|
||||
useRoute,
|
||||
type NativeStackNavigationProp,
|
||||
} from "expo-router"
|
||||
import {
|
||||
createContext,
|
||||
useCallback,
|
||||
useContext,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
useState,
|
||||
type PropsWithChildren,
|
||||
} from "react"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||
|
||||
type TabTheme = {
|
||||
palette: CoverPalette
|
||||
selectedColor: string
|
||||
hasArtworkPalette: boolean
|
||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||
}
|
||||
const AndroidTabTheme = createContext<TabTheme | null>(null)
|
||||
|
||||
function useDefaultPalette() {
|
||||
const theme = useThemeColors()
|
||||
const isDark = useIsDark()
|
||||
return useMemo(() => themeCoverPalette(theme, isDark), [theme, isDark])
|
||||
}
|
||||
|
||||
export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
|
||||
const defaultPalette = useDefaultPalette()
|
||||
const [screen, setScreen] = useState<{
|
||||
palette: CoverPalette
|
||||
owner: string
|
||||
} | null>(null)
|
||||
const palette = screen?.palette ?? null
|
||||
const setPalette = useCallback(
|
||||
(palette: CoverPalette | null, owner: string) => {
|
||||
setScreen((current) =>
|
||||
palette ? { palette, owner } : current?.owner === owner ? null : current
|
||||
)
|
||||
},
|
||||
[]
|
||||
)
|
||||
const artworkPalette =
|
||||
palette &&
|
||||
(palette.background !== defaultPalette.background ||
|
||||
palette.foreground !== defaultPalette.foreground ||
|
||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||
palette.accent !== defaultPalette.accent)
|
||||
? palette
|
||||
: null
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
palette: artworkPalette ?? defaultPalette,
|
||||
selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText,
|
||||
hasArtworkPalette: artworkPalette !== null,
|
||||
setPalette,
|
||||
}),
|
||||
[defaultPalette, artworkPalette, setPalette]
|
||||
)
|
||||
return (
|
||||
<AndroidTabTheme.Provider value={value}>
|
||||
{children}
|
||||
</AndroidTabTheme.Provider>
|
||||
)
|
||||
}
|
||||
|
||||
export function useAndroidTabPalette() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
return theme?.palette ?? defaultPalette
|
||||
}
|
||||
|
||||
export function useAndroidTabHasArtworkPalette() {
|
||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||
}
|
||||
|
||||
export function useAndroidTabSelectedColor() {
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
return theme?.selectedColor ?? defaultPalette.accentText
|
||||
}
|
||||
|
||||
/** Keep Android artwork screens and shared bars on the same displayed palette. */
|
||||
export function useAndroidScreenPalette(palette: CoverPalette) {
|
||||
const isFocused = useIsFocused()
|
||||
const owner = useRoute().key
|
||||
const navigation =
|
||||
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
|
||||
const [appeared, setAppeared] = useState(false)
|
||||
const [leaving, setLeaving] = useState(false)
|
||||
const [laidOut, setLaidOut] = useState(false)
|
||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||
const theme = useContext(AndroidTabTheme)
|
||||
const setPalette = theme?.setPalette
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (Platform.OS !== "android") return
|
||||
return navigation.addListener("transitionEnd", ({ data }) => {
|
||||
setAppeared(!data.closing)
|
||||
})
|
||||
}, [navigation])
|
||||
|
||||
usePreventRemove(Platform.OS === "android" && !leaving, ({ repeat }) => {
|
||||
setLeaving(true)
|
||||
setPalette?.(null, owner)
|
||||
// Let the page and bars paint their shared destination colors before the
|
||||
// native stack removes the page. React blur happens too early for this.
|
||||
requestAnimationFrame(() => requestAnimationFrame(repeat))
|
||||
})
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (
|
||||
Platform.OS !== "android" ||
|
||||
!setPalette ||
|
||||
!isFocused ||
|
||||
!laidOut ||
|
||||
!appeared ||
|
||||
leaving
|
||||
)
|
||||
return
|
||||
setPalette(palette, owner)
|
||||
return () => setPalette(null, owner)
|
||||
}, [appeared, isFocused, laidOut, leaving, owner, palette, setPalette])
|
||||
|
||||
return {
|
||||
palette: Platform.OS === "android" && theme ? theme.palette : palette,
|
||||
onLayout: Platform.OS === "android" ? onLayout : undefined,
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,6 @@
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import {
|
||||
createAudioPlaylist,
|
||||
setAudioModeAsync,
|
||||
setIsAudioActiveAsync,
|
||||
type AudioMetadata,
|
||||
type AudioPlaylist,
|
||||
type AudioPlaylistStatus,
|
||||
@@ -21,6 +19,7 @@ import {
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import { AppState } from "react-native"
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage"
|
||||
|
||||
import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
@@ -58,6 +57,8 @@ import {
|
||||
const PREVIOUS_TRACK_RESTART_THRESHOLD_SECONDS = 5
|
||||
const PROGRESS_SAVE_INTERVAL_MS = 5000
|
||||
const PREFETCH_UPCOMING_SONGS = 5
|
||||
const VOLUME_STORAGE_KEY = "otunes:volume"
|
||||
const DEFAULT_VOLUME = 0.8
|
||||
|
||||
function lockScreenMetadata(
|
||||
song: BrowseSong,
|
||||
@@ -78,20 +79,18 @@ type PlaybackContextValue = {
|
||||
shuffleEnabled: boolean
|
||||
repeatEnabled: RepeatMode
|
||||
isPlaying: boolean
|
||||
volume: number
|
||||
currentTime: number
|
||||
duration: number
|
||||
seekTo: (seconds: number) => void
|
||||
waitForPlaybackReady: (playing?: boolean) => Promise<void>
|
||||
setIsPlaying: (playing: boolean) => void
|
||||
setVolume: (volume: number) => void
|
||||
playInOrder: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromSong: (
|
||||
songId: Id<"songs">,
|
||||
songIds: Id<"songs">[],
|
||||
origin?: string
|
||||
) => Promise<void>
|
||||
playFromSong: (songId: Id<"songs">, songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromLibrarySong: (
|
||||
songId: Id<"songs">,
|
||||
sort: {
|
||||
@@ -268,16 +267,18 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
const pendingSeekRef = useRef<number | null>(null)
|
||||
const seekInFlightRef = useRef(false)
|
||||
const loadRequestIdRef = useRef(0)
|
||||
const queueOriginRef = useRef<string | undefined>(undefined)
|
||||
const playRequestRef = useRef(0)
|
||||
const volumeRef = useRef(DEFAULT_VOLUME)
|
||||
const volumeChangedRef = useRef(false)
|
||||
const volumeSaveTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
const ignoreTrackChangeTimerRef = useRef<ReturnType<
|
||||
typeof setTimeout
|
||||
> | null>(null)
|
||||
|
||||
const [queueStartVersion, setQueueStartVersion] = useState(0)
|
||||
const [isPlaying, setIsPlayingState] = useState(false)
|
||||
const [currentTime, setCurrentTime] = useState(0)
|
||||
const [measuredDuration, setDuration] = useState(0)
|
||||
const [volume, setVolumeState] = useState(DEFAULT_VOLUME)
|
||||
const [progressToRestore, setProgressToRestore] = useState<number | null>(
|
||||
null
|
||||
)
|
||||
@@ -321,7 +322,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
? JSON.stringify([
|
||||
user._id,
|
||||
user.playbackQuality,
|
||||
dolbyAtmosSupported && (user.preferAtmos ?? false),
|
||||
user.preferAtmos ?? false,
|
||||
])
|
||||
: ""
|
||||
|
||||
@@ -354,21 +355,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
loadedLoadKeyRef.current = null
|
||||
}, [])
|
||||
|
||||
// A new queue must not inherit the native player's position or a pending seek.
|
||||
const resetQueuePlayback = useCallback(() => {
|
||||
loadRequestIdRef.current += 1
|
||||
destroyPlaylist()
|
||||
pendingSeekRef.current = null
|
||||
seekInFlightRef.current = false
|
||||
progressRestoredForSongRef.current = null
|
||||
lastSavedProgressRef.current = -1
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
setDuration(0)
|
||||
setProgressToRestore(null)
|
||||
setQueueStartVersion((version) => version + 1)
|
||||
}, [destroyPlaylist])
|
||||
|
||||
const handlePlaylistStatusUpdate = useCallback(
|
||||
(status: AudioPlaylistStatus) => {
|
||||
if (!status.isLoaded) return
|
||||
@@ -480,8 +466,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
updateInterval: 500,
|
||||
loop: repeatToPlaylistLoop(storeRef.current.getState().repeatEnabled),
|
||||
})
|
||||
// System volume controls loudness; keep the player gain at full scale.
|
||||
playlist.volume = 1
|
||||
playlist.volume = volumeRef.current
|
||||
statusSubscriptionRef.current = playlist.addListener(
|
||||
"playlistStatusUpdate",
|
||||
handlePlaylistStatusUpdate
|
||||
@@ -513,12 +498,42 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
}
|
||||
})
|
||||
|
||||
void AsyncStorage.getItem(VOLUME_STORAGE_KEY)
|
||||
.then((stored) => {
|
||||
if (!cancelled && !volumeChangedRef.current && stored) {
|
||||
const parsed = Number(stored)
|
||||
if (Number.isFinite(parsed)) {
|
||||
const restoredVolume = Math.min(1, Math.max(0, parsed))
|
||||
volumeRef.current = restoredVolume
|
||||
setVolumeState(restoredVolume)
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch(() => {})
|
||||
|
||||
return () => {
|
||||
cancelled = true
|
||||
if (volumeSaveTimerRef.current) {
|
||||
clearTimeout(volumeSaveTimerRef.current)
|
||||
volumeSaveTimerRef.current = null
|
||||
}
|
||||
if (volumeChangedRef.current) {
|
||||
void AsyncStorage.setItem(
|
||||
VOLUME_STORAGE_KEY,
|
||||
String(volumeRef.current)
|
||||
).catch(() => {})
|
||||
}
|
||||
destroyPlaylist()
|
||||
}
|
||||
}, [destroyPlaylist])
|
||||
|
||||
useEffect(() => {
|
||||
volumeRef.current = volume
|
||||
if (playlistRef.current) {
|
||||
playlistRef.current.volume = volume
|
||||
}
|
||||
}, [volume])
|
||||
|
||||
useEffect(() => {
|
||||
const playlist = playlistRef.current
|
||||
if (playlist) {
|
||||
@@ -538,6 +553,25 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
}
|
||||
}, [])
|
||||
|
||||
const setVolume = useCallback((nextVolume: number) => {
|
||||
const clamped = Math.min(1, Math.max(0, nextVolume))
|
||||
volumeChangedRef.current = true
|
||||
volumeRef.current = clamped
|
||||
setVolumeState(clamped)
|
||||
if (volumeSaveTimerRef.current) {
|
||||
clearTimeout(volumeSaveTimerRef.current)
|
||||
}
|
||||
volumeSaveTimerRef.current = setTimeout(() => {
|
||||
volumeSaveTimerRef.current = null
|
||||
void AsyncStorage.setItem(VOLUME_STORAGE_KEY, String(clamped)).catch(
|
||||
() => {}
|
||||
)
|
||||
}, 250)
|
||||
if (playlistRef.current) {
|
||||
playlistRef.current.volume = clamped
|
||||
}
|
||||
}, [])
|
||||
|
||||
const seekTo = useCallback(
|
||||
async (seconds: number) => {
|
||||
const playlist = playlistRef.current
|
||||
@@ -586,12 +620,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
if (progressRestoredForSongRef.current === currentSongId) return
|
||||
progressRestoredForSongRef.current = currentSongId
|
||||
lastSavedProgressRef.current = -1
|
||||
pendingSeekRef.current = null
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
setDuration(0)
|
||||
setProgressToRestore(store.getState().progressSeconds)
|
||||
}, [currentSongId, destroyPlaylist, queueStartVersion, store])
|
||||
}, [currentSongId, destroyPlaylist, store])
|
||||
|
||||
useEffect(() => {
|
||||
if (progressToRestore === null || progressToRestore <= 0) return
|
||||
@@ -649,7 +682,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
}
|
||||
if (!isCurrentLoad()) return
|
||||
|
||||
const loadKey = `${user.playbackQuality}:${dolbyAtmosSupported && (user.preferAtmos ?? false)}:${cookieHeader}`
|
||||
const loadKey = `${user.playbackQuality}:${user.preferAtmos ?? false}:${cookieHeader}`
|
||||
const needsRebuild =
|
||||
loadedLoadKeyRef.current !== loadKey ||
|
||||
nativePlaylistNeedsRebuild(
|
||||
@@ -671,6 +704,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
playlist.skipTo(currentIndex)
|
||||
}
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
playlist.volume = volumeRef.current
|
||||
if (metadata) {
|
||||
updatePlaylistLockScreenMetadata(playlist, metadata)
|
||||
}
|
||||
@@ -691,7 +725,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
const plan = playbackStreamPlan(
|
||||
song.files,
|
||||
user.playbackQuality,
|
||||
dolbyAtmosSupported && (user.preferAtmos ?? false)
|
||||
user.preferAtmos ?? false
|
||||
)
|
||||
sources.set(
|
||||
song.id,
|
||||
@@ -784,6 +818,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
}
|
||||
loadedSongIdsRef.current = windowSongIds
|
||||
loadedLoadKeyRef.current = loadKey
|
||||
playlist.volume = volumeRef.current
|
||||
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
|
||||
activatePlaylistLockScreen(
|
||||
playlist,
|
||||
@@ -797,14 +832,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
playlist.play()
|
||||
} else {
|
||||
playlist.pause()
|
||||
// Enable audio for the restored queue without starting playback.
|
||||
try {
|
||||
await setIsAudioActiveAsync(true)
|
||||
} catch {
|
||||
if (isCurrentLoad()) {
|
||||
showError("Audio playback could not be initialized.")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -829,7 +856,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
handlePlaybackLoadFailure,
|
||||
historySyncKey,
|
||||
queueSyncKey,
|
||||
queueStartVersion,
|
||||
repeatEnabled,
|
||||
scheduleTrackChangeHandling,
|
||||
userPlaybackKey,
|
||||
@@ -850,19 +876,18 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
) => playbackQueue.PlaybackQueueState,
|
||||
recorded: {
|
||||
playlistId?: Id<"playlists">
|
||||
origin?: string
|
||||
entity?: { kind: MusicEntityKind; id: string }
|
||||
} = {}
|
||||
) => {
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current =
|
||||
recorded.origin ??
|
||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||
resetQueuePlayback()
|
||||
const previousSongId = store.getState().queue[0]
|
||||
store.update(recipe)
|
||||
const firstSongId = store.getState().queue[0]
|
||||
if (!firstSongId) return
|
||||
|
||||
if (firstSongId === previousSongId) {
|
||||
void seekTo(0)
|
||||
}
|
||||
setIsPlaying(true)
|
||||
void (async () => {
|
||||
const deadline = Date.now() + 20_000
|
||||
@@ -893,7 +918,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
: { songId: firstSongId }
|
||||
)
|
||||
},
|
||||
[store, resetQueuePlayback, setIsPlaying, recordPlay]
|
||||
[store, seekTo, setIsPlaying, recordPlay]
|
||||
)
|
||||
|
||||
const playCollection = useCallback(
|
||||
@@ -902,7 +927,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
shuffled: boolean,
|
||||
recorded: {
|
||||
playlistId?: Id<"playlists">
|
||||
origin?: string
|
||||
entity?: { kind: MusicEntityKind; id: string }
|
||||
} = {}
|
||||
) => {
|
||||
@@ -967,19 +991,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const playFromSong = useCallback(
|
||||
async (songId: Id<"songs">, songIds: Id<"songs">[], origin?: string) => {
|
||||
if (
|
||||
origin &&
|
||||
queueOriginRef.current === origin &&
|
||||
store.getState().queue[0] === songId
|
||||
)
|
||||
return
|
||||
startPlayback(
|
||||
(state) => playbackQueue.startQueueFromSong(state, songId, songIds),
|
||||
{ origin }
|
||||
async (songId: Id<"songs">, songIds: Id<"songs">[]) => {
|
||||
startPlayback((state) =>
|
||||
playbackQueue.startQueueFromSong(state, songId, songIds)
|
||||
)
|
||||
},
|
||||
[startPlayback, store]
|
||||
[startPlayback]
|
||||
)
|
||||
|
||||
const playFromLibrarySong = useCallback(
|
||||
@@ -1049,7 +1066,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
(albumId: Id<"albums">, songIds?: Id<"songs">[]) =>
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), false, {
|
||||
entity: { kind: "album", id: albumId },
|
||||
origin: `album:${albumId}`,
|
||||
}),
|
||||
[playCollection, loadAlbumSongIds]
|
||||
)
|
||||
@@ -1058,7 +1074,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
(albumId: Id<"albums">, songIds?: Id<"songs">[]) =>
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), true, {
|
||||
entity: { kind: "album", id: albumId },
|
||||
origin: `album:${albumId}`,
|
||||
}),
|
||||
[playCollection, loadAlbumSongIds]
|
||||
)
|
||||
@@ -1121,14 +1136,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
async (songIds: Id<"songs">[], shuffled: boolean) => {
|
||||
if (songIds.length === 0) return
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current = undefined
|
||||
resetQueuePlayback()
|
||||
store.update((state) =>
|
||||
playbackQueue.startQueue(state, songIds, shuffled)
|
||||
)
|
||||
setIsPlaying(false)
|
||||
},
|
||||
[store, resetQueuePlayback, setIsPlaying]
|
||||
[store, setIsPlaying]
|
||||
)
|
||||
|
||||
const startFromSong = useCallback(
|
||||
@@ -1139,20 +1152,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
play: boolean
|
||||
) => {
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current = undefined
|
||||
resetQueuePlayback()
|
||||
store.update((state) => playbackQueue.setShuffleEnabled(state, shuffled))
|
||||
store.update((state) =>
|
||||
playbackQueue.startQueueFromSong(state, songId, songIds)
|
||||
)
|
||||
setIsPlaying(play)
|
||||
},
|
||||
[store, resetQueuePlayback, setIsPlaying]
|
||||
[store, setIsPlaying]
|
||||
)
|
||||
|
||||
const clearQueue = useCallback(async () => {
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current = undefined
|
||||
store.update(playbackQueue.clearQueue)
|
||||
setIsPlaying(false)
|
||||
}, [store, setIsPlaying])
|
||||
@@ -1335,9 +1345,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
shuffleEnabled: playback.shuffleEnabled,
|
||||
repeatEnabled,
|
||||
isPlaying: isPlaybackActive,
|
||||
volume,
|
||||
currentTime,
|
||||
duration,
|
||||
seekTo,
|
||||
setVolume,
|
||||
}),
|
||||
[
|
||||
actionsValue,
|
||||
@@ -1351,6 +1363,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
queueSongIds,
|
||||
repeatEnabled,
|
||||
seekTo,
|
||||
setVolume,
|
||||
volume,
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@@ -5,22 +5,13 @@
|
||||
},
|
||||
"build": {
|
||||
"development": {
|
||||
"env": {
|
||||
"APP_VARIANT": "development"
|
||||
},
|
||||
"developmentClient": true,
|
||||
"distribution": "internal"
|
||||
},
|
||||
"preview": {
|
||||
"env": {
|
||||
"APP_VARIANT": "preview"
|
||||
},
|
||||
"distribution": "internal"
|
||||
},
|
||||
"production": {
|
||||
"env": {
|
||||
"APP_VARIANT": "production"
|
||||
},
|
||||
"autoIncrement": true
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
import { useEffect, useState } from "react"
|
||||
import { Keyboard, Platform } from "react-native"
|
||||
|
||||
export function useAndroidKeyboardVisible() {
|
||||
const [visible, setVisible] = useState(false)
|
||||
useEffect(() => {
|
||||
if (Platform.OS !== "android") return
|
||||
setVisible(Keyboard.isVisible())
|
||||
const show = Keyboard.addListener("keyboardDidShow", () => setVisible(true))
|
||||
const hide = Keyboard.addListener("keyboardDidHide", () =>
|
||||
setVisible(false)
|
||||
)
|
||||
return () => {
|
||||
show.remove()
|
||||
hide.remove()
|
||||
}
|
||||
}, [])
|
||||
return visible
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
import { requireOptionalNativeModule, type EventEmitter } from "expo"
|
||||
import { useFocusEffect } from "expo-router"
|
||||
import { useCallback, useEffect, useState } from "react"
|
||||
import { AppState, Platform } from "react-native"
|
||||
|
||||
type VolumeState = { volume: number; available: boolean }
|
||||
type VolumeEvents = { onVolumeChange: (state: VolumeState) => void }
|
||||
interface SystemVolumeModule extends EventEmitter<VolumeEvents> {
|
||||
setPlayerVisible?(visible: boolean): Promise<void>
|
||||
getState(): Promise<VolumeState>
|
||||
setVolume(volume: number): Promise<void>
|
||||
}
|
||||
|
||||
const native = requireOptionalNativeModule<SystemVolumeModule>("SystemVolume")
|
||||
|
||||
/** The device owns volume. Never restore an app-specific level on launch. */
|
||||
export function useSystemVolume() {
|
||||
const [state, setState] = useState<VolumeState>({
|
||||
volume: 0,
|
||||
available: false,
|
||||
})
|
||||
|
||||
useFocusEffect(
|
||||
useCallback(() => {
|
||||
if (Platform.OS !== "ios" || !native?.setPlayerVisible) return
|
||||
void native.setPlayerVisible(true).catch(() => {})
|
||||
return () => {
|
||||
void native.setPlayerVisible?.(false).catch(() => {})
|
||||
}
|
||||
}, [])
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
if (!native) return
|
||||
let active = true
|
||||
let revision = 0
|
||||
const listener = native.addListener("onVolumeChange", (next) => {
|
||||
revision++
|
||||
if (active) setState(next)
|
||||
})
|
||||
const refresh = async () => {
|
||||
const requestedRevision = ++revision
|
||||
try {
|
||||
const next = await native.getState()
|
||||
if (active && requestedRevision === revision) setState(next)
|
||||
} catch {
|
||||
if (active && requestedRevision === revision) {
|
||||
setState((value) => ({ ...value, available: false }))
|
||||
}
|
||||
}
|
||||
}
|
||||
void refresh()
|
||||
const foreground = AppState.addEventListener("change", (next) => {
|
||||
if (next === "active") void refresh()
|
||||
})
|
||||
return () => {
|
||||
active = false
|
||||
listener.remove()
|
||||
foreground.remove()
|
||||
}
|
||||
}, [])
|
||||
|
||||
const setVolume = useCallback((value: number) => {
|
||||
if (!native || !Number.isFinite(value)) return
|
||||
const volume = Math.min(1, Math.max(0, value))
|
||||
void native.setVolume(volume).catch(() => {
|
||||
setState((current) => ({ ...current, available: false }))
|
||||
})
|
||||
}, [])
|
||||
|
||||
return { ...state, setVolume }
|
||||
}
|
||||
@@ -38,13 +38,6 @@ export function useAppNavigation() {
|
||||
const router = useRouter()
|
||||
|
||||
const push = useCallback((path: string) => {
|
||||
if (activeSegmentsRef.current.includes("player")) {
|
||||
// Leave the root player modal before navigating into the library stack.
|
||||
router.dismiss()
|
||||
router.navigate(tabPath("library", path))
|
||||
return
|
||||
}
|
||||
|
||||
router.push(tabPath(getActiveTabFromRef(), path))
|
||||
}, [router])
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { NativeStackNavigationOptions } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
import { useColorScheme } from "react-native"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { colors } from "@/lib/theme"
|
||||
|
||||
type StackScreenOptions = NativeStackNavigationOptions
|
||||
|
||||
@@ -18,7 +18,8 @@ export const tabStackScreenTitles: Record<string, string> = {
|
||||
export function useStackScreenOptions(
|
||||
overrides?: StackScreenOptions
|
||||
): StackScreenOptions {
|
||||
const theme = useThemeColors()
|
||||
const scheme = useColorScheme()
|
||||
const theme = scheme === "dark" ? colors.dark : colors.light
|
||||
|
||||
return {
|
||||
headerLargeTitle: true,
|
||||
@@ -26,16 +27,6 @@ export function useStackScreenOptions(
|
||||
headerTintColor: theme.foreground,
|
||||
headerLargeTitleStyle: { color: theme.foreground },
|
||||
headerBackButtonDisplayMode: "minimal",
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: theme.background },
|
||||
headerShadowVisible: false,
|
||||
statusBarStyle: "light" as const,
|
||||
contentStyle: { backgroundColor: theme.background },
|
||||
}
|
||||
: {}),
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
import { Platform } from "react-native"
|
||||
|
||||
// Android Dolby decoder reports do not reliably indicate working Atmos playback.
|
||||
export const dolbyAtmosSupported = Platform.OS === "ios"
|
||||
@@ -50,12 +50,12 @@ export const colors = {
|
||||
export type ThemeColors = (typeof colors)[keyof typeof colors]
|
||||
|
||||
export function useThemeColors(): ThemeColors {
|
||||
return useIsDark() ? colors.dark : colors.light
|
||||
const scheme = useColorScheme()
|
||||
return scheme === "dark" ? colors.dark : colors.light
|
||||
}
|
||||
|
||||
export function useIsDark(): boolean {
|
||||
const scheme = useColorScheme()
|
||||
return Platform.OS === "android" || scheme === "dark"
|
||||
return useColorScheme() === "dark"
|
||||
}
|
||||
|
||||
export function useBlurTint(): "light" | "dark" {
|
||||
@@ -84,13 +84,13 @@ export const radius = {
|
||||
} as const
|
||||
|
||||
export const miniPlayerHeight = 56
|
||||
export const tabBarHeight = Platform.OS === "ios" ? 49 : 80
|
||||
export const tabBarHeight = Platform.OS === "ios" ? 49 : 56
|
||||
export const playerBarHeight = miniPlayerHeight
|
||||
export const carouselCardWidth = 160
|
||||
|
||||
export function useTwoColumnCardWidth(
|
||||
horizontalPadding = spacing.lg,
|
||||
gap = spacing.md
|
||||
gap = spacing.md,
|
||||
) {
|
||||
const { width } = useWindowDimensions()
|
||||
return Math.floor((width - horizontalPadding * 2 - gap) / 2)
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { Platform } from "react-native"
|
||||
import type { AudioSource } from "expo-audio"
|
||||
|
||||
export type PlaybackQuality = "low" | "medium" | "high" | "lossless"
|
||||
@@ -52,9 +50,8 @@ export function songPlayUrl(
|
||||
preferAtmos: boolean | undefined
|
||||
) {
|
||||
const params = new URLSearchParams()
|
||||
if (Platform.OS === "ios") params.set("losslessFormat", "alac")
|
||||
if (quality) params.set("quality", quality)
|
||||
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
|
||||
if (preferAtmos) params.set("preferAtmos", "true")
|
||||
const query = params.toString()
|
||||
return `${serverUrl}/api/song/${songId}/play${query ? `?${query}` : ""}`
|
||||
}
|
||||
@@ -67,7 +64,7 @@ export function songHlsPlaylistUrl(
|
||||
) {
|
||||
const params = new URLSearchParams()
|
||||
if (quality) params.set("quality", quality)
|
||||
if (dolbyAtmosSupported && preferAtmos) params.set("preferAtmos", "true")
|
||||
if (preferAtmos) params.set("preferAtmos", "true")
|
||||
const query = params.toString()
|
||||
return `${serverUrl}/api/song/${songId}/play/hls${query ? `?${query}` : ""}`
|
||||
}
|
||||
@@ -89,13 +86,8 @@ export function songAudioSource(
|
||||
: undefined
|
||||
const name = options?.songTitle
|
||||
|
||||
if (headers || name || useHls) {
|
||||
return {
|
||||
uri,
|
||||
...(useHls ? { mimeType: "application/x-mpegURL" } : {}),
|
||||
...(name ? { name } : {}),
|
||||
...(headers ? { headers } : {}),
|
||||
}
|
||||
if (headers || name) {
|
||||
return { uri, ...(name ? { name } : {}), ...(headers ? { headers } : {}) }
|
||||
}
|
||||
|
||||
return uri
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
/android/build/
|
||||
@@ -1,15 +0,0 @@
|
||||
plugins {
|
||||
id 'com.android.library'
|
||||
id 'expo-module-gradle-plugin'
|
||||
}
|
||||
|
||||
group = 'expo.modules.audiooutput'
|
||||
version = '1.0.0'
|
||||
|
||||
android {
|
||||
namespace 'expo.modules.audiooutput'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'androidx.mediarouter:mediarouter:1.8.1'
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Android 13's switcher helper checks for a system broadcast receiver. -->
|
||||
<queries>
|
||||
<package android:name="com.android.systemui" />
|
||||
<intent>
|
||||
<action android:name="com.android.settings.panel.action.MEDIA_OUTPUT" />
|
||||
</intent>
|
||||
</queries>
|
||||
</manifest>
|
||||
@@ -1,23 +0,0 @@
|
||||
package expo.modules.audiooutput
|
||||
|
||||
import android.os.Build
|
||||
import androidx.mediarouter.app.SystemOutputSwitcherDialogController
|
||||
import expo.modules.kotlin.functions.Queues
|
||||
import expo.modules.kotlin.modules.Module
|
||||
import expo.modules.kotlin.modules.ModuleDefinition
|
||||
|
||||
class AudioOutputModule : Module() {
|
||||
override fun definition() = ModuleDefinition {
|
||||
Name("AudioOutput")
|
||||
|
||||
AsyncFunction("showPicker") {
|
||||
val activity = appContext.currentActivity
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || activity == null) {
|
||||
false
|
||||
} else {
|
||||
// AndroidX handles Android 13's system intent and Android 14+'s public API.
|
||||
SystemOutputSwitcherDialogController.showDialog(activity)
|
||||
}
|
||||
}.runOnQueue(Queues.MAIN)
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"platforms": ["apple", "android"],
|
||||
"apple": {
|
||||
"modules": ["AudioOutputModule"]
|
||||
},
|
||||
"android": {
|
||||
"modules": ["expo.modules.audiooutput.AudioOutputModule"]
|
||||
}
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'AudioOutput'
|
||||
s.version = '1.0.0'
|
||||
s.summary = 'Native audio output selection for oTunes'
|
||||
s.description = s.summary
|
||||
s.license = { :type => 'MIT' }
|
||||
s.author = 'oTunes'
|
||||
s.homepage = 'https://otunes.abunchofknowitalls.com'
|
||||
s.platforms = { :ios => '16.4' }
|
||||
s.swift_version = '5.9'
|
||||
s.source = { :git => '' }
|
||||
s.static_framework = true
|
||||
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
|
||||
s.dependency 'ExpoModulesCore'
|
||||
s.frameworks = 'AVKit'
|
||||
s.source_files = '**/*.swift'
|
||||
end
|
||||
@@ -1,44 +0,0 @@
|
||||
import AVKit
|
||||
import ExpoModulesCore
|
||||
|
||||
public class AudioOutputModule: Module {
|
||||
public func definition() -> ModuleDefinition {
|
||||
Name("AudioOutput")
|
||||
|
||||
View(AudioOutputView.self) {
|
||||
Prop("tint") { (view: AudioOutputView, color: UIColor) in
|
||||
view.icon.tintColor = color
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
final class AudioOutputView: ExpoView {
|
||||
private let picker = AVRoutePickerView()
|
||||
let icon = UIImageView(
|
||||
image: UIImage(
|
||||
systemName: "airplay.audio",
|
||||
withConfiguration: UIImage.SymbolConfiguration(pointSize: 27, weight: .semibold)
|
||||
)
|
||||
)
|
||||
|
||||
required init(appContext: AppContext? = nil) {
|
||||
super.init(appContext: appContext)
|
||||
picker.prioritizesVideoDevices = false
|
||||
picker.backgroundColor = .clear
|
||||
// Hide only the native glyph. Making the picker transparent prevents taps.
|
||||
picker.tintColor = .clear
|
||||
picker.activeTintColor = .clear
|
||||
addSubview(picker)
|
||||
icon.contentMode = .center
|
||||
icon.isUserInteractionEnabled = false
|
||||
icon.isAccessibilityElement = false
|
||||
addSubview(icon)
|
||||
}
|
||||
|
||||
override func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
picker.frame = bounds
|
||||
icon.frame = bounds
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"name": "otunes-audio-output",
|
||||
"version": "1.0.0",
|
||||
"private": true
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
package com.abunchofknowitalls.otunes
|
||||
|
||||
import android.content.Context
|
||||
import android.database.ContentObserver
|
||||
import android.media.AudioManager
|
||||
import android.os.Build
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.provider.Settings
|
||||
import expo.modules.kotlin.functions.Queues
|
||||
import expo.modules.kotlin.modules.Module
|
||||
import expo.modules.kotlin.modules.ModuleDefinition
|
||||
import kotlin.math.roundToInt
|
||||
|
||||
class SystemVolume : Module() {
|
||||
private val context get() = requireNotNull(appContext.reactContext)
|
||||
private val audio get() = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
|
||||
private var observer: ContentObserver? = null
|
||||
private var lastState: Map<String, Any>? = null
|
||||
|
||||
override fun definition() = ModuleDefinition {
|
||||
Name("SystemVolume")
|
||||
Events("onVolumeChange")
|
||||
|
||||
AsyncFunction("getState") { state() }.runOnQueue(Queues.MAIN)
|
||||
|
||||
AsyncFunction("setVolume") { value: Double ->
|
||||
if (value.isFinite() && available()) {
|
||||
val maximum = audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
|
||||
val minimum = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
|
||||
audio.getStreamMinVolume(AudioManager.STREAM_MUSIC)
|
||||
} else {
|
||||
0
|
||||
}
|
||||
val index = (value.coerceIn(0.0, 1.0) * maximum).roundToInt().coerceIn(minimum, maximum)
|
||||
audio.setStreamVolume(AudioManager.STREAM_MUSIC, index, 0)
|
||||
publishState()
|
||||
}
|
||||
}.runOnQueue(Queues.MAIN)
|
||||
|
||||
OnStartObserving {
|
||||
lastState = null
|
||||
observer = object : ContentObserver(Handler(Looper.getMainLooper())) {
|
||||
override fun onChange(selfChange: Boolean) = publishState()
|
||||
}.also {
|
||||
context.contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, it)
|
||||
}
|
||||
}
|
||||
|
||||
OnStopObserving { stopObserving() }
|
||||
OnDestroy { stopObserving() }
|
||||
}
|
||||
|
||||
private fun available(): Boolean =
|
||||
!audio.isVolumeFixed && audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC) > 0
|
||||
|
||||
private fun state(): Map<String, Any> {
|
||||
val maximum = audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
|
||||
return mapOf(
|
||||
"volume" to if (maximum > 0) audio.getStreamVolume(AudioManager.STREAM_MUSIC).toDouble() / maximum else 0.0,
|
||||
"available" to available()
|
||||
)
|
||||
}
|
||||
|
||||
private fun publishState() {
|
||||
val next = state()
|
||||
if (next != lastState) {
|
||||
lastState = next
|
||||
sendEvent("onVolumeChange", next)
|
||||
}
|
||||
}
|
||||
|
||||
private fun stopObserving() {
|
||||
observer?.let { context.contentResolver.unregisterContentObserver(it) }
|
||||
observer = null
|
||||
}
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
import AVFAudio
|
||||
import MediaPlayer
|
||||
import UIKit
|
||||
internal import ExpoModulesCore
|
||||
|
||||
/// Bridges system volume without changing the playback audio session or player gain.
|
||||
final class SystemVolume: Module {
|
||||
private var volumeView: MPVolumeView?
|
||||
private var observation: NSKeyValueObservation?
|
||||
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("SystemVolume")
|
||||
Events("onVolumeChange")
|
||||
|
||||
AsyncFunction("getState") { () -> [String: Any] in
|
||||
return self.state()
|
||||
}.runOnQueue(.main)
|
||||
|
||||
AsyncFunction("setPlayerVisible") { (visible: Bool) in
|
||||
if visible {
|
||||
self.prepareVolumeView()
|
||||
} else {
|
||||
self.volumeView?.removeFromSuperview()
|
||||
self.volumeView = nil
|
||||
}
|
||||
}.runOnQueue(.main)
|
||||
|
||||
AsyncFunction("setVolume") { (value: Double) in
|
||||
guard value.isFinite, self.volumeView?.window != nil,
|
||||
let slider = self.volumeView?.subviews.compactMap({ $0 as? UISlider }).first
|
||||
else { return }
|
||||
slider.setValue(Float(min(1, max(0, value))), animated: false)
|
||||
slider.sendActions(for: .valueChanged)
|
||||
slider.sendActions(for: .touchUpInside)
|
||||
}.runOnQueue(.main)
|
||||
|
||||
OnStartObserving {
|
||||
self.observation = AVAudioSession.sharedInstance().observe(
|
||||
\.outputVolume, options: [.new]
|
||||
) { [weak self] _, _ in
|
||||
guard let self else { return }
|
||||
self.sendEvent("onVolumeChange", self.state())
|
||||
}
|
||||
}
|
||||
|
||||
OnStopObserving {
|
||||
self.observation = nil
|
||||
}
|
||||
|
||||
OnDestroy {
|
||||
self.observation = nil
|
||||
let view = self.volumeView
|
||||
self.volumeView = nil
|
||||
DispatchQueue.main.async { view?.removeFromSuperview() }
|
||||
}
|
||||
}
|
||||
|
||||
private func prepareVolumeView() {
|
||||
#if !targetEnvironment(simulator)
|
||||
if volumeView == nil {
|
||||
// MPVolumeView must belong to a window to control the device's volume.
|
||||
let view = MPVolumeView(frame: CGRect(x: -200, y: -200, width: 120, height: 30))
|
||||
view.showsRouteButton = false
|
||||
volumeView = view
|
||||
}
|
||||
if volumeView?.window == nil {
|
||||
let window = UIApplication.shared.connectedScenes
|
||||
.compactMap { $0 as? UIWindowScene }
|
||||
.flatMap { $0.windows }
|
||||
.first { $0.isKeyWindow }
|
||||
if let volumeView { window?.addSubview(volumeView) }
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
private func state() -> [String: Any] {
|
||||
#if targetEnvironment(simulator)
|
||||
// Simulator's host audio controls do not update AVAudioSession.outputVolume.
|
||||
let available = false
|
||||
#else
|
||||
// The control remains visible on physical iPhones, including during route changes.
|
||||
let available = true
|
||||
#endif
|
||||
return ["volume": AVAudioSession.sharedInstance().outputVolume, "available": available]
|
||||
}
|
||||
}
|
||||
@@ -34,14 +34,12 @@
|
||||
"expo-image": "~58.0.16",
|
||||
"expo-image-picker": "~58.0.10",
|
||||
"expo-linking": "~58.0.14",
|
||||
"expo-navigation-bar": "~58.0.4",
|
||||
"expo-router": "~58.0.25",
|
||||
"expo-secure-store": "~58.0.2",
|
||||
"expo-sharing": "~58.0.20",
|
||||
"expo-splash-screen": "~58.0.11",
|
||||
"expo-status-bar": "~58.0.4",
|
||||
"expo-symbols": "~58.0.4",
|
||||
"expo-system-ui": "~58.0.6",
|
||||
"react": "19.3.0",
|
||||
"react-dom": "19.3.0",
|
||||
"react-native": "0.88.0",
|
||||
@@ -59,12 +57,5 @@
|
||||
"@types/react": "~19.3.0",
|
||||
"babel-preset-expo": "^58.0.18",
|
||||
"typescript": "~6.0.3"
|
||||
},
|
||||
"expo": {
|
||||
"autolinking": {
|
||||
"buildFromSource": [
|
||||
"expo-audio"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
const { withAndroidStyles } = require("expo/config-plugins")
|
||||
|
||||
// Native controls and system bars must never fall back to device theme colors.
|
||||
module.exports = (config) =>
|
||||
withAndroidStyles(config, (config) => {
|
||||
const theme = config.modResults.resources.style.find(
|
||||
(style) => style.$.name === "AppTheme"
|
||||
)
|
||||
const colors = {
|
||||
colorPrimary: "#FA2D48",
|
||||
colorPrimaryDark: "#000000",
|
||||
colorAccent: "#FA2D48",
|
||||
"android:windowBackground": "#000000",
|
||||
"android:statusBarColor": "#000000",
|
||||
"android:navigationBarColor": "#000000",
|
||||
"android:windowLightStatusBar": "false",
|
||||
"android:windowLightNavigationBar": "false",
|
||||
"android:enforceStatusBarContrast": "false",
|
||||
"android:enforceNavigationBarContrast": "false",
|
||||
}
|
||||
for (const [name, value] of Object.entries(colors)) {
|
||||
theme.item = theme.item.filter((item) => item.$.name !== name)
|
||||
theme.item.push({ $: { name }, _: value })
|
||||
}
|
||||
return config
|
||||
})
|
||||
@@ -1,7 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
|
||||
import Link from "next/link"
|
||||
import { Home, Search } from "lucide-react"
|
||||
|
||||
@@ -10,7 +8,6 @@ import { Button } from "@/components/ui/button"
|
||||
export default function Page() {
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader />
|
||||
<div className="flex flex-1 items-center justify-center px-6 pb-28">
|
||||
<div className="flex max-w-md flex-col items-center text-center">
|
||||
<p className="text-sm font-medium text-muted-foreground">404</p>
|
||||
|
||||
@@ -5,8 +5,6 @@ import { PlayerBar } from "@/components/player-bar"
|
||||
import { LazyQueuePanel } from "@/components/lazy-queue-panel"
|
||||
import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"
|
||||
import { AppSidebar } from "@/components/app-sidebar"
|
||||
import { ScrollRestoration } from "@/components/scroll-restoration"
|
||||
import { Suspense } from "react"
|
||||
|
||||
export default function AppLayout({
|
||||
children,
|
||||
@@ -20,11 +18,7 @@ export default function AppLayout({
|
||||
<FavoritesProvider>
|
||||
<AppSidebar />
|
||||
<div className="flex min-h-svh min-w-0 flex-1">
|
||||
<SidebarInset className="min-w-0 flex-1">
|
||||
<Suspense>
|
||||
<ScrollRestoration>{children}</ScrollRestoration>
|
||||
</Suspense>
|
||||
</SidebarInset>
|
||||
<SidebarInset className="min-w-0 flex-1">{children}</SidebarInset>
|
||||
<LazyQueuePanel />
|
||||
</div>
|
||||
<PlayerBar />
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
|
||||
import { Plus } from "lucide-react"
|
||||
|
||||
import { useAddToPlaylist } from "@/components/add-to-playlist-provider"
|
||||
@@ -18,10 +17,7 @@ export default function Page() {
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center justify-between gap-2 border-b px-4 py-3">
|
||||
<div className="flex min-w-0 items-center gap-2">
|
||||
<MobileSidebarTrigger />
|
||||
<h1 className="text-lg font-semibold">Playlists</h1>
|
||||
</div>
|
||||
<h1 className="text-lg font-semibold">Playlists</h1>
|
||||
<Button
|
||||
variant="secondary"
|
||||
size="sm"
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
import { useSearchParams } from "next/navigation"
|
||||
|
||||
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
|
||||
import { SearchResultsSkeleton } from "@/components/library-skeletons"
|
||||
import { SearchPrompt } from "@/components/search-prompt"
|
||||
import { Skeleton } from "@/components/ui/skeleton"
|
||||
@@ -12,8 +11,7 @@ export default function Loading() {
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center justify-center gap-2 border-b px-4 py-3">
|
||||
<MobileSidebarTrigger />
|
||||
<header className="flex items-center justify-center border-b px-4 py-3">
|
||||
<Skeleton className="h-10 w-full max-w-xl rounded-full" />
|
||||
</header>
|
||||
{hasQuery ? <SearchResultsSkeleton /> : <SearchPrompt />}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
|
||||
import { Suspense, useCallback, useEffect, useRef, useState } from "react"
|
||||
import { SearchIcon } from "lucide-react"
|
||||
import { usePathname, useSearchParams } from "next/navigation"
|
||||
@@ -213,8 +212,7 @@ function SearchPageContent() {
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center justify-center gap-2 border-b px-4 py-3">
|
||||
<MobileSidebarTrigger />
|
||||
<header className="flex items-center justify-center border-b px-4 py-3">
|
||||
<div className="relative w-full max-w-xl">
|
||||
<SearchIcon className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
|
||||
<input
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import { audioContentTypeForPath } from "@/lib/audio-content-type"
|
||||
import { seekableLosslessFile } from "@/lib/server-lossless"
|
||||
import { getConvexClient } from "@/lib/convex-server"
|
||||
import { ffmpegToReadableStream, streamFile } from "@/lib/server-audio-stream"
|
||||
import { NextRequest, NextResponse, userAgent } from "next/server"
|
||||
@@ -123,7 +122,11 @@ export async function GET(
|
||||
}))!
|
||||
|
||||
const quality = request.nextUrl.searchParams.get("quality") as
|
||||
"low" | "medium" | "high" | "lossless" | null
|
||||
| "low"
|
||||
| "medium"
|
||||
| "high"
|
||||
| "lossless"
|
||||
| null
|
||||
|
||||
const preferAtmos =
|
||||
request.nextUrl.searchParams.get("preferAtmos") === "true"
|
||||
@@ -154,11 +157,7 @@ export async function GET(
|
||||
const metadata = await music.parseFile(song.files[originalCodec])
|
||||
|
||||
if (!transcodeNeeded && originalCodec === "lossless") {
|
||||
// Native iOS playback does not identify itself as Safari.
|
||||
const acceptsAlac =
|
||||
browser.name === "Safari" ||
|
||||
request.nextUrl.searchParams.get("losslessFormat") === "alac"
|
||||
if (acceptsAlac && metadata.format.codec === "ALAC") {
|
||||
if (browser.name === "Safari" && metadata.format.codec === "ALAC") {
|
||||
try {
|
||||
return await streamFileResponse(
|
||||
request,
|
||||
@@ -170,9 +169,26 @@ export async function GET(
|
||||
}
|
||||
}
|
||||
|
||||
const ffmpegArgs = [
|
||||
"-nostdin",
|
||||
"-i",
|
||||
song.files[originalCodec],
|
||||
"-f",
|
||||
"flac",
|
||||
"pipe:1",
|
||||
]
|
||||
|
||||
try {
|
||||
const file = await seekableLosslessFile(song.files[originalCodec])
|
||||
return await streamFileResponse(request, file, "audio/flac")
|
||||
const ffmpegProcess = spawn("ffmpeg", ffmpegArgs)
|
||||
const stream = ffmpegToReadableStream(ffmpegProcess)
|
||||
|
||||
return new NextResponse(stream, {
|
||||
status: 200,
|
||||
headers: {
|
||||
"Content-Type": "audio/flac",
|
||||
"Cache-Control": "no-cache",
|
||||
},
|
||||
})
|
||||
} catch {
|
||||
return new Response("Server Error", { status: 500 })
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 35 KiB |
@@ -1,12 +1,10 @@
|
||||
"use client"
|
||||
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import Link from "next/link"
|
||||
import { Play, Share2, Shuffle, Star } from "lucide-react"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { MediaCollectionFooter } from "@/components/media-collection-footer"
|
||||
import { TrackNumberPlayButton } from "@/components/track-number-play-button"
|
||||
|
||||
@@ -22,8 +20,6 @@ import {
|
||||
} from "@/components/media-context-menu"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { ScrollArea } from "@/components/ui/scroll-area"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { useQueueMediaActions } from "@/hooks/use-queue-media-actions"
|
||||
import { useTrackSelection } from "@/hooks/use-track-selection"
|
||||
import { cn } from "@/lib/utils"
|
||||
@@ -276,20 +272,6 @@ export function AlbumView({
|
||||
[album.tracks]
|
||||
)
|
||||
|
||||
// Older servers do not include album format availability yet.
|
||||
const formatTracks = useCachedQuery(
|
||||
api.library.getSongsForPlayback,
|
||||
album.hasLossless === undefined || album.hasAtmos === undefined
|
||||
? { ids: albumSongIds }
|
||||
: "skip"
|
||||
)
|
||||
const hasLossless =
|
||||
album.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
|
||||
React.useEffect(() => {
|
||||
rememberSongs(albumDetailSongs(album))
|
||||
}, [album])
|
||||
@@ -389,8 +371,7 @@ export function AlbumView({
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader />
|
||||
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
|
||||
<ScrollArea className="min-h-0 flex-1">
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full min-w-0 max-w-9/10">
|
||||
<div className="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end">
|
||||
@@ -419,23 +400,9 @@ export function AlbumView({
|
||||
>
|
||||
{album.artist.name}
|
||||
</Link>
|
||||
<div className="flex flex-wrap items-center justify-center gap-2 text-sm text-muted-foreground sm:justify-start">
|
||||
{metadata ? <span>{metadata}</span> : null}
|
||||
{hasLossless ? (
|
||||
<>
|
||||
{metadata ? <span aria-hidden>·</span> : null}
|
||||
<AudioFormatBadge format="lossless" />
|
||||
</>
|
||||
) : null}
|
||||
{hasAtmos ? (
|
||||
<>
|
||||
{metadata || hasLossless ? (
|
||||
<span aria-hidden>·</span>
|
||||
) : null}
|
||||
<AudioFormatBadge format="atmos" />
|
||||
</>
|
||||
) : null}
|
||||
</div>
|
||||
{metadata ? (
|
||||
<p className="text-sm text-muted-foreground">{metadata}</p>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
<div className="flex flex-wrap items-center justify-center gap-2 sm:justify-start">
|
||||
@@ -547,8 +514,7 @@ export function AlbumView({
|
||||
onPlay={() =>
|
||||
void playFromSong(
|
||||
track.id as Id<"songs">,
|
||||
albumSongIds,
|
||||
`album:${album.id}`
|
||||
albumSongIds
|
||||
)
|
||||
}
|
||||
/>
|
||||
|
||||
@@ -35,7 +35,6 @@ import {
|
||||
SidebarMenu,
|
||||
SidebarMenuButton,
|
||||
SidebarMenuItem,
|
||||
useSidebar,
|
||||
} from "@/components/ui/sidebar"
|
||||
import { ThemeToggle } from "@/components/theme-toggle"
|
||||
import Image from "next/image"
|
||||
@@ -64,7 +63,6 @@ const library = [
|
||||
]
|
||||
|
||||
export function AppSidebar() {
|
||||
const { setOpenMobile } = useSidebar()
|
||||
const pathname = usePathname()
|
||||
const router = useRouter()
|
||||
const { signOut } = useAuthActions()
|
||||
@@ -122,7 +120,7 @@ export function AppSidebar() {
|
||||
{browse.map((item) => (
|
||||
<SidebarMenuItem key={item.title}>
|
||||
<SidebarMenuButton isActive={pathname === item.path} asChild>
|
||||
<Link href={item.path} onClick={() => setOpenMobile(false)}>
|
||||
<Link href={item.path}>
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</Link>
|
||||
@@ -146,7 +144,7 @@ export function AppSidebar() {
|
||||
}
|
||||
asChild
|
||||
>
|
||||
<Link href={item.path} onClick={() => setOpenMobile(false)}>
|
||||
<Link href={item.path}>
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</Link>
|
||||
@@ -164,7 +162,7 @@ export function AppSidebar() {
|
||||
{playlistNav.map((item) => (
|
||||
<SidebarMenuItem key={item.path}>
|
||||
<SidebarMenuButton isActive={pathname === item.path} asChild>
|
||||
<Link href={item.path} onClick={() => setOpenMobile(false)}>
|
||||
<Link href={item.path}>
|
||||
<item.icon />
|
||||
<span>{item.title}</span>
|
||||
</Link>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import { Play, Shuffle } from "lucide-react"
|
||||
@@ -65,7 +64,6 @@ export function ArtistView({
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader />
|
||||
<ScrollArea className="min-h-0 flex-1">
|
||||
<div className="pb-28">
|
||||
<div className="flex min-w-0 items-center gap-4 px-6 pt-6 pb-8 sm:gap-6">
|
||||
|
||||
@@ -1,99 +0,0 @@
|
||||
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
|
||||
|
||||
const MARK_HEIGHT = 11
|
||||
|
||||
function DolbyMark({ color }: { color: string }) {
|
||||
return (
|
||||
<svg
|
||||
width={(MARK_HEIGHT * 23) / 16}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="0 0 23 16"
|
||||
>
|
||||
<path d="M0 0H2.5A8 8 0 0 1 2.5 16H0Z" fill={color} />
|
||||
<path d="M23 0H20.5A8 8 0 0 0 20.5 16H23Z" fill={color} />
|
||||
</svg>
|
||||
)
|
||||
}
|
||||
|
||||
const LOSSLESS_PEAKS = [110, 215, 320]
|
||||
const LOSSLESS_THIN_WIDTH = 24
|
||||
const LOSSLESS_STROKES: [peak: number, d: string][] = [
|
||||
[110, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[215, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[320, "M-30 185C-22 173 -11 166 0 166"],
|
||||
[110, "M166 413C176 413 186 406 194 395"],
|
||||
[215, "M166 413C200 413 226 340 240 275"],
|
||||
[320, "M166 413C200 413 226 340 240 275"],
|
||||
]
|
||||
const LOSSLESS_FALL =
|
||||
"M0 178L4 179L8 181L12 184L16 189L20 196L23 204L27 213L30 223L34 233L39 243L43 254L48 266L53 278L58 289L62 301L66 313L71 325L75 336L79 347L83 357L86 364L89 370L93 377L97 382L101 387L105 392L109 397L113 401L117 405L121 408L126 412L130 415L134 417L139 419L143 421L148 423L152 424L157 424L161 425L166 425L166 401L163 401L161 400L159 400L157 399L154 397L152 396L151 394L149 392L147 389L145 386L143 383L142 380L140 376L138 371L137 367L135 362L134 357L132 351L130 345L127 339L124 330L120 319L116 308L111 297L107 285L102 272L98 260L93 248L88 235L82 223L76 212L69 201L61 192L53 183L45 175L37 168L28 163L19 158L10 155L0 154Z"
|
||||
const LOSSLESS_FALL_GAP =
|
||||
"M0 178L4 180L6 184L8 190L9 197L11 203L14 210L17 219L21 228L24 238L29 248L33 259L38 270L43 282L47 293L52 305L56 317L60 328L64 340L68 351L73 361L76 368L79 375L83 381L87 387L91 393L95 398L100 403L104 408L109 412L113 416L118 419L124 422L130 424L135 425L141 426L147 426L152 426L157 425L161 425L166 425L166 401L163 401L161 399L159 398L158 395L157 393L156 390L155 387L155 384L154 381L153 379L152 376L150 373L149 369L148 366L146 361L145 357L143 352L142 347L140 341L137 335L134 326L130 315L126 304L122 293L117 281L113 268L108 256L103 243L98 231L92 219L86 207L79 196L71 186L62 177L53 168L44 161L32 157L21 155L10 154L0 154Z"
|
||||
|
||||
/**
|
||||
* Three overlapping waves. Each thick downstroke is outlined in the
|
||||
* background color so it reads as passing over the strokes behind it.
|
||||
*/
|
||||
function LosslessMark({
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
return (
|
||||
<svg
|
||||
width={(MARK_HEIGHT * 544) / 271}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="28 154 544 271"
|
||||
>
|
||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||
<path
|
||||
key={index}
|
||||
d={d}
|
||||
transform={`translate(${peak})`}
|
||||
stroke={color}
|
||||
strokeWidth={LOSSLESS_THIN_WIDTH}
|
||||
strokeLinecap="round"
|
||||
fill="none"
|
||||
/>
|
||||
))}
|
||||
{LOSSLESS_PEAKS.map((peak) => (
|
||||
<g key={peak} transform={`translate(${peak})`}>
|
||||
<path d={LOSSLESS_FALL_GAP} fill={backgroundColor} />
|
||||
<path d={LOSSLESS_FALL} fill={color} />
|
||||
</g>
|
||||
))}
|
||||
</svg>
|
||||
)
|
||||
}
|
||||
|
||||
export function AudioFormatBadge({
|
||||
format,
|
||||
iconOnly = false,
|
||||
backgroundColor = "var(--background)",
|
||||
}: {
|
||||
format: PlaybackFormat
|
||||
iconOnly?: boolean
|
||||
backgroundColor?: string
|
||||
}) {
|
||||
const label = format === "atmos" ? "Dolby Atmos" : "Lossless"
|
||||
return (
|
||||
<span
|
||||
className="inline-flex shrink-0 items-center gap-[3px] text-[13px] font-medium"
|
||||
title={iconOnly ? label : undefined}
|
||||
>
|
||||
<span aria-hidden="true">
|
||||
{format === "atmos" ? (
|
||||
<DolbyMark color="currentColor" />
|
||||
) : (
|
||||
<LosslessMark
|
||||
color="currentColor"
|
||||
backgroundColor={backgroundColor}
|
||||
/>
|
||||
)}
|
||||
</span>
|
||||
<span className={iconOnly ? "sr-only" : undefined}>{label}</span>
|
||||
</span>
|
||||
)
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
|
||||
import { Skeleton } from "@/components/ui/skeleton"
|
||||
import { albumGridClassName } from "@/lib/album-grid-classes"
|
||||
import { TRACK_LIST_CONTAINER } from "@/lib/selection-range-styles"
|
||||
@@ -19,16 +18,10 @@ function LoadingRegion({
|
||||
)
|
||||
}
|
||||
|
||||
export function PageHeader({ title }: { title?: string }) {
|
||||
export function PageHeader({ title }: { title: string }) {
|
||||
return (
|
||||
<header
|
||||
className={cn(
|
||||
"flex shrink-0 items-center gap-2 border-b px-4 py-3",
|
||||
!title && "md:hidden"
|
||||
)}
|
||||
>
|
||||
<MobileSidebarTrigger />
|
||||
{title ? <h1 className="text-lg font-semibold">{title}</h1> : null}
|
||||
<header className="flex items-center gap-2 border-b px-4 py-3">
|
||||
<h1 className="text-lg font-semibold">{title}</h1>
|
||||
</header>
|
||||
)
|
||||
}
|
||||
@@ -140,7 +133,6 @@ export function SongListSkeleton() {
|
||||
export function CollectionDetailSkeleton() {
|
||||
return (
|
||||
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
|
||||
<PageHeader />
|
||||
<div className="mx-auto w-full max-w-9/10 min-w-0">
|
||||
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
|
||||
<Skeleton className="mx-auto aspect-square w-full max-w-60 shrink-0 rounded-lg sm:mx-0" />
|
||||
@@ -169,7 +161,6 @@ export function CollectionDetailSkeleton() {
|
||||
export function ArtistDetailSkeleton() {
|
||||
return (
|
||||
<LoadingRegion className="flex h-svh flex-col overflow-hidden pb-28">
|
||||
<PageHeader />
|
||||
<div className="flex min-w-0 items-center gap-4 px-6 pt-6 pb-8 sm:gap-6">
|
||||
<Skeleton className="size-32 shrink-0 rounded-full sm:size-40" />
|
||||
<div className="flex min-w-0 flex-1 flex-col gap-4">
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { Menu } from "lucide-react"
|
||||
|
||||
import { Button } from "@/components/ui/button"
|
||||
import { useSidebar } from "@/components/ui/sidebar"
|
||||
|
||||
export function MobileSidebarTrigger() {
|
||||
const { openMobile, setOpenMobile } = useSidebar()
|
||||
|
||||
return (
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="size-11 shrink-0 md:hidden"
|
||||
aria-label="Open sidebar"
|
||||
aria-expanded={openMobile}
|
||||
onClick={() => setOpenMobile(true)}
|
||||
>
|
||||
<Menu />
|
||||
</Button>
|
||||
)
|
||||
}
|
||||
@@ -1,9 +1,6 @@
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
|
||||
export function PageMessage({ children }: { children: React.ReactNode }) {
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader />
|
||||
<div className="flex flex-1 items-center justify-center pb-28">
|
||||
<p className="text-sm text-muted-foreground">{children}</p>
|
||||
</div>
|
||||
|
||||
@@ -19,11 +19,7 @@ import { toast } from "sonner"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
import {
|
||||
playbackFormat,
|
||||
type PlaybackFormat,
|
||||
playbackStreamPlan,
|
||||
} from "@otunes/convex/playback-stream"
|
||||
import { playbackStreamPlan } from "@otunes/convex/playback-stream"
|
||||
import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
useCacheScope,
|
||||
@@ -48,7 +44,6 @@ const PROGRESS_SAVE_INTERVAL_MS = 5000
|
||||
type PlaybackContextValue = {
|
||||
queueSongIds: Id<"songs">[]
|
||||
queueHistorySongIds: Id<"songs">[]
|
||||
currentFormat: PlaybackFormat | null
|
||||
currentSong: BrowseSong | null
|
||||
shuffleEnabled: boolean
|
||||
repeatEnabled: RepeatMode
|
||||
@@ -63,11 +58,7 @@ type PlaybackContextValue = {
|
||||
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromSong: (
|
||||
songId: Id<"songs">,
|
||||
songIds: Id<"songs">[],
|
||||
origin?: string
|
||||
) => Promise<void>
|
||||
playFromSong: (songId: Id<"songs">, songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromLibrarySong: (
|
||||
songId: Id<"songs">,
|
||||
sort: {
|
||||
@@ -1054,7 +1045,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
}
|
||||
}, [currentSongId, currentSong])
|
||||
|
||||
const queueOriginRef = useRef<string | undefined>(undefined)
|
||||
const playRequestRef = useRef(0)
|
||||
|
||||
const startPlayback = useCallback(
|
||||
@@ -1062,12 +1052,9 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
recipe: (
|
||||
state: playbackQueue.PlaybackQueueState
|
||||
) => playbackQueue.PlaybackQueueState,
|
||||
recorded: { playlistId?: Id<"playlists">; origin?: string } = {}
|
||||
recorded: { playlistId?: Id<"playlists"> } = {}
|
||||
) => {
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current =
|
||||
recorded.origin ??
|
||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||
const previousSongId = store.getState().queue[0]
|
||||
store.update(recipe)
|
||||
const firstSongId = store.getState().queue[0]
|
||||
@@ -1092,7 +1079,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
async (
|
||||
songIds: Id<"songs">[] | Promise<Id<"songs">[]>,
|
||||
shuffled: boolean,
|
||||
recorded: { playlistId?: Id<"playlists">; origin?: string } = {}
|
||||
recorded: { playlistId?: Id<"playlists"> } = {}
|
||||
) => {
|
||||
const request = ++playRequestRef.current
|
||||
let resolvedSongIds: Id<"songs">[]
|
||||
@@ -1157,19 +1144,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const playFromSong = useCallback(
|
||||
async (songId: Id<"songs">, songIds: Id<"songs">[], origin?: string) => {
|
||||
if (
|
||||
origin &&
|
||||
queueOriginRef.current === origin &&
|
||||
store.getState().queue[0] === songId
|
||||
)
|
||||
return
|
||||
startPlayback(
|
||||
(state) => playbackQueue.startQueueFromSong(state, songId, songIds),
|
||||
{ origin }
|
||||
async (songId: Id<"songs">, songIds: Id<"songs">[]) => {
|
||||
startPlayback((state) =>
|
||||
playbackQueue.startQueueFromSong(state, songId, songIds)
|
||||
)
|
||||
},
|
||||
[startPlayback, store]
|
||||
[startPlayback]
|
||||
)
|
||||
|
||||
const playFromLibrarySong = useCallback(
|
||||
@@ -1237,17 +1217,13 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
|
||||
const playAlbum = useCallback(
|
||||
(albumId: Id<"albums">, songIds?: Id<"songs">[]) =>
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), false, {
|
||||
origin: `album:${albumId}`,
|
||||
}),
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), false),
|
||||
[playCollection, loadAlbumSongIds]
|
||||
)
|
||||
|
||||
const playAlbumShuffled = useCallback(
|
||||
(albumId: Id<"albums">, songIds?: Id<"songs">[]) =>
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), true, {
|
||||
origin: `album:${albumId}`,
|
||||
}),
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), true),
|
||||
[playCollection, loadAlbumSongIds]
|
||||
)
|
||||
|
||||
@@ -1345,21 +1321,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
skipPrevious,
|
||||
})
|
||||
|
||||
const currentFormat =
|
||||
currentSongDoc && user
|
||||
? playbackFormat(
|
||||
currentSongDoc.files,
|
||||
user.playbackQuality,
|
||||
dolbyAtmosSupported === true && (user.preferAtmos ?? false)
|
||||
)
|
||||
: null
|
||||
|
||||
const value = useMemo<PlaybackContextValue>(
|
||||
() => ({
|
||||
queueSongIds: playback.queue,
|
||||
queueHistorySongIds: playback.history,
|
||||
currentSong,
|
||||
currentFormat,
|
||||
shuffleEnabled: playback.shuffleEnabled,
|
||||
repeatEnabled: playback.repeatEnabled,
|
||||
queueOpen,
|
||||
@@ -1393,7 +1359,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
[
|
||||
playback,
|
||||
currentSong,
|
||||
currentFormat,
|
||||
queueOpen,
|
||||
isPlaybackActive,
|
||||
volume,
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
import Link from "next/link"
|
||||
import {
|
||||
ListMusic,
|
||||
MessageSquareQuote,
|
||||
Music,
|
||||
Pause,
|
||||
Play,
|
||||
Repeat,
|
||||
@@ -16,12 +15,7 @@ import {
|
||||
Volume2,
|
||||
} from "lucide-react"
|
||||
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import {
|
||||
Popover,
|
||||
PopoverContent,
|
||||
PopoverTrigger,
|
||||
} from "@/components/ui/popover"
|
||||
import { PlaybackSongMeta } from "@/components/playback-song-meta"
|
||||
import {
|
||||
usePlayback,
|
||||
usePlaybackProgress,
|
||||
@@ -32,6 +26,8 @@ import { useSidebar } from "@/components/ui/sidebar"
|
||||
import { albumCoverUrl } from "@/lib/cover-urls"
|
||||
import { cn } from "@/lib/utils"
|
||||
|
||||
const PLACEHOLDER_TIME = "--:--"
|
||||
|
||||
function formatDuration(seconds: number): string {
|
||||
const total = Math.max(0, Math.floor(seconds))
|
||||
const minutes = Math.floor(total / 60)
|
||||
@@ -42,7 +38,6 @@ function formatDuration(seconds: number): string {
|
||||
export function PlayerBar() {
|
||||
const {
|
||||
currentSong,
|
||||
currentFormat,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
queueOpen,
|
||||
@@ -71,27 +66,23 @@ export function PlayerBar() {
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"@container pointer-events-none fixed bottom-4 z-50 flex justify-center px-4 transition-[left,right] duration-200 ease-linear",
|
||||
sidebarExpanded ? "right-0 left-[16rem]" : "inset-x-0",
|
||||
"pointer-events-none fixed bottom-4 z-50 flex justify-center px-4 transition-[left,right] duration-200 ease-linear",
|
||||
sidebarExpanded ? "left-[16rem] right-0" : "inset-x-0",
|
||||
queueOpen && !isMobile && "right-72"
|
||||
)}
|
||||
>
|
||||
<div className="pointer-events-auto flex w-full max-w-6xl items-center gap-2 rounded-full border border-foreground/20 bg-(--player-background) px-3 py-2 text-card-foreground shadow-lg [--player-background:var(--card)] @min-[640px]:gap-5 @min-[640px]:px-5 @min-[640px]:py-3 dark:border-white/20 dark:text-white dark:[--player-background:#303033]">
|
||||
<div className="flex shrink-0 items-center gap-0 @min-[640px]:gap-1 [&_button]:size-7 @min-[640px]:[&_button]:size-10 [&_svg]:size-4 @min-[640px]:[&_svg]:size-6">
|
||||
<div className="pointer-events-auto flex w-full max-w-3xl flex-col gap-2 rounded-xl border bg-card/80 px-3 py-2 shadow-lg backdrop-blur">
|
||||
<div className="grid grid-cols-[1fr_auto_1fr] items-center gap-2">
|
||||
<div className="flex items-center justify-start gap-1">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
aria-label="Shuffle"
|
||||
aria-pressed={shuffleEnabled}
|
||||
className={cn(
|
||||
"hidden @min-[640px]:inline-flex",
|
||||
shuffleEnabled
|
||||
? "text-card-foreground dark:text-white"
|
||||
: "text-muted-foreground dark:text-white/40"
|
||||
)}
|
||||
className={cn(shuffleEnabled && "text-primary")}
|
||||
onClick={() => void toggleShuffle()}
|
||||
>
|
||||
<Shuffle className="size-4 @min-[640px]:size-6" />
|
||||
<Shuffle />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -100,7 +91,7 @@ export function PlayerBar() {
|
||||
disabled={!hasQueue}
|
||||
onClick={() => void skipPrevious()}
|
||||
>
|
||||
<SkipBack className="size-4 fill-current @min-[640px]:size-6" />
|
||||
<SkipBack />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -109,11 +100,7 @@ export function PlayerBar() {
|
||||
disabled={!hasQueue}
|
||||
onClick={() => setIsPlaying(!isPlaying)}
|
||||
>
|
||||
{isPlaying ? (
|
||||
<Pause className="size-5! fill-current @min-[640px]:size-8!" />
|
||||
) : (
|
||||
<Play className="size-5! fill-current @min-[640px]:size-8!" />
|
||||
)}
|
||||
{isPlaying ? <Pause /> : <Play className="fill-current" />}
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -122,115 +109,52 @@ export function PlayerBar() {
|
||||
disabled={!hasQueue}
|
||||
onClick={() => void skipNext()}
|
||||
>
|
||||
<SkipForward className="size-4 fill-current @min-[640px]:size-6" />
|
||||
<SkipForward />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
aria-label="Repeat"
|
||||
aria-pressed={repeatEnabled !== "none"}
|
||||
className={cn(
|
||||
"hidden @min-[640px]:inline-flex",
|
||||
repeatEnabled !== "none"
|
||||
? "text-card-foreground dark:text-white"
|
||||
: "text-muted-foreground dark:text-white/40"
|
||||
)}
|
||||
className={cn(repeatEnabled !== "none" && "text-primary")}
|
||||
onClick={() => void cycleRepeat()}
|
||||
>
|
||||
{repeatEnabled === "once" ? (
|
||||
<Repeat1 className="size-4 @min-[640px]:size-6" />
|
||||
) : (
|
||||
<Repeat className="size-4 @min-[640px]:size-6" />
|
||||
)}
|
||||
{repeatEnabled === "once" ? <Repeat1 /> : <Repeat />}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<div className="relative flex h-11 min-w-0 flex-1 items-center gap-2 pb-2 @min-[640px]:h-16 @min-[640px]:gap-3">
|
||||
<div className="flex h-10 min-w-0 items-center justify-center gap-3 px-2">
|
||||
{currentSong ? (
|
||||
<>
|
||||
<div className="relative size-9 shrink-0 overflow-hidden rounded @min-[640px]:size-14">
|
||||
<div className="relative size-8 shrink-0 overflow-hidden rounded">
|
||||
<Image
|
||||
src={albumCoverUrl(currentSong.album.id)}
|
||||
alt={currentSong.album.title}
|
||||
fill
|
||||
sizes="56px"
|
||||
sizes="32px"
|
||||
className="object-cover"
|
||||
/>
|
||||
</div>
|
||||
<div className="min-w-0 flex-1">
|
||||
<Link
|
||||
href={`/album/${currentSong.album.id}`}
|
||||
className="block truncate text-sm font-semibold hover:underline @min-[640px]:text-xl"
|
||||
>
|
||||
{currentSong.title}
|
||||
</Link>
|
||||
<p className="truncate text-xs @min-[640px]:text-lg">
|
||||
<Link
|
||||
href={`/artist/${currentSong.artist.id}`}
|
||||
className="hover:underline"
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</Link>
|
||||
<span aria-hidden> · </span>
|
||||
<Link
|
||||
href={`/album/${currentSong.album.id}`}
|
||||
className="hover:underline"
|
||||
>
|
||||
{currentSong.album.title}
|
||||
</Link>
|
||||
</p>
|
||||
<div className="flex h-10 min-w-0 max-w-48 flex-col justify-center overflow-hidden sm:max-w-64">
|
||||
<PlaybackSongMeta song={currentSong} />
|
||||
</div>
|
||||
{currentFormat ? (
|
||||
<AudioFormatBadge
|
||||
format={currentFormat}
|
||||
iconOnly
|
||||
backgroundColor="var(--player-background)"
|
||||
/>
|
||||
) : null}
|
||||
</>
|
||||
) : (
|
||||
<Image
|
||||
src="/logo.png"
|
||||
alt="oTunes"
|
||||
width={24}
|
||||
height={24}
|
||||
className="mx-auto size-6 opacity-85"
|
||||
/>
|
||||
<div className="flex size-8 shrink-0 items-center justify-center">
|
||||
<Image
|
||||
src="/logo-monochrome.svg"
|
||||
alt="oTunes"
|
||||
width={14}
|
||||
height={24}
|
||||
className="h-6 w-auto opacity-85"
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
<div className="absolute inset-x-0 -bottom-1">
|
||||
<Slider
|
||||
className={cn(
|
||||
"h-3 flex-1 [&_[data-slot=slider-range]]:bg-current/80 [&_[data-slot=slider-thumb]]:size-2 [&_[data-slot=slider-thumb]]:border-current [&_[data-slot=slider-thumb]]:bg-current [&_[data-slot=slider-thumb]]:opacity-0 focus-within:[&_[data-slot=slider-thumb]]:opacity-100 hover:[&_[data-slot=slider-thumb]]:opacity-100 [&_[data-slot=slider-track]]:h-[3px] [&_[data-slot=slider-track]]:bg-current/30",
|
||||
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
|
||||
)}
|
||||
min={0}
|
||||
max={maxDuration}
|
||||
step={0.1}
|
||||
value={[displayTime]}
|
||||
disabled={!hasActiveSong}
|
||||
onValueChange={([value]) => {
|
||||
setIsSeeking(true)
|
||||
setSeekValue(value)
|
||||
}}
|
||||
onValueCommit={([value]) => {
|
||||
seekTo(value)
|
||||
setIsSeeking(false)
|
||||
}}
|
||||
aria-label="Seek"
|
||||
aria-valuetext={`${formatDuration(displayTime)} of ${formatDuration(duration)}`}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex shrink-0 items-center gap-0 @min-[640px]:gap-2 [&_button]:size-7 @min-[640px]:[&_button]:size-10 [&_svg]:size-4 @min-[640px]:[&_svg]:size-6">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="hidden @min-[640px]:inline-flex"
|
||||
aria-label="Lyrics"
|
||||
disabled
|
||||
>
|
||||
<MessageSquareQuote className="size-4 @min-[640px]:size-6" />
|
||||
<div className="flex items-center justify-end gap-1">
|
||||
<Button variant="ghost" size="icon" aria-label="Lyrics" disabled>
|
||||
<Music />
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
@@ -240,24 +164,63 @@ export function PlayerBar() {
|
||||
className={cn(queueOpen && "text-primary")}
|
||||
onClick={toggleQueueOpen}
|
||||
>
|
||||
<ListMusic className="size-4 @min-[640px]:size-6" />
|
||||
<ListMusic />
|
||||
</Button>
|
||||
<Popover>
|
||||
<PopoverTrigger asChild>
|
||||
<Button variant="ghost" size="icon" aria-label="Volume">
|
||||
<Volume2 className="size-4 @min-[640px]:size-6" />
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent side="top" align="end" className="w-40">
|
||||
<Slider
|
||||
min={0}
|
||||
max={100}
|
||||
value={[volume]}
|
||||
onValueChange={([value]) => setVolume(value)}
|
||||
aria-label="Volume"
|
||||
/>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
<div className="hidden items-center gap-2 sm:flex">
|
||||
<Volume2 className="size-4 shrink-0 text-muted-foreground" />
|
||||
<Slider
|
||||
className="w-20"
|
||||
min={0}
|
||||
max={100}
|
||||
value={[volume]}
|
||||
onValueChange={([value]) => setVolume(value)}
|
||||
aria-label="Volume"
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
aria-label="Volume"
|
||||
className="sm:hidden"
|
||||
>
|
||||
<Volume2 />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2 px-1">
|
||||
<span
|
||||
className="w-9 shrink-0 text-right text-xs tabular-nums text-muted-foreground"
|
||||
aria-hidden
|
||||
>
|
||||
{hasActiveSong ? formatDuration(displayTime) : PLACEHOLDER_TIME}
|
||||
</span>
|
||||
<Slider
|
||||
className={cn(
|
||||
"flex-1",
|
||||
!hasActiveSong && "[&_[data-slot=slider-thumb]]:hidden"
|
||||
)}
|
||||
min={0}
|
||||
max={maxDuration}
|
||||
step={0.1}
|
||||
value={[displayTime]}
|
||||
disabled={!hasActiveSong}
|
||||
onValueChange={([value]) => {
|
||||
setIsSeeking(true)
|
||||
setSeekValue(value)
|
||||
}}
|
||||
onValueCommit={([value]) => {
|
||||
seekTo(value)
|
||||
setIsSeeking(false)
|
||||
}}
|
||||
aria-label="Seek"
|
||||
/>
|
||||
<span
|
||||
className="w-9 shrink-0 text-xs tabular-nums text-muted-foreground"
|
||||
aria-hidden
|
||||
>
|
||||
{hasActiveSong ? formatDuration(duration) : PLACEHOLDER_TIME}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { PageHeader } from "@/components/library-skeletons"
|
||||
import { stationArtistId } from "@/lib/station-artist"
|
||||
import * as React from "react"
|
||||
import Image from "next/image"
|
||||
@@ -519,7 +518,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<PageHeader />
|
||||
<ScrollArea className="min-h-0 flex-1">
|
||||
<div className="pb-28">
|
||||
<div className="mx-auto w-full min-w-0 max-w-9/10">
|
||||
@@ -697,11 +695,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
|
||||
}}
|
||||
isNowPlaying={currentSong?.id === song.id}
|
||||
onPlay={() =>
|
||||
void playFromSong(
|
||||
song.id as Id<"songs">,
|
||||
playlistSongIds,
|
||||
`playlist:${playlist.id}`
|
||||
)
|
||||
void playFromSong(song.id as Id<"songs">, playlistSongIds)
|
||||
}
|
||||
/>
|
||||
))
|
||||
|
||||
@@ -1,107 +0,0 @@
|
||||
"use client"
|
||||
|
||||
import { useLayoutEffect, useRef } from "react"
|
||||
import { usePathname, useSearchParams } from "next/navigation"
|
||||
|
||||
const historyKey = "otunesScrollKey"
|
||||
const scrollSelector = '[data-slot="scroll-area-viewport"], .overflow-y-auto'
|
||||
type Position = { top: number; left: number }
|
||||
|
||||
// Track page containers independently of the window, including split library views.
|
||||
export function ScrollRestoration({ children }: { children: React.ReactNode }) {
|
||||
const pathname = usePathname()
|
||||
const searchParams = useSearchParams()
|
||||
const route = `${pathname}?${searchParams.toString()}`
|
||||
const rootRef = useRef<HTMLDivElement>(null)
|
||||
const positions = useRef(new Map<string, Map<number, Position>>())
|
||||
useLayoutEffect(() => {
|
||||
const root = rootRef.current
|
||||
if (!root) return
|
||||
|
||||
const key =
|
||||
typeof history.state?.[historyKey] === "string"
|
||||
? (history.state[historyKey] as string)
|
||||
: crypto.randomUUID()
|
||||
history.replaceState({ ...history.state, [historyKey]: key }, "")
|
||||
const saved = positions.current.get(key)
|
||||
const pending = new Map(saved)
|
||||
if (!positions.current.has(key)) positions.current.set(key, new Map())
|
||||
// Bound memory during long listening sessions.
|
||||
if (positions.current.size > 100) {
|
||||
const oldest = positions.current.keys().next().value
|
||||
if (oldest !== undefined) positions.current.delete(oldest)
|
||||
}
|
||||
|
||||
const containers = () =>
|
||||
Array.from(root.querySelectorAll<HTMLElement>(scrollSelector)).filter(
|
||||
(element) => element.getClientRects().length > 0
|
||||
)
|
||||
const restore = () => {
|
||||
for (const [index, element] of containers().entries()) {
|
||||
const position = pending.get(index)
|
||||
if (!position) continue
|
||||
element.scrollTo({
|
||||
top: position.top,
|
||||
left: position.left,
|
||||
behavior: "instant",
|
||||
})
|
||||
// Keep waiting if asynchronous content is still too short.
|
||||
if (
|
||||
Math.abs(element.scrollTop - position.top) < 1 &&
|
||||
Math.abs(element.scrollLeft - position.left) < 1
|
||||
) {
|
||||
pending.delete(index)
|
||||
}
|
||||
}
|
||||
}
|
||||
const record = (event: Event) => {
|
||||
if (!(event.target instanceof HTMLElement)) return
|
||||
const index = containers().indexOf(event.target)
|
||||
if (index < 0 || pending.has(index)) return
|
||||
positions.current.get(key)?.set(index, {
|
||||
top: event.target.scrollTop,
|
||||
left: event.target.scrollLeft,
|
||||
})
|
||||
}
|
||||
const stopRestoring = () => {
|
||||
pending.clear()
|
||||
observer.disconnect()
|
||||
resizeObserver.disconnect()
|
||||
}
|
||||
const observer = new MutationObserver(() => {
|
||||
restore()
|
||||
for (const element of containers()) {
|
||||
resizeObserver.observe(element)
|
||||
for (const child of element.children) resizeObserver.observe(child)
|
||||
}
|
||||
})
|
||||
const resizeObserver = new ResizeObserver(restore)
|
||||
if (pending.size) {
|
||||
observer.observe(root, { childList: true, subtree: true })
|
||||
for (const element of containers()) {
|
||||
resizeObserver.observe(element)
|
||||
for (const child of element.children) resizeObserver.observe(child)
|
||||
}
|
||||
restore()
|
||||
}
|
||||
const timeout = window.setTimeout(stopRestoring, 10_000)
|
||||
root.addEventListener("scroll", record, true)
|
||||
root.addEventListener("wheel", stopRestoring, { passive: true })
|
||||
root.addEventListener("touchstart", stopRestoring, { passive: true })
|
||||
root.addEventListener("keydown", stopRestoring)
|
||||
return () => {
|
||||
window.clearTimeout(timeout)
|
||||
stopRestoring()
|
||||
root.removeEventListener("scroll", record, true)
|
||||
root.removeEventListener("wheel", stopRestoring)
|
||||
root.removeEventListener("touchstart", stopRestoring)
|
||||
root.removeEventListener("keydown", stopRestoring)
|
||||
}
|
||||
}, [route])
|
||||
|
||||
return (
|
||||
<div ref={rootRef} className="contents">
|
||||
{children}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
"use client"
|
||||
|
||||
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
|
||||
import { stationArtistId } from "@/lib/station-artist"
|
||||
import { useEffect, useMemo, useState, useRef, MouseEvent } from "react"
|
||||
import Image from "next/image"
|
||||
@@ -363,10 +362,7 @@ export function SongsView() {
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center justify-between gap-2 border-b px-4 py-3">
|
||||
<div className="flex min-w-0 items-center gap-2">
|
||||
<MobileSidebarTrigger />
|
||||
<h1 className="text-lg font-semibold">Songs</h1>
|
||||
</div>
|
||||
<h1 className="text-lg font-semibold">Songs</h1>
|
||||
</header>
|
||||
<SongListSkeleton />
|
||||
</div>
|
||||
@@ -376,10 +372,7 @@ export function SongsView() {
|
||||
return (
|
||||
<div className="flex h-svh flex-col">
|
||||
<header className="flex items-center justify-between gap-2 border-b px-4 py-3">
|
||||
<div className="flex min-w-0 items-center gap-2">
|
||||
<MobileSidebarTrigger />
|
||||
<h1 className="text-lg font-semibold">Songs</h1>
|
||||
</div>
|
||||
<h1 className="text-lg font-semibold">Songs</h1>
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="ghost" size="icon-sm" aria-label="Sort songs">
|
||||
|
||||
@@ -49,8 +49,6 @@ function Slider({
|
||||
<SliderPrimitive.Thumb
|
||||
data-slot="slider-thumb"
|
||||
key={index}
|
||||
aria-label={props["aria-label"]}
|
||||
aria-valuetext={props["aria-valuetext"]}
|
||||
className="relative block size-3 shrink-0 rounded-full border border-ring bg-white ring-ring/50 transition-[color,box-shadow] select-none after:absolute after:-inset-2 hover:ring-3 focus-visible:ring-3 focus-visible:outline-hidden active:ring-3 disabled:pointer-events-none disabled:opacity-50"
|
||||
/>
|
||||
))}
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
import { spawn } from "node:child_process"
|
||||
import { createHash } from "node:crypto"
|
||||
import fs from "node:fs/promises"
|
||||
import os from "node:os"
|
||||
import path from "node:path"
|
||||
|
||||
const conversions = new Map<string, Promise<string>>()
|
||||
|
||||
// A completed FLAC file has a duration and supports byte ranges. Piped FLAC does not.
|
||||
export async function seekableLosslessFile(source: string): Promise<string> {
|
||||
if (path.extname(source).toLowerCase() === ".flac") return source
|
||||
|
||||
const stat = await fs.stat(source)
|
||||
const key = createHash("sha256")
|
||||
.update(`${source}:${stat.size}:${stat.mtimeMs}`)
|
||||
.digest("hex")
|
||||
const existing = conversions.get(key)
|
||||
if (existing) return existing
|
||||
|
||||
const conversion = convert(source, key)
|
||||
conversions.set(key, conversion)
|
||||
try {
|
||||
return await conversion
|
||||
} finally {
|
||||
conversions.delete(key)
|
||||
}
|
||||
}
|
||||
|
||||
async function convert(source: string, key: string): Promise<string> {
|
||||
const dir = path.join(os.tmpdir(), "otunes-lossless")
|
||||
await fs.mkdir(dir, { recursive: true })
|
||||
const cutoff = Date.now() - 30 * 60 * 1000
|
||||
await Promise.all(
|
||||
(await fs.readdir(dir))
|
||||
.filter((name) => name.endsWith(".flac"))
|
||||
.map(async (name) => {
|
||||
const file = path.join(dir, name)
|
||||
const stat = await fs.stat(file).catch(() => null)
|
||||
if (stat && stat.mtimeMs < cutoff) await fs.rm(file, { force: true })
|
||||
})
|
||||
)
|
||||
const output = path.join(dir, `${key}.flac`)
|
||||
try {
|
||||
await fs.access(output)
|
||||
return output
|
||||
} catch {
|
||||
// Publish only completed conversions so range requests always see a complete file.
|
||||
}
|
||||
const temporary = path.join(
|
||||
await fs.mkdtemp(path.join(dir, "convert-")),
|
||||
"audio.flac"
|
||||
)
|
||||
try {
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const child = spawn(
|
||||
"ffmpeg",
|
||||
[
|
||||
"-nostdin",
|
||||
"-v",
|
||||
"error",
|
||||
"-i",
|
||||
source,
|
||||
"-map",
|
||||
"0:a:0",
|
||||
"-c:a",
|
||||
"flac",
|
||||
temporary,
|
||||
],
|
||||
{ stdio: "ignore" }
|
||||
)
|
||||
child.on("error", reject)
|
||||
child.on("close", (code) => {
|
||||
if (code === 0) resolve()
|
||||
else reject(new Error(`Lossless conversion failed: ${code}`))
|
||||
})
|
||||
})
|
||||
await fs.rename(temporary, output)
|
||||
return output
|
||||
} finally {
|
||||
await fs.rm(path.dirname(temporary), { recursive: true, force: true })
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 45 KiB |