Compare commits

...
199 changed files with 8834 additions and 1594 deletions

No files matched your search

+3 -3
View File
@@ -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
+87
View File
@@ -0,0 +1,87 @@
# 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.
### Shared links and artwork
Shared URLs stay as ordinary HTTPS links. The web page's "Open App" action
opens `otunes://open?url=<encoded HTTPS URL>`, including the server address and
album, artist, or playlist destination. No domain association files, signing
settings, or per-server mobile builds are needed.
The app checks the link's server against its configured server before opening
media. Links for another server do not switch the current server. On a fresh
installation, the server address is prefilled in setup. The destination is kept
in memory through setup and sign-in, and is opened after authentication.
The browser may ask before opening the app. If the app is absent, the web page
remains available. Native changes still require a new mobile build.
Native sharing supplies media titles and artwork through iOS link metadata and Android's chooser
thumbnail, while sharing the original HTTPS URL. Receiving apps control whether
they display previews. If artwork cannot load, the URL is still shared. Existing
builds without the native sharing module fall back to URL-only sharing.
### iPad sidebar
Expo Router owns navigation through `NativeTabs sidebarAdaptable`.
`native/TabletSidebar.swift` adds UIKit Library and Playlists groups and the pinned
account footer, which the current Expo Router API does not expose. The bridge
reuses the router's tab instances so each destination retains its navigation stack.
The `react-native-screens` patch checks the selected leaf controller rather than
the group's root controller. It also notifies the sidebar bridge after each native
tab reconciliation, so startup updates cannot replace the Library and Playlists
sections with a flat tab list. Keep both behaviors when updating the dependency.
After changing native modules or dependency patches, run `pod install` in `ios`
and rebuild the development app.
### Mac Catalyst
On a Mac with Xcode and CocoaPods installed, generate the iOS project with
Catalyst enabled. Use a separate checkout for Catalyst builds, since prebuild
changes the generated iOS project and its dependency configuration.
```sh
MAC_CATALYST=1 APP_VARIANT=development pnpm exec expo prebuild --platform ios --clean
open ios/*.xcworkspace
```
In Xcode, select the app scheme and the **My Mac (Mac Catalyst)** destination,
select your signing team, then build and run. For a Release build, use Xcode's
Archive action with the Catalyst destination. EAS's existing iOS profiles still
build iPhone/iPad apps.
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
raises pod deployment targets to the app's, and disables precompiled React
Native and Expo modules so dependencies can compile for Catalyst. System volume
stays under macOS control.
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
same team. Handoff only pairs apps with a matching team and activity type, which
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
To return a checkout to ordinary iOS builds, rerun prebuild without
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
+64
View File
@@ -0,0 +1,64 @@
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)"
: ""
// Expo writes this filename into Xcode build settings without quoting it.
const composer = {
development: "oTunesDev",
preview: "oTunesPreview",
production: "oTunes",
}[variant]
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
return {
...config,
plugins: [
...(config.plugins ?? []),
...(process.env.MAC_CATALYST === "1"
? ["./plugins/with-mac-catalyst"]
: []),
],
name: `${config.name}${nameSuffix}`,
slug: config.slug!,
scheme: variant === "production" ? "otunes" : `otunes-${variant}`,
icon: `./assets/icon${iconSuffix}.png`,
ios: {
...config.ios,
bundleIdentifier,
icon: `./assets/${composer}.icon`,
infoPlist: {
...config.ios?.infoPlist,
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
NSUserActivityTypes: [`${bundleIdentifier}.media`],
},
},
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`,
},
},
}
}
+19 -22
View File
@@ -26,8 +26,11 @@
"adaptiveIcon": {
"monochromeImage": "./assets/android-icon-monochrome.png",
"foregroundImage": "./assets/android-icon-foreground.png",
"backgroundColor": "#C60322"
}
"backgroundImage": "./assets/android-icon-background.png"
},
"userInterfaceStyle": "dark",
"softwareKeyboardLayoutMode": "resize",
"icon": "./assets/android-icon.png"
},
"plugins": [
"expo-router",
@@ -44,34 +47,28 @@
[
"expo-splash-screen",
{
"ios": {
"backgroundColor": "#ffffff",
"image": "./assets/ios-icon.png",
"dark": {
"image": "./assets/ios-icon-dark.png",
"backgroundColor": "#000000"
},
"imageWidth": 200
},
"android": {
"backgroundColor": "#ffffff",
"image": "./assets/icon.png",
"dark": {
"image": "./assets/icon-dark.png",
"backgroundColor": "#000000"
},
"imageWidth": 200
}
"backgroundColor": "#000000"
}
],
"expo-image",
"expo-status-bar",
"expo-app-intents"
"expo-app-intents",
"./plugins/with-android-colors",
[
"expo-navigation-bar",
{
"enforceContrast": false,
"style": "light"
}
]
],
"experiments": {
"typedRoutes": true,
"inlineModules": {
"watchedDirectories": ["app-intents"]
"watchedDirectories": [
"app-intents",
"native"
]
}
},
"extra": {
@@ -0,0 +1,25 @@
import { Stack } from "expo-router"
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
export default function TabletSectionLayout({ segment }: { segment: string }) {
const section = tabletSections.find((item) => item.group === segment)
const options = useStackScreenOptions()
return (
<TabletSectionContext value={section}>
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...options,
title:
route.name === "index"
? section?.title
: tabStackScreenTitles[route.name],
})}
/>
</TabletSectionContext>
)
}
@@ -0,0 +1 @@
export { default } from "../../library/album/[id]"
@@ -0,0 +1 @@
export { default } from "../../library/artist/[id]"
@@ -0,0 +1 @@
export { default } from "../../library/browse/albums"
@@ -0,0 +1 @@
export { default } from "../../library/browse/artists"
@@ -0,0 +1 @@
export { default } from "../../library/browse/playlists"
@@ -0,0 +1 @@
export { default } from "../../library/browse/songs"
@@ -0,0 +1,23 @@
import { useContext } from "react"
import Albums from "../home/browse/albums"
import Artists from "../home/browse/artists"
import Songs from "../home/browse/songs"
import Playlists from "../home/browse/playlists"
import Favorites from "../home/playlist/favorites"
import RecentlyPlayed from "../home/recently-played"
import { TabletSectionContext } from "@/lib/tablet-navigation"
const screens = {
albums: Albums,
artists: Artists,
songs: Songs,
playlists: Playlists,
favorites: Favorites,
recent: RecentlyPlayed,
}
export default function TabletSectionScreen() {
const section = useContext(TabletSectionContext)
const Screen = screens[section?.name ?? "albums"]
return <Screen />
}
@@ -0,0 +1 @@
export { default } from "../../library/playlist/[id]"
@@ -0,0 +1 @@
export { default } from "../../library/playlist/favorites"
@@ -0,0 +1 @@
export { default } from "../library/queue"
@@ -0,0 +1 @@
export { default } from "../library/recently-added"
@@ -0,0 +1 @@
export { default } from "../library/recently-played"
@@ -0,0 +1 @@
export { default } from "../library/settings"
+179 -55
View File
@@ -1,35 +1,57 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { TabletMiniPlayer } from "@/components/tablet-mini-player"
import { TabletPlayerLayoutProvider } from "@/contexts/tablet-player-layout"
import Animated from "react-native-reanimated"
import { NavigationBar } from "expo-navigation-bar"
import {
ScreenPaletteProvider,
useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidNativeTabColors,
} from "@/contexts/android-tab-theme"
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
import { NativeTabs } from "expo-router/native-tabs"
import { DynamicColorIOS, Platform, useColorScheme } from "react-native"
import { DynamicColorIOS, Platform } from "react-native"
import { useMemo } from "react"
import { TabBottomAccessory } from "@/components/mini-player"
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
import { useAndroidKeyboardVisible } from "@/hooks/use-android-keyboard-visible"
import { usePlaybackQueue } from "@/contexts/playback"
import { appleMusic, colors } from "@/lib/theme"
import { appleMusic, colors, miniPlayerHeight, useIsDark } from "@/lib/theme"
export const unstable_settings = { anchor: "library" }
function useRouterTheme() {
const isDark = useColorScheme() === "dark"
const themeIsDark = useIsDark()
const androidPalette = useAndroidTabPalette()
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
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: palette.background,
card: palette.card,
text: palette.foreground,
border: palette.border,
primary: palette.primary,
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,
},
}
}, [isDark])
}, [isDark, androidPalette])
}
function useNativeTabColors() {
const isDark = useColorScheme() === "dark"
// These props initialize native tabs; the worklet owns subsequent colors.
const selectedColor = colors.dark.primary
const themeIsDark = useIsDark()
const androidPalette = colors.dark
const artworkPalette = useAndroidTabPalette()
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
const inactive = appleMusic.tabInactive
const iconColor =
@@ -39,24 +61,23 @@ function useNativeTabColors() {
selected: appleMusic.pink,
}
: {
default: isDark ? inactive : "#636366",
selected: appleMusic.pink,
default: androidPalette.mutedForeground,
selected: selectedColor,
}
const labelColor =
Platform.OS === "ios"
? DynamicColorIOS({ dark: inactive, light: "#636366" })
: isDark
? inactive
: "#636366"
: androidPalette.mutedForeground
return {
isDark,
tintColor: Platform.OS === "android" ? selectedColor : appleMusic.pink,
iconColor,
labelStyle: {
default: { color: labelColor, fontSize: 10 },
selected: {
color: appleMusic.pink,
color: Platform.OS === "android" ? selectedColor : appleMusic.pink,
fontSize: 10,
fontWeight: "600" as const,
},
@@ -64,58 +85,161 @@ function useNativeTabColors() {
blurEffect: isDark
? "systemChromeMaterialDark"
: "systemChromeMaterialLight",
backgroundColor:
Platform.OS === "ios"
? undefined
: isDark
? appleMusic.background
: colors.light.background,
// Reveal the shared UI-thread background beneath the native tab bar.
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
}
}
export default function TabsLayout() {
function TabsContent() {
const tabletLayout = useTabletLayout()
const homeColors = useAndroidNativeTabColors()
const libraryColors = useAndroidNativeTabColors()
const searchColors = useAndroidNativeTabColors()
const keyboardVisible = useAndroidKeyboardVisible()
const routerTheme = useRouterTheme()
const tabColors = useNativeTabColors()
const backgroundStyle = useAndroidTabBackgroundStyle()
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}>
<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>
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
{Platform.OS === "android" ? (
<NavigationBar style={tabColors.isDark ? "light" : "dark"} />
) : null}
<NativeTabs
sidebarAdaptable
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" && !tabletLayout && showBottomAccessory ? (
<NativeTabs.BottomAccessory>
<TabBottomAccessory />
</NativeTabs.BottomAccessory>
) : null}
<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="home"
unstable_nativeProps={
Platform.OS === "android" ? homeColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
<NativeTabs.Trigger.Icon sf="house.fill" md="home" />
<NativeTabs.Trigger.Label>Home</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="library"
unstable_nativeProps={
Platform.OS === "android" ? libraryColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
<NativeTabs.Trigger.Icon
sf="music.note.square.stack.fill"
md="library_music"
/>
<NativeTabs.Trigger.Label>
{tabletLayout ? "Recently Added" : "Library"}
</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="search" disableTransparentOnScrollEdge>
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
</NativeTabs>
<NativeTabs.Trigger
name="search"
unstable_nativeProps={
Platform.OS === "android" ? searchColors : undefined
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(albums)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
disableTransparentOnScrollEdge
>
<NativeTabs.Trigger.Icon sf="square.stack" />
<NativeTabs.Trigger.Label>Albums</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(artists)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
disableTransparentOnScrollEdge
>
<NativeTabs.Trigger.Icon sf="mic" />
<NativeTabs.Trigger.Label>Artists</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(songs)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
disableTransparentOnScrollEdge
>
<NativeTabs.Trigger.Icon sf="music.note" />
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(playlists)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
disableTransparentOnScrollEdge
>
<NativeTabs.Trigger.Icon sf="music.note.list" />
<NativeTabs.Trigger.Label>All Playlists</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(favorites)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
disableTransparentOnScrollEdge
>
<NativeTabs.Trigger.Icon sf="star" />
<NativeTabs.Trigger.Label>Favorites</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger
name="(recent)"
hidden={!(Platform.OS === "ios" && Platform.isPad)}
disableTransparentOnScrollEdge
>
<NativeTabs.Trigger.Icon sf="clock" />
<NativeTabs.Trigger.Label>Recently Played</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
</NativeTabs>
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
{tabletLayout ? <TabletMiniPlayer /> : null}
</Animated.View>
</ThemeProvider>
)
}
export default function TabsLayout() {
return (
<ScreenPaletteProvider>
<TabletPlayerLayoutProvider>
<TabsContent />
</TabletPlayerLayoutProvider>
</ScreenPaletteProvider>
)
}
@@ -1,3 +1,4 @@
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -12,6 +13,7 @@ export default function HomeLayout() {
return (
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Home",
+277 -86
View File
@@ -1,15 +1,34 @@
import { SongSwipeRow } from "@/components/song-swipe-row"
import {
useSwipeRowGroup,
type SwipeRowGroup,
} from "@/components/ios-swipe-to-remove-row"
import {
CollectionHero,
useCollectionHeroLayout,
} from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated"
import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { StatusBar } from "expo-status-bar"
import { memo, useCallback, useEffect, useMemo } from "react"
import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
import { Ionicons } from "@expo/vector-icons"
import { Platform, Pressable, StyleSheet, View } from "react-native"
import {
CollectionDivider,
collectionInset,
DiscHeader,
} from "@/components/collection-list"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { CoverImage } from "@/components/cover-image"
import {
@@ -54,18 +73,36 @@ export default function AlbumScreen() {
handleAlbumTrackAction,
isAlbumFavorite: isAlbumFav,
} = useMediaMenuActions()
const swipeGroup = useSwipeRowGroup()
const isFocused = useIsFocused()
const coverUri =
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
const { palette, settled } = useCoverPalette(
const heroLayout = useCollectionHeroLayout()
const { palette: artworkPalette, settled } = useCoverPalette(
coverUri,
album ? album.cover != null : album === null ? false : undefined
)
const { palette, onLayout, backgroundStyle } =
useScreenPalette(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))
@@ -81,13 +118,16 @@ export default function AlbumScreen() {
}
return album ? (
<AlbumTrackRow
swipeGroup={swipeGroup}
track={item.track}
number={item.number}
album={album}
songIds={songIds}
palette={palette}
favorited={isSongFavorite(item.track.id)}
onPlay={playFromSong}
onPlay={(songId, ids) =>
playFromSong(songId, ids, `album:${album.id}`)
}
onAction={handleAlbumTrackAction}
/>
) : null
@@ -99,6 +139,7 @@ export default function AlbumScreen() {
palette,
playFromSong,
songIds,
swipeGroup,
]
)
@@ -109,9 +150,25 @@ export default function AlbumScreen() {
options={{
title: "",
headerLargeTitle: false,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerTintColor: palette.foreground,
}
: {}),
}}
/>
<CollectionDetailSkeleton />
<CollectionDetailSkeleton
zoomCoverSize={220}
onLayout={onLayout}
style={backgroundStyle}
backgroundColor={
Platform.OS === "android" ? palette.background : undefined
}
/>
</>
)
}
@@ -126,9 +183,9 @@ export default function AlbumScreen() {
}}
/>
<View style={[styles.empty, { backgroundColor: colors.background }]}>
<Text style={{ color: colors.mutedForeground }}>
<PaletteText style={{ color: colors.mutedForeground }}>
Album not found.
</Text>
</PaletteText>
</View>
</>
)
@@ -147,104 +204,214 @@ export default function AlbumScreen() {
title: "",
headerLargeTitle: false,
headerTintColor: palette.foreground,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark
? ("light" as const)
: ("dark" as const),
}
: {}),
headerRight: () => (
<MediaActionMenu
stationArtistId={album.artist.id}
selectedCount={album.tracks.length}
favorited={isAlbumFav(album.id)}
share={{ type: "album", albumId: album.id }}
share={{ type: "album", albumId: album.id, title: album.title }}
onAction={(action) =>
void handleAlbumDetailAction(
album.id as Id<"albums">,
songIds,
action
action,
album.artist.id as Id<"artists">
)
}
>
<Pressable hitSlop={8}>
<Ionicons
<PaletteIcon
tone="foreground"
name="ellipsis-horizontal"
size={22}
color={palette.foreground}
color={palette.isDark ? "#fff" : "#000"}
/>
</Pressable>
</MediaActionMenu>
),
}}
/>
<FlatList
<Animated.FlatList
onScrollBeginDrag={swipeGroup.closeOpenRow}
onLayout={onLayout}
{...longListProps}
data={listItems}
keyExtractor={albumListItemKey}
style={{ flex: 1, backgroundColor: palette.background }}
style={[
{ flex: 1, backgroundColor: palette.background },
backgroundStyle,
]}
contentContainerStyle={{ paddingBottom: contentBottomInset }}
contentInsetAdjustmentBehavior="automatic"
indicatorStyle={palette.isDark ? "white" : "black"}
ListHeaderComponent={
<View>
<MusicEntityView kind="album" id={album.id} style={styles.hero}>
<CoverImage
uri={coverUri}
hasCover={album.cover != null}
style={styles.cover}
/>
<Text style={[styles.title, { color: palette.foreground }]}>
{album.title}
</Text>
<Pressable
onPress={() => push(`/artist/${album.artist.id}`)}
style={styles.artistPressable}
<MusicEntityView kind="album" id={album.id}>
<CollectionHero
artwork={
<Link.AppleZoomTarget>
<View collapsable={false}>
<CoverImage
uri={coverUri}
hasCover={album.cover != null}
style={[
styles.cover,
heroLayout.coverSize
? {
width: heroLayout.coverSize,
height: heroLayout.coverSize,
}
: undefined,
]}
/>
</View>
</Link.AppleZoomTarget>
}
actions={
<View
style={[
styles.actions,
heroLayout.landscape && { flexDirection: "row-reverse" },
]}
>
<Pressable
onPress={() => void toggleAlbumFavorite(album.id)}
hitSlop={8}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
]}
>
<PaletteIcon
tone={favorited ? "accent" : "foreground"}
name={favorited ? "star" : "star-outline"}
size={24}
color={favorited ? palette.accent : palette.foreground}
/>
</Pressable>
<Button
title="Play"
icon="play"
onPress={() => void playAlbum(album.id, songIds)}
style={styles.playButton}
tint={{
background: palette.accent,
foreground: palette.accentForeground,
}}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playAlbumShuffled(album.id, songIds)}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
]}
>
<PaletteIcon
tone="foreground"
name="shuffle"
size={24}
color={palette.foreground}
/>
</Pressable>
</View>
}
>
<Text style={[styles.artist, { color: palette.accentText }]}>
{album.artist.name}
</Text>
</Pressable>
{metadata ? (
<Text style={{ color: palette.secondaryForeground }}>
{metadata}
</Text>
) : null}
<View style={styles.actions}>
<Pressable
onPress={() => void toggleAlbumFavorite(album.id)}
hitSlop={8}
<PaletteText
tone="foreground"
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
styles.title,
heroLayout.landscape && styles.titleLandscape,
{ color: palette.foreground },
]}
>
<Ionicons
name={favorited ? "star" : "star-outline"}
size={24}
color={favorited ? palette.accent : palette.foreground}
/>
{album.title}
</PaletteText>
<Pressable
onPress={() => push(`/artist/${album.artist.id}`)}
style={styles.artistPressable}
>
<PaletteText
tone="accentText"
style={[
styles.artist,
heroLayout.landscape && styles.artistLandscape,
{ color: palette.accentText },
]}
>
{album.artist.name}
</PaletteText>
</Pressable>
<Button
title="Play"
icon="play"
onPress={() => void playAlbum(album.id, songIds)}
style={styles.playButton}
tint={{
background: palette.accent,
foreground: palette.accentForeground,
<View
style={{
flexDirection: "row",
alignItems: "center",
justifyContent: heroLayout.landscape
? "flex-start"
: "center",
flexWrap: "wrap",
gap: 8,
}}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playAlbumShuffled(album.id, songIds)}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
]}
>
<Ionicons
name="shuffle"
size={24}
color={palette.foreground}
/>
</Pressable>
</View>
{metadata ? (
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
{metadata}
</PaletteText>
) : null}
{hasLossless ? (
<>
{metadata ? (
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
·
</PaletteText>
) : null}
<AudioFormatBadge
artwork
format="lossless"
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</>
) : null}
{hasAtmos ? (
<>
{metadata || hasLossless ? (
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
·
</PaletteText>
) : null}
<AudioFormatBadge
artwork
format="atmos"
color={palette.secondaryForeground}
backgroundColor={palette.background}
/>
</>
) : null}
</View>
</CollectionHero>
</MusicEntityView>
<CollectionDivider color={palette.divider} />
</View>
@@ -298,6 +465,7 @@ function albumListItemKey(item: AlbumListItem) {
const AlbumTrackRow = memo(function AlbumTrackRow({
track,
swipeGroup,
number,
album,
songIds,
@@ -307,6 +475,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
onAction,
}: {
track: BrowseAlbumTrack
swipeGroup: SwipeRowGroup
number: number
album: BrowseAlbumDetail
songIds: Id<"songs">[]
@@ -319,8 +488,23 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
action: MediaAction
) => Promise<void>
}) {
const Row = Platform.OS === "ios" ? SongSwipeRow : Pressable
const { config } = useServerConfig()
return (
<MediaContextMenu
preview={
config
? {
kind: "song",
title: track.title,
artist: album.artist.name,
album: album.title,
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
hasArtwork: album.cover != null,
}
: undefined
}
stationArtistId={album.artist.id}
favorited={favorited}
navigation={{
artist: { id: album.artist.id },
@@ -330,19 +514,24 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
type: "song",
albumId: album.id,
songId: track.id,
title: `${track.title} - ${album.title}`,
}}
onAction={(action) => void onAction(track, album, action)}
>
<MusicEntityView kind="song" id={track.id}>
<Pressable
<Row
group={swipeGroup}
backgroundColor={palette.background}
onPlayNext={() => void onAction(track, album, "play-next")}
style={styles.trackRow}
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
>
<Text
<PaletteText
tone="secondaryForeground"
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
>
{number}
</Text>
</PaletteText>
<View
style={[
styles.trackContent,
@@ -350,26 +539,31 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
]}
>
<View style={styles.trackMeta}>
<Text
<PaletteText
tone="foreground"
style={[styles.trackTitle, { color: palette.foreground }]}
numberOfLines={1}
>
{track.title}
</Text>
</PaletteText>
{track.artists ? (
<Text
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
numberOfLines={1}
>
{track.artists.join(", ")}
</Text>
</PaletteText>
) : null}
</View>
<Text style={{ color: palette.secondaryForeground }}>
<PaletteText
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
{formatDuration(track.durationSeconds)}
</Text>
</PaletteText>
</View>
</Pressable>
</Row>
</MusicEntityView>
</MediaContextMenu>
)
@@ -377,17 +571,14 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
const styles = StyleSheet.create({
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
hero: {
alignItems: "center",
padding: spacing.lg,
gap: spacing.sm,
},
cover: {
width: 220,
height: 220,
borderRadius: radius.lg,
},
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
titleLandscape: { textAlign: "left", fontSize: 22 },
artistLandscape: { textAlign: "left", fontSize: 22, fontWeight: "400" },
artistPressable: { alignSelf: "stretch" },
artist: { fontSize: 16, fontWeight: "600", textAlign: "center" },
actions: {
@@ -75,7 +75,11 @@ export default function ArtistScreen() {
<MediaActionMenu
selectedCount={data.albums.length}
favorited={isArtistFav(data.artist.id)}
share={{ type: "artist", artistId: data.artist.id }}
share={{
type: "artist",
artistId: data.artist.id,
title: data.artist.name,
}}
onAction={(action) =>
void handleArtistAction(data.artist, action)
}
@@ -141,8 +141,14 @@ const ArtistRow = memo(function ArtistRow({
return (
<MediaContextMenu
preview={{
kind: "artist",
title: artist.name,
artworkUrl: artistCoverUrl(serverUrl, artist.id),
hasArtwork: artist.photo != null,
}}
favorited={favorited}
share={{ type: "artist", artistId: artist.id }}
share={{ type: "artist", artistId: artist.id, title: artist.name }}
onAction={(action) => void onAction(artist, action)}
>
<Pressable
@@ -160,7 +166,11 @@ const ArtistRow = memo(function ArtistRow({
>
{artist.name}
</Text>
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
<Ionicons
name="chevron-forward"
size={16}
color={colors.mutedForeground}
/>
</Pressable>
</MediaContextMenu>
)
@@ -1,7 +1,26 @@
import {
CollectionHero,
useCollectionHeroLayout,
} from "@/components/collection-hero"
import {
PaletteText,
PaletteIcon,
renderArtworkBackButton,
} from "@/components/palette-text"
import Animated from "react-native-reanimated"
import {
PlaylistSearchBar,
usePlaylistSearch,
} from "@/components/playlist-search-bar"
import {
renderAndroidArtworkBackground,
useScreenPalette,
} from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { useMutation } from "convex/react"
import { memo, useCallback, useEffect, useMemo } from "react"
import {
Link,
Stack,
useIsFocused,
useLocalSearchParams,
@@ -9,21 +28,17 @@ import {
} from "expo-router"
import { StatusBar } from "expo-status-bar"
import {
FlatList,
Platform,
Pressable,
StyleSheet,
Text,
View,
type ListRenderItemInfo,
} from "react-native"
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
import { Ionicons } from "@expo/vector-icons"
import { CollectionDivider } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image"
import {
SwipeToRemoveRow,
useSwipeRowGroup,
type SwipeRowGroup,
} from "@/components/ios-swipe-to-remove-row"
@@ -38,10 +53,7 @@ import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useCoverPalette } from "@/hooks/use-cover-palette"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { api } from "@otunes/convex/_generated/api"
@@ -54,7 +66,6 @@ import { showError } from "@/lib/toast"
import { playlistCoverUrl } from "@/lib/urls"
import { radius, spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 50
const PLAYLIST_LABEL = "Add to Another Playlist"
const OWNER_MENU_ACTIONS: MediaAction[] = [
"share",
@@ -73,55 +84,50 @@ export default function PlaylistScreen() {
const playlistId = typeof id === "string" ? (id as Id<"playlists">) : null
const playlist = useCachedQuery(
api.playlists.browsePlaylistDetail,
playlistId
? {
id: playlistId,
includeSongs: false,
}
: "skip"
)
const {
results: songs,
status,
loadMore,
isCached,
} = useCachedPaginatedQuery(
api.playlists.browsePlaylistSongsPaginated,
playlistId ? { id: playlistId } : "skip",
{ initialNumItems: PAGE_SIZE }
)
const allSongIds = useCachedQuery(
api.playlists.getPlaylistSongIds,
playlistId ? { playlistId } : "skip"
playlistId ? { id: playlistId } : "skip"
)
const songs = playlist?.songs
const coverUri =
config && playlistId
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
: ""
const { palette, settled } = useCoverPalette(
const { palette: artworkPalette, settled } = useCoverPalette(
coverUri,
playlist ? playlist.cover != null : playlist === null ? false : undefined
)
const { palette, onLayout, backgroundStyle } =
useScreenPalette(artworkPalette)
useEffect(() => {
rememberSongs(songs)
if (songs) rememberSongs(songs)
}, [songs])
if (
playlist === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config ||
!settled
) {
if (playlist === undefined || !config || !settled) {
return (
<>
<Stack.Screen
options={{
title: "",
headerLargeTitle: false,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
headerTintColor: palette.foreground,
}
: {}),
}}
/>
<CollectionDetailSkeleton />
<CollectionDetailSkeleton
zoomCoverSize={200}
onLayout={onLayout}
style={backgroundStyle}
backgroundColor={
Platform.OS === "android" ? palette.background : undefined
}
/>
</>
)
}
@@ -136,9 +142,9 @@ export default function PlaylistScreen() {
}}
/>
<View style={[styles.empty, { backgroundColor: colors.background }]}>
<Text style={{ color: colors.mutedForeground }}>
<PaletteText style={{ color: colors.mutedForeground }}>
Playlist not found.
</Text>
</PaletteText>
</View>
</>
)
@@ -146,32 +152,30 @@ export default function PlaylistScreen() {
return (
<PlaylistContent
backgroundStyle={backgroundStyle}
onLayout={onLayout}
playlist={playlist}
songs={songs}
allSongIds={allSongIds}
songs={playlist.songs}
coverUri={coverUri}
palette={palette}
onEndReached={() => {
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
}}
/>
)
}
function PlaylistContent({
backgroundStyle,
onLayout,
playlist,
songs,
allSongIds,
coverUri,
palette,
onEndReached,
}: {
onLayout?: () => void
backgroundStyle: ReturnType<typeof useScreenPalette>["backgroundStyle"]
playlist: BrowsePlaylistDetail
songs: BrowseSong[]
allSongIds: Id<"songs">[] | undefined
coverUri: string
palette: CoverPalette
onEndReached: () => void
}) {
const router = useRouter()
const isFocused = useIsFocused()
@@ -187,13 +191,15 @@ function PlaylistContent({
const playlistId = playlist.id
const isSubscribed = playlist.isSubscribed
const canEdit = playlist.isOwner && playlistId !== null
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const songIds = allSongIds ?? loadedSongIds
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs)
const swipeGroup = useSwipeRowGroup()
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds),
[playFromSong, songIds]
(song: BrowseSong) =>
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
[playFromSong, songIds, playlistId]
)
const handleSongMenuAction = useCallback(
@@ -221,12 +227,12 @@ function PlaylistContent({
)
const handlePlay = useCallback(() => {
if (playlistId) void playPlaylist(playlistId, allSongIds)
}, [allSongIds, playPlaylist, playlistId])
if (playlistId) void playPlaylist(playlistId, songIds)
}, [playPlaylist, playlistId, songIds])
const handleShuffle = useCallback(() => {
if (playlistId) void playPlaylistShuffled(playlistId, allSongIds)
}, [allSongIds, playPlaylistShuffled, playlistId])
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
}, [playPlaylistShuffled, playlistId, songIds])
const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return
@@ -269,6 +275,17 @@ function PlaylistContent({
title: "",
headerLargeTitle: false,
headerTintColor: palette.foreground,
...(Platform.OS === "android"
? {
headerStyle: { backgroundColor: "transparent" },
headerBackground: renderAndroidArtworkBackground,
headerBackVisible: false,
headerLeft: renderArtworkBackButton,
statusBarStyle: palette.isDark
? ("light" as const)
: ("dark" as const),
}
: {}),
headerRight: () => (
<MediaActionMenu
selectedCount={songIds.length}
@@ -276,15 +293,17 @@ function PlaylistContent({
share={{
type: "playlist",
playlistId: playlistId ?? "favorites",
title: playlist?.title ?? "oTunes",
}}
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
onAction={handlePlaylistMenuAction}
>
<Pressable hitSlop={8}>
<Ionicons
<PaletteIcon
tone="foreground"
name="ellipsis-horizontal"
size={22}
color={palette.foreground}
color={palette.isDark ? "#fff" : "#000"}
/>
</Pressable>
</MediaActionMenu>
@@ -295,7 +314,10 @@ function PlaylistContent({
deletePlaylist,
handlePlaylistDetailAction,
palette.foreground,
palette.background,
palette.isDark,
playlistId,
playlist?.title,
router,
songIds,
])
@@ -330,18 +352,35 @@ function PlaylistContent({
<StatusBar style={palette.isDark ? "light" : "dark"} />
) : null}
<Stack.Screen options={screenOptions} />
<FlatList
<PlaylistSearchBar
onQueryChange={onQueryChange}
onSearchSubmit={onSearchSubmit}
/>
<Animated.FlatList
onLayout={onLayout}
{...longListProps}
data={songs}
data={filteredSongs}
keyExtractor={songKey}
renderItem={renderItem}
style={{ flex: 1, backgroundColor: palette.background }}
style={[
{ flex: 1, backgroundColor: palette.background },
backgroundStyle,
]}
indicatorStyle={palette.isDark ? "white" : "black"}
contentContainerStyle={styles.listContent}
contentInsetAdjustmentBehavior="automatic"
onEndReached={onEndReached}
onEndReachedThreshold={0.5}
onScrollBeginDrag={swipeGroup.closeOpenRow}
ListEmptyComponent={
<PaletteText
tone="secondaryForeground"
style={[
styles.emptyResults,
{ color: palette.secondaryForeground },
]}
>
{songs.length ? "No songs found." : "No songs in this playlist."}
</PaletteText>
}
ListHeaderComponent={
<PlaylistHero
entityId={playlistId ?? "otunes:favorites"}
@@ -394,28 +433,24 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
playlistLabel={PLAYLIST_LABEL}
palette={palette}
inset
swipe={
Platform.OS === "ios"
? {
group: swipeGroup,
backgroundColor: palette.background,
onPlayNext: () => onAction(song, "play-next"),
}
: undefined
}
onPlay={onPlay}
onAction={onAction}
/>
)
if (!removable) {
if (Platform.OS === "ios" || !removable) {
return row
}
if (Platform.OS === "ios") {
return (
<SwipeToRemoveRow
group={swipeGroup}
backgroundColor={palette.background}
actionAccessibilityLabel={`Remove ${song.title} from playlist`}
onRemove={handleRemove}
>
{row}
</SwipeToRemoveRow>
)
}
return (
<ReanimatedSwipeable
friction={2}
@@ -434,15 +469,19 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
}}
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
>
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
<Text
<PaletteIcon
name="trash"
size={22}
color={colors.primaryForeground}
/>
<PaletteText
style={[
styles.removeActionText,
{ color: colors.primaryForeground },
]}
>
Remove
</Text>
</PaletteText>
</Pressable>
)}
>
@@ -476,76 +515,125 @@ const PlaylistHero = memo(function PlaylistHero({
onPlay: () => void
onShuffle: () => void
}) {
const heroLayout = useCollectionHeroLayout()
return (
<MusicEntityView kind="playlist" id={entityId}>
<View style={styles.hero}>
<CoverImage uri={coverUri} hasCover={hasCover} style={styles.cover} />
<Text style={[styles.title, { color: palette.foreground }]}>
{title}
</Text>
<Text style={{ color: palette.secondaryForeground }}>{ownerName}</Text>
<View style={styles.actions}>
{showSubscribe ? (
<CollectionHero
artwork={
<Link.AppleZoomTarget>
<View collapsable={false}>
<CoverImage
uri={coverUri}
hasCover={hasCover}
style={[
styles.cover,
heroLayout.coverSize
? {
width: heroLayout.coverSize,
height: heroLayout.coverSize,
}
: undefined,
]}
/>
</View>
</Link.AppleZoomTarget>
}
actions={
<View
style={[
styles.actions,
heroLayout.landscape && { flexDirection: "row-reverse" },
]}
>
{showSubscribe ? (
<Pressable
accessibilityRole="button"
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
accessibilityState={{ selected: isSubscribed }}
hitSlop={8}
onPress={onSubscribeToggle}
style={[
styles.iconAction,
{
backgroundColor: isSubscribed
? palette.surface
: palette.accent,
},
]}
>
<PaletteIcon
tone={isSubscribed ? "foreground" : "accentForeground"}
name={isSubscribed ? "checkmark" : "add"}
size={24}
color={
isSubscribed ? palette.foreground : palette.accentForeground
}
/>
</Pressable>
) : null}
<Button
title="Play"
icon="play"
onPress={onPlay}
style={styles.playButton}
tint={{
background: palette.accent,
foreground: palette.accentForeground,
}}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
accessibilityState={{ selected: isSubscribed }}
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={onSubscribeToggle}
style={[
styles.iconAction,
{
backgroundColor: isSubscribed
? palette.surface
: palette.accent,
},
]}
onPress={onShuffle}
style={[styles.iconAction, { backgroundColor: palette.surface }]}
>
<Ionicons
name={isSubscribed ? "checkmark" : "add"}
<PaletteIcon
tone="foreground"
name="shuffle"
size={24}
color={
isSubscribed ? palette.foreground : palette.accentForeground
}
color={palette.foreground}
/>
</Pressable>
) : null}
<Button
title="Play"
icon="play"
onPress={onPlay}
style={styles.playButton}
tint={{
background: palette.accent,
foreground: palette.accentForeground,
}}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={onShuffle}
style={[styles.iconAction, { backgroundColor: palette.surface }]}
>
<Ionicons name="shuffle" size={24} color={palette.foreground} />
</Pressable>
</View>
</View>
</View>
}
>
<PaletteText
tone="foreground"
style={[
styles.title,
heroLayout.landscape && styles.titleLandscape,
{ color: palette.foreground },
]}
>
{title}
</PaletteText>
<PaletteText
tone="foreground"
style={{
color: palette.foreground,
fontSize: heroLayout.landscape ? 22 : 16,
}}
>
{ownerName}
</PaletteText>
</CollectionHero>
<CollectionDivider color={palette.divider} />
</MusicEntityView>
)
})
const styles = StyleSheet.create({
emptyResults: { padding: spacing.lg, textAlign: "center" },
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
listContent: { paddingBottom: contentBottomInset },
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
cover: {
width: 200,
height: 200,
borderRadius: radius.lg,
},
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
titleLandscape: { textAlign: "left", fontSize: 22 },
actions: {
flexDirection: "row",
alignItems: "center",
@@ -1,3 +1,7 @@
import {
PlaylistSearchBar,
usePlaylistSearch,
} from "@/components/playlist-search-bar"
import { memo, useCallback, useEffect, useMemo } from "react"
import {
FlatList,
@@ -15,10 +19,7 @@ import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { api } from "@otunes/convex/_generated/api"
import type { MediaAction } from "@/components/media-context-menu"
@@ -29,32 +30,23 @@ import { radius, spacing, useThemeColors } from "@/lib/theme"
import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router"
const PAGE_SIZE = 50
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
export default function FavoritesScreen() {
const colors = useThemeColors()
const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesSummary)
const {
results: songs,
status,
loadMore,
isCached,
} = useCachedPaginatedQuery(
api.favorites.browseFavoritesSongsPaginated,
{},
{ initialNumItems: PAGE_SIZE }
)
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = favorites?.songs ?? []
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const songIds = favorites?.songIds ?? loadedSongIds
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
const { filteredSongs, onQueryChange, onSearchSubmit } =
usePlaylistSearch(songs)
useEffect(() => {
rememberSongs(songs)
}, [songs])
if (favorites) rememberSongs(favorites.songs)
}, [favorites])
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds),
@@ -88,11 +80,7 @@ export default function FavoritesScreen() {
[handlePlaySong, handleSongMenuAction, isSongFavorite]
)
if (
favorites === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config
) {
if (favorites === undefined || !config) {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
@@ -117,18 +105,25 @@ export default function FavoritesScreen() {
return (
<>
<Stack.Screen options={SCREEN_OPTIONS} />
<PlaylistSearchBar
onQueryChange={onQueryChange}
onSearchSubmit={onSearchSubmit}
/>
<FlatList
{...longListProps}
data={songs}
data={filteredSongs}
keyExtractor={songKey}
renderItem={renderItem}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={styles.listContent}
contentInsetAdjustmentBehavior="automatic"
onEndReached={() => {
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
}}
onEndReachedThreshold={0.5}
ListEmptyComponent={
<Text
style={[styles.emptyResults, { color: colors.mutedForeground }]}
>
{songs.length ? "No songs found." : "No songs in this playlist."}
</Text>
}
ListHeaderComponent={
<FavoritesHero
title={favorites.title}
@@ -195,6 +190,7 @@ const FavoritesHero = memo(function FavoritesHero({
})
const styles = StyleSheet.create({
emptyResults: { padding: spacing.lg, textAlign: "center" },
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
listContent: { paddingBottom: contentBottomInset },
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
+81 -14
View File
@@ -1,10 +1,12 @@
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 { useRouter } from "expo-router"
import { useState } from "react"
import { router } from "expo-router"
import {
Platform,
Pressable,
ScrollView,
StyleSheet,
@@ -18,9 +20,14 @@ import { contentBottomInset } from "@/components/player"
import { Button, Input, LoadingView } from "@/components/ui/primitives"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { useServerConfig } from "@/contexts/server-config"
import {
setArtworkColorsEnabled,
useArtworkColorsEnabled,
useArtworkColorPreferenceLoaded,
} from "@/lib/artwork-color-preference"
import { initialsFromName } from "@/lib/format"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { clearLocalData, signOutToSignIn } from "@/lib/session"
import { changeServer, signOut } from "@/lib/session"
import { radius, spacing, useThemeColors } from "@/lib/theme"
import { showError } from "@/lib/toast"
import type { PlaybackQuality } from "@/lib/urls"
@@ -73,7 +80,6 @@ const SECTIONS: SectionConfig[] = [
export default function SettingsScreen() {
const colors = useThemeColors()
const router = useRouter()
const user = useCachedQuery(api.auth.currentUser)
const { invalidateSession } = useInvalidateAuthSession()
const { clearServer } = useServerConfig()
@@ -91,14 +97,19 @@ export default function SettingsScreen() {
const visibleSections = SECTIONS.filter((item) => !item.admin || isAdmin)
async function handleSignOut() {
await signOutToSignIn(router, invalidateSession)
try {
await signOut(invalidateSession)
} catch {
showError("Could not clear all local data.")
}
}
async function handleChangeServer() {
await invalidateSession()
await clearLocalData()
await clearServer()
router.replace("/server")
try {
await changeServer(invalidateSession, clearServer)
} catch {
showError("Could not clear all local data.")
}
}
return (
@@ -137,7 +148,12 @@ export default function SettingsScreen() {
})}
</View>
{section === "profile" ? <ProfileSection user={user} /> : null}
{section === "profile" ? (
<>
<AppearanceSection />
<ProfileSection user={user} />
</>
) : null}
{section === "quality" ? <QualitySection user={user} /> : null}
{section === "library" && isAdmin ? <LibrarySection /> : null}
{section === "users" && isAdmin && allUsers ? (
@@ -154,6 +170,33 @@ export default function SettingsScreen() {
)
}
function AppearanceSection() {
const enabled = useArtworkColorsEnabled()
const loaded = useArtworkColorPreferenceLoaded()
const [saving, setSaving] = useState(false)
return (
<SettingsCard title="Appearance">
<SwitchRow
title="New artwork colors"
subtitle="Use the new color algorithm on this device."
value={enabled}
disabled={!loaded || saving}
onValueChange={async (checked) => {
setSaving(true)
try {
await setArtworkColorsEnabled(checked)
} catch {
showError("Could not save artwork colors preference.")
} finally {
setSaving(false)
}
}}
/>
</SettingsCard>
)
}
function ProfileSection({ user }: { user: CurrentUser }) {
const colors = useThemeColors()
const updateName = useMutation(api.users.updateProfileName)
@@ -370,8 +413,13 @@ function QualitySection({ user }: { user: CurrentUser }) {
<SettingsCard title="Spatial Audio">
<SwitchRow
title="Prefer Dolby Atmos"
subtitle="Use Atmos versions when they are available."
value={user.preferAtmos ?? false}
subtitle={
dolbyAtmosSupported
? "Use Atmos versions when they are available."
: "This device does not support Dolby Atmos playback."
}
disabled={!dolbyAtmosSupported}
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
onValueChange={(checked) =>
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
showError(error.message)
@@ -455,7 +503,7 @@ function UsersSection({
<SettingsCard title="Sign Up">
<SwitchRow
title="Disable account creation"
subtitle="Stop people from registering themselves. Admins can still create accounts from the web app."
subtitle="Stop people from registering themselves. Admins can still create accounts."
value={appSettings?.disableAccountCreation ?? false}
onValueChange={(checked) =>
void setDisableCreation({ disabled: checked }).catch(
@@ -469,6 +517,10 @@ 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
@@ -492,7 +544,10 @@ function UsersSection({
</Text>
{user.isAdmin ? (
<View
style={[styles.badge, { backgroundColor: colors.muted }]}
style={[
styles.badge,
{ backgroundColor: colors.muted },
]}
>
<Text
style={[
@@ -629,10 +684,12 @@ function SwitchRow({
subtitle,
value,
onValueChange,
disabled,
}: {
title: string
subtitle?: string
value: boolean
disabled?: boolean
onValueChange: (checked: boolean) => void
}) {
const colors = useThemeColors()
@@ -647,7 +704,17 @@ function SwitchRow({
<Text style={{ color: colors.mutedForeground }}>{subtitle}</Text>
) : null}
</View>
<Switch value={value} onValueChange={onValueChange} />
<Switch
value={value}
disabled={disabled}
onValueChange={onValueChange}
{...(Platform.OS === "android"
? {
trackColor: { false: colors.muted, true: colors.primary },
thumbColor: colors.foreground,
}
: {})}
/>
</View>
)
}
@@ -1,3 +1,5 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -8,13 +10,17 @@ export const unstable_settings = {
}
export default function LibraryLayout() {
const tabletLayout = useTabletLayout()
const baseOptions = useStackScreenOptions({ title: "Library" })
return (
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Library",
title:
tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"),
headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems:
+64 -24
View File
@@ -1,3 +1,4 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { useMemo } from "react"
import { Pressable, StyleSheet, Text, View } from "react-native"
import { SymbolView } from "expo-symbols"
@@ -12,14 +13,22 @@ import { useAppNavigation } from "@/lib/app-navigation"
import { api } from "@otunes/convex/_generated/api"
import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 16
const PAGE_SIZE = 24
const links = [
{ title: "Playlists", href: "/browse/playlists", icon: "music.note.list" as const },
{
title: "Playlists",
href: "/browse/playlists",
icon: "music.note.list" as const,
},
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
{ title: "Recently Played", href: "/recently-played", icon: "clock" as const },
{
title: "Recently Played",
href: "/recently-played",
icon: "clock" as const,
},
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
]
@@ -43,11 +52,19 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
sparkles: "sparkles",
star: "star",
}
return <Ionicons name={ionMap[name] ?? "musical-notes"} size={22} color={appleMusic.pink} />
return (
<Ionicons
name={ionMap[name] ?? "musical-notes"}
size={22}
color={appleMusic.pink}
/>
)
}
export default function LibraryScreen() {
const tabletLayout = useTabletLayout()
const { push } = useAppNavigation()
const isTablet = tabletLayout
const colors = useThemeColors()
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated,
@@ -58,29 +75,46 @@ export default function LibraryScreen() {
const listHeader = useMemo(
() => (
<View>
{links.map((link) => (
<Pressable
key={link.href}
style={[styles.row, { borderBottomColor: colors.border }]}
onPress={() => push(link.href)}
>
<LibraryIcon name={link.icon} />
<Text style={[styles.rowTitle, { color: colors.foreground }]}>{link.title}</Text>
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
</Pressable>
))}
{!isTablet ? (
<>
{links.map((link) => (
<Pressable
key={link.href}
style={styles.row}
onPress={() => push(link.href)}
>
<LibraryIcon name={link.icon} />
<View
style={[
styles.rowContent,
{ borderBottomColor: colors.border },
]}
>
<Text style={[styles.rowTitle, { color: colors.foreground }]}>
{link.title}
</Text>
<Ionicons
name="chevron-forward"
size={16}
color={colors.mutedForeground}
/>
</View>
</Pressable>
))}
<Pressable
style={[styles.section, { paddingHorizontal: spacing.lg }]}
onPress={() => push("/recently-added")}
>
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Recently Added
</Text>
</Pressable>
<Pressable
style={[styles.section, { paddingHorizontal: spacing.lg }]}
onPress={() => push("/recently-added")}
>
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Recently Added
</Text>
</Pressable>
</>
) : null}
</View>
),
[colors.border, colors.foreground, colors.mutedForeground, push]
[colors.border, colors.foreground, colors.mutedForeground, push, isTablet]
)
if (status === "LoadingFirstPage" && !isCached) {
@@ -111,6 +145,12 @@ const styles = StyleSheet.create({
alignItems: "center",
gap: spacing.md,
paddingHorizontal: spacing.lg,
},
rowContent: {
flex: 1,
flexDirection: "row",
alignItems: "center",
gap: spacing.md,
paddingVertical: 14,
borderBottomWidth: StyleSheet.hairlineWidth,
},
@@ -1,3 +1,4 @@
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -12,6 +13,7 @@ export default function SearchLayout() {
return (
<Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({
...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Search",
@@ -1,3 +1,5 @@
import { Platform } from "react-native"
import { useThemeColors } from "@/lib/theme"
import { Stack } from "expo-router"
import { useCallback } from "react"
@@ -5,6 +7,7 @@ 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(
@@ -21,6 +24,15 @@ 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} />
+42 -23
View File
@@ -1,32 +1,48 @@
import { router, type Href } from "expo-router"
import { useServerConfig } from "@/contexts/server-config"
import {
incomingMediaLink,
subscribeIncomingMediaLink,
takeIncomingMediaLink,
} from "@/lib/incoming-media-link"
import { useConvexAuth as useLocalConvexAuth } from "@convex-dev/auth/react"
import {
useConvexAuth as useServerConvexAuth,
useConvexConnectionState,
} from "convex/react"
import { Redirect, Stack } from "expo-router"
import { Stack } from "expo-router"
import { Platform } from "react-native"
import { useEffect } from "react"
import { useEffect, useSyncExternalStore } from "react"
import { AppIntentBridge } from "@/components/app-intent-bridge"
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
import { LoadingView } from "@/components/ui/primitives"
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { FavoritesProvider } from "@/contexts/favorites"
import { PlaybackProvider } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { useStackScreenOptions } from "@/lib/navigation"
import { AppNavigationSync } from "@/lib/app-navigation"
const AUTH_HANDSHAKE_TIMEOUT_MS = 15_000
export default function AppLayout() {
const { config } = useServerConfig()
const localAuth = useLocalConvexAuth()
const serverAuth = useServerConvexAuth()
const { isWebSocketConnected } = useConvexConnectionState()
const { invalidateSession } = useInvalidateAuthSession()
const stackOptions = useStackScreenOptions()
const { config } = useServerConfig()
const pendingDestination = useSyncExternalStore(
subscribeIncomingMediaLink,
() => (config ? incomingMediaLink(config.serverUrl) : null),
() => null
)
useEffect(() => {
if (!config || !pendingDestination) return
const destination = takeIncomingMediaLink(config.serverUrl)
if (destination) router.replace(destination as Href)
}, [config, pendingDestination])
useEffect(() => {
if (
@@ -51,18 +67,6 @@ export default function AppLayout() {
serverAuth?.isAuthenticated,
])
if (!config) {
return <Redirect href="/server" />
}
if (!localAuth || localAuth.isLoading) {
return <LoadingView />
}
if (!localAuth.isAuthenticated) {
return <Redirect href="/signin" />
}
// Convex holds queries until the stored token is confirmed, so the app can
// render cached data while the server handshake is still in progress.
@@ -74,11 +78,15 @@ export default function AppLayout() {
<AddToPlaylistProvider>
<FavoritesProvider>
<Stack screenOptions={stackOptions}>
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
<Stack.Screen
name="(tabs)"
options={{ headerShown: false, animation: "none" }}
/>
<Stack.Screen
name="settings"
options={{
headerShown: false,
headerShown: Platform.OS === "android",
title: "Settings",
presentation:
Platform.OS === "ios" ? "modal" : "fullScreenModal",
animation: "slide_from_bottom",
@@ -86,14 +94,25 @@ 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,
presentation:
Platform.OS === "ios"
? "transparentModal"
: "fullScreenModal",
// Keep the library visible behind the custom swipe animation.
presentation: "transparentModal",
contentStyle: { backgroundColor: "transparent" },
animation: "slide_from_bottom",
gestureEnabled: true,
gestureDirection: "vertical",
+199
View File
@@ -0,0 +1,199 @@
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 },
})
-5
View File
@@ -1,5 +0,0 @@
import { Redirect } from "expo-router"
export default function AppIndex() {
return <Redirect href="/(app)/(tabs)/home" />
}
+98 -52
View File
@@ -1,5 +1,9 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { TabletNowPlaying } from "@/components/tablet-now-playing"
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { NavigationBar } from "expo-navigation-bar"
import { MusicEntityView } from "@/components/music-entity-view"
import { useRouter } from "expo-router"
import { Stack, useRouter, useLocalSearchParams } from "expo-router"
import * as Haptics from "expo-haptics"
import { StatusBar } from "expo-status-bar"
import { useEffect, useRef, useState } from "react"
@@ -29,6 +33,7 @@ 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 {
@@ -39,6 +44,7 @@ import {
NowPlayingQueue,
QUEUE_HORIZONTAL_INSET,
} from "@/components/now-playing-queue"
import { PlayerArtistMenu } from "@/components/player-artist-menu"
import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites"
@@ -47,6 +53,7 @@ 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,
@@ -68,10 +75,15 @@ const DISMISS_VELOCITY = 900
const DISMISS_CORNER_RADIUS = 48
export default function PlayerScreen() {
const tabletLayout = useTabletLayout()
const router = useRouter()
const hadSongRef = useRef(false)
const insets = useSafeAreaInsets()
const { width: windowWidth, height: windowHeight } = useWindowDimensions()
// Unfolded iPhones retain the phone idiom but have room for the iPad player.
const isTablet =
tabletLayout ||
(Platform.OS === "ios" && Math.min(windowWidth, windowHeight) >= 600)
const { config } = useServerConfig()
const {
currentSong,
@@ -80,15 +92,16 @@ export default function PlayerScreen() {
repeatEnabled,
currentTime,
duration,
volume,
queueSongIds,
setIsPlaying,
setVolume,
seekTo,
skipNext,
skipPrevious,
} = usePlayback()
const [showQueue, setShowQueue] = useState(false)
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const { queue } = useLocalSearchParams<{ queue?: string }>()
const [showQueue, setShowQueue] = useState(queue === "1")
const [isDismissing, setIsDismissing] = useState(false)
const [stageHeight, setStageHeight] = useState(0)
const [scrubTime, setScrubTime] = useState<number | null>(null)
const user = useCachedQuery(api.auth.currentUser)
@@ -101,7 +114,7 @@ export default function PlayerScreen() {
? playbackFormat(
playbackInfo.files,
user.playbackQuality,
user.preferAtmos ?? false
dolbyAtmosSupported && (user.preferAtmos ?? false)
)
: null
@@ -160,6 +173,7 @@ export default function PlayerScreen() {
event.translationY > DISMISS_DISTANCE ||
event.velocityY > DISMISS_VELOCITY
) {
scheduleOnRN(setIsDismissing, true)
dismissY.value = withTiming(
windowHeight,
{ duration: 220 },
@@ -213,9 +227,37 @@ export default function PlayerScreen() {
setShowQueue((value) => !value)
}
if (isTablet) {
return (
<MusicEntityView kind="song" id={currentSong.id} style={{ flex: 1 }}>
<TabletNowPlaying
colors={colors}
backgroundStyle={backgroundStyle}
dismissStyle={dismissStyle}
dismissGesture={dismissGesture}
showQueue={showQueue}
toggleQueue={toggleQueue}
metadata={<SongMeta song={currentSong} colors={colors} />}
/>
</MusicEntityView>
)
}
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"
@@ -377,31 +419,35 @@ export default function PlayerScreen() {
</TransportButton>
</View>
<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}
/>
}
/>
{volumeAvailable ? (
<PlayerSlider
accessibilityLabel="Volume"
commitHoldMs={0}
animateValueChanges
value={volume}
maximumValue={1}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setVolume}
leading={
<PlayerSymbol
name="speaker.fill"
fallback="volume-low"
size={14}
color={colors.secondaryForeground}
/>
}
trailing={
<PlayerSymbol
name="speaker.wave.3.fill"
fallback="volume-high"
size={14}
color={colors.secondaryForeground}
/>
}
/>
) : null}
<View style={styles.footer}>
<Pressable
@@ -419,21 +465,10 @@ export default function PlayerScreen() {
color={colors.foreground}
/>
</Pressable>
<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>
<AudioOutputButton
color={colors.foreground}
style={styles.queueButton}
/>
<Pressable
onPress={toggleQueue}
hitSlop={8}
@@ -510,13 +545,15 @@ function SongMeta({
{ color: colors.foreground },
]}
/>
<MarqueeText
text={song.artist.name}
style={[
compact ? styles.compactArtist : styles.artist,
{ color: colors.secondaryForeground },
]}
/>
<PlayerArtistMenu song={song} onAction={handleAction}>
<MarqueeText
text={song.artist.name}
style={[
compact ? styles.compactArtist : styles.artist,
{ color: colors.secondaryForeground },
]}
/>
</PlayerArtistMenu>
</View>
<Pressable
onPress={() => void toggleSongFavorite(song.id)}
@@ -533,15 +570,24 @@ function SongMeta({
/>
</Pressable>
<MediaActionMenu
share={{
type: "song",
songId: song.id,
albumId: song.album.id,
title: song.title,
}}
stationArtistId={song.artist.id}
favorited={favorited}
navigation={{
artist: { id: song.artist.id },
album: { id: song.album.id },
}}
includeActions={[
"share",
"play-next",
"play-last",
"shuffle",
"create-station",
"favorite",
"go-artist",
"go-album",
+16 -1
View File
@@ -1 +1,16 @@
export { default } from "./(tabs)/home/settings"
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>
)
}
+2 -23
View File
@@ -1,28 +1,7 @@
import { useConvexAuth } from "@convex-dev/auth/react"
import { Redirect, Stack } from "expo-router"
import { Stack } from "expo-router"
import { LoadingView } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config"
export const unstable_settings = { anchor: "signin" }
export default function AuthLayout() {
const { config, isLoading: serverLoading } = useServerConfig()
const auth = useConvexAuth()
if (serverLoading) {
return <LoadingView />
}
if (!config) {
return <Redirect href="/server" />
}
if (!auth || auth.isLoading) {
return <LoadingView />
}
if (auth.isAuthenticated) {
return <Redirect href="/(app)/(tabs)/home" />
}
return <Stack screenOptions={{ headerShown: false }} />
}
+57
View File
@@ -0,0 +1,57 @@
import { loadServerConfig, parseServerHostname } from "@/lib/server-config"
import { secureGetItem } from "@/lib/auth-storage"
import {
isMediaRoute,
rememberIncomingMediaLink,
} from "@/lib/incoming-media-link"
import { showError } from "@/lib/toast"
export async function redirectSystemPath({
path,
}: {
path: string
initial: boolean
}) {
try {
const link = new URL(path, "otunes:///")
if (
!["otunes:", "otunes-development:", "otunes-preview:"].includes(
link.protocol
) ||
link.hostname !== "open"
) {
return path
}
const target = new URL(link.searchParams.get("url") ?? "")
const server = parseServerHostname(target.host)
if (
!server ||
!["https:", "http:"].includes(target.protocol) ||
target.username ||
target.password ||
new URL(server.serverUrl).origin !== target.origin ||
!isMediaRoute(target.pathname)
) {
return "/"
}
const config = await loadServerConfig(secureGetItem)
if (config && new URL(config.serverUrl).origin !== target.origin) {
showError("This link belongs to a different oTunes server")
return "/"
}
const query = new URLSearchParams()
const songId = target.searchParams.get("s")
if (target.pathname.startsWith("/album/") && songId) query.set("s", songId)
const suffix = query.size ? `?${query}` : ""
const destination = `/(app)/(tabs)/home${target.pathname}${suffix}`
rememberIncomingMediaLink(destination, target.origin)
return config
? destination
: `/server?hostname=${encodeURIComponent(server.hostname)}`
} catch {
return "/"
}
}
+51 -13
View File
@@ -1,28 +1,66 @@
import { Stack } from "expo-router"
import { useConvexAuth } from "@convex-dev/auth/react"
import { DarkTheme, Stack, ThemeProvider } from "expo-router"
import { StatusBar } from "expo-status-bar"
import { useColorScheme } from "react-native"
import { useIsDark } from "@/lib/theme"
import { GestureHandlerRootView } from "react-native-gesture-handler"
import { SafeAreaProvider } from "react-native-safe-area-context"
import { Toaster } from "@/components/ui/toaster"
import { ConvexAppProvider } from "@/contexts/convex-app"
import { ServerConfigProvider } from "@/contexts/server-config"
import { ServerConfigProvider, useServerConfig } from "@/contexts/server-config"
export default function RootLayout() {
const colorScheme = useColorScheme()
import { HandoffBridge } from "@/components/handoff-bridge"
const navigationTheme = {
...DarkTheme,
colors: { ...DarkTheme.colors, background: "#000", card: "#000" },
}
function RootNavigator() {
const { config, isLoading } = useServerConfig()
const auth = useConvexAuth()
if (isLoading || (config && (!auth || auth.isLoading))) {
return null
}
const isAuthenticated = Boolean(config && auth?.isAuthenticated)
return (
<GestureHandlerRootView style={{ flex: 1 }}>
<Stack
screenOptions={{
headerShown: false,
animation: "none",
contentStyle: { backgroundColor: "#000" },
}}
>
<Stack.Screen name="index" />
<Stack.Protected guard={isAuthenticated}>
<Stack.Screen name="(app)" />
</Stack.Protected>
<Stack.Protected guard={Boolean(config) && !isAuthenticated}>
<Stack.Screen name="(auth)" />
</Stack.Protected>
<Stack.Protected guard={!config}>
<Stack.Screen name="server" />
</Stack.Protected>
</Stack>
)
}
export default function RootLayout() {
const isDark = useIsDark()
return (
<GestureHandlerRootView style={{ flex: 1, backgroundColor: "#000" }}>
<SafeAreaProvider>
<ServerConfigProvider>
<ConvexAppProvider>
<StatusBar style={colorScheme === "dark" ? "light" : "dark"} />
<Stack screenOptions={{ headerShown: false }}>
<Stack.Screen name="index" />
<Stack.Screen name="server" />
<Stack.Screen name="(auth)" />
<Stack.Screen name="(app)" />
</Stack>
<StatusBar style={isDark ? "light" : "dark"} />
<ThemeProvider value={navigationTheme}>
<HandoffBridge />
<RootNavigator />
</ThemeProvider>
<Toaster />
</ConvexAppProvider>
</ServerConfigProvider>
+17 -9
View File
@@ -1,19 +1,27 @@
import { Redirect } from "expo-router"
import { useConvexAuth } from "@convex-dev/auth/react"
import { incomingMediaLink } from "@/lib/incoming-media-link"
import { Redirect, type Href } from "expo-router"
import { LoadingView } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config"
import { AuthenticatedRedirect } from "@/components/authenticated-redirect"
export default function Index() {
const { config, isLoading } = useServerConfig()
if (isLoading) {
return <LoadingView />
}
const { config } = useServerConfig()
const auth = useConvexAuth()
if (!config) {
return <Redirect href="/server" />
}
return <AuthenticatedRedirect />
const destination = auth?.isAuthenticated
? incomingMediaLink(config.serverUrl)
: null
return (
<Redirect
href={
(destination as Href) ??
(auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin")
}
/>
)
}
+15 -27
View File
@@ -1,32 +1,28 @@
import { useRouter } from "expo-router"
import { useLocalSearchParams } from "expo-router"
import { useEffect, useState } from "react"
import {
KeyboardAvoidingView,
Platform,
StyleSheet,
Text,
View,
} from "react-native"
import { 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"
export default function ServerScreen() {
const router = useRouter()
const colors = useThemeColors()
const { config, isLoading, setServerHostname } = useServerConfig()
const [hostname, setHostname] = useState("")
const { setServerHostname } = useServerConfig()
const { hostname: linkedHostname } = useLocalSearchParams<{
hostname?: string
}>()
const [hostname, setHostname] = useState(linkedHostname ?? "")
useEffect(() => {
if (linkedHostname) setHostname(linkedHostname)
}, [linkedHostname])
const [error, setError] = useState<string | null>(null)
const [submitting, setSubmitting] = useState(false)
useEffect(() => {
if (config?.hostname) {
setHostname(config.hostname)
}
}, [config?.hostname])
async function handleContinue() {
setError(null)
setSubmitting(true)
@@ -38,7 +34,6 @@ export default function ServerScreen() {
)
return
}
router.replace("/signin")
} catch {
setError(
"Could not save the server address. Check device storage and try again."
@@ -48,16 +43,9 @@ export default function ServerScreen() {
}
}
if (isLoading) {
return null
}
return (
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
<KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : undefined}
style={styles.container}
>
<KeyboardForm style={styles.container}>
<View style={styles.hero}>
<Text style={[styles.brand, { color: colors.foreground }]}>
oTunes
@@ -95,7 +83,7 @@ export default function ServerScreen() {
onPress={() => void handleContinue()}
/>
</Card>
</KeyboardAvoidingView>
</KeyboardForm>
</SafeAreaView>
)
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 324 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 284 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 324 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 963 KiB

After

Width:  |  Height:  |  Size: 284 KiB

+1 -1
View File
@@ -26,7 +26,7 @@
"image-name" : "music.note.png",
"name" : "music.note",
"position" : {
"scale" : 1,
"scale" : 1.5,
"translation-in-points" : [
0,
0
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

@@ -0,0 +1,53 @@
{
"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"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

@@ -0,0 +1,53 @@
{
"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"
}
}
+15
View File
@@ -0,0 +1,15 @@
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>
)
}
+10 -2
View File
@@ -1,4 +1,5 @@
import { StyleSheet, Text, View } from "react-native"
import { PaletteText } from "@/components/palette-text"
import { StyleSheet, View } from "react-native"
import Svg, { G, Path } from "react-native-svg"
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
@@ -74,10 +75,12 @@ function LosslessMark({
/** The Dolby Atmos or Lossless label shown under the progress bar. */
export function AudioFormatBadge({
artwork = false,
format,
color,
backgroundColor,
}: {
artwork?: boolean
format: PlaybackFormat
color: string
backgroundColor: string
@@ -90,7 +93,12 @@ export function AudioFormatBadge({
) : (
<LosslessMark color={color} backgroundColor={backgroundColor} />
)}
<Text style={[styles.label, { color }]}>{label}</Text>
<PaletteText
tone={artwork ? "secondaryForeground" : undefined}
style={[styles.label, { color }]}
>
{label}
</PaletteText>
</View>
)
}
@@ -0,0 +1,71 @@
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>
)
}
+45 -39
View File
@@ -1,21 +1,17 @@
import { useAuthActions, useConvexAuth } from "@convex-dev/auth/react"
import { Link, useRouter } from "expo-router"
import { useAuthActions } from "@convex-dev/auth/react"
import { Link } from "expo-router"
import { useQuery } from "convex/react"
import { useEffect, useState } from "react"
import {
KeyboardAvoidingView,
Platform,
Pressable,
StyleSheet,
Text,
View,
} from "react-native"
import { useState } from "react"
import { 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"
import { spacing, useThemeColors } from "@/lib/theme"
import { showError } from "@/lib/toast"
type AuthFlow = "signIn" | "signUp"
@@ -50,10 +46,8 @@ const copy: Record<
export function AuthForm({ flow }: { flow: AuthFlow }) {
const { signIn } = useAuthActions()
const auth = useConvexAuth()
const router = useRouter()
const colors = useThemeColors()
const { config } = useServerConfig()
const { config, clearServer } = useServerConfig()
const appSettings = useQuery(api.users.getAppSettings)
const [name, setName] = useState("")
const [email, setEmail] = useState("")
@@ -61,12 +55,6 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
const [error, setError] = useState<string | null>(null)
const [submitting, setSubmitting] = useState(false)
useEffect(() => {
if (auth.isAuthenticated) {
router.replace("/(app)/(tabs)/home")
}
}, [auth.isAuthenticated, router])
const text = copy[flow]
const accountCreationDisabled = appSettings?.disableAccountCreation ?? false
const signupsDisabled = flow === "signUp" && accountCreationDisabled
@@ -99,14 +87,15 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
return (
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
<KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : undefined}
style={styles.container}
>
<KeyboardForm 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 ? (
@@ -118,8 +107,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}>
@@ -144,16 +133,28 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
onChangeText={setPassword}
placeholder="Password"
secureTextEntry
autoComplete={flow === "signIn" ? "current-password" : "new-password"}
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()}
/>
{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>
@@ -164,12 +165,17 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
)}
</Card>
<Link href="/server" asChild>
<Pressable style={styles.changeServer}>
<Text style={{ color: colors.mutedForeground }}>Change server</Text>
</Pressable>
</Link>
</KeyboardAvoidingView>
<Pressable
style={styles.changeServer}
onPress={() =>
void clearServer().catch(() =>
showError("Could not clear the server address.")
)
}
>
<Text style={{ color: colors.mutedForeground }}>Change server</Text>
</Pressable>
</KeyboardForm>
</SafeAreaView>
)
}
@@ -1,24 +0,0 @@
import { useConvexAuth } from "@convex-dev/auth/react"
import { Redirect } from "expo-router"
import { LoadingView } from "@/components/ui/primitives"
export function AuthenticatedRedirect() {
const auth = useConvexAuth()
if (!auth) {
return <LoadingView />
}
const { isLoading, isAuthenticated } = auth
if (isLoading) {
return <LoadingView />
}
if (!isAuthenticated) {
return <Redirect href="/signin" />
}
return <Redirect href="/(app)/(tabs)/home" />
}
@@ -0,0 +1,66 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import type { ReactNode } from "react"
import { Platform, StyleSheet, useWindowDimensions, View } from "react-native"
import { useSafeAreaInsets } from "react-native-safe-area-context"
export function useCollectionHeroLayout() {
const tabletLayout = useTabletLayout()
const { width, height } = useWindowDimensions()
const insets = useSafeAreaInsets()
const paneWidth = width - insets.left - insets.right
const isTablet =
Platform.OS === "ios" ? tabletLayout : Math.min(width, height) >= 600
const landscape = isTablet && width > height && paneWidth >= 640
return {
landscape,
coverSize: landscape
? Math.min(300, Math.max(180, (paneWidth - 100) * 0.4))
: undefined,
}
}
/** Tablet artwork and controls share a bottom edge, with metadata above the controls. */
export function CollectionHero({
artwork,
actions,
children,
}: {
artwork: ReactNode
actions: ReactNode
children: ReactNode
}) {
const { landscape } = useCollectionHeroLayout()
return (
<View style={[styles.hero, landscape && styles.landscape]}>
{artwork}
<View style={[styles.details, landscape && styles.landscapeDetails]}>
<View style={[styles.metadata, landscape && styles.landscapeMetadata]}>
{children}
</View>
{actions}
</View>
</View>
)
}
const styles = StyleSheet.create({
hero: { padding: 16, gap: 8, alignItems: "center" },
landscape: {
flexDirection: "row",
alignItems: "stretch",
paddingHorizontal: 32,
paddingTop: 34,
paddingBottom: 40,
gap: 34,
},
details: { alignItems: "center", gap: 8, alignSelf: "stretch" },
landscapeDetails: {
flex: 1,
minWidth: 0,
paddingTop: 64,
justifyContent: "space-between",
alignItems: "flex-start",
},
metadata: { gap: 8, alignSelf: "stretch", alignItems: "center" },
landscapeMetadata: { alignItems: "flex-start", gap: 4 },
})
+7 -3
View File
@@ -1,5 +1,6 @@
import { PaletteText } from "@/components/palette-text"
import { memo } from "react"
import { StyleSheet, Text, View } from "react-native"
import { StyleSheet, View } from "react-native"
import { useThemeColors } from "@/lib/theme"
@@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({
}) {
const colors = useThemeColors()
return (
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
<PaletteText
tone={color ? "foreground" : undefined}
style={[styles.discHeader, { color: color ?? colors.foreground }]}
>
{label}
</Text>
</PaletteText>
)
})
+6
View File
@@ -2,6 +2,7 @@ import { Ionicons } from "@expo/vector-icons"
import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
import { memo, useMemo } from "react"
import {
Platform,
PixelRatio,
StyleProp,
StyleSheet,
@@ -9,6 +10,8 @@ import {
type ViewStyle,
} from "react-native"
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
import { useThemeColors } from "@/lib/theme"
import {
coverImageSizes,
@@ -106,6 +109,9 @@ export const CoverImage = memo(function CoverImage({
contentFit={contentFit}
transition={150}
blurRadius={blurRadius}
onLoad={
Platform.OS === "android" ? () => prefetchCoverPalette(uri) : undefined
}
cachePolicy="memory-disk"
recyclingKey={sourceUri}
enforceEarlyResizing
+85
View File
@@ -0,0 +1,85 @@
import { useConvexAuth } from "@convex-dev/auth/react"
import { requireOptionalNativeModule, type NativeModule } from "expo"
import { usePathname } from "expo-router"
import { useEffect } from "react"
import { Platform } from "react-native"
import { useServerConfig } from "@/contexts/server-config"
import {
isMediaRoute,
rememberIncomingMediaLink,
} from "@/lib/incoming-media-link"
import { showError } from "@/lib/toast"
type Activity = { server: string; route: string }
declare class HandoffModule extends NativeModule<{ onActivity: () => void }> {
takeActivity(): Promise<Activity | null>
publish(server: string | null, route: string | null): Promise<void>
}
const handoff =
Platform.OS === "ios"
? requireOptionalNativeModule<HandoffModule>("Handoff")
: null
export function HandoffBridge() {
const { config, isLoading } = useServerConfig()
const auth = useConvexAuth()
const pathname = usePathname()
useEffect(() => {
if (!handoff || isLoading) return
let active = true
async function receive() {
const activity = await handoff!.takeActivity()
if (!active || !activity) return
try {
const source = new URL(activity.server)
if (!config) {
showError("Connect to an oTunes server to continue this activity.")
return
}
if (source.origin !== new URL(config.serverUrl).origin) {
showError("This activity belongs to a different oTunes server.")
return
}
if (
!["http:", "https:"].includes(source.protocol) ||
source.username ||
source.password ||
!isMediaRoute(activity.route)
)
return
rememberIncomingMediaLink(
`/(app)/(tabs)/home${activity.route}`,
source.origin
)
} catch {
// Ignore malformed activities without navigating or changing servers.
}
}
const subscription = handoff.addListener("onActivity", () => {
void receive()
})
void receive()
return () => {
active = false
subscription.remove()
}
}, [config, isLoading])
useEffect(() => {
if (!handoff) return
const route = pathname.replace(/^\/(home|search|library)/, "")
const canPublish = config && auth?.isAuthenticated && isMediaRoute(route)
void handoff.publish(
canPublish ? config.serverUrl : null,
canPublish ? route : null
)
return () => {
void handoff.publish(null, null)
}
}, [config, auth?.isAuthenticated, pathname])
return null
}
+42
View File
@@ -0,0 +1,42 @@
import type { PropsWithChildren } from "react"
import {
KeyboardAvoidingView,
Platform,
ScrollView,
StyleSheet,
type StyleProp,
type ViewStyle,
} from "react-native"
/** Center account forms on wide windows; scroll when the keyboard reduces height. */
export function KeyboardForm({
children,
style,
}: PropsWithChildren<{ style?: StyleProp<ViewStyle> }>) {
return (
<KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : undefined}
style={styles.fill}
>
<ScrollView
style={styles.fill}
contentContainerStyle={[style, styles.content]}
keyboardShouldPersistTaps="handled"
keyboardDismissMode={Platform.OS === "ios" ? "interactive" : "on-drag"}
>
{children}
</ScrollView>
</KeyboardAvoidingView>
)
}
const styles = StyleSheet.create({
fill: { flex: 1 },
content: {
flex: undefined,
flexGrow: 1,
width: "100%",
maxWidth: 528,
alignSelf: "center",
},
})
+200 -84
View File
@@ -1,9 +1,17 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import Animated from "react-native-reanimated"
import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { TabletMediaGrid } from "@/components/tablet-media-grid"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { MusicEntityView } from "@/components/music-entity-view"
import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react"
import {
FlatList,
Platform,
Pressable,
ScrollView,
StyleSheet,
Text,
View,
@@ -22,66 +30,84 @@ import type {
PlaylistSummary,
} from "@otunes/convex/types"
import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls"
import {
carouselCardWidth,
radius,
spacing,
useThemeColors,
useTwoColumnCardWidth,
} from "@/lib/theme"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
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,
width = carouselCardWidth,
fluid = false,
}: {
album: BrowseAlbum
width?: number
fluid?: boolean
}) {
const { push } = useAppNavigation()
const { href } = useAppNavigation()
const tabletLayout = useTabletLayout()
const { config } = useServerConfig()
const colors = useThemeColors()
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
const onPress = useCallback(() => {
push(`/album/${album.id}`)
}, [push, album.id])
if (!config) return null
const card = (
<Pressable style={[styles.card, { width }]} onPress={onPress}>
<CoverImage
uri={albumCoverUrl(config.serverUrl, album.id)}
hasCover={album.cover != null}
style={{ width, height: width, borderRadius: radius.md }}
/>
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={2}
<Link href={href(`/album/${album.id}`)} push asChild>
<Pressable
style={StyleSheet.flatten([
styles.card,
{ width: fluid ? "100%" : width },
])}
>
{album.title}
</Text>
<Text
style={[styles.subtitle, { color: colors.mutedForeground }]}
numberOfLines={1}
>
{album.artist.name}
</Text>
</Pressable>
<Link.AppleZoom>
<View collapsable={false}>
<CoverImage
uri={albumCoverUrl(config.serverUrl, album.id)}
hasCover={album.cover != null}
style={
fluid
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
: { width, height: width, borderRadius: radius.md }
}
/>
</View>
</Link.AppleZoom>
<MusicEntityView kind="album" id={album.id} style={styles.card}>
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={tabletLayout ? 1 : 2}
>
{album.title}
</Text>
<Text
style={[styles.subtitle, { color: colors.mutedForeground }]}
numberOfLines={1}
>
{album.artist.name}
</Text>
</MusicEntityView>
</Pressable>
</Link>
)
return (
<MediaContextMenu
preview={{
kind: "album",
title: album.title,
artist: album.artist.name,
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
hasArtwork: album.cover != null,
}}
favorited={isAlbumFavorite(album.id)}
stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id }}
share={{ type: "album", albumId: album.id, title: album.title }}
onAction={(action) => void handleAlbumAction(album, action)}
>
<MusicEntityView kind="album" id={album.id}>
{card}
</MusicEntityView>
{card}
</MediaContextMenu>
)
})
@@ -89,11 +115,14 @@ export const AlbumCard = memo(function AlbumCard({
export const ArtistCard = memo(function ArtistCard({
artist,
width = carouselCardWidth,
fluid = false,
}: {
artist: BrowseArtist
width?: number
fluid?: boolean
}) {
const { push } = useAppNavigation()
const tabletLayout = useTabletLayout()
const { config } = useServerConfig()
const colors = useThemeColors()
const { handleArtistAction, isArtistFavorite } = useMediaMenuActions()
@@ -103,15 +132,22 @@ export const ArtistCard = memo(function ArtistCard({
if (!config) return null
const card = (
<Pressable style={[styles.card, { width }]} onPress={onPress}>
<Pressable
style={[styles.card, { width: fluid ? "100%" : width }]}
onPress={onPress}
>
<CoverImage
uri={artistCoverUrl(config.serverUrl, artist.id)}
hasCover={artist.photo != null}
style={{ width, height: width, borderRadius: width / 2 }}
style={
fluid
? { width: "100%", aspectRatio: 1, borderRadius: 9999 }
: { width, height: width, borderRadius: width / 2 }
}
/>
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={2}
numberOfLines={tabletLayout ? 1 : 2}
>
{artist.name}
</Text>
@@ -120,8 +156,14 @@ export const ArtistCard = memo(function ArtistCard({
return (
<MediaContextMenu
preview={{
kind: "artist",
title: artist.name,
artworkUrl: artistCoverUrl(config.serverUrl, artist.id),
hasArtwork: artist.photo != null,
}}
favorited={isArtistFavorite(artist.id)}
share={{ type: "artist", artistId: artist.id }}
share={{ type: "artist", artistId: artist.id, title: artist.name }}
onAction={(action) => void handleArtistAction(artist, action)}
>
<MusicEntityView kind="artist" id={artist.id}>
@@ -134,50 +176,69 @@ export const ArtistCard = memo(function ArtistCard({
export const PlaylistCard = memo(function PlaylistCard({
playlist,
width = carouselCardWidth,
fluid = false,
}: {
playlist: PlaylistSummary
width?: number
fluid?: boolean
}) {
const { push } = useAppNavigation()
const { href } = useAppNavigation()
const tabletLayout = useTabletLayout()
const { config } = useServerConfig()
const colors = useThemeColors()
const { handlePlaylistAction } = useMediaMenuActions()
const onPress = useCallback(() => {
push(`/playlist/${playlist.id}`)
}, [push, playlist.id])
if (!config) return null
const card = (
<Pressable style={[styles.card, { width }]} onPress={onPress}>
<CoverImage
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
hasCover={playlist.cover != null}
style={{ width, height: width, borderRadius: radius.md }}
/>
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={2}
<Link href={href(`/playlist/${playlist.id}`)} push asChild>
<Pressable
style={StyleSheet.flatten([
styles.card,
{ width: fluid ? "100%" : width },
])}
>
{playlist.title}
</Text>
<Text
style={[styles.subtitle, { color: colors.mutedForeground }]}
numberOfLines={1}
>
{playlist.owner}
</Text>
</Pressable>
<Link.AppleZoom>
<View collapsable={false}>
<CoverImage
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
hasCover={playlist.cover != null}
style={
fluid
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
: { width, height: width, borderRadius: radius.md }
}
/>
</View>
</Link.AppleZoom>
<MusicEntityView kind="playlist" id={playlist.id} style={styles.card}>
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={tabletLayout ? 1 : 2}
>
{playlist.title}
</Text>
<Text
style={[styles.subtitle, { color: colors.mutedForeground }]}
numberOfLines={1}
>
{playlist.owner}
</Text>
</MusicEntityView>
</Pressable>
</Link>
)
return (
<MediaContextMenu
showFavorite={false}
share={{ type: "playlist", playlistId: playlist.id }}
share={{
type: "playlist",
playlistId: playlist.id,
title: playlist.title,
}}
onAction={(action) => void handlePlaylistAction(playlist, action)}
>
<MusicEntityView kind="playlist" id={playlist.id}>
{card}
</MusicEntityView>
{card}
</MediaContextMenu>
)
})
@@ -185,29 +246,42 @@ export const PlaylistCard = memo(function PlaylistCard({
const CarouselCard = memo(function CarouselCard({
item,
width,
fluid = false,
}: {
item: MediaItem
width: number
fluid?: boolean
}) {
if ("owner" in item) return <PlaylistCard playlist={item} width={width} />
if ("artist" in item) return <AlbumCard album={item} width={width} />
return <ArtistCard artist={item} width={width} />
if ("owner" in item)
return <PlaylistCard playlist={item} width={width} fluid={fluid} />
if ("artist" in item)
return <AlbumCard album={item} width={width} fluid={fluid} />
return <ArtistCard artist={item} width={width} fluid={fluid} />
})
export function MediaGrid({ content }: { content: MediaItem[] }) {
const cardWidth = useTwoColumnCardWidth()
const tabletLayout = useTabletLayout()
const { cardWidth, onLayout, ready } = useMediaGridLayout()
return (
<View style={styles.grid}>
{content.map((item) => (
<View key={item.id} style={{ width: cardWidth }}>
<CarouselCard item={item} width={cardWidth} />
</View>
<View style={styles.grid} onLayout={onLayout}>
{(ready ? content : []).map((item) => (
<Animated.View
key={item.id}
layout={tabletLayout ? tabletLayoutTransition : undefined}
style={{ width: cardWidth }}
>
<CarouselCard item={item} width={cardWidth} fluid={tabletLayout} />
</Animated.View>
))}
</View>
)
}
function renderTabletCard(item: MediaItem, width: number) {
return <CarouselCard item={item} width={width} fluid />
}
export function MediaGridList({
content,
paddingBottom,
@@ -221,7 +295,9 @@ export function MediaGridList({
ListHeaderComponent?: ReactElement
contentInset?: boolean
}) {
const cardWidth = useTwoColumnCardWidth()
const tabletLayout = useTabletLayout()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
const colors = useThemeColors()
const renderItem = useCallback(
({ item }: ListRenderItemInfo<MediaItem>) => (
@@ -232,23 +308,43 @@ export function MediaGridList({
[cardWidth]
)
if (tabletLayout) {
return (
<TabletMediaGrid
content={content}
paddingBottom={paddingBottom}
onEndReached={onEndReached}
ListHeaderComponent={ListHeaderComponent}
contentInset={contentInset}
renderCard={renderTabletCard}
/>
)
}
return (
<FlatList
key={columns}
onLayout={onLayout}
data={content}
keyExtractor={mediaItemKey}
renderItem={renderItem}
numColumns={2}
numColumns={columns}
initialNumToRender={GRID_INITIAL_ROWS}
maxToRenderPerBatch={GRID_INITIAL_ROWS}
windowSize={longListProps.windowSize}
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[
contentInset ? styles.gridListContent : styles.gridListContentInset,
{ paddingBottom },
{
paddingBottom,
gap,
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
},
]}
columnWrapperStyle={[
styles.gridListRow,
!contentInset && styles.gridListRowInset,
!contentInset && { paddingHorizontal: horizontalPadding },
{ gap },
]}
contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={ListHeaderComponent}
@@ -305,14 +401,30 @@ function ContentCarouselBody({
/>
) : null}
</Pressable>
<FlatList
data={content}
keyExtractor={mediaItemKey}
renderItem={renderCarouselItem}
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.carouselContent}
/>
{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}
/>
)}
</View>
)
}
@@ -342,6 +454,10 @@ 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,
},
+133 -7
View File
@@ -1,14 +1,22 @@
import { MenuView, type MenuAction } from "@expo/ui/community/menu"
import type { MenuAction } from "@expo/ui/community/menu"
import { MenuView } from "@/components/media-menu"
import { requireNativeView } from "expo"
import type { ComponentType, ReactNode } from "react"
import {
Platform,
Text,
useWindowDimensions,
View,
type StyleProp,
type ViewProps,
type ViewStyle,
} from "react-native"
import { Ionicons } from "@expo/vector-icons"
import { CoverImage } from "@/components/cover-image"
import { useThemeColors } from "@/lib/theme"
import { useAppNavigation } from "@/lib/app-navigation"
import { useServerConfig } from "@/contexts/server-config"
import type { MediaShareContext } from "@/lib/media-links"
import { shouldShowShare } from "@/lib/media-links"
@@ -20,6 +28,7 @@ export type MediaAction =
| "play-next"
| "play-last"
| "shuffle"
| "create-station"
| "favorite"
| "go-artist"
| "go-album"
@@ -30,11 +39,22 @@ export type MediaNavigation = {
album?: { id: string }
}
export type MediaMenuPreview = {
title: string
artist?: string
album?: string
artworkUrl: string
hasArtwork: boolean
kind: "album" | "artist" | "song"
}
export type MediaMenuConfig = {
preview?: MediaMenuPreview
selectedCount?: number
playlistLabel?: string
favorited?: boolean
showFavorite?: boolean
stationArtistId?: string
navigation?: MediaNavigation
share?: MediaShareContext
includeActions?: MediaAction[]
@@ -78,15 +98,20 @@ const MEDIA_ACTION_ITEMS: {
label: (countSuffix) => `Shuffle${countSuffix}`,
image: "shuffle",
},
{
action: "create-station",
label: () => "Create Station",
image: "shuffle",
},
{
action: "go-artist",
label: () => "Go to Artist",
image: "person",
image: "music.mic",
},
{
action: "go-album",
label: () => "Go to Album",
image: "opticaldisc",
image: "square.stack",
},
{
action: "favorite",
@@ -105,6 +130,10 @@ function isActionIncluded(
action: MediaAction,
config: Omit<MediaMenuConfig, "onAction">
): boolean {
if (action === "create-station" && !config.stationArtistId) {
return false
}
if (config.includeActions) {
return config.includeActions.includes(action)
}
@@ -160,8 +189,7 @@ 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,
})
}
@@ -203,10 +231,95 @@ function MediaMenuBase({
const NativeContextMenuView =
Platform.OS === "ios"
? requireNativeView<
ViewProps & { disableForceFlatten?: boolean; children: ReactNode }
ViewProps & {
disableForceFlatten?: boolean
children: ReactNode
onPreviewTappedAnimationCompleted?: () => void
}
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewView")
: null
const NativeContextMenuPreview =
Platform.OS === "ios"
? requireNativeView<
ViewProps & {
preferredContentSize: { width: number; height: number }
children: ReactNode
}
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewContentView")
: null
function MediaPreview({ preview }: { preview: MediaMenuPreview }) {
const colors = useThemeColors()
const { width: windowWidth, fontScale } = useWindowDimensions()
if (!NativeContextMenuPreview) return null
const width = Math.min(360, windowWidth - 32)
const height = Math.max(124, 32 + 76 * fontScale)
const isArtist = preview.kind === "artist"
return (
// Match Expo Router's preview wrapper: UIKit mounts this separately, but
// Yoga must also keep it out of the trigger's normal layout.
<NativeContextMenuPreview
preferredContentSize={{ width, height }}
style={{ position: "absolute", top: 0, left: 0 }}
>
<View
style={{
width,
height,
padding: 16,
flexDirection: "row",
alignItems: "center",
gap: 16,
backgroundColor: colors.card,
}}
>
<CoverImage
uri={preview.artworkUrl}
hasCover={preview.hasArtwork}
style={{ width: 88, height: 88, borderRadius: isArtist ? 44 : 12 }}
/>
<View style={{ flex: 1, gap: 2 }}>
<Text
numberOfLines={2}
style={{
color: colors.foreground,
fontSize: 17,
fontWeight: "600",
}}
>
{preview.title}
</Text>
{preview.artist ? (
<Text
numberOfLines={1}
style={{ color: colors.mutedForeground, fontSize: 15 }}
>
{preview.artist}
</Text>
) : null}
{preview.album ? (
<Text
numberOfLines={1}
style={{ color: colors.mutedForeground, fontSize: 14 }}
>
{preview.album}
</Text>
) : null}
</View>
{preview.kind !== "song" ? (
<Ionicons
name="chevron-forward"
size={20}
color={colors.mutedForeground}
/>
) : null}
</View>
</NativeContextMenuPreview>
)
}
const NativeContextMenuAction: ComponentType<{
identifier: string
title: string
@@ -222,11 +335,13 @@ const NativeContextMenuAction: ComponentType<{
function NativeMediaContextMenu({
children,
preview,
onAction,
share,
...actionConfig
}: MediaMenuWrapperProps) {
const { config } = useServerConfig()
const { push } = useAppNavigation()
if (!NativeContextMenuView || !NativeContextMenuAction) {
return children
@@ -241,10 +356,21 @@ function NativeMediaContextMenu({
}
return (
<NativeContextMenuView style={{ display: "contents" }} disableForceFlatten>
<NativeContextMenuView
style={{ display: "contents" }}
disableForceFlatten
onPreviewTappedAnimationCompleted={() => {
if (share?.type === "artist") push(`/artist/${share.artistId}`)
else if (share?.type === "album" || share?.type === "song")
push(`/album/${share.albumId}`)
}}
>
{/* The native menu retains its first trigger. Keep that view mounted when
focus changes replace the Siri entity wrapper inside it. */}
<View collapsable={false}>{children}</View>
{preview && (actionConfig.selectedCount ?? 1) === 1 ? (
<MediaPreview preview={preview} />
) : null}
{buildMediaMenuActions({ ...actionConfig, share }).map((action) => (
<NativeContextMenuAction
key={action.id}
@@ -0,0 +1,140 @@
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",
}}
// Rows fill their parent width; compact action buttons keep intrinsic sizing.
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
>
<DropdownMenu
expanded={expanded}
onDismissRequest={() => setExpanded(false)}
color={appleMusic.elevated}
cornerRadius={4}
shadowElevation={0}
properties={{ clippingEnabled: false }}
>
<DropdownMenu.Trigger>
<RNHostView
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
>
{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>
)
}
+45
View File
@@ -0,0 +1,45 @@
import type { MenuComponentProps } from "@expo/ui/community/menu"
import { Button, Host, Menu, RNHostView } from "@expo/ui/swift-ui"
import { disabled, menuOrder } from "@expo/ui/swift-ui/modifiers"
// SwiftUI's automatic order reverses menus that open upward in the player.
// Keep the same top-to-bottom order as the UIKit long-press menus.
export function MenuView({
actions,
children,
style,
testID,
onPressAction,
}: MenuComponentProps) {
return (
<Host matchContents style={style} testID={testID} ignoreSafeArea="all">
<Menu
modifiers={[menuOrder("fixed")]}
label={
<RNHostView matchContents>
<>{children}</>
</RNHostView>
}
>
{actions
.filter((action) => !action.attributes?.hidden)
.map((action) => (
<Button
key={action.id ?? action.title}
label={action.title}
systemImage={
typeof action.image === "string" ? action.image : undefined
}
role={action.attributes?.destructive ? "destructive" : undefined}
modifiers={[disabled(action.attributes?.disabled ?? false)]}
onPress={() =>
onPressAction?.({
nativeEvent: { event: action.id ?? action.title },
})
}
/>
))}
</Menu>
</Host>
)
}
+1
View File
@@ -0,0 +1 @@
export { MenuView } from "@expo/ui/community/menu"
+114 -64
View File
@@ -1,20 +1,22 @@
import { Ionicons } from "@expo/vector-icons"
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import Animated from "react-native-reanimated"
import {
useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidTabHasArtworkPalette,
} from "@/contexts/android-tab-theme"
import { NativeTabs } from "expo-router/native-tabs"
import { useRouter } from "expo-router"
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
import { Platform, Pressable, StyleSheet, View } from "react-native"
import { useSafeAreaInsets } from "react-native-safe-area-context"
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,
useBlurTint,
useMiniPlayerBackground,
useThemeColors,
} from "@/lib/theme"
import { miniPlayerHeight, tabBarHeight, useThemeColors } from "@/lib/theme"
function MiniPlayerContent({
placement,
@@ -25,10 +27,19 @@ function MiniPlayerContent({
variant: "bar" | "accessory"
onOpenPlayer: () => void
}) {
const colors = useThemeColors()
const theme = useThemeColors()
const palette = useAndroidTabPalette()
const colors =
Platform.OS === "android"
? {
...theme,
foreground: palette.foreground,
mutedForeground: palette.secondaryForeground,
}
: theme
const { config } = useServerConfig()
const { currentSong, isPlaying } = usePlaybackQueue()
const { setIsPlaying, skipNext } = usePlaybackActions()
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
if (!currentSong || !config) {
return null
@@ -56,7 +67,8 @@ function MiniPlayerContent({
<View
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
>
<Text
<PaletteText
tone="foreground"
style={[
isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground },
@@ -64,7 +76,7 @@ function MiniPlayerContent({
numberOfLines={1}
>
{currentSong.title}
</Text>
</PaletteText>
</View>
<Pressable
style={styles.controlButton}
@@ -74,7 +86,8 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
<Ionicons
<PaletteIcon
tone="foreground"
name={isPlaying ? "pause" : "play"}
size={20}
color={colors.foreground}
@@ -92,7 +105,8 @@ function MiniPlayerContent({
style={artworkStyle}
/>
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
<Text
<PaletteText
tone="foreground"
style={[
isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground },
@@ -100,8 +114,9 @@ function MiniPlayerContent({
numberOfLines={1}
>
{currentSong.title}
</Text>
<Text
</PaletteText>
<PaletteText
tone="secondaryForeground"
style={[
isAccessory ? styles.accessoryArtist : styles.artist,
{ color: colors.mutedForeground },
@@ -109,9 +124,28 @@ function MiniPlayerContent({
numberOfLines={1}
>
{currentSong.artist.name}
</Text>
</PaletteText>
</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}
>
<PaletteIcon
tone="foreground"
name="play-back"
size={24}
color={colors.foreground}
/>
</Pressable>
) : null}
<Pressable
style={styles.controlButton}
onPress={(event) => {
@@ -120,7 +154,8 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
<Ionicons
<PaletteIcon
tone="foreground"
name={isPlaying ? "pause" : "play"}
size={24}
color={colors.foreground}
@@ -134,7 +169,12 @@ function MiniPlayerContent({
}}
hitSlop={6}
>
<Ionicons name="play-forward" size={24} color={colors.foreground} />
<PaletteIcon
tone="foreground"
name="play-forward"
size={24}
color={colors.foreground}
/>
</Pressable>
</View>
</Pressable>
@@ -142,14 +182,30 @@ function MiniPlayerContent({
}
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
const colors = useThemeColors()
const backgroundColor = useMiniPlayerBackground()
const palette = useAndroidTabPalette()
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
const backgroundStyle = useAndroidTabBackgroundStyle()
return (
<View style={[styles.androidBar, { backgroundColor }]}>
<View style={[styles.topBorder, { backgroundColor: colors.border }]} />
<Animated.View style={[styles.androidBar, backgroundStyle]}>
{children}
</View>
{hasArtworkPalette ? (
<View
style={[
styles.separator,
styles.topBorder,
{ backgroundColor: palette.secondaryForeground },
]}
/>
) : null}
<View
style={[
styles.separator,
styles.bottomBorder,
{ backgroundColor: palette.secondaryForeground },
]}
/>
</Animated.View>
)
}
@@ -178,43 +234,31 @@ export function TabBottomAccessory() {
return content
}
//
// 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>
// )
// }
/** 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>
)
}
const styles = StyleSheet.create({
floatingContainer: {
@@ -234,9 +278,15 @@ const styles = StyleSheet.create({
androidBar: {
overflow: "hidden",
},
topBorder: {
height: StyleSheet.hairlineWidth,
separator: {
position: "absolute",
left: 0,
right: 0,
height: 1,
zIndex: 1,
},
topBorder: { top: 0 },
bottomBorder: { bottom: 0 },
content: {
flexDirection: "row",
alignItems: "center",
+83 -33
View File
@@ -61,7 +61,7 @@ type QueueListItem =
| { type: "history-header"; key: string }
| { type: "history"; key: string; songId: Id<"songs">; historyIndex: number }
| { type: "current"; key: string }
| { type: "controls"; key: string; showTitle: boolean }
| { type: "controls"; key: string; showTitle: boolean; tablet?: boolean }
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
| { type: "empty"; key: string; height: number }
@@ -72,7 +72,11 @@ function itemHeight(item: QueueListItem) {
case "current":
return CURRENT_HEIGHT
case "controls":
return item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT
return item.tablet
? 44
: item.showTitle
? CONTROLS_HEIGHT
: TOGGLES_ONLY_HEIGHT
case "empty":
return item.height
default:
@@ -97,10 +101,14 @@ export function NowPlayingQueue({
colors,
viewportHeight,
currentHeader,
tablet = false,
fadeColor,
}: {
colors: NowPlayingColors
viewportHeight: number
currentHeader: ReactNode
tablet?: boolean
fadeColor?: string
}) {
const {
queueSongIds,
@@ -114,6 +122,7 @@ export function NowPlayingQueue({
skipToQueueIndex,
skipToHistoryIndex,
} = usePlayback()
const [viewportWidth, setViewportWidth] = useState(0)
const swipeGroup = useSwipeRowGroup()
const [scrollEnabled, setScrollEnabled] = useState(true)
const dragFrom = useSharedValue(-1)
@@ -142,9 +151,14 @@ export function NowPlayingQueue({
})
)
}
list.push({ type: "current", key: "current" })
if (!tablet) list.push({ type: "current", key: "current" })
const hasUpcoming = queueSongIds.length > 1
list.push({ type: "controls", key: "controls", showTitle: hasUpcoming })
list.push({
type: "controls",
key: "controls",
showTitle: hasUpcoming,
tablet,
})
const occurrences = new Map<string, number>()
queueSongIds.forEach((songId, queueIndex) => {
const occurrence = occurrences.get(songId) ?? 0
@@ -169,7 +183,7 @@ export function NowPlayingQueue({
})
}
return list
}, [queueHistorySongIds, queueSongIds, viewportHeight])
}, [queueHistorySongIds, queueSongIds, viewportHeight, tablet])
const offsets = useMemo(() => {
const result: number[] = []
@@ -181,8 +195,10 @@ export function NowPlayingQueue({
return result
}, [items])
const currentIndex = items.findIndex((item) => item.type === "current")
const controlsIndex = currentIndex + 1
const currentIndex = items.findIndex(
(item) => item.type === (tablet ? "controls" : "current")
)
const controlsIndex = tablet ? currentIndex : currentIndex + 1
const belowCurrentHeight = items
.slice(currentIndex)
.reduce((sum, item) => sum + itemHeight(item), 0)
@@ -325,29 +341,31 @@ export function NowPlayingQueue({
style={[
styles.controls,
{
height: item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT,
backgroundColor: colors.background,
height: itemHeight(item),
backgroundColor: tablet ? "transparent" : colors.background,
},
]}
>
<View style={styles.toggles}>
<QueueToggle
colors={colors}
selected={shuffleEnabled}
label="Shuffle"
symbol="shuffle"
fallback="shuffle"
onPress={toggleShuffle}
/>
<QueueToggle
colors={colors}
selected={repeatEnabled !== "none"}
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
fallback="repeat"
onPress={cycleRepeat}
/>
</View>
{!tablet ? (
<View style={styles.toggles}>
<QueueToggle
colors={colors}
selected={shuffleEnabled}
label="Shuffle"
symbol="shuffle"
fallback="shuffle"
onPress={toggleShuffle}
/>
<QueueToggle
colors={colors}
selected={repeatEnabled !== "none"}
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
fallback="repeat"
onPress={cycleRepeat}
/>
</View>
) : null}
{item.showTitle ? (
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Continue Playing
@@ -361,6 +379,7 @@ export function NowPlayingQueue({
songId={item.songId}
queueIndex={item.queueIndex}
lastIndex={queueSongIds.length - 1}
tablet={tablet}
colors={colors}
drag={drag}
swipeGroup={swipeGroup}
@@ -384,7 +403,10 @@ export function NowPlayingQueue({
}
return (
<View style={styles.root}>
<View
style={styles.root}
onLayout={(event) => setViewportWidth(event.nativeEvent.layout.width)}
>
<FlatList
ref={listRef}
data={items}
@@ -403,18 +425,31 @@ export function NowPlayingQueue({
ListFooterComponent={<View style={{ height: footerHeight }} />}
/>
<Svg
key={viewportWidth}
pointerEvents="none"
style={styles.bottomFade}
width="100%"
width={viewportWidth}
height={BOTTOM_FADE_HEIGHT}
>
<Defs>
<LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1">
<Stop offset="0" stopColor={colors.background} stopOpacity={0} />
<Stop offset="1" stopColor={colors.background} stopOpacity={1} />
<Stop
offset="0"
stopColor={fadeColor ?? colors.background}
stopOpacity={0}
/>
<Stop
offset="1"
stopColor={fadeColor ?? colors.background}
stopOpacity={1}
/>
</LinearGradient>
</Defs>
<Rect width="100%" height="100%" fill="url(#queue-fade)" />
<Rect
width={viewportWidth}
height={BOTTOM_FADE_HEIGHT}
fill="url(#queue-fade)"
/>
</Svg>
</View>
)
@@ -581,6 +616,7 @@ const UpcomingRow = memo(function UpcomingRow({
songId,
queueIndex,
lastIndex,
tablet = false,
colors,
drag,
swipeGroup,
@@ -592,6 +628,7 @@ const UpcomingRow = memo(function UpcomingRow({
songId: Id<"songs">
queueIndex: number
lastIndex: number
tablet?: boolean
colors: NowPlayingColors
drag: DragState
swipeGroup: SwipeRowGroup
@@ -685,6 +722,19 @@ const UpcomingRow = memo(function UpcomingRow({
</GestureDetector>
}
/>
{tablet ? (
<View
pointerEvents="none"
style={{
position: "absolute",
left: 88,
right: 26,
bottom: 0,
height: StyleSheet.hairlineWidth,
backgroundColor: colors.sliderTrack,
}}
/>
) : null}
<Animated.View
pointerEvents="none"
style={[
@@ -701,7 +751,7 @@ const UpcomingRow = memo(function UpcomingRow({
{Platform.OS === "ios" ? (
<SwipeToRemoveRow
group={swipeGroup}
backgroundColor={colors.background}
backgroundColor={tablet ? "transparent" : colors.background}
actionAccessibilityLabel="Remove from queue"
onRemove={handleRemove}
>
+49
View File
@@ -0,0 +1,49 @@
import { Ionicons } from "@expo/vector-icons"
import type { ComponentProps } from "react"
import { Pressable, type TextProps } from "react-native"
import { useRouter } from "expo-router"
import Animated from "react-native-reanimated"
import {
useAnimatedPaletteColor,
type PaletteColor,
} from "@/contexts/android-tab-theme"
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
/** Keep artwork text colors on the same UI-thread animation as the background. */
export function PaletteText({
tone,
style,
...props
}: TextProps & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <Animated.Text {...props} style={[style, colorStyle]} />
}
export function PaletteIcon({
tone,
style,
...props
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
const colorStyle = useAnimatedPaletteColor(tone)
return <AnimatedIcon {...props} style={[style, colorStyle]} />
}
function ArtworkBackButton() {
const router = useRouter()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel="Navigate up"
hitSlop={8}
onPress={() => router.back()}
>
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
</Pressable>
)
}
export function renderArtworkBackButton() {
return <ArtworkBackButton />
}
@@ -0,0 +1,56 @@
import { useState, type ReactNode } from "react"
import { StyleSheet, View } from "react-native"
import {
MediaActionMenu,
type MediaAction,
} from "@/components/media-context-menu"
import type { BrowseSong } from "@otunes/convex/types"
export function PlayerArtistMenu({
song,
onAction,
children,
}: {
song: BrowseSong
onAction: (action: MediaAction) => void
children: ReactNode
}) {
const [size, setSize] = useState({ width: 0, height: 0 })
return (
<View
style={styles.container}
onLayout={({ nativeEvent: { layout } }) =>
setSize({ width: layout.width, height: layout.height })
}
>
<View
pointerEvents="none"
accessibilityElementsHidden
importantForAccessibility="no-hide-descendants"
>
{children}
</View>
{size.width > 0 ? (
<MediaActionMenu
style={StyleSheet.absoluteFill}
includeActions={["go-album", "go-artist"]}
onAction={onAction}
>
<View
style={size}
accessible
accessibilityRole="button"
accessibilityLabel={song.artist.name}
accessibilityHint="Opens album and artist options"
/>
</MediaActionMenu>
) : null}
</View>
)
}
const styles = StyleSheet.create({
container: { overflow: "hidden" },
})
+26 -4
View File
@@ -2,6 +2,7 @@ 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,
@@ -34,6 +35,8 @@ export function PlayerSlider({
leading,
trailing,
accessibilityLabel,
commitHoldMs = COMMIT_HOLD_MS,
animateValueChanges = false,
}: {
value: number
maximumValue: number
@@ -46,6 +49,9 @@ 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))
@@ -57,23 +63,38 @@ export function PlayerSlider({
useEffect(() => {
if (dragging.value || Date.now() < holdUntil.current) return
fraction.value = clamp(value / max)
}, [dragging, fraction, max, value])
const next = clamp(value / max)
fraction.value = animateValueChanges
? withTiming(next, { duration: 160 })
: next
}, [animateValueChanges, dragging, fraction, max, value])
const callbacks = useRef({
onValueChange,
onSlidingStart,
onSlidingComplete,
value,
commitHoldMs,
max,
})
callbacks.current = { onValueChange, onSlidingStart, onSlidingComplete, max }
callbacks.current = {
onValueChange,
onSlidingStart,
onSlidingComplete,
value,
commitHoldMs,
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() + COMMIT_HOLD_MS
holdUntil.current = Date.now() + callbacks.current.commitHoldMs
if (callbacks.current.commitHoldMs === 0) {
fraction.value = clamp(callbacks.current.value / callbacks.current.max)
}
callbacks.current.onSlidingComplete?.(next * callbacks.current.max)
}
@@ -85,6 +106,7 @@ export function PlayerSlider({
active.value = withSpring(1, { duration: 250, dampingRatio: 0.8 })
})
.onStart(() => {
cancelAnimation(fraction)
dragging.value = true
startFraction.value = fraction.value
scheduleOnRN(start)
+84 -18
View File
@@ -1,3 +1,6 @@
import { SongSwipeRow } from "@/components/song-swipe-row"
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
import { PaletteText } from "@/components/palette-text"
import { MusicEntityView } from "@/components/music-entity-view"
import { collectionInset } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image"
@@ -6,9 +9,14 @@ import type { BrowseSong } from "@otunes/convex/types"
import type { CoverPalette } from "@/lib/cover-palette"
import { formatDuration } from "@/lib/format"
import { albumCoverUrl } from "@/lib/urls"
import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
import {
miniPlayerHeight,
tabletMiniPlayerHeight,
spacing,
useThemeColors,
} from "@/lib/theme"
import { memo, useCallback } from "react"
import { Pressable, StyleSheet, Text, View } from "react-native"
import { Platform, Pressable, StyleSheet, View } from "react-native"
import {
MediaContextMenu,
@@ -16,6 +24,8 @@ import {
type MediaMenuConfig,
} from "@/components/media-context-menu"
function consumeLongPress() {}
export const SongRow = memo(function SongRow({
song,
onPress,
@@ -23,6 +33,7 @@ export const SongRow = memo(function SongRow({
trailing,
palette,
inset = false,
swipe,
}: {
song: BrowseSong
onPress?: () => void
@@ -31,6 +42,11 @@ export const SongRow = memo(function SongRow({
}
trailing?: React.ReactNode
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
swipe?: {
group: SwipeRowGroup
onPlayNext: () => void
backgroundColor: string
}
/** Album/playlist layout: the divider starts at the title, not the artwork. */
inset?: boolean
}) {
@@ -46,33 +62,33 @@ export const SongRow = memo(function SongRow({
const content = (
<>
<View style={styles.rowMeta}>
<Text
<PaletteText
tone={palette ? "foreground" : undefined}
style={[styles.rowTitle, { color: foreground }]}
numberOfLines={1}
>
{song.title}
</Text>
<Text
</PaletteText>
<PaletteText
tone={palette ? "secondaryForeground" : undefined}
style={[styles.rowSubtitle, { color: secondaryForeground }]}
numberOfLines={1}
>
{song.artist.name} · {song.album.title}
</Text>
</PaletteText>
</View>
<Text style={[styles.duration, { color: secondaryForeground }]}>
<PaletteText
tone={palette ? "secondaryForeground" : undefined}
style={[styles.duration, { color: secondaryForeground }]}
>
{formatDuration(song.durationSeconds)}
</Text>
</PaletteText>
{trailing}
</>
)
const row = (
<Pressable
style={
inset ? styles.insetRow : [styles.row, { borderBottomColor: divider }]
}
onPress={onPress}
>
const rowContent = (
<>
<CoverImage
uri={albumCoverUrl(config.serverUrl, song.album.id)}
hasCover={song.album.cover != null}
@@ -85,8 +101,31 @@ export const SongRow = memo(function SongRow({
) : (
content
)}
</Pressable>
</>
)
const rowStyle = inset
? styles.insetRow
: [styles.row, { borderBottomColor: divider }]
const row =
swipe && Platform.OS === "ios" ? (
<SongSwipeRow
group={swipe.group}
onPlayNext={swipe.onPlayNext}
backgroundColor={swipe.backgroundColor}
onPress={onPress}
style={rowStyle}
>
{rowContent}
</SongSwipeRow>
) : (
<Pressable
style={rowStyle}
onPress={onPress}
onLongPress={contextMenu ? consumeLongPress : undefined}
>
{rowContent}
</Pressable>
)
if (!contextMenu) {
return (
@@ -116,6 +155,7 @@ export const SongListRow = memo(function SongListRow({
playlistLabel,
palette,
inset,
swipe,
onPlay,
onAction,
}: {
@@ -124,9 +164,15 @@ export const SongListRow = memo(function SongListRow({
playlistLabel?: string
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
inset?: boolean
swipe?: {
group: SwipeRowGroup
onPlayNext: () => void
backgroundColor: string
}
onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void
}) {
const { config } = useServerConfig()
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
return (
@@ -134,8 +180,20 @@ export const SongListRow = memo(function SongListRow({
song={song}
palette={palette}
inset={inset}
swipe={swipe}
onPress={handlePress}
contextMenu={{
preview: config
? {
kind: "song",
title: song.title,
artist: song.artist.name,
album: song.album.title,
artworkUrl: albumCoverUrl(config.serverUrl, song.album.id),
hasArtwork: song.album.cover != null,
}
: undefined,
stationArtistId: song.artist.id,
favorited,
playlistLabel,
navigation: {
@@ -146,6 +204,7 @@ export const SongListRow = memo(function SongListRow({
type: "song",
albumId: song.album.id,
songId: song.id,
title: `${song.title} - ${song.album.title}`,
},
onAction: (action) => onAction(song, action),
}}
@@ -153,8 +212,15 @@ export const SongListRow = memo(function SongListRow({
)
})
export const tabContentBottomInset = spacing.lg
export const contentBottomInset = miniPlayerHeight + spacing.lg
const tabletPlayerInset = tabletMiniPlayerHeight + spacing.sm + spacing.lg
export const tabContentBottomInset =
Platform.OS === "ios" && Platform.isPad ? tabletPlayerInset : spacing.lg
export const contentBottomInset =
Platform.OS === "ios" && Platform.isPad
? tabletPlayerInset
: Platform.OS === "android"
? spacing.lg
: miniPlayerHeight + spacing.lg
const styles = StyleSheet.create({
row: {
@@ -0,0 +1,56 @@
import { useCallback, useMemo } from "react"
import { Platform } from "react-native"
import { Stack } from "expo-router"
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
import { useThemeColors } from "@/lib/theme"
import type { BrowseSong } from "@otunes/convex/types"
export function usePlaylistSearch(songs: BrowseSong[]) {
const search = useDebouncedSearch()
const filteredSongs = useMemo(() => {
const query = search.searchQuery.toLowerCase()
if (!query) return songs
return songs.filter((song) =>
[song.title, song.artist.name, song.album.title].some((value) =>
value.toLowerCase().includes(query)
)
)
}, [songs, search.searchQuery])
return { ...search, filteredSongs }
}
export function PlaylistSearchBar({
onQueryChange,
onSearchSubmit,
}: Pick<
ReturnType<typeof useDebouncedSearch>,
"onQueryChange" | "onSearchSubmit"
>) {
const colors = useThemeColors()
const handleChangeText = useCallback(
(event: { nativeEvent: { text: string } }) => {
onQueryChange(event.nativeEvent.text)
},
[onQueryChange]
)
return (
<Stack.SearchBar
placeholder="Search playlist"
onChangeText={handleChangeText}
onSearchButtonPress={onSearchSubmit}
autoCapitalize="none"
{...(Platform.OS === "android"
? {
barTintColor: colors.background,
textColor: colors.foreground,
tintColor: colors.primary,
hintTextColor: colors.mutedForeground,
headerIconColor: colors.foreground,
}
: {})}
/>
)
}
@@ -1,5 +1,6 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { useOpenSettings } from "@/hooks/use-open-settings"
import { Image } from "expo-image"
import { useRouter } from "expo-router"
import { Pressable, StyleSheet, Text, View } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query"
@@ -8,16 +9,19 @@ import { radius, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
export function ProfileHeaderButton() {
const router = useRouter()
const tabletLayout = useTabletLayout()
const openSettings = useOpenSettings()
const colors = useThemeColors()
const user = useCachedQuery(api.auth.currentUser)
if (tabletLayout) return null
return (
<Pressable
accessibilityLabel="Open profile"
accessibilityRole="button"
hitSlop={8}
onPress={() => router.push("/(app)/settings")}
onPress={openSettings}
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
>
<View
@@ -30,7 +34,11 @@ export function ProfileHeaderButton() {
]}
>
{user?.image ? (
<Image source={{ uri: user.image }} style={styles.image} contentFit="cover" />
<Image
source={{ uri: user.image }}
style={styles.image}
contentFit="cover"
/>
) : (
<Text style={[styles.initials, { color: colors.foreground }]}>
{initialsFromName(user?.name ?? "Me")}
+181 -89
View File
@@ -1,6 +1,14 @@
import { useEffect, useRef } from "react"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import {
Animated,
CollectionHero,
useCollectionHeroLayout,
} from "@/components/collection-hero"
import { Link } from "expo-router"
import { useHeaderHeight } from "expo-router/react-navigation"
import Reanimated from "react-native-reanimated"
import { type ReactNode, type ComponentProps } from "react"
import {
Platform,
ScrollView,
StyleSheet,
View,
@@ -10,41 +18,43 @@ import {
} from "react-native"
import { contentBottomInset } from "@/components/player"
import {
carouselCardWidth,
radius,
spacing,
useThemeColors,
useTwoColumnCardWidth,
} from "@/lib/theme"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
function SkeletonContent({
children,
embedded = false,
}: {
children: ReactNode
embedded?: boolean
}) {
const colors = useThemeColors()
const headerHeight = useHeaderHeight()
if (embedded) return <>{children}</>
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading"
>
{children}
</ScrollView>
)
}
export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
const colors = useThemeColors()
const opacity = useRef(new Animated.Value(1)).current
useEffect(() => {
const pulse = Animated.loop(
Animated.sequence([
Animated.timing(opacity, {
toValue: 0.5,
duration: 800,
useNativeDriver: true,
}),
Animated.timing(opacity, {
toValue: 1,
duration: 800,
useNativeDriver: true,
}),
])
)
pulse.start()
return () => pulse.stop()
}, [opacity])
return (
<Animated.View
<View
style={[
{ backgroundColor: colors.muted, borderRadius: radius.sm, opacity },
{ backgroundColor: colors.muted, borderRadius: radius.sm },
style,
]}
/>
@@ -74,13 +84,21 @@ export function SongRowSkeleton() {
)
}
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
export function SongListSkeleton({
rows = 10,
embedded = false,
}: {
rows?: number
embedded?: boolean
}) {
return (
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
{Array.from({ length: rows }, (_, index) => (
<SongRowSkeleton key={index} />
))}
</View>
<SkeletonContent embedded={embedded}>
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
{Array.from({ length: rows }, (_, index) => (
<SongRowSkeleton key={index} />
))}
</View>
</SkeletonContent>
)
}
@@ -109,24 +127,38 @@ function CardSkeleton({
export function MediaGridSkeleton({
items = 6,
contentInset = true,
embedded = false,
}: {
items?: number
contentInset?: boolean
embedded?: boolean
}) {
const cardWidth = useTwoColumnCardWidth()
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout()
return (
<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 embedded={embedded}>
<View
onLayout={onLayout}
accessibilityLabel="Loading"
accessibilityRole="progressbar"
style={[
styles.grid,
contentInset ? styles.gridInset : styles.gridRowInset,
{
paddingHorizontal: horizontalPadding,
paddingTop: contentInset ? horizontalPadding : 0,
gap,
},
]}
>
{Array.from(
{ length: ready ? Math.max(items, columns * 3) : 0 },
(_, index) => (
<CardSkeleton key={index} width={cardWidth} />
)
)}
</View>
</SkeletonContent>
)
}
@@ -144,12 +176,16 @@ export function CarouselSkeleton() {
}
export function HomeSkeleton() {
const headerHeight = useHeaderHeight()
const colors = useThemeColors()
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={styles.home}
contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={[
styles.home,
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
]}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading"
>
@@ -161,59 +197,115 @@ export function HomeSkeleton() {
/** Album and playlist pages: cover, title, play buttons, then tracks. */
export function CollectionDetailSkeleton({
zoomCoverSize,
style,
round = false,
backgroundColor,
onLayout,
}: {
zoomCoverSize?: number
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
round?: boolean
backgroundColor?: string
onLayout?: () => void
}) {
const colors = useThemeColors()
const coverSize = round ? 180 : 210
const headerHeight = useHeaderHeight()
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
const coverSize =
!round && landscape
? tabletCoverSize!
: (zoomCoverSize ?? (round ? 180 : 210))
const actions = (
<View style={styles.actions}>
<Skeleton style={styles.iconAction} />
<Skeleton style={styles.playButton} />
<Skeleton style={styles.iconAction} />
</View>
)
const artwork = (
<Skeleton
style={{
width: coverSize,
height: coverSize,
borderRadius: round ? coverSize / 2 : radius.lg,
}}
/>
)
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={{ paddingBottom: contentBottomInset }}
contentInsetAdjustmentBehavior="automatic"
<Reanimated.ScrollView
onLayout={onLayout}
style={[
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
style,
]}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false}
accessibilityLabel="Loading"
>
<View style={styles.hero}>
<Skeleton
style={{
width: coverSize,
height: coverSize,
borderRadius: round ? coverSize / 2 : radius.lg,
}}
/>
<TextLine width={200} height={24} />
<TextLine width={120} height={16} />
<View style={styles.actions}>
<Skeleton style={styles.iconAction} />
<Skeleton style={styles.playButton} />
<Skeleton style={styles.iconAction} />
</View>
</View>
{round ? (
<MediaGridSkeleton items={4} contentInset={false} />
<View style={styles.artistHero}>
{zoomCoverSize ? (
<Link.AppleZoomTarget>
<View collapsable={false}>{artwork}</View>
</Link.AppleZoomTarget>
) : (
artwork
)}
<TextLine width={200} height={24} />
<TextLine width={120} height={16} />
{actions}
</View>
) : (
<SongListSkeleton rows={8} />
<CollectionHero
artwork={
zoomCoverSize ? (
<Link.AppleZoomTarget>
<View collapsable={false}>{artwork}</View>
</Link.AppleZoomTarget>
) : (
artwork
)
}
actions={actions}
>
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
<TextLine
width={landscape && !round ? "60%" : 120}
height={landscape && !round ? 22 : 16}
/>
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
</CollectionHero>
)}
</ScrollView>
{round ? (
<MediaGridSkeleton items={4} contentInset={false} embedded />
) : (
<SongListSkeleton rows={8} embedded />
)}
</Reanimated.ScrollView>
)
}
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
const colors = useThemeColors()
return (
<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>
</SkeletonContent>
)
}
@@ -233,10 +325,10 @@ const styles = StyleSheet.create({
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
gridInset: { padding: spacing.lg },
gridRowInset: { paddingHorizontal: spacing.lg },
carousel: { gap: spacing.md },
carousel: { gap: spacing.md, overflow: "hidden" },
carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl },
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: {
flexDirection: "row",
alignItems: "center",
+332
View File
@@ -0,0 +1,332 @@
import * as Haptics from "expo-haptics"
import { SymbolView } from "expo-symbols"
import {
useCallback,
useEffect,
useMemo,
useState,
type ReactNode,
} from "react"
import {
Pressable,
StyleSheet,
type StyleProp,
type ViewStyle,
} from "react-native"
import { Gesture, GestureDetector } from "react-native-gesture-handler"
import Animated, {
type SharedValue,
cancelAnimation,
Extrapolation,
interpolate,
useAnimatedStyle,
useSharedValue,
withSpring,
} from "react-native-reanimated"
import { scheduleOnRN } from "react-native-worklets"
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
const ACTION_WIDTH = 82
const SPRING = { duration: 450, dampingRatio: 1 }
function impact() {
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium)
}
/** A tap competes with the swipe so dragging a moving row never starts playback. */
export function SongSwipeRow({
children,
style,
backgroundColor,
group,
onPress,
onPlayNext,
}: {
children: ReactNode
style?: StyleProp<ViewStyle>
backgroundColor: string
group: SwipeRowGroup
onPress?: () => void
onPlayNext: () => void
}) {
const x = useSharedValue(0)
const startX = useSharedValue(0)
const width = useSharedValue(0)
const height = useSharedValue(0)
const committed = useSharedValue(false)
const commitProgress = useSharedValue(0)
const [open, setOpen] = useState<-1 | 0 | 1>(0)
const close = useCallback(() => {
x.value = withSpring(0, SPRING)
committed.value = false
commitProgress.value = withSpring(0, SPRING)
setOpen(0)
group.clear(close)
}, [commitProgress, committed, group, x])
useEffect(() => () => group.clear(close), [close, group])
const begin = useCallback(() => group.setOpen(close), [close, group])
const settle = useCallback(
(side: -1 | 0 | 1) => {
setOpen(side)
if (!side) group.clear(close)
},
[close, group]
)
const activate = useCallback(
(side: number) => {
close()
if (side > 0) onPlayNext()
// Download is intentionally a placeholder.
},
[close, onPlayNext]
)
const tapRow = useCallback(() => {
if (open) close()
else onPress?.()
}, [close, onPress, open])
const gesture = useMemo(() => {
const pan = Gesture.Pan()
// Leave the screen's leading edge available for native back navigation.
.hitSlop({ left: -24 })
.activeOffsetX([-10, 10])
.failOffsetY([-10, 10])
.onStart(() => {
cancelAnimation(x)
startX.value = x.value
scheduleOnRN(begin)
})
.onUpdate((event) => {
x.value = Math.max(
-width.value,
Math.min(width.value, startX.value + event.translationX)
)
const commit =
Math.abs(x.value) > Math.max(ACTION_WIDTH, width.value * 0.55)
if (commit !== committed.value) {
committed.value = commit
commitProgress.value = withSpring(commit ? 1 : 0, SPRING)
scheduleOnRN(impact)
}
})
.onEnd((event) => {
const side = x.value > 0 ? 1 : -1
if (committed.value) {
x.value = withSpring(0, SPRING)
scheduleOnRN(activate, side)
return
}
const projected = x.value + event.velocityX * 0.12
const target =
Math.abs(x.value) > 10 && projected * side > ACTION_WIDTH / 2
? side
: 0
x.value = withSpring(target * ACTION_WIDTH, {
...SPRING,
velocity: event.velocityX,
})
scheduleOnRN(settle, target)
})
.onFinalize((_event, success) => {
if (!success) {
x.value = withSpring(0, SPRING)
scheduleOnRN(close)
}
})
const tap = Gesture.Tap()
.maxDistance(10)
.maxDuration(500)
.onEnd((_event, success) => {
if (success) scheduleOnRN(tapRow)
})
return Gesture.Exclusive(pan, tap)
}, [
activate,
begin,
close,
commitProgress,
committed,
settle,
startX,
tapRow,
width,
x,
])
const rowStyle = useAnimatedStyle(() => ({
transform: [{ translateX: x.value }],
borderRadius: interpolate(
Math.abs(x.value),
[0, 40],
[0, height.value / 2],
Extrapolation.CLAMP
),
}))
const fillStyle = useAnimatedStyle(() => ({
opacity: interpolate(
Math.abs(x.value),
[0, 40],
[0, 1],
Extrapolation.CLAMP
),
}))
return (
<Animated.View
style={styles.container}
onLayout={(event) => {
width.value = event.nativeEvent.layout.width
height.value = event.nativeEvent.layout.height
}}
>
<SwipeAction
side={1}
x={x}
height={height}
progress={commitProgress}
open={open === 1}
onPress={() => activate(1)}
/>
<SwipeAction
side={-1}
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => activate(-1)}
/>
<GestureDetector gesture={gesture}>
<Animated.View
accessible
accessibilityRole="button"
onAccessibilityTap={tapRow}
accessibilityActions={[
{ name: "playNext", label: "Play Next" },
{ name: "download", label: "Download" },
]}
onAccessibilityAction={(event) => {
if (event.nativeEvent.actionName === "playNext") activate(1)
}}
style={[styles.row, { backgroundColor }, rowStyle]}
>
<Animated.View
pointerEvents="none"
style={[StyleSheet.absoluteFill, styles.fill, fillStyle]}
/>
<Animated.View style={style}>{children}</Animated.View>
</Animated.View>
</GestureDetector>
</Animated.View>
)
}
function SwipeAction({
side,
x,
height,
progress,
open,
onPress,
}: {
side: 1 | -1
x: SharedValue<number>
height: SharedValue<number>
progress: SharedValue<number>
open: boolean
onPress: () => void
}) {
const actionStyle = useAnimatedStyle(() => ({
width: Math.max(0, x.value * side),
}))
const pillStyle = useAnimatedStyle(() => {
const revealed = Math.max(0, x.value * side)
const resting = Math.max(
0,
Math.min(
revealed - 20,
interpolate(revealed, [24, ACTION_WIDTH, 220], [0, 62, 200])
)
)
const pillWidth =
resting + (Math.max(0, revealed - 12) - resting) * progress.value
const restingHeight = interpolate(
pillWidth,
[0, 24, 62, 140, 200],
[0, 0.3, 0.77, 0.82, 0.86].map((ratio) => ratio * height.value),
Extrapolation.CLAMP
)
const pillHeight =
restingHeight +
(Math.max(0, height.value - 12) - restingHeight) * progress.value
return {
width: pillWidth,
height: pillHeight,
borderRadius: pillHeight / 2,
}
})
const iconStyle = useAnimatedStyle(() => ({
transform: [
{
scale: interpolate(
x.value * side,
[24, 64],
[0, 1],
Extrapolation.CLAMP
),
},
],
}))
return (
<Animated.View
pointerEvents={open ? "auto" : "none"}
accessibilityElementsHidden={!open}
importantForAccessibility={open ? "auto" : "no-hide-descendants"}
style={[
styles.action,
side > 0 ? styles.leading : styles.trailing,
actionStyle,
]}
>
<Pressable
accessibilityRole="button"
accessibilityLabel={side > 0 ? "Play Next" : "Download"}
onPress={onPress}
style={styles.actionButton}
>
<Animated.View
style={[
styles.pill,
{ backgroundColor: side > 0 ? "#6b5bff" : "#008dff" },
pillStyle,
]}
>
<Animated.View style={iconStyle}>
<SymbolView
name={
side > 0
? "text.line.first.and.arrowtriangle.forward"
: "arrow.down"
}
size={22}
tintColor="white"
/>
</Animated.View>
</Animated.View>
</Pressable>
</Animated.View>
)
}
const styles = StyleSheet.create({
container: { overflow: "hidden" },
row: { overflow: "hidden" },
fill: { backgroundColor: "rgba(128,128,128,0.16)" },
action: { position: "absolute", top: 0, bottom: 0 },
leading: { left: 0 },
trailing: { right: 0 },
actionButton: { flex: 1, alignItems: "center", justifyContent: "center" },
pill: { alignItems: "center", justifyContent: "center", overflow: "hidden" },
})
@@ -0,0 +1,27 @@
import Animated from "react-native-reanimated"
import { SafeAreaView } from "react-native-safe-area-context"
import { Platform } from "react-native"
import type { ReactNode } from "react"
import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
import { TabletSidebar } from "@/components/tablet-sidebar"
/** Apply sidebar insets natively, before Yoga measures the content pane. */
export function TabScreenContent({ children }: { children: ReactNode }) {
const backgroundStyle = useAndroidTabBackgroundStyle()
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
return (
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
{children}
</SafeAreaView>
<TabletSidebar />
<TabletPlayerLayoutSync />
</Animated.View>
)
}
export function renderTabScreenContent({ children }: { children: ReactNode }) {
return <TabScreenContent>{children}</TabScreenContent>
}
@@ -0,0 +1,139 @@
import {
useEffect,
useCallback,
useRef,
useState,
type ReactElement,
} from "react"
import {
ScrollView,
View,
type NativeSyntheticEvent,
type NativeScrollEvent,
} from "react-native"
import Animated from "react-native-reanimated"
import { useSafeAreaInsets } from "react-native-safe-area-context"
import type { MediaItem } from "@/components/media-cards"
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
import { tabletLayoutTransition } from "@/lib/tablet-motion"
import { useThemeColors } from "@/lib/theme"
type GridProps = {
content: MediaItem[]
paddingBottom: number
onEndReached?: () => void
ListHeaderComponent?: ReactElement
contentInset?: boolean
renderCard: (item: MediaItem, width: number) => ReactElement
}
/**
* Keep tiles keyed by media ID across column changes. Only the viewport plus
* two rows on either side is mounted, even when a large library is loaded.
*/
export function TabletMediaGrid({
content,
paddingBottom,
onEndReached,
ListHeaderComponent,
contentInset = true,
renderCard,
}: GridProps) {
const colors = useThemeColors()
const insets = useSafeAreaInsets()
const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
useMediaGridLayout()
const [viewportHeight, setViewportHeight] = useState(900)
const [headerHeight, setHeaderHeight] = useState(0)
const [scrollY, setScrollY] = useState(0)
const lastRequestedLength = useRef(-1)
const rowHeight = cardWidth + 48 + gap
const firstRow = Math.max(
0,
Math.floor((scrollY - headerHeight) / rowHeight) - 2
)
const visibleRows = Math.ceil(viewportHeight / rowHeight) + 5
const start = firstRow * columns
const end = Math.min(content.length, (firstRow + visibleRows) * columns)
const rows = Math.ceil(content.length / columns)
const gridHeight = rows * rowHeight
const onScroll = useCallback(
(event: NativeSyntheticEvent<NativeScrollEvent>) => {
const { contentOffset, layoutMeasurement, contentSize } =
event.nativeEvent
const nextY = Math.max(0, contentOffset.y)
setScrollY((current) =>
Math.floor(current / rowHeight) === Math.floor(nextY / rowHeight)
? current
: nextY
)
if (
contentOffset.y + layoutMeasurement.height * 1.5 >=
contentSize.height &&
lastRequestedLength.current !== content.length
) {
lastRequestedLength.current = content.length
onEndReached?.()
}
},
[content.length, onEndReached, rowHeight]
)
useEffect(() => {
if (
content.length > 0 &&
gridHeight + headerHeight <= viewportHeight * 1.5 &&
lastRequestedLength.current !== content.length
) {
lastRequestedLength.current = content.length
onEndReached?.()
}
}, [content.length, gridHeight, headerHeight, viewportHeight, onEndReached])
return (
<Animated.View
style={{ flex: 1, backgroundColor: colors.background }}
onLayout={(event) => {
onLayout(event)
setViewportHeight(event.nativeEvent.layout.height)
}}
>
<ScrollView
onScroll={onScroll}
scrollEventThrottle={32}
contentInsetAdjustmentBehavior="automatic"
contentContainerStyle={{
paddingTop: contentInset ? horizontalPadding : 0,
paddingBottom: paddingBottom + insets.bottom,
}}
>
<View
onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)}
>
{ListHeaderComponent}
</View>
<View style={{ height: gridHeight }}>
{(ready ? content.slice(start, end) : []).map((item, offset) => {
const index = start + offset
return (
<Animated.View
key={item.id}
layout={tabletLayoutTransition}
style={{
position: "absolute",
left:
horizontalPadding + (index % columns) * (cardWidth + gap),
top: Math.floor(index / columns) * rowHeight,
width: cardWidth,
}}
>
{renderCard(item, cardWidth)}
</Animated.View>
)
})}
</View>
</ScrollView>
</Animated.View>
)
}
@@ -0,0 +1,289 @@
import { useEffect, type ReactNode } from "react"
import Animated, {
useAnimatedStyle,
useSharedValue,
withTiming,
} from "react-native-reanimated"
import { GlassView, isLiquidGlassAvailable } from "expo-glass-effect"
import { tabletMotion } from "@/lib/tablet-motion"
import { BlurView } from "expo-blur"
import { useIsFocused, useRouter } from "expo-router"
import {
Pressable,
StyleSheet,
Text,
useWindowDimensions,
View,
} from "react-native"
import { useTabletPlayerInsets } from "@/contexts/tablet-player-layout"
import { CoverImage } from "@/components/cover-image"
import { MediaActionMenu } from "@/components/media-actions-sheet"
import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { tabletMiniPlayerHeight } from "@/lib/theme"
import { albumCoverUrl } from "@/lib/urls"
export function TabletMiniPlayer() {
const focused = useIsFocused()
const router = useRouter()
const insets = useTabletPlayerInsets()
const { width } = useWindowDimensions()
const left = useSharedValue(insets.left)
const right = useSharedValue(insets.right)
const bottom = useSharedValue(insets.bottom)
useEffect(() => {
left.value = withTiming(insets.left, tabletMotion)
right.value = withTiming(insets.right, tabletMotion)
bottom.value = withTiming(insets.bottom, tabletMotion)
}, [insets.left, insets.right, insets.bottom, left, right, bottom])
const positionStyle = useAnimatedStyle(() => ({
left: left.value + 16,
right: right.value + 16,
bottom: bottom.value + 8,
}))
const { config } = useServerConfig()
const {
currentSong,
queueSongIds,
isPlaying,
shuffleEnabled,
repeatEnabled,
} = usePlaybackQueue()
const { setIsPlaying, skipPrevious, skipNext, toggleShuffle, cycleRepeat } =
usePlaybackActions()
const { handleSongAction } = useMediaMenuActions()
const { isSongFavorite } = useFavorites()
const roomy = width - insets.left - insets.right >= 650
if (!focused || !config || !currentSong || queueSongIds.length === 0)
return null
const color = "#fff"
const inactive = "rgba(255,255,255,0.4)"
const accent = "#FA2D48"
return (
<Animated.View
pointerEvents="box-none"
style={[styles.position, positionStyle]}
>
<TabletPlayerSurface>
<View style={styles.controls}>
{roomy ? (
<Control
label="Shuffle"
symbol="shuffle"
fallback="shuffle"
color={shuffleEnabled ? accent : inactive}
selected={shuffleEnabled}
onPress={() => void toggleShuffle()}
size={21}
/>
) : null}
<Control
label="Previous track"
symbol="backward.fill"
fallback="play-back"
color={color}
onPress={() => void skipPrevious()}
size={27}
/>
<Control
label={isPlaying ? "Pause" : "Play"}
symbol={isPlaying ? "pause.fill" : "play.fill"}
fallback={isPlaying ? "pause" : "play"}
color={color}
onPress={() => setIsPlaying(!isPlaying)}
size={34}
/>
<Control
label="Next track"
symbol="forward.fill"
fallback="play-forward"
color={color}
onPress={() => void skipNext()}
size={27}
/>
{roomy ? (
<Control
label="Repeat"
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
fallback="repeat"
color={repeatEnabled !== "none" ? accent : inactive}
selected={repeatEnabled !== "none"}
onPress={() => void cycleRepeat()}
size={21}
/>
) : null}
</View>
<Pressable
onPress={() => router.push("/(app)/player")}
style={styles.track}
accessibilityLabel="Open Now Playing"
>
<CoverImage
uri={albumCoverUrl(config.serverUrl, currentSong.album.id)}
hasCover={currentSong.album.cover != null}
style={styles.artwork}
/>
<View style={styles.meta}>
<Text numberOfLines={1} style={styles.title}>
{currentSong.title}
</Text>
<Text numberOfLines={1} style={styles.artist}>
{currentSong.artist.name}
</Text>
</View>
</Pressable>
<MediaActionMenu
style={{ alignSelf: "center" }}
favorited={isSongFavorite(currentSong.id)}
stationArtistId={currentSong.artist.id}
navigation={{
artist: { id: currentSong.artist.id },
album: { id: currentSong.album.id },
}}
includeActions={["playlist", "favorite", "go-artist", "go-album"]}
onAction={(action) => void handleSongAction(currentSong, action)}
>
<Pressable
style={styles.control}
accessibilityRole="button"
accessibilityLabel="More"
>
<PlayerSymbol
name="ellipsis"
fallback="ellipsis-horizontal"
size={23}
color={color}
/>
</Pressable>
</MediaActionMenu>
{roomy ? (
<Pressable
style={styles.control}
disabled
accessibilityRole="button"
accessibilityLabel="Lyrics"
accessibilityState={{ disabled: true }}
>
<PlayerSymbol
name="quote.bubble"
fallback="chatbox-outline"
size={23}
color={inactive}
/>
</Pressable>
) : null}
<Control
label="Show queue"
symbol="list.bullet"
fallback="list"
color={color}
size={25}
onPress={() =>
router.push({ pathname: "/(app)/player", params: { queue: "1" } })
}
/>
</TabletPlayerSurface>
</Animated.View>
)
}
function TabletPlayerSurface({ children }: { children: ReactNode }) {
if (isLiquidGlassAvailable()) {
return (
<GlassView
glassEffectStyle="regular"
colorScheme="dark"
isInteractive
style={styles.bar}
>
{children}
</GlassView>
)
}
return (
<BlurView intensity={70} tint="dark" style={styles.bar}>
{children}
</BlurView>
)
}
function Control({
label,
symbol,
fallback,
color,
size,
onPress,
selected,
}: {
label: string
symbol: React.ComponentProps<typeof PlayerSymbol>["name"]
fallback: React.ComponentProps<typeof PlayerSymbol>["fallback"]
color: string
size: number
onPress: () => void
selected?: boolean
}) {
return (
<Pressable
style={styles.control}
onPress={onPress}
accessibilityRole="button"
accessibilityLabel={label}
accessibilityState={{ selected }}
>
<PlayerSymbol
name={symbol}
fallback={fallback}
color={color}
size={size}
weight="semibold"
/>
</Pressable>
)
}
const styles = StyleSheet.create({
position: { position: "absolute", alignItems: "center", zIndex: 100 },
bar: {
flexDirection: "row",
alignItems: "center",
width: "100%",
maxWidth: 720,
height: tabletMiniPlayerHeight,
paddingHorizontal: 14,
gap: 4,
borderRadius: 34,
overflow: "hidden",
},
controls: {
flexDirection: "row",
alignItems: "center",
gap: 1,
marginRight: 12,
},
control: {
width: 40,
height: 44,
alignItems: "center",
justifyContent: "center",
},
track: {
flex: 1,
minWidth: 0,
flexDirection: "row",
alignItems: "center",
gap: 10,
},
artwork: { width: 50, height: 50, borderRadius: 5 },
meta: { flex: 1, minWidth: 0 },
title: { color: "#fff", fontSize: 15, lineHeight: 19, fontWeight: "500" },
artist: { color: "rgba(255,255,255,0.7)", fontSize: 14, lineHeight: 18 },
})
@@ -0,0 +1,418 @@
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
import {
Pressable,
StyleSheet,
Text,
View,
useWindowDimensions,
} from "react-native"
import Animated, {
Easing,
ReduceMotion,
interpolate,
useAnimatedStyle,
useSharedValue,
withTiming,
} from "react-native-reanimated"
import { GestureDetector, Gesture } from "react-native-gesture-handler"
import { useSafeAreaInsets } from "react-native-safe-area-context"
import { useRouter } from "expo-router"
import { StatusBar } from "expo-status-bar"
import { AudioOutputButton } from "@/components/audio-output-button"
import { CoverImage } from "@/components/cover-image"
import { NowPlayingQueue } from "@/components/now-playing-queue"
import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol"
import { usePlayback } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { useSystemVolume } from "@/hooks/use-system-volume"
import { formatDuration, formatRemainingDuration } from "@/lib/format"
import type { NowPlayingColors } from "@/lib/now-playing-colors"
import { albumCoverUrl } from "@/lib/urls"
const queueMotion = {
duration: 420,
easing: Easing.bezier(0.22, 1, 0.36, 1),
reduceMotion: ReduceMotion.System,
}
/** Tablet player keeps transport controls visible while the queue opens beside them. */
export function TabletNowPlaying({
colors,
backgroundStyle,
dismissStyle,
dismissGesture,
showQueue,
toggleQueue,
metadata,
}: {
colors: NowPlayingColors
backgroundStyle: ComponentProps<typeof Animated.View>["style"]
dismissStyle: ComponentProps<typeof Animated.View>["style"]
dismissGesture: () => ReturnType<typeof Gesture.Pan>
showQueue: boolean
toggleQueue: () => void
metadata: ReactNode
}) {
const router = useRouter()
const insets = useSafeAreaInsets()
const { width, height } = useWindowDimensions()
const { config } = useServerConfig()
const {
currentSong,
currentTime,
duration,
isPlaying,
setIsPlaying,
seekTo,
skipNext,
skipPrevious,
shuffleEnabled,
repeatEnabled,
toggleShuffle,
cycleRepeat,
} = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
const [scrubTime, setScrubTime] = useState<number | null>(null)
const [queueHeight, setQueueHeight] = useState(0)
const wideLayout = width >= 700
const sideBySide = showQueue && wideLayout
const progress = useSharedValue(sideBySide ? 1 : 0)
useEffect(() => {
progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
}, [sideBySide, progress])
const closedCoverSize = Math.max(
160,
Math.min(322, width * 0.52, height - 460)
)
const openCoverSize = Math.max(160, Math.min(322, width * 0.34, height - 460))
const mainMotion = useAnimatedStyle(() => ({
transform: [{ translateX: -width * 0.2625 * progress.value }],
}))
const artworkMotion = useAnimatedStyle(() => ({
width: interpolate(
progress.value,
[0, 1],
[closedCoverSize, openCoverSize]
),
height: interpolate(
progress.value,
[0, 1],
[closedCoverSize, openCoverSize]
),
}))
const controlsMotion = useAnimatedStyle(() => ({
width: interpolate(
progress.value,
[0, 1],
[Math.min(456, width - 80), Math.min(456, width * 0.475 - 80)]
),
}))
const queueStyle = useAnimatedStyle(() => ({
opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
transform: [{ translateX: (1 - progress.value) * 48 }],
}))
const time = scrubTime ?? currentTime
if (!currentSong || !config) return null
const control = (
label: string,
symbol: React.ComponentProps<typeof PlayerSymbol>["name"],
fallback: React.ComponentProps<typeof PlayerSymbol>["fallback"],
onPress: () => void,
size = 32,
selected = false,
inactive = false
) => (
<Pressable
onPress={onPress}
accessibilityRole="button"
accessibilityLabel={label}
accessibilityState={{ selected }}
style={[styles.button, selected && { backgroundColor: colors.control }]}
>
<PlayerSymbol
name={symbol}
fallback={fallback}
size={size}
color={inactive ? colors.secondaryForeground : colors.foreground}
/>
</Pressable>
)
const queue = (
<NowPlayingQueue
tablet
colors={colors}
viewportHeight={queueHeight}
currentHeader={null}
/>
)
return (
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
<StatusBar style={colors.isDark ? "light" : "dark"} />
<GestureDetector gesture={dismissGesture()}>
<Pressable
onPress={() => router.back()}
accessibilityRole="button"
accessibilityLabel="Close player"
style={[styles.handleRow, { marginTop: insets.top }]}
>
<View
style={[styles.handle, { backgroundColor: colors.sliderFill }]}
/>
</Pressable>
</GestureDetector>
<View style={styles.body}>
<Animated.View style={[styles.main, mainMotion]}>
<GestureDetector gesture={dismissGesture()}>
<View style={styles.artworkArea}>
<Animated.View style={artworkMotion}>
<CoverImage
uri={albumCoverUrl(config.serverUrl, currentSong.album.id)}
hasCover={currentSong.album.cover != null}
style={{ width: "100%", height: "100%", borderRadius: 10 }}
/>
</Animated.View>
</View>
</GestureDetector>
<Animated.View style={[styles.controls, controlsMotion]}>
<View style={styles.meta}>{metadata}</View>
<PlayerSlider
accessibilityLabel="Playback position"
value={time}
maximumValue={duration}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={setScrubTime}
onSlidingComplete={(value) => {
void seekTo(value)
setScrubTime(null)
}}
/>
<View style={styles.times}>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatDuration(time)}
</Text>
<Text
style={[styles.time, { color: colors.secondaryForeground }]}
>
{formatRemainingDuration(time, duration).replace("-", "−")}
</Text>
</View>
<View style={styles.transport}>
{control(
"Shuffle",
"shuffle",
"shuffle",
() => void toggleShuffle(),
21,
shuffleEnabled
)}
{control(
"Previous",
"backward.fill",
"play-back",
() => void skipPrevious(),
38
)}
{control(
isPlaying ? "Pause" : "Play",
isPlaying ? "pause.fill" : "play.fill",
isPlaying ? "pause" : "play",
() => setIsPlaying(!isPlaying),
44
)}
{control(
"Next",
"forward.fill",
"play-forward",
() => void skipNext(),
38
)}
{control(
"Repeat",
repeatEnabled === "once" ? "repeat.1" : "repeat",
"repeat",
() => void cycleRepeat(),
21,
repeatEnabled !== "none",
repeatEnabled === "none"
)}
</View>
<View style={styles.volume}>
<View
pointerEvents={volumeAvailable ? "auto" : "none"}
accessibilityState={{ disabled: !volumeAvailable }}
>
<PlayerSlider
accessibilityLabel="Volume"
commitHoldMs={0}
animateValueChanges
value={volume}
maximumValue={1}
fillColor={colors.sliderFill}
activeFillColor={colors.foreground}
trackColor={colors.sliderTrack}
onValueChange={volumeAvailable ? setVolume : undefined}
leading={
<PlayerSymbol
name="speaker.fill"
fallback="volume-low"
size={14}
color={colors.secondaryForeground}
/>
}
trailing={
<PlayerSymbol
name="speaker.wave.3.fill"
fallback="volume-high"
size={18}
color={colors.secondaryForeground}
/>
}
/>
</View>
</View>
</Animated.View>
</Animated.View>
{wideLayout ? (
<Animated.View
pointerEvents={showQueue ? "auto" : "none"}
accessibilityElementsHidden={!showQueue}
importantForAccessibility={
showQueue ? "auto" : "no-hide-descendants"
}
style={[styles.queue, queueStyle]}
onLayout={(event) =>
setQueueHeight(event.nativeEvent.layout.height)
}
>
{queueHeight > 0 ? queue : null}
</Animated.View>
) : null}
{showQueue && !sideBySide ? (
<View
style={[
styles.portraitQueue,
{ backgroundColor: colors.background },
]}
onLayout={(event) =>
setQueueHeight(event.nativeEvent.layout.height)
}
>
{queueHeight > 0 ? queue : null}
</View>
) : null}
</View>
<View
style={[
styles.footer,
{ paddingBottom: Math.max(insets.bottom, 24) + 12 },
]}
>
<AudioOutputButton
color={colors.foreground}
style={styles.footerButton}
/>
<View style={styles.footerActions}>
<Pressable
disabled
accessibilityRole="button"
accessibilityLabel="Lyrics"
accessibilityState={{ disabled: true }}
style={[styles.footerButton, { opacity: 0.4 }]}
>
<PlayerSymbol
name="quote.bubble"
fallback="chatbox-outline"
size={25}
color={colors.foreground}
/>
</Pressable>
<Pressable
onPress={toggleQueue}
accessibilityRole="button"
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
accessibilityState={{ selected: showQueue }}
style={[
styles.footerButton,
showQueue && { backgroundColor: colors.selected },
]}
>
<PlayerSymbol
name="list.bullet"
fallback="list"
size={25}
color={showQueue ? colors.selectedForeground : colors.foreground}
/>
</Pressable>
</View>
</View>
</Animated.View>
)
}
const styles = StyleSheet.create({
root: { flex: 1, overflow: "hidden" },
handleRow: { height: 32, alignItems: "center", justifyContent: "center" },
handle: { width: 60, height: 4, borderRadius: 2 },
body: { flex: 1, flexDirection: "row", minHeight: 0 },
main: {
flex: 1,
minWidth: 0,
alignItems: "center",
paddingTop: 20,
paddingBottom: 0,
},
artworkArea: {
flex: 1,
width: "100%",
alignItems: "center",
justifyContent: "center",
paddingBottom: 36,
},
controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
meta: { height: 48 },
times: {
flexDirection: "row",
justifyContent: "space-between",
marginTop: -4,
},
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
transport: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
height: 80,
paddingHorizontal: 14,
},
button: {
width: 64,
minWidth: 36,
flexShrink: 1,
height: 64,
borderRadius: 32,
alignItems: "center",
justifyContent: "center",
},
volume: { height: 36, justifyContent: "center" },
queue: { position: "absolute", left: "47.5%", right: 20, top: 0, bottom: 0 },
portraitQueue: { ...StyleSheet.absoluteFill, bottom: 270 },
footer: {
flexDirection: "row",
justifyContent: "space-between",
paddingHorizontal: 44,
paddingTop: 12,
},
footerActions: { flexDirection: "row", gap: 16 },
footerButton: {
width: 40,
height: 40,
borderRadius: 20,
alignItems: "center",
justifyContent: "center",
},
})
+39
View File
@@ -0,0 +1,39 @@
import { useOpenSettings } from "@/hooks/use-open-settings"
import { requireNativeView } from "expo"
import { useIsFocused } from "expo-router"
import { Platform, type ViewProps } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { initialsFromName } from "@/lib/format"
import { api } from "@otunes/convex/_generated/api"
const NativeSidebar =
Platform.OS === "ios"
? requireNativeView<
ViewProps & {
accountName: string
initials: string
imageURL?: string
active: boolean
onProfilePress: () => void
}
>("TabletSidebar")
: null
export function TabletSidebar() {
const user = useCachedQuery(api.auth.currentUser)
const openSettings = useOpenSettings()
const active = useIsFocused()
if (!NativeSidebar) return null
return (
<NativeSidebar
style={{ position: "absolute", width: 0, height: 0 }}
accountName={user?.name ?? "Account"}
initials={initialsFromName(user?.name ?? "Me")}
imageURL={user?.image}
active={active}
onProfilePress={openSettings}
/>
)
}
+29 -3
View File
@@ -1,5 +1,7 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import {
ActivityIndicator,
Platform,
Pressable,
PressableProps,
StyleProp,
@@ -72,8 +74,20 @@ export function Button({
<ActivityIndicator color={textColor} />
) : (
<View style={styles.buttonContent}>
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
{icon ? (
<PaletteIcon
tone={tint ? "accentForeground" : undefined}
name={icon}
size={18}
color={textColor}
/>
) : null}
<PaletteText
tone={tint ? "accentForeground" : undefined}
style={[styles.buttonText, { color: textColor }]}
>
{title}
</PaletteText>
</View>
)}
</Pressable>
@@ -85,6 +99,13 @@ 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,
@@ -102,7 +123,12 @@ 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>
)
+4 -5
View File
@@ -1,16 +1,15 @@
import { Toaster as SonnerToaster } from "sonner-native"
import { useColorScheme } from "react-native"
import { colors, radius } from "@/lib/theme"
import { radius, useIsDark, useThemeColors } from "@/lib/theme"
export function Toaster() {
const scheme = useColorScheme()
const themeColors = scheme === "dark" ? colors.dark : colors.light
const isDark = useIsDark()
const themeColors = useThemeColors()
return (
<SonnerToaster
position="top-center"
theme={scheme === "dark" ? "dark" : "light"}
theme={isDark ? "dark" : "light"}
toastOptions={{
style: {
backgroundColor: themeColors.card,
+80 -72
View File
@@ -1,3 +1,4 @@
import { AndroidSheet } from "@/components/android-sheet"
import { useConvex, useMutation } from "convex/react"
import {
createContext,
@@ -246,51 +247,53 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
transparent
onRequestClose={closeAddToPlaylist}
>
<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)
}}
/>
<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>
</Pressable>
</AndroidSheet>
</Modal>
<Modal
@@ -299,38 +302,43 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
transparent
onRequestClose={() => setCreateOpen(false)}
>
<Pressable style={styles.overlay} onPress={() => setCreateOpen(false)}>
<AndroidSheet>
<Pressable
style={[
styles.createSheet,
{ backgroundColor: colors.card, borderColor: colors.border },
]}
onPress={(event) => event.stopPropagation()}
style={styles.overlay}
onPress={() => setCreateOpen(false)}
>
<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)}
<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
/>
<Button
title="Create"
loading={submitting}
disabled={!newPlaylistName.trim()}
onPress={() => void handleCreatePlaylist()}
/>
</View>
<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>
</Pressable>
</Pressable>
</AndroidSheet>
</Modal>
</AddToPlaylistContext.Provider>
)
+250
View File
@@ -0,0 +1,250 @@
import {
useIsFocused,
useRoute,
useNavigation,
type NativeStackNavigationProp,
} from "expo-router"
import {
createContext,
useCallback,
useContext,
useLayoutEffect,
useMemo,
useRef,
useState,
type PropsWithChildren,
} from "react"
import { Platform, StyleSheet, type HostInstance } from "react-native"
import Reanimated, {
useSharedValue,
useAnimatedStyle,
useAnimatedReaction,
useAnimatedRef,
setNativeProps,
processColor,
withTiming,
type SharedValue,
} from "react-native-reanimated"
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
import { useIsDark, useThemeColors } from "@/lib/theme"
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
selectedColor: string
}
type TabTheme = {
palette: CoverPalette
colors: SharedValue<PaletteColors>
hasArtworkPalette: boolean
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 ScreenPaletteProvider({ children }: PropsWithChildren) {
const defaultPalette = useDefaultPalette()
const [screen, setScreen] = useState<{
palette: CoverPalette
owner: string
} | null>(null)
const palette = screen?.palette ?? defaultPalette
const hasArtwork =
palette.background !== defaultPalette.background ||
palette.foreground !== defaultPalette.foreground ||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
palette.accent !== defaultPalette.accent
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
const animatedColors = useSharedValue<PaletteColors>({
...defaultColors,
selectedColor: defaultPalette.accentText,
})
useLayoutEffect(() => {
const { isDark: _isDark, ...colors } = palette
animatedColors.value = withTiming(
{
...colors,
selectedColor: hasArtwork
? palette.foreground
: defaultPalette.accentText,
},
{ duration: PALETTE_FADE_MS }
)
}, [animatedColors, palette, defaultPalette, hasArtwork])
const paletteOwner = useRef<string | null>(null)
const setPalette = useCallback(
(palette: CoverPalette | null, owner: string) => {
if (!palette && paletteOwner.current !== owner) return
paletteOwner.current = palette ? owner : null
// Start on the UI thread immediately. React may defer commits while
// the native stack is animating, including transitionStart state updates.
const target = palette ?? defaultPalette
const { isDark: _isDark, ...colors } = target
animatedColors.value = withTiming(
{
...colors,
selectedColor: palette ? target.foreground : target.accentText,
},
{ duration: PALETTE_FADE_MS }
)
setScreen(palette ? { palette, owner } : null)
},
[animatedColors, defaultPalette]
)
const artworkPalette = hasArtwork ? palette : null
const value = useMemo(
() => ({
palette: artworkPalette ?? defaultPalette,
colors: animatedColors,
hasArtworkPalette: artworkPalette !== null,
setPalette,
}),
[defaultPalette, artworkPalette, setPalette, animatedColors]
)
return (
<AndroidTabTheme.Provider value={value}>
{children}
</AndroidTabTheme.Provider>
)
}
/**
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
* directly so appearance updates stay on the UI thread with the page colors.
*/
export function useAndroidNativeTabColors() {
const colors = useContext(AndroidTabTheme)?.colors
const ref = useAnimatedRef<HostInstance>()
const mounted = useSharedValue(false)
const attach = useCallback(
(host: HostInstance | null) => {
if (host) ref(host)
mounted.value = host !== null
},
[ref, mounted]
)
useAnimatedReaction(
() => ({ colors: colors?.value, mounted: mounted.value }),
({ colors: palette, mounted: ready }) => {
if (Platform.OS !== "android" || !ready || !palette) return
const normal = processColor(palette.secondaryForeground)
const selected = processColor(palette.selectedColor)
setNativeProps(ref, {
standardAppearance: {
tabBarBackgroundColor: processColor("transparent"),
tabBarItemRippleColor: selected,
tabBarItemActiveIndicatorEnabled: false,
tabBarItemTitleSmallLabelFontSize: 10,
tabBarItemTitleLargeLabelFontSize: 10,
normal: {
tabBarItemTitleFontColor: normal,
tabBarItemIconColor: normal,
},
selected: {
tabBarItemTitleFontColor: selected,
tabBarItemIconColor: selected,
},
},
})
}
)
return { ref: attach, style: { backgroundColor: "transparent" } }
}
export function useAndroidTabPalette() {
const theme = useContext(AndroidTabTheme)
const defaultPalette = useDefaultPalette()
return theme?.palette ?? defaultPalette
}
export function useAndroidTabHasArtworkPalette() {
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
}
export function useAndroidTabBackgroundStyle() {
const theme = useContext(AndroidTabTheme)
const fallback = useDefaultPalette().background
const colors = theme?.colors
return useAnimatedStyle(() =>
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
? { backgroundColor: colors?.value.background ?? fallback }
: {}
)
}
/** Color tokens share the background's UI-thread timing. */
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
const colors = useContext(AndroidTabTheme)?.colors
return useAnimatedStyle(() =>
Platform.OS === "android" && tone && colors
? { color: colors.value[tone] }
: {}
)
}
/** Native headers draw this same UI-thread background as the page and bars. */
function AndroidArtworkBackground() {
const style = useAndroidTabBackgroundStyle()
return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
}
export function renderAndroidArtworkBackground() {
return <AndroidArtworkBackground />
}
const PALETTE_FADE_MS = 400
/** The focused artwork screen selects the shared background for page and bars. */
export function useScreenPalette(palette: CoverPalette) {
const isFocused = useIsFocused()
const isTablet = Platform.OS === "ios" && Platform.isPad
const sharesPalette =
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
const owner = useRoute().key
const navigation =
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
const [laidOut, setLaidOut] = useState(false)
const [closing, setClosing] = useState(false)
const onLayout = useCallback(() => setLaidOut(true), [])
const theme = useContext(AndroidTabTheme)
const setPalette = theme?.setPalette
useLayoutEffect(() => {
if (!sharesPalette) return
const start = navigation.addListener("transitionStart", ({ data }) => {
if (data.closing) setPalette?.(null, owner)
else setPalette?.(palette, owner)
setClosing(data.closing)
})
const cancel = navigation.addListener("gestureCancel", () => {
setPalette?.(palette, owner)
setClosing(false)
})
return () => {
start()
cancel()
}
}, [navigation, sharesPalette, setPalette, owner, palette])
const defaultPalette = useDefaultPalette()
const ready = laidOut || isTablet
const target = isFocused && ready && !closing ? palette : defaultPalette
const backgroundStyle = useAndroidTabBackgroundStyle()
useLayoutEffect(() => {
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
setPalette(palette, owner)
return () => setPalette(null, owner)
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
return {
palette: Platform.OS === "android" ? target : palette,
backgroundStyle,
onLayout: sharesPalette ? onLayout : undefined,
}
}
+5 -5
View File
@@ -22,11 +22,11 @@ export function ConvexAppProvider({ children }: { children: ReactNode }) {
return
}
await clearStoredAuthTokens(config.convexUrl)
try {
await clearAppIntentCatalogs()
} finally {
setAuthEpoch((epoch) => epoch + 1)
}
setAuthEpoch((epoch) => epoch + 1)
// Native catalog cleanup can be slow; it must not hold the signed-in UI open.
void clearAppIntentCatalogs().catch((error) => {
console.warn("Could not clear app intent catalogs.", error)
})
}, [config])
if (!client || !config) {
+84 -83
View File
@@ -1,6 +1,8 @@
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import {
createAudioPlaylist,
setAudioModeAsync,
setIsAudioActiveAsync,
type AudioMetadata,
type AudioPlaylist,
type AudioPlaylistStatus,
@@ -19,7 +21,6 @@ import {
type ReactNode,
} from "react"
import { AppState } from "react-native"
import AsyncStorage from "@react-native-async-storage/async-storage"
import {
ANONYMOUS_CACHE_SCOPE,
@@ -57,8 +58,6 @@ 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,
@@ -79,18 +78,20 @@ 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">[]) => Promise<void>
playFromSong: (
songId: Id<"songs">,
songIds: Id<"songs">[],
origin?: string
) => Promise<void>
playFromLibrarySong: (
songId: Id<"songs">,
sort: {
@@ -167,7 +168,12 @@ type PlaybackActionsValue = Pick<
type PlaybackQueueValue = Pick<
PlaybackContextValue,
"queueSongIds" | "queueHistorySongIds" | "currentSong" | "isPlaying"
| "queueSongIds"
| "queueHistorySongIds"
| "currentSong"
| "isPlaying"
| "shuffleEnabled"
| "repeatEnabled"
>
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
@@ -267,18 +273,16 @@ 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
)
@@ -322,7 +326,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
? JSON.stringify([
user._id,
user.playbackQuality,
user.preferAtmos ?? false,
dolbyAtmosSupported && (user.preferAtmos ?? false),
])
: ""
@@ -355,6 +359,21 @@ 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
@@ -466,7 +485,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
updateInterval: 500,
loop: repeatToPlaylistLoop(storeRef.current.getState().repeatEnabled),
})
playlist.volume = volumeRef.current
// System volume controls loudness; keep the player gain at full scale.
playlist.volume = 1
statusSubscriptionRef.current = playlist.addListener(
"playlistStatusUpdate",
handlePlaylistStatusUpdate
@@ -498,42 +518,12 @@ 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) {
@@ -553,25 +543,6 @@ 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
@@ -620,11 +591,12 @@ 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, store])
}, [currentSongId, destroyPlaylist, queueStartVersion, store])
useEffect(() => {
if (progressToRestore === null || progressToRestore <= 0) return
@@ -682,7 +654,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
}
if (!isCurrentLoad()) return
const loadKey = `${user.playbackQuality}:${user.preferAtmos ?? false}:${cookieHeader}`
const loadKey = `${user.playbackQuality}:${dolbyAtmosSupported && (user.preferAtmos ?? false)}:${cookieHeader}`
const needsRebuild =
loadedLoadKeyRef.current !== loadKey ||
nativePlaylistNeedsRebuild(
@@ -704,7 +676,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
playlist.skipTo(currentIndex)
}
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
playlist.volume = volumeRef.current
if (metadata) {
updatePlaylistLockScreenMetadata(playlist, metadata)
}
@@ -725,7 +696,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const plan = playbackStreamPlan(
song.files,
user.playbackQuality,
user.preferAtmos ?? false
dolbyAtmosSupported && (user.preferAtmos ?? false)
)
sources.set(
song.id,
@@ -818,7 +789,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
}
loadedSongIdsRef.current = windowSongIds
loadedLoadKeyRef.current = loadKey
playlist.volume = volumeRef.current
playlist.loop = repeatToPlaylistLoop(repeatEnabled)
activatePlaylistLockScreen(
playlist,
@@ -832,6 +802,14 @@ 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.")
}
}
}
}
@@ -856,6 +834,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
handlePlaybackLoadFailure,
historySyncKey,
queueSyncKey,
queueStartVersion,
repeatEnabled,
scheduleTrackChangeHandling,
userPlaybackKey,
@@ -876,18 +855,20 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
) => playbackQueue.PlaybackQueueState,
recorded: {
playlistId?: Id<"playlists">
origin?: string
entity?: { kind: MusicEntityKind; id: string }
} = {}
) => {
playRequestRef.current += 1
const previousSongId = store.getState().queue[0]
queueOriginRef.current =
recorded.origin ??
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
resetQueuePlayback()
store.update(playbackQueue.clearQueue)
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
@@ -918,7 +899,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
: { songId: firstSongId }
)
},
[store, seekTo, setIsPlaying, recordPlay]
[store, resetQueuePlayback, setIsPlaying, recordPlay]
)
const playCollection = useCallback(
@@ -927,6 +908,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
shuffled: boolean,
recorded: {
playlistId?: Id<"playlists">
origin?: string
entity?: { kind: MusicEntityKind; id: string }
} = {}
) => {
@@ -991,12 +973,19 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
)
const playFromSong = useCallback(
async (songId: Id<"songs">, songIds: Id<"songs">[]) => {
startPlayback((state) =>
playbackQueue.startQueueFromSong(state, songId, songIds)
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 }
)
},
[startPlayback]
[startPlayback, store]
)
const playFromLibrarySong = useCallback(
@@ -1066,6 +1055,7 @@ 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]
)
@@ -1074,6 +1064,7 @@ 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]
)
@@ -1136,12 +1127,14 @@ 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, setIsPlaying]
[store, resetQueuePlayback, setIsPlaying]
)
const startFromSong = useCallback(
@@ -1152,17 +1145,20 @@ 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, setIsPlaying]
[store, resetQueuePlayback, setIsPlaying]
)
const clearQueue = useCallback(async () => {
playRequestRef.current += 1
queueOriginRef.current = undefined
store.update(playbackQueue.clearQueue)
setIsPlaying(false)
}, [store, setIsPlaying])
@@ -1327,12 +1323,21 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const queueValue = useMemo<PlaybackQueueValue>(
() => ({
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled,
queueSongIds,
queueHistorySongIds,
currentSong,
isPlaying: isPlaybackActive,
}),
[currentSong, isPlaybackActive, queueHistorySongIds, queueSongIds]
[
currentSong,
isPlaybackActive,
queueHistorySongIds,
queueSongIds,
playback.shuffleEnabled,
repeatEnabled,
]
)
const value = useMemo<PlaybackContextValue>(
@@ -1345,11 +1350,9 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
shuffleEnabled: playback.shuffleEnabled,
repeatEnabled,
isPlaying: isPlaybackActive,
volume,
currentTime,
duration,
seekTo,
setVolume,
}),
[
actionsValue,
@@ -1363,8 +1366,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
queueSongIds,
repeatEnabled,
seekTo,
setVolume,
volume,
]
)
@@ -0,0 +1,54 @@
import {
createContext,
useCallback,
useContext,
useLayoutEffect,
useMemo,
useState,
type ReactNode,
} from "react"
import { useIsFocused } from "expo-router"
import { useSafeAreaInsets } from "react-native-safe-area-context"
type PlayerInsets = { left: number; right: number; bottom: number }
const TabletPlayerLayout = createContext<{
insets: PlayerInsets
setInsets: (insets: PlayerInsets) => void
} | null>(null)
/** Keep one player above the navigator, positioned using the focused screen's safe area. */
export function TabletPlayerLayoutProvider({
children,
}: {
children: ReactNode
}) {
const safeArea = useSafeAreaInsets()
const [insets, updateInsets] = useState<PlayerInsets>(safeArea)
const setInsets = useCallback((next: PlayerInsets) => {
updateInsets((current) =>
current.left === next.left &&
current.right === next.right &&
current.bottom === next.bottom
? current
: next
)
}, [])
const value = useMemo(() => ({ insets, setInsets }), [insets, setInsets])
return <TabletPlayerLayout value={value}>{children}</TabletPlayerLayout>
}
export function TabletPlayerLayoutSync() {
const focused = useIsFocused()
const { left, right, bottom } = useSafeAreaInsets()
const setInsets = useContext(TabletPlayerLayout)?.setInsets
useLayoutEffect(() => {
if (focused) setInsets?.({ left, right, bottom })
}, [focused, left, right, bottom, setInsets])
return null
}
export function useTabletPlayerInsets() {
const layout = useContext(TabletPlayerLayout)
const safeArea = useSafeAreaInsets()
return layout?.insets ?? safeArea
}
+9
View File
@@ -5,13 +5,22 @@
},
"build": {
"development": {
"env": {
"APP_VARIANT": "development"
},
"developmentClient": true,
"distribution": "internal"
},
"preview": {
"env": {
"APP_VARIANT": "preview"
},
"distribution": "internal"
},
"production": {
"env": {
"APP_VARIANT": "production"
},
"autoIncrement": true
}
},
Loaded 100 of 199 files, more files were not shown because too many files have changed in this diff. Show more