Compare commits

..
240 changed files with 5349 additions and 12304 deletions

No files matched your search

+6 -5
View File
@@ -54,11 +54,12 @@ playwright.config.*
*~ *~
*.log *.log
# Environment variables, in any workspace. Next.js inlines NEXT_PUBLIC_* values # Environment variables (only commit template files)
# into the bundle and the Convex CLI reads .env.local on deploy. .env
**/.env .env*.local
**/.env.* .env.development
!**/.env.example .env.test
.env.production.local
# Docker configuration files (not needed inside build context) # Docker configuration files (not needed inside build context)
Dockerfile* Dockerfile*
+1 -6
View File
@@ -195,12 +195,7 @@ RUN node --version \
&& ldd /convex/generate_key \ && ldd /convex/generate_key \
&& ! ldd /convex/convex-local-backend /convex/generate_key | grep -q 'not found' && ! ldd /convex/convex-local-backend /convex/generate_key | grep -q 'not found'
# The backend gets its own user so the web server cannot read the database or RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes
# instance secret. It joins the otunes group to clean up the web server's HLS
# cache in /tmp/otunes.
RUN useradd --system --user-group --home-dir /app --shell /usr/sbin/nologin otunes \
&& useradd --system --user-group --groups otunes --create-home --home-dir /home/convex \
--shell /usr/sbin/nologin convex
COPY --from=convex-functions /app /opt/otunes/convex COPY --from=convex-functions /app /opt/otunes/convex
COPY docker/generate-auth-keys.mjs /opt/otunes/generate-auth-keys.mjs COPY docker/generate-auth-keys.mjs /opt/otunes/generate-auth-keys.mjs
+2 -2
View File
@@ -1,5 +1,5 @@
/ios/ ios/
/android/ android/
# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb # @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb
# The following patterns were generated by expo-cli # The following patterns were generated by expo-cli
-82
View File
@@ -1,82 +0,0 @@
# Mobile build variants
EAS profiles set `APP_VARIANT` to select the app identity in `app.config.ts`.
Both iOS bundle identifiers and Android package names use these values:
| Profile | App name | Identifier |
| --- | --- | --- |
| development | oTunes (Development) | com.abunchofknowitalls.otunes.development |
| preview | oTunes (Preview) | com.abunchofknowitalls.otunes.preview |
| production | oTunes | com.abunchofknowitalls.otunes |
Build with `eas build --profile development`, `--profile preview`, or
`--profile production` from this directory.
For local builds and Metro, select the same variant explicitly:
```sh
APP_VARIANT=development pnpm ios
APP_VARIANT=development pnpm android
APP_VARIANT=development pnpm start
```
An unset `APP_VARIANT` keeps the production identity. Unknown variants fail
configuration. URL schemes are `otunes-development`, `otunes-preview`, and
`otunes` respectively, allowing the apps to be installed together.
### 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.
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
patches. It disables precompiled React Native and Expo modules so dependencies
can compile for Catalyst. The Mac app derives a separate bundle identifier with
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
To return a checkout to ordinary iOS builds, rerun prebuild without
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
-61
View File
@@ -1,61 +0,0 @@
import type { ConfigContext, ExpoConfig } from "expo/config"
export default ({ config }: ConfigContext): ExpoConfig => {
const variant: string =
process.env.APP_VARIANT ?? process.env.EAS_BUILD_PROFILE ?? "production"
if (
variant !== "development" &&
variant !== "preview" &&
variant !== "production"
) {
throw new Error(`Unsupported APP_VARIANT: ${variant}`)
}
const suffix = variant === "production" ? "" : `.${variant}`
const iconSuffix = variant === "production" ? "" : `-${variant}`
const nameSuffix =
variant === "development"
? " (Development)"
: variant === "preview"
? " (Preview)"
: ""
// Expo writes this filename into Xcode build settings without quoting it.
const composer = {
development: "oTunesDev",
preview: "oTunesPreview",
production: "oTunes",
}[variant]
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: `${config.ios!.bundleIdentifier}${suffix}`,
icon: `./assets/${composer}.icon`,
infoPlist: {
...config.ios?.infoPlist,
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.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`,
},
},
}
}
+4 -18
View File
@@ -26,11 +26,8 @@
"adaptiveIcon": { "adaptiveIcon": {
"monochromeImage": "./assets/android-icon-monochrome.png", "monochromeImage": "./assets/android-icon-monochrome.png",
"foregroundImage": "./assets/android-icon-foreground.png", "foregroundImage": "./assets/android-icon-foreground.png",
"backgroundImage": "./assets/android-icon-background.png" "backgroundColor": "#C60322"
}, }
"userInterfaceStyle": "dark",
"softwareKeyboardLayoutMode": "resize",
"icon": "./assets/android-icon.png"
}, },
"plugins": [ "plugins": [
"expo-router", "expo-router",
@@ -52,23 +49,12 @@
], ],
"expo-image", "expo-image",
"expo-status-bar", "expo-status-bar",
"expo-app-intents", "expo-app-intents"
"./plugins/with-android-colors",
[
"expo-navigation-bar",
{
"enforceContrast": false,
"style": "light"
}
]
], ],
"experiments": { "experiments": {
"typedRoutes": true, "typedRoutes": true,
"inlineModules": { "inlineModules": {
"watchedDirectories": [ "watchedDirectories": ["app-intents"]
"app-intents",
"native"
]
} }
}, },
"extra": { "extra": {
@@ -1,25 +0,0 @@
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>
)
}
@@ -1 +0,0 @@
export { default } from "../../library/album/[id]"
@@ -1 +0,0 @@
export { default } from "../../library/artist/[id]"
@@ -1 +0,0 @@
export { default } from "../../library/browse/albums"
@@ -1 +0,0 @@
export { default } from "../../library/browse/artists"
@@ -1 +0,0 @@
export { default } from "../../library/browse/playlists"
@@ -1 +0,0 @@
export { default } from "../../library/browse/songs"
@@ -1,23 +0,0 @@
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 />
}
@@ -1 +0,0 @@
export { default } from "../../library/playlist/[id]"
@@ -1 +0,0 @@
export { default } from "../../library/playlist/favorites"
@@ -1 +0,0 @@
export { default } from "../library/recently-added"
@@ -1 +0,0 @@
export { default } from "../library/recently-played"
@@ -1 +0,0 @@
export { default } from "../library/settings"
+55 -177
View File
@@ -1,57 +1,37 @@
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 { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
import { NativeTabs } from "expo-router/native-tabs" import { NativeTabs } from "expo-router/native-tabs"
import { DynamicColorIOS, Platform } from "react-native" import { DynamicColorIOS, Platform, useColorScheme } from "react-native"
import { useMemo } from "react" import { useMemo } from "react"
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player" import { TabBottomAccessory } from "@/components/mini-player"
import { useAndroidKeyboardVisible } from "@/hooks/use-android-keyboard-visible"
import { usePlaybackQueue } from "@/contexts/playback" import { usePlaybackQueue } from "@/contexts/playback"
import { appleMusic, colors, miniPlayerHeight, useIsDark } from "@/lib/theme" import { appleMusic, colors } from "@/lib/theme"
export const unstable_settings = { anchor: "library" } export const unstable_settings = { anchor: "library" }
function useRouterTheme() { function useRouterTheme() {
const themeIsDark = useIsDark() const isDark = useColorScheme() === "dark"
const androidPalette = useAndroidTabPalette()
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
return useMemo(() => { return useMemo(() => {
const palette = isDark ? colors.dark : colors.light const palette = isDark ? colors.dark : colors.light
const android = Platform.OS === "android" ? androidPalette : null
const base = isDark ? DarkTheme : DefaultTheme const base = isDark ? DarkTheme : DefaultTheme
return { return {
...base, ...base,
colors: { colors: {
...base.colors, ...base.colors,
background: android?.background ?? palette.background, background: palette.background,
card: android?.surface ?? palette.card, card: palette.card,
text: android?.foreground ?? palette.foreground, text: palette.foreground,
border: android?.divider ?? palette.border, border: palette.border,
primary: android?.accentText ?? palette.primary, primary: palette.primary,
}, },
} }
}, [isDark, androidPalette]) }, [isDark])
} }
function useNativeTabColors() { function useNativeTabColors() {
// These props initialize native tabs; the worklet owns subsequent colors. const isDark = useColorScheme() === "dark"
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 inactive = appleMusic.tabInactive
const iconColor = const iconColor =
@@ -61,23 +41,24 @@ function useNativeTabColors() {
selected: appleMusic.pink, selected: appleMusic.pink,
} }
: { : {
default: androidPalette.mutedForeground, default: isDark ? inactive : "#636366",
selected: selectedColor, selected: appleMusic.pink,
} }
const labelColor = const labelColor =
Platform.OS === "ios" Platform.OS === "ios"
? DynamicColorIOS({ dark: inactive, light: "#636366" }) ? DynamicColorIOS({ dark: inactive, light: "#636366" })
: androidPalette.mutedForeground : isDark
? inactive
: "#636366"
return { return {
isDark, isDark,
tintColor: Platform.OS === "android" ? selectedColor : appleMusic.pink,
iconColor, iconColor,
labelStyle: { labelStyle: {
default: { color: labelColor, fontSize: 10 }, default: { color: labelColor, fontSize: 10 },
selected: { selected: {
color: Platform.OS === "android" ? selectedColor : appleMusic.pink, color: appleMusic.pink,
fontSize: 10, fontSize: 10,
fontWeight: "600" as const, fontWeight: "600" as const,
}, },
@@ -85,161 +66,58 @@ function useNativeTabColors() {
blurEffect: isDark blurEffect: isDark
? "systemChromeMaterialDark" ? "systemChromeMaterialDark"
: "systemChromeMaterialLight", : "systemChromeMaterialLight",
// Reveal the shared UI-thread background beneath the native tab bar. backgroundColor:
backgroundColor: Platform.OS === "ios" ? undefined : "transparent", Platform.OS === "ios"
? undefined
: isDark
? appleMusic.background
: colors.light.background,
} }
} }
function TabsContent() { export default function TabsLayout() {
const tabletLayout = useTabletLayout()
const homeColors = useAndroidNativeTabColors()
const libraryColors = useAndroidNativeTabColors()
const searchColors = useAndroidNativeTabColors()
const keyboardVisible = useAndroidKeyboardVisible()
const routerTheme = useRouterTheme() const routerTheme = useRouterTheme()
const tabColors = useNativeTabColors() const tabColors = useNativeTabColors()
const backgroundStyle = useAndroidTabBackgroundStyle()
const { currentSong, queueSongIds } = usePlaybackQueue() const { currentSong, queueSongIds } = usePlaybackQueue()
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0) 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 ( return (
<ThemeProvider value={routerTheme}> <ThemeProvider value={routerTheme}>
<Animated.View style={[{ flex: 1 }, backgroundStyle]}> <NativeTabs
{Platform.OS === "android" ? ( blurEffect={
<NavigationBar style={tabColors.isDark ? "light" : "dark"} /> tabColors.blurEffect as
"systemChromeMaterialDark" | "systemChromeMaterialLight"
}
backgroundColor={tabColors.backgroundColor}
iconColor={tabColors.iconColor}
labelStyle={tabColors.labelStyle}
tintColor={appleMusic.pink}
minimizeBehavior="onScrollDown"
>
{showBottomAccessory ? (
<NativeTabs.BottomAccessory>
<TabBottomAccessory />
</NativeTabs.BottomAccessory>
) : null} ) : 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 <NativeTabs.Trigger name="home" disableTransparentOnScrollEdge>
name="home" <NativeTabs.Trigger.Icon sf="house.fill" md="home" />
unstable_nativeProps={ <NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
Platform.OS === "android" ? homeColors : undefined </NativeTabs.Trigger>
}
disableTransparentOnScrollEdge
contentStyle={androidContentStyle}
>
<NativeTabs.Trigger.Icon sf="house.fill" md="home" />
<NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger <NativeTabs.Trigger name="library" disableTransparentOnScrollEdge>
name="library" <NativeTabs.Trigger.Icon
unstable_nativeProps={ sf="music.note.square.stack.fill"
Platform.OS === "android" ? libraryColors : undefined md="library_music"
} />
disableTransparentOnScrollEdge <NativeTabs.Trigger.Label>Library</NativeTabs.Trigger.Label>
contentStyle={androidContentStyle} </NativeTabs.Trigger>
>
<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 <NativeTabs.Trigger name="search" disableTransparentOnScrollEdge>
name="search" <NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
unstable_nativeProps={ <NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
Platform.OS === "android" ? searchColors : undefined </NativeTabs.Trigger>
} </NativeTabs>
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> </ThemeProvider>
) )
} }
export default function TabsLayout() {
return (
<ScreenPaletteProvider>
<TabletPlayerLayoutProvider>
<TabsContent />
</TabletPlayerLayoutProvider>
</ScreenPaletteProvider>
)
}
@@ -1,4 +1,3 @@
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button" import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -13,7 +12,6 @@ export default function HomeLayout() {
return ( return (
<Stack <Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
...baseOptions, ...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Home", title: tabStackScreenTitles[route.name] ?? "Home",
+86 -275
View File
@@ -1,41 +1,22 @@
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 { MusicEntityView } from "@/components/music-entity-view"
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router" import { Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
import { Platform, Pressable, StyleSheet, View } from "react-native" import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
import { Ionicons } from "@expo/vector-icons"
import { import {
CollectionDivider, CollectionDivider,
collectionInset, collectionInset,
DiscHeader, DiscHeader,
} from "@/components/collection-list" } from "@/components/collection-list"
import { AudioFormatBadge } from "@/components/audio-format-badge"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { import {
MediaActionMenu, MediaActionMenu,
MediaContextMenu, MediaContextMenu,
type MediaAction, type MediaAction,
} from "@/components/media-context-menu" } from "@/components/media-actions-sheet"
import { CollectionDetailSkeleton } from "@/components/skeletons" import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives" import { Button } from "@/components/ui/primitives"
import { contentBottomInset } from "@/components/player" import { contentBottomInset } from "@/components/player"
@@ -73,36 +54,18 @@ export default function AlbumScreen() {
handleAlbumTrackAction, handleAlbumTrackAction,
isAlbumFavorite: isAlbumFav, isAlbumFavorite: isAlbumFav,
} = useMediaMenuActions() } = useMediaMenuActions()
const swipeGroup = useSwipeRowGroup()
const isFocused = useIsFocused() const isFocused = useIsFocused()
const coverUri = const coverUri =
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : "" config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
const heroLayout = useCollectionHeroLayout() const { palette, settled } = useCoverPalette(
const { palette: artworkPalette, settled } = useCoverPalette(
coverUri, coverUri,
album ? album.cover != null : album === null ? false : undefined album ? album.cover != null : album === null ? false : undefined
) )
const { palette, onLayout, backgroundStyle } =
useScreenPalette(artworkPalette)
const songIds = useMemo( const songIds = useMemo(
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [], () => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
[album] [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(() => { useEffect(() => {
if (album) { if (album) {
rememberSongs(albumDetailSongs(album)) rememberSongs(albumDetailSongs(album))
@@ -118,16 +81,13 @@ export default function AlbumScreen() {
} }
return album ? ( return album ? (
<AlbumTrackRow <AlbumTrackRow
swipeGroup={swipeGroup}
track={item.track} track={item.track}
number={item.number} number={item.number}
album={album} album={album}
songIds={songIds} songIds={songIds}
palette={palette} palette={palette}
favorited={isSongFavorite(item.track.id)} favorited={isSongFavorite(item.track.id)}
onPlay={(songId, ids) => onPlay={playFromSong}
playFromSong(songId, ids, `album:${album.id}`)
}
onAction={handleAlbumTrackAction} onAction={handleAlbumTrackAction}
/> />
) : null ) : null
@@ -139,7 +99,6 @@ export default function AlbumScreen() {
palette, palette,
playFromSong, playFromSong,
songIds, songIds,
swipeGroup,
] ]
) )
@@ -150,25 +109,9 @@ export default function AlbumScreen() {
options={{ options={{
title: "", title: "",
headerLargeTitle: false, 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
}
/>
</> </>
) )
} }
@@ -183,9 +126,9 @@ export default function AlbumScreen() {
}} }}
/> />
<View style={[styles.empty, { backgroundColor: colors.background }]}> <View style={[styles.empty, { backgroundColor: colors.background }]}>
<PaletteText style={{ color: colors.mutedForeground }}> <Text style={{ color: colors.mutedForeground }}>
Album not found. Album not found.
</PaletteText> </Text>
</View> </View>
</> </>
) )
@@ -204,23 +147,12 @@ export default function AlbumScreen() {
title: "", title: "",
headerLargeTitle: false, headerLargeTitle: false,
headerTintColor: palette.foreground, 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: () => ( headerRight: () => (
<MediaActionMenu <MediaActionMenu
stationArtistId={album.artist.id} stationArtistId={album.artist.id}
selectedCount={album.tracks.length} selectedCount={album.tracks.length}
favorited={isAlbumFav(album.id)} favorited={isAlbumFav(album.id)}
share={{ type: "album", albumId: album.id, title: album.title }} share={{ type: "album", albumId: album.id }}
onAction={(action) => onAction={(action) =>
void handleAlbumDetailAction( void handleAlbumDetailAction(
album.id as Id<"albums">, album.id as Id<"albums">,
@@ -231,187 +163,90 @@ export default function AlbumScreen() {
} }
> >
<Pressable hitSlop={8}> <Pressable hitSlop={8}>
<PaletteIcon <Ionicons
tone="foreground"
name="ellipsis-horizontal" name="ellipsis-horizontal"
size={22} size={22}
color={palette.isDark ? "#fff" : "#000"} color={palette.foreground}
/> />
</Pressable> </Pressable>
</MediaActionMenu> </MediaActionMenu>
), ),
}} }}
/> />
<Animated.FlatList <FlatList
onScrollBeginDrag={swipeGroup.closeOpenRow}
onLayout={onLayout}
{...longListProps} {...longListProps}
data={listItems} data={listItems}
keyExtractor={albumListItemKey} keyExtractor={albumListItemKey}
style={[ style={{ flex: 1, backgroundColor: palette.background }}
{ flex: 1, backgroundColor: palette.background },
backgroundStyle,
]}
contentContainerStyle={{ paddingBottom: contentBottomInset }} contentContainerStyle={{ paddingBottom: contentBottomInset }}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
indicatorStyle={palette.isDark ? "white" : "black"} indicatorStyle={palette.isDark ? "white" : "black"}
ListHeaderComponent={ ListHeaderComponent={
<View> <View>
<MusicEntityView kind="album" id={album.id}> <MusicEntityView kind="album" id={album.id} style={styles.hero}>
<CollectionHero <CoverImage
artwork={ uri={coverUri}
<Link.AppleZoomTarget> hasCover={album.cover != null}
<View collapsable={false}> style={styles.cover}
<CoverImage />
uri={coverUri} <Text style={[styles.title, { color: palette.foreground }]}>
hasCover={album.cover != null} {album.title}
style={[ </Text>
styles.cover, <Pressable
heroLayout.coverSize onPress={() => push(`/artist/${album.artist.id}`)}
? { style={styles.artistPressable}
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>
}
> >
<PaletteText <Text style={[styles.artist, { color: palette.accentText }]}>
tone="foreground" {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}
style={[ style={[
styles.title, styles.iconAction,
heroLayout.landscape && styles.titleLandscape, { backgroundColor: palette.surface },
{ color: palette.foreground },
]} ]}
> >
{album.title} <Ionicons
</PaletteText> name={favorited ? "star" : "star-outline"}
<Pressable size={24}
onPress={() => push(`/artist/${album.artist.id}`)} color={favorited ? palette.accent : palette.foreground}
style={styles.artistPressable} />
>
<PaletteText
tone="accentText"
style={[
styles.artist,
heroLayout.landscape && styles.artistLandscape,
{ color: palette.accentText },
]}
>
{album.artist.name}
</PaletteText>
</Pressable> </Pressable>
<View <Button
style={{ title="Play"
flexDirection: "row", icon="play"
alignItems: "center", onPress={() => void playAlbum(album.id, songIds)}
justifyContent: heroLayout.landscape style={styles.playButton}
? "flex-start" tint={{
: "center", background: palette.accent,
flexWrap: "wrap", foreground: palette.accentForeground,
gap: 8,
}} }}
/>
<Pressable
accessibilityRole="button"
accessibilityLabel="Shuffle"
hitSlop={8}
onPress={() => void playAlbumShuffled(album.id, songIds)}
style={[
styles.iconAction,
{ backgroundColor: palette.surface },
]}
> >
{metadata ? ( <Ionicons
<PaletteText name="shuffle"
tone="secondaryForeground" size={24}
style={{ color: palette.secondaryForeground }} color={palette.foreground}
> />
{metadata} </Pressable>
</PaletteText> </View>
) : 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> </MusicEntityView>
<CollectionDivider color={palette.divider} /> <CollectionDivider color={palette.divider} />
</View> </View>
@@ -465,7 +300,6 @@ function albumListItemKey(item: AlbumListItem) {
const AlbumTrackRow = memo(function AlbumTrackRow({ const AlbumTrackRow = memo(function AlbumTrackRow({
track, track,
swipeGroup,
number, number,
album, album,
songIds, songIds,
@@ -475,7 +309,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
onAction, onAction,
}: { }: {
track: BrowseAlbumTrack track: BrowseAlbumTrack
swipeGroup: SwipeRowGroup
number: number number: number
album: BrowseAlbumDetail album: BrowseAlbumDetail
songIds: Id<"songs">[] songIds: Id<"songs">[]
@@ -488,22 +321,8 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
action: MediaAction action: MediaAction
) => Promise<void> ) => Promise<void>
}) { }) {
const Row = Platform.OS !== "web" ? SongSwipeRow : Pressable
const { config } = useServerConfig()
return ( return (
<MediaContextMenu <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} stationArtistId={album.artist.id}
favorited={favorited} favorited={favorited}
navigation={{ navigation={{
@@ -514,25 +333,19 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
type: "song", type: "song",
albumId: album.id, albumId: album.id,
songId: track.id, songId: track.id,
title: `${track.title} - ${album.title}`,
}} }}
onAction={(action) => void onAction(track, album, action)} onAction={(action) => void onAction(track, album, action)}
> >
<MusicEntityView kind="song" id={track.id}> <MusicEntityView kind="song" id={track.id}>
<Row <Pressable
group={swipeGroup}
backgroundColor={palette.background}
onPlayNext={() => void onAction(track, album, "play-next")}
onAddToQueue={() => void onAction(track, album, "play-last")}
style={styles.trackRow} style={styles.trackRow}
onPress={() => void onPlay(track.id as Id<"songs">, songIds)} onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
> >
<PaletteText <Text
tone="secondaryForeground"
style={[styles.trackNumber, { color: palette.secondaryForeground }]} style={[styles.trackNumber, { color: palette.secondaryForeground }]}
> >
{number} {number}
</PaletteText> </Text>
<View <View
style={[ style={[
styles.trackContent, styles.trackContent,
@@ -540,31 +353,26 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
]} ]}
> >
<View style={styles.trackMeta}> <View style={styles.trackMeta}>
<PaletteText <Text
tone="foreground"
style={[styles.trackTitle, { color: palette.foreground }]} style={[styles.trackTitle, { color: palette.foreground }]}
numberOfLines={1} numberOfLines={1}
> >
{track.title} {track.title}
</PaletteText> </Text>
{track.artists ? ( {track.artists ? (
<PaletteText <Text
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }} style={{ color: palette.secondaryForeground }}
numberOfLines={1} numberOfLines={1}
> >
{track.artists.join(", ")} {track.artists.join(", ")}
</PaletteText> </Text>
) : null} ) : null}
</View> </View>
<PaletteText <Text style={{ color: palette.secondaryForeground }}>
tone="secondaryForeground"
style={{ color: palette.secondaryForeground }}
>
{formatDuration(track.durationSeconds)} {formatDuration(track.durationSeconds)}
</PaletteText> </Text>
</View> </View>
</Row> </Pressable>
</MusicEntityView> </MusicEntityView>
</MediaContextMenu> </MediaContextMenu>
) )
@@ -572,14 +380,17 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
const styles = StyleSheet.create({ const styles = StyleSheet.create({
empty: { flex: 1, alignItems: "center", justifyContent: "center" }, empty: { flex: 1, alignItems: "center", justifyContent: "center" },
hero: {
alignItems: "center",
padding: spacing.lg,
gap: spacing.sm,
},
cover: { cover: {
width: 220, width: 220,
height: 220, height: 220,
borderRadius: radius.lg, borderRadius: radius.lg,
}, },
title: { fontSize: 24, fontWeight: "800", textAlign: "center" }, title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
titleLandscape: { textAlign: "left", fontSize: 22 },
artistLandscape: { textAlign: "left", fontSize: 22, fontWeight: "400" },
artistPressable: { alignSelf: "stretch" }, artistPressable: { alignSelf: "stretch" },
artist: { fontSize: 16, fontWeight: "600", textAlign: "center" }, artist: { fontSize: 16, fontWeight: "600", textAlign: "center" },
actions: { actions: {
@@ -6,7 +6,7 @@ import { Ionicons } from "@expo/vector-icons"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { MediaGridList } from "@/components/media-cards" import { MediaGridList } from "@/components/media-cards"
import { MediaActionMenu } from "@/components/media-context-menu" import { MediaActionMenu } from "@/components/media-actions-sheet"
import { CollectionDetailSkeleton } from "@/components/skeletons" import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives" import { Button } from "@/components/ui/primitives"
import { contentBottomInset } from "@/components/player" import { contentBottomInset } from "@/components/player"
@@ -75,11 +75,7 @@ export default function ArtistScreen() {
<MediaActionMenu <MediaActionMenu
selectedCount={data.albums.length} selectedCount={data.albums.length}
favorited={isArtistFav(data.artist.id)} favorited={isArtistFav(data.artist.id)}
share={{ share={{ type: "artist", artistId: data.artist.id }}
type: "artist",
artistId: data.artist.id,
title: data.artist.name,
}}
onAction={(action) => onAction={(action) =>
void handleArtistAction(data.artist, action) void handleArtistAction(data.artist, action)
} }
@@ -141,14 +141,8 @@ const ArtistRow = memo(function ArtistRow({
return ( return (
<MediaContextMenu <MediaContextMenu
preview={{
kind: "artist",
title: artist.name,
artworkUrl: artistCoverUrl(serverUrl, artist.id),
hasArtwork: artist.photo != null,
}}
favorited={favorited} favorited={favorited}
share={{ type: "artist", artistId: artist.id, title: artist.name }} share={{ type: "artist", artistId: artist.id }}
onAction={(action) => void onAction(artist, action)} onAction={(action) => void onAction(artist, action)}
> >
<Pressable <Pressable
@@ -166,11 +160,7 @@ const ArtistRow = memo(function ArtistRow({
> >
{artist.name} {artist.name}
</Text> </Text>
<Ionicons <Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
name="chevron-forward"
size={16}
color={colors.mutedForeground}
/>
</Pressable> </Pressable>
</MediaContextMenu> </MediaContextMenu>
) )
@@ -1,26 +1,7 @@
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 { MusicEntityView } from "@/components/music-entity-view"
import { useMutation } from "convex/react" import { useMutation } from "convex/react"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
import { import {
Link,
Stack, Stack,
useIsFocused, useIsFocused,
useLocalSearchParams, useLocalSearchParams,
@@ -28,17 +9,21 @@ import {
} from "expo-router" } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { import {
FlatList,
Platform, Platform,
Pressable, Pressable,
StyleSheet, StyleSheet,
Text,
View, View,
type ListRenderItemInfo, type ListRenderItemInfo,
} from "react-native" } from "react-native"
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable" import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
import { Ionicons } from "@expo/vector-icons"
import { CollectionDivider } from "@/components/collection-list" import { CollectionDivider } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { import {
SwipeToRemoveRow,
useSwipeRowGroup, useSwipeRowGroup,
type SwipeRowGroup, type SwipeRowGroup,
} from "@/components/ios-swipe-to-remove-row" } from "@/components/ios-swipe-to-remove-row"
@@ -46,14 +31,17 @@ import {
import { import {
MediaActionMenu, MediaActionMenu,
type MediaAction, type MediaAction,
} from "@/components/media-context-menu" } from "@/components/media-actions-sheet"
import { CollectionDetailSkeleton } from "@/components/skeletons" import { CollectionDetailSkeleton } from "@/components/skeletons"
import { Button } from "@/components/ui/primitives" import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongListRow } from "@/components/player" import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback" import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query" import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { useCoverPalette } from "@/hooks/use-cover-palette" import { useCoverPalette } from "@/hooks/use-cover-palette"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -66,6 +54,7 @@ import { showError } from "@/lib/toast"
import { playlistCoverUrl } from "@/lib/urls" import { playlistCoverUrl } from "@/lib/urls"
import { radius, spacing, useThemeColors } from "@/lib/theme" import { radius, spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 50
const PLAYLIST_LABEL = "Add to Another Playlist" const PLAYLIST_LABEL = "Add to Another Playlist"
const OWNER_MENU_ACTIONS: MediaAction[] = [ const OWNER_MENU_ACTIONS: MediaAction[] = [
"share", "share",
@@ -84,50 +73,55 @@ export default function PlaylistScreen() {
const playlistId = typeof id === "string" ? (id as Id<"playlists">) : null const playlistId = typeof id === "string" ? (id as Id<"playlists">) : null
const playlist = useCachedQuery( const playlist = useCachedQuery(
api.playlists.browsePlaylistDetail, api.playlists.browsePlaylistDetail,
playlistId ? { id: playlistId } : "skip" playlistId
? {
id: playlistId,
includeSongs: false,
}
: "skip"
)
const {
results: songs,
status,
loadMore,
isCached,
} = useCachedPaginatedQuery(
api.playlists.browsePlaylistSongsPaginated,
playlistId ? { id: playlistId } : "skip",
{ initialNumItems: PAGE_SIZE }
)
const allSongIds = useCachedQuery(
api.playlists.getPlaylistSongIds,
playlistId ? { playlistId } : "skip"
) )
const songs = playlist?.songs
const coverUri = const coverUri =
config && playlistId config && playlistId
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId) ? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
: "" : ""
const { palette: artworkPalette, settled } = useCoverPalette( const { palette, settled } = useCoverPalette(
coverUri, coverUri,
playlist ? playlist.cover != null : playlist === null ? false : undefined playlist ? playlist.cover != null : playlist === null ? false : undefined
) )
const { palette, onLayout, backgroundStyle } =
useScreenPalette(artworkPalette)
useEffect(() => { useEffect(() => {
if (songs) rememberSongs(songs) rememberSongs(songs)
}, [songs]) }, [songs])
if (playlist === undefined || !config || !settled) { if (
playlist === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config ||
!settled
) {
return ( return (
<> <>
<Stack.Screen <Stack.Screen
options={{ options={{
title: "", title: "",
headerLargeTitle: false, 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
}
/>
</> </>
) )
} }
@@ -142,9 +136,9 @@ export default function PlaylistScreen() {
}} }}
/> />
<View style={[styles.empty, { backgroundColor: colors.background }]}> <View style={[styles.empty, { backgroundColor: colors.background }]}>
<PaletteText style={{ color: colors.mutedForeground }}> <Text style={{ color: colors.mutedForeground }}>
Playlist not found. Playlist not found.
</PaletteText> </Text>
</View> </View>
</> </>
) )
@@ -152,30 +146,32 @@ export default function PlaylistScreen() {
return ( return (
<PlaylistContent <PlaylistContent
backgroundStyle={backgroundStyle}
onLayout={onLayout}
playlist={playlist} playlist={playlist}
songs={playlist.songs} songs={songs}
allSongIds={allSongIds}
coverUri={coverUri} coverUri={coverUri}
palette={palette} palette={palette}
onEndReached={() => {
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
}}
/> />
) )
} }
function PlaylistContent({ function PlaylistContent({
backgroundStyle,
onLayout,
playlist, playlist,
songs, songs,
allSongIds,
coverUri, coverUri,
palette, palette,
onEndReached,
}: { }: {
onLayout?: () => void
backgroundStyle: ReturnType<typeof useScreenPalette>["backgroundStyle"]
playlist: BrowsePlaylistDetail playlist: BrowsePlaylistDetail
songs: BrowseSong[] songs: BrowseSong[]
allSongIds: Id<"songs">[] | undefined
coverUri: string coverUri: string
palette: CoverPalette palette: CoverPalette
onEndReached: () => void
}) { }) {
const router = useRouter() const router = useRouter()
const isFocused = useIsFocused() const isFocused = useIsFocused()
@@ -191,15 +187,13 @@ function PlaylistContent({
const playlistId = playlist.id const playlistId = playlist.id
const isSubscribed = playlist.isSubscribed const isSubscribed = playlist.isSubscribed
const canEdit = playlist.isOwner && playlistId !== null const canEdit = playlist.isOwner && playlistId !== null
const songIds = useMemo(() => songs.map((song) => song.id), [songs]) const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const { filteredSongs, onQueryChange, onSearchSubmit } = const songIds = allSongIds ?? loadedSongIds
usePlaylistSearch(songs)
const swipeGroup = useSwipeRowGroup() const swipeGroup = useSwipeRowGroup()
const handlePlaySong = useCallback( const handlePlaySong = useCallback(
(song: BrowseSong) => (song: BrowseSong) => void playFromSong(song.id, songIds),
void playFromSong(song.id, songIds, `playlist:${playlistId}`), [playFromSong, songIds]
[playFromSong, songIds, playlistId]
) )
const handleSongMenuAction = useCallback( const handleSongMenuAction = useCallback(
@@ -227,12 +221,12 @@ function PlaylistContent({
) )
const handlePlay = useCallback(() => { const handlePlay = useCallback(() => {
if (playlistId) void playPlaylist(playlistId, songIds) if (playlistId) void playPlaylist(playlistId, allSongIds)
}, [playPlaylist, playlistId, songIds]) }, [allSongIds, playPlaylist, playlistId])
const handleShuffle = useCallback(() => { const handleShuffle = useCallback(() => {
if (playlistId) void playPlaylistShuffled(playlistId, songIds) if (playlistId) void playPlaylistShuffled(playlistId, allSongIds)
}, [playPlaylistShuffled, playlistId, songIds]) }, [allSongIds, playPlaylistShuffled, playlistId])
const handleSubscribeToggle = useCallback(async () => { const handleSubscribeToggle = useCallback(async () => {
if (!playlistId) return if (!playlistId) return
@@ -275,17 +269,6 @@ function PlaylistContent({
title: "", title: "",
headerLargeTitle: false, headerLargeTitle: false,
headerTintColor: palette.foreground, 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: () => ( headerRight: () => (
<MediaActionMenu <MediaActionMenu
selectedCount={songIds.length} selectedCount={songIds.length}
@@ -293,17 +276,15 @@ function PlaylistContent({
share={{ share={{
type: "playlist", type: "playlist",
playlistId: playlistId ?? "favorites", playlistId: playlistId ?? "favorites",
title: playlist?.title ?? "oTunes",
}} }}
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined} includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
onAction={handlePlaylistMenuAction} onAction={handlePlaylistMenuAction}
> >
<Pressable hitSlop={8}> <Pressable hitSlop={8}>
<PaletteIcon <Ionicons
tone="foreground"
name="ellipsis-horizontal" name="ellipsis-horizontal"
size={22} size={22}
color={palette.isDark ? "#fff" : "#000"} color={palette.foreground}
/> />
</Pressable> </Pressable>
</MediaActionMenu> </MediaActionMenu>
@@ -314,9 +295,7 @@ function PlaylistContent({
deletePlaylist, deletePlaylist,
handlePlaylistDetailAction, handlePlaylistDetailAction,
palette.foreground, palette.foreground,
palette.isDark,
playlistId, playlistId,
playlist?.title,
router, router,
songIds, songIds,
]) ])
@@ -351,35 +330,18 @@ function PlaylistContent({
<StatusBar style={palette.isDark ? "light" : "dark"} /> <StatusBar style={palette.isDark ? "light" : "dark"} />
) : null} ) : null}
<Stack.Screen options={screenOptions} /> <Stack.Screen options={screenOptions} />
<PlaylistSearchBar <FlatList
onQueryChange={onQueryChange}
onSearchSubmit={onSearchSubmit}
/>
<Animated.FlatList
onLayout={onLayout}
{...longListProps} {...longListProps}
data={filteredSongs} data={songs}
keyExtractor={songKey} keyExtractor={songKey}
renderItem={renderItem} renderItem={renderItem}
style={[ style={{ flex: 1, backgroundColor: palette.background }}
{ flex: 1, backgroundColor: palette.background },
backgroundStyle,
]}
indicatorStyle={palette.isDark ? "white" : "black"} indicatorStyle={palette.isDark ? "white" : "black"}
contentContainerStyle={styles.listContent} contentContainerStyle={styles.listContent}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
onEndReached={onEndReached}
onEndReachedThreshold={0.5}
onScrollBeginDrag={swipeGroup.closeOpenRow} 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={ ListHeaderComponent={
<PlaylistHero <PlaylistHero
entityId={playlistId ?? "otunes:favorites"} entityId={playlistId ?? "otunes:favorites"}
@@ -432,31 +394,28 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
playlistLabel={PLAYLIST_LABEL} playlistLabel={PLAYLIST_LABEL}
palette={palette} palette={palette}
inset inset
swipe={
Platform.OS !== "web"
? {
group: swipeGroup,
backgroundColor: palette.background,
onPlayNext: () => onAction(song, "play-next"),
onAddToQueue: () => onAction(song, "play-last"),
onRemove:
Platform.OS === "android" && removable
? () => {
void onRemove(song.id)
}
: undefined,
}
: undefined
}
onPlay={onPlay} onPlay={onPlay}
onAction={onAction} onAction={onAction}
/> />
) )
if (Platform.OS !== "web" || !removable) { if (!removable) {
return row return row
} }
if (Platform.OS === "ios") {
return (
<SwipeToRemoveRow
group={swipeGroup}
backgroundColor={palette.background}
actionAccessibilityLabel={`Remove ${song.title} from playlist`}
onRemove={handleRemove}
>
{row}
</SwipeToRemoveRow>
)
}
return ( return (
<ReanimatedSwipeable <ReanimatedSwipeable
friction={2} friction={2}
@@ -475,19 +434,15 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
}} }}
style={[styles.removeAction, { backgroundColor: colors.destructive }]} style={[styles.removeAction, { backgroundColor: colors.destructive }]}
> >
<PaletteIcon <Ionicons name="trash" size={22} color={colors.primaryForeground} />
name="trash" <Text
size={22}
color={colors.primaryForeground}
/>
<PaletteText
style={[ style={[
styles.removeActionText, styles.removeActionText,
{ color: colors.primaryForeground }, { color: colors.primaryForeground },
]} ]}
> >
Remove Remove
</PaletteText> </Text>
</Pressable> </Pressable>
)} )}
> >
@@ -521,125 +476,76 @@ const PlaylistHero = memo(function PlaylistHero({
onPlay: () => void onPlay: () => void
onShuffle: () => void onShuffle: () => void
}) { }) {
const heroLayout = useCollectionHeroLayout()
return ( return (
<MusicEntityView kind="playlist" id={entityId}> <MusicEntityView kind="playlist" id={entityId}>
<CollectionHero <View style={styles.hero}>
artwork={ <CoverImage uri={coverUri} hasCover={hasCover} style={styles.cover} />
<Link.AppleZoomTarget> <Text style={[styles.title, { color: palette.foreground }]}>
<View collapsable={false}> {title}
<CoverImage </Text>
uri={coverUri} <Text style={{ color: palette.secondaryForeground }}>{ownerName}</Text>
hasCover={hasCover} <View style={styles.actions}>
style={[ {showSubscribe ? (
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 <Pressable
accessibilityRole="button" accessibilityRole="button"
accessibilityLabel="Shuffle" accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
accessibilityState={{ selected: isSubscribed }}
hitSlop={8} hitSlop={8}
onPress={onShuffle} onPress={onSubscribeToggle}
style={[styles.iconAction, { backgroundColor: palette.surface }]} style={[
styles.iconAction,
{
backgroundColor: isSubscribed
? palette.surface
: palette.accent,
},
]}
> >
<PaletteIcon <Ionicons
tone="foreground" name={isSubscribed ? "checkmark" : "add"}
name="shuffle"
size={24} size={24}
color={palette.foreground} color={
isSubscribed ? palette.foreground : palette.accentForeground
}
/> />
</Pressable> </Pressable>
</View> ) : null}
} <Button
> title="Play"
<PaletteText icon="play"
tone="foreground" onPress={onPlay}
style={[ style={styles.playButton}
styles.title, tint={{
heroLayout.landscape && styles.titleLandscape, background: palette.accent,
{ color: palette.foreground }, foreground: palette.accentForeground,
]} }}
> />
{title} <Pressable
</PaletteText> accessibilityRole="button"
<PaletteText accessibilityLabel="Shuffle"
tone="foreground" hitSlop={8}
style={{ onPress={onShuffle}
color: palette.foreground, style={[styles.iconAction, { backgroundColor: palette.surface }]}
fontSize: heroLayout.landscape ? 22 : 16, >
}} <Ionicons name="shuffle" size={24} color={palette.foreground} />
> </Pressable>
{ownerName} </View>
</PaletteText> </View>
</CollectionHero>
<CollectionDivider color={palette.divider} /> <CollectionDivider color={palette.divider} />
</MusicEntityView> </MusicEntityView>
) )
}) })
const styles = StyleSheet.create({ const styles = StyleSheet.create({
emptyResults: { padding: spacing.lg, textAlign: "center" },
empty: { flex: 1, alignItems: "center", justifyContent: "center" }, empty: { flex: 1, alignItems: "center", justifyContent: "center" },
listContent: { paddingBottom: contentBottomInset }, listContent: { paddingBottom: contentBottomInset },
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
cover: { cover: {
width: 200, width: 200,
height: 200, height: 200,
borderRadius: radius.lg, borderRadius: radius.lg,
}, },
title: { fontSize: 24, fontWeight: "800", textAlign: "center" }, title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
titleLandscape: { textAlign: "left", fontSize: 22 },
actions: { actions: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
@@ -1,7 +1,3 @@
import {
PlaylistSearchBar,
usePlaylistSearch,
} from "@/components/playlist-search-bar"
import { memo, useCallback, useEffect, useMemo } from "react" import { memo, useCallback, useEffect, useMemo } from "react"
import { import {
FlatList, FlatList,
@@ -19,7 +15,10 @@ import { contentBottomInset, SongListRow } from "@/components/player"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
import { usePlaybackActions } from "@/contexts/playback" import { usePlaybackActions } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query" import {
useCachedPaginatedQuery,
useCachedQuery,
} from "@/hooks/use-cached-query"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { MediaAction } from "@/components/media-context-menu" import type { MediaAction } from "@/components/media-context-menu"
@@ -30,23 +29,32 @@ import { radius, spacing, useThemeColors } from "@/lib/theme"
import { Ionicons } from "@expo/vector-icons" import { Ionicons } from "@expo/vector-icons"
import { Stack } from "expo-router" import { Stack } from "expo-router"
const PAGE_SIZE = 50
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false } const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
export default function FavoritesScreen() { export default function FavoritesScreen() {
const colors = useThemeColors() const colors = useThemeColors()
const { config } = useServerConfig() const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail) const favorites = useCachedQuery(api.favorites.browseFavoritesSummary)
const songs = favorites?.songs ?? [] const {
results: songs,
status,
loadMore,
isCached,
} = useCachedPaginatedQuery(
api.favorites.browseFavoritesSongsPaginated,
{},
{ initialNumItems: PAGE_SIZE }
)
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions() const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions() const { handleSongAction } = useMediaMenuActions()
const songIds = useMemo(() => songs.map((song) => song.id), [songs]) const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
const { filteredSongs, onQueryChange, onSearchSubmit } = const songIds = favorites?.songIds ?? loadedSongIds
usePlaylistSearch(songs)
useEffect(() => { useEffect(() => {
if (favorites) rememberSongs(favorites.songs) rememberSongs(songs)
}, [favorites]) }, [songs])
const handlePlaySong = useCallback( const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds), (song: BrowseSong) => void playFromSong(song.id, songIds),
@@ -80,7 +88,11 @@ export default function FavoritesScreen() {
[handlePlaySong, handleSongMenuAction, isSongFavorite] [handlePlaySong, handleSongMenuAction, isSongFavorite]
) )
if (favorites === undefined || !config) { if (
favorites === undefined ||
(status === "LoadingFirstPage" && !isCached) ||
!config
) {
return ( return (
<> <>
<Stack.Screen options={SCREEN_OPTIONS} /> <Stack.Screen options={SCREEN_OPTIONS} />
@@ -105,25 +117,18 @@ export default function FavoritesScreen() {
return ( return (
<> <>
<Stack.Screen options={SCREEN_OPTIONS} /> <Stack.Screen options={SCREEN_OPTIONS} />
<PlaylistSearchBar
onQueryChange={onQueryChange}
onSearchSubmit={onSearchSubmit}
/>
<FlatList <FlatList
{...longListProps} {...longListProps}
data={filteredSongs} data={songs}
keyExtractor={songKey} keyExtractor={songKey}
renderItem={renderItem} renderItem={renderItem}
style={{ flex: 1, backgroundColor: colors.background }} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={styles.listContent} contentContainerStyle={styles.listContent}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
ListEmptyComponent={ onEndReached={() => {
<Text if (status === "CanLoadMore") loadMore(PAGE_SIZE)
style={[styles.emptyResults, { color: colors.mutedForeground }]} }}
> onEndReachedThreshold={0.5}
{songs.length ? "No songs found." : "No songs in this playlist."}
</Text>
}
ListHeaderComponent={ ListHeaderComponent={
<FavoritesHero <FavoritesHero
title={favorites.title} title={favorites.title}
@@ -190,7 +195,6 @@ const FavoritesHero = memo(function FavoritesHero({
}) })
const styles = StyleSheet.create({ const styles = StyleSheet.create({
emptyResults: { padding: spacing.lg, textAlign: "center" },
empty: { flex: 1, alignItems: "center", justifyContent: "center" }, empty: { flex: 1, alignItems: "center", justifyContent: "center" },
listContent: { paddingBottom: contentBottomInset }, listContent: { paddingBottom: contentBottomInset },
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm }, hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
+186
View File
@@ -0,0 +1,186 @@
import { Stack, useRouter } from "expo-router"
import { memo, useCallback, useMemo } from "react"
import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
import { Button } from "@/components/ui/primitives"
import { contentBottomInset, SongRow } from "@/components/player"
import { SongRowSkeleton } from "@/components/skeletons"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { longListProps } from "@/lib/list"
import { useSong, useSongs } from "@/lib/song-cache"
import { spacing, useThemeColors } from "@/lib/theme"
/** `key` stays stable when earlier songs leave the queue, so rows are not remounted on skip. */
type QueueItem = { songId: Id<"songs">; queueIndex: number; key: string }
function queueItemKey(item: QueueItem) {
return item.key
}
const QueueRow = memo(function QueueRow({
songId,
queueIndex,
isLast,
isCurrent,
onSkipTo,
onMove,
}: Omit<QueueItem, "key"> & {
isLast: boolean
isCurrent: boolean
onSkipTo: (index: number) => void
onMove: (index: number, direction: -1 | 1) => void
}) {
const colors = useThemeColors()
const song = useSong(songId)
return (
<View>
{song ? (
<SongRow song={song} onPress={() => onSkipTo(queueIndex)} />
) : (
<SongRowSkeleton />
)}
<View style={styles.queueActions}>
<Pressable
disabled={queueIndex === 0}
onPress={() => onMove(queueIndex, -1)}
>
<Text style={{ color: colors.foreground }}>Move up</Text>
</Pressable>
<Pressable disabled={isLast} onPress={() => onMove(queueIndex, 1)}>
<Text style={{ color: colors.foreground }}>Move down</Text>
</Pressable>
{isCurrent ? (
<Text style={{ color: colors.primary, fontWeight: "700" }}>
Now playing
</Text>
) : null}
</View>
</View>
)
})
export default function QueueScreen() {
const router = useRouter()
const colors = useThemeColors()
const { queueSongIds, queueHistorySongIds } = usePlaybackQueue()
const { skipToQueueIndex, clearQueue, reorderQueue } = usePlaybackActions()
const historySongs = useSongs(queueHistorySongIds)
const items = useMemo<QueueItem[]>(() => {
const occurrences = new Map<string, number>()
return queueSongIds.map((songId, queueIndex) => {
const occurrence = occurrences.get(songId) ?? 0
occurrences.set(songId, occurrence + 1)
return { songId, queueIndex, key: `${songId}:${occurrence}` }
})
}, [queueSongIds])
const moveSong = useCallback(
(fromIndex: number, direction: -1 | 1) => {
const toIndex = fromIndex + direction
if (toIndex < 0 || toIndex >= queueSongIds.length) return
const next = [...queueSongIds]
const [item] = next.splice(fromIndex, 1)
next.splice(toIndex, 0, item)
void reorderQueue(next)
},
[queueSongIds, reorderQueue]
)
function handleClearQueue() {
if (router.canGoBack()) {
router.back()
setTimeout(() => {
void clearQueue()
}, 0)
return
}
void clearQueue()
}
return (
<>
<Stack.Screen
options={{
headerRight: () =>
queueSongIds.length > 0 ? (
<Button
title="Clear"
variant="ghost"
onPress={handleClearQueue}
/>
) : null,
}}
/>
<FlatList
style={{ flex: 1, backgroundColor: colors.background }}
ListHeaderComponent={
<View>
<Text style={[styles.section, { color: colors.mutedForeground }]}>
Up Next
</Text>
{queueSongIds.length === 0 ? (
<Text style={[styles.empty, { color: colors.mutedForeground }]}>
Queue is empty
</Text>
) : null}
</View>
}
{...longListProps}
data={items}
keyExtractor={queueItemKey}
contentContainerStyle={{ paddingBottom: contentBottomInset }}
contentInsetAdjustmentBehavior="automatic"
renderItem={({ item }) => (
<QueueRow
songId={item.songId}
queueIndex={item.queueIndex}
isLast={item.queueIndex === queueSongIds.length - 1}
isCurrent={item.queueIndex === 0}
onSkipTo={skipToQueueIndex}
onMove={moveSong}
/>
)}
ListFooterComponent={
queueHistorySongIds.length > 0 ? (
<View style={styles.history}>
<Text style={[styles.section, { color: colors.mutedForeground }]}>
History
</Text>
{historySongs.map((song, index) =>
song ? (
<SongRow key={`${song.id}-${index}`} song={song} />
) : (
<SongRowSkeleton
key={`${queueHistorySongIds[index]}-${index}`}
/>
)
)}
</View>
) : undefined
}
/>
</>
)
}
const styles = StyleSheet.create({
section: {
paddingHorizontal: spacing.lg,
paddingTop: spacing.md,
fontSize: 12,
fontWeight: "700",
textTransform: "uppercase",
},
empty: { padding: spacing.lg },
queueActions: {
flexDirection: "row",
gap: spacing.lg,
paddingHorizontal: spacing.lg,
paddingBottom: spacing.sm,
},
history: { marginTop: spacing.lg },
})
+8 -72
View File
@@ -1,12 +1,9 @@
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
import { Ionicons } from "@expo/vector-icons" import { Ionicons } from "@expo/vector-icons"
import { useAction, useMutation, useQuery } from "convex/react" import { useAction, useMutation, useQuery } from "convex/react"
import { Image } from "expo-image" import { Image } from "expo-image"
import * as ImagePicker from "expo-image-picker" import * as ImagePicker from "expo-image-picker"
import { useState } from "react" import { useState } from "react"
import { router } from "expo-router"
import { import {
Platform,
Pressable, Pressable,
ScrollView, ScrollView,
StyleSheet, StyleSheet,
@@ -20,13 +17,8 @@ import { contentBottomInset } from "@/components/player"
import { Button, Input, LoadingView } from "@/components/ui/primitives" import { Button, Input, LoadingView } from "@/components/ui/primitives"
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session" import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import {
setArtworkColorsEnabled,
useArtworkColorsEnabled,
} from "@/lib/artwork-color-preference"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { changeServer, signOut } from "@/lib/session" import { changeServer, signOut } from "@/lib/session"
import { radius, spacing, useThemeColors } from "@/lib/theme" import { radius, spacing, useThemeColors } from "@/lib/theme"
import { showError } from "@/lib/toast" import { showError } from "@/lib/toast"
@@ -148,12 +140,7 @@ export default function SettingsScreen() {
})} })}
</View> </View>
{section === "profile" ? ( {section === "profile" ? <ProfileSection user={user} /> : null}
<>
<AppearanceSection />
<ProfileSection user={user} />
</>
) : null}
{section === "quality" ? <QualitySection user={user} /> : null} {section === "quality" ? <QualitySection user={user} /> : null}
{section === "library" && isAdmin ? <LibrarySection /> : null} {section === "library" && isAdmin ? <LibrarySection /> : null}
{section === "users" && isAdmin && allUsers ? ( {section === "users" && isAdmin && allUsers ? (
@@ -170,32 +157,6 @@ export default function SettingsScreen() {
) )
} }
function AppearanceSection() {
const enabled = useArtworkColorsEnabled()
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 ?? false}
disabled={enabled === undefined || 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 }) { function ProfileSection({ user }: { user: CurrentUser }) {
const colors = useThemeColors() const colors = useThemeColors()
const updateName = useMutation(api.users.updateProfileName) const updateName = useMutation(api.users.updateProfileName)
@@ -412,13 +373,8 @@ function QualitySection({ user }: { user: CurrentUser }) {
<SettingsCard title="Spatial Audio"> <SettingsCard title="Spatial Audio">
<SwitchRow <SwitchRow
title="Prefer Dolby Atmos" title="Prefer Dolby Atmos"
subtitle={ subtitle="Use Atmos versions when they are available."
dolbyAtmosSupported value={user.preferAtmos ?? false}
? "Use Atmos versions when they are available."
: "This device does not support Dolby Atmos playback."
}
disabled={!dolbyAtmosSupported}
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
onValueChange={(checked) => onValueChange={(checked) =>
void updateAtmos({ preferAtmos: checked }).catch((error: Error) => void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
showError(error.message) showError(error.message)
@@ -502,7 +458,7 @@ function UsersSection({
<SettingsCard title="Sign Up"> <SettingsCard title="Sign Up">
<SwitchRow <SwitchRow
title="Disable account creation" title="Disable account creation"
subtitle="Stop people from registering themselves. Admins can still create accounts." subtitle="Stop people from registering themselves. Admins can still create accounts from the web app."
value={appSettings?.disableAccountCreation ?? false} value={appSettings?.disableAccountCreation ?? false}
onValueChange={(checked) => onValueChange={(checked) =>
void setDisableCreation({ disabled: checked }).catch( void setDisableCreation({ disabled: checked }).catch(
@@ -516,10 +472,6 @@ function UsersSection({
title="People" title="People"
subtitle="Manage who can access this server." subtitle="Manage who can access this server."
> >
<Button
title="Create account"
onPress={() => router.push("/(app)/create-account")}
/>
<View style={styles.userList}> <View style={styles.userList}>
{users.map((user, index) => ( {users.map((user, index) => (
<View <View
@@ -543,10 +495,7 @@ function UsersSection({
</Text> </Text>
{user.isAdmin ? ( {user.isAdmin ? (
<View <View
style={[ style={[styles.badge, { backgroundColor: colors.muted }]}
styles.badge,
{ backgroundColor: colors.muted },
]}
> >
<Text <Text
style={[ style={[
@@ -683,12 +632,10 @@ function SwitchRow({
subtitle, subtitle,
value, value,
onValueChange, onValueChange,
disabled,
}: { }: {
title: string title: string
subtitle?: string subtitle?: string
value: boolean value: boolean
disabled?: boolean
onValueChange: (checked: boolean) => void onValueChange: (checked: boolean) => void
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
@@ -703,17 +650,7 @@ function SwitchRow({
<Text style={{ color: colors.mutedForeground }}>{subtitle}</Text> <Text style={{ color: colors.mutedForeground }}>{subtitle}</Text>
) : null} ) : null}
</View> </View>
<Switch <Switch value={value} onValueChange={onValueChange} />
value={value}
disabled={disabled}
onValueChange={onValueChange}
{...(Platform.OS === "android"
? {
trackColor: { false: colors.muted, true: colors.primary },
thumbColor: colors.foreground,
}
: {})}
/>
</View> </View>
) )
} }
@@ -769,7 +706,6 @@ function ProfileAvatar({
style?: StyleProp<ViewStyle> style?: StyleProp<ViewStyle>
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const imageUrl = useProfileImageUrl(user.image)
const avatarStyle = [ const avatarStyle = [
styles.avatar, styles.avatar,
{ {
@@ -781,11 +717,11 @@ function ProfileAvatar({
style, style,
] ]
if (imageUrl) { if (user.image) {
return ( return (
<View style={avatarStyle}> <View style={avatarStyle}>
<Image <Image
source={{ uri: imageUrl }} source={{ uri: user.image }}
style={styles.avatarImage} style={styles.avatarImage}
contentFit="cover" contentFit="cover"
/> />
@@ -1,5 +1,3 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button" import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -10,17 +8,13 @@ export const unstable_settings = {
} }
export default function LibraryLayout() { export default function LibraryLayout() {
const tabletLayout = useTabletLayout()
const baseOptions = useStackScreenOptions({ title: "Library" }) const baseOptions = useStackScreenOptions({ title: "Library" })
return ( return (
<Stack <Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
...baseOptions, ...baseOptions,
title: title: tabStackScreenTitles[route.name] ?? "Library",
tabStackScreenTitles[route.name] ??
(tabletLayout ? "Recently Added" : "Library"),
headerRight: headerRight:
route.name === "index" ? () => <ProfileHeaderButton /> : undefined, route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
unstable_headerRightItems: unstable_headerRightItems:
+26 -58
View File
@@ -1,4 +1,3 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { useMemo } from "react" import { useMemo } from "react"
import { Pressable, StyleSheet, Text, View } from "react-native" import { Pressable, StyleSheet, Text, View } from "react-native"
import { SymbolView } from "expo-symbols" import { SymbolView } from "expo-symbols"
@@ -13,22 +12,14 @@ import { useAppNavigation } from "@/lib/app-navigation"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import { appleMusic, spacing, useThemeColors } from "@/lib/theme" import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
const PAGE_SIZE = 24 const PAGE_SIZE = 16
const links = [ 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: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const }, { title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
{ title: "Songs", href: "/browse/songs", icon: "music.note" 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 }, { title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
] ]
@@ -52,19 +43,11 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
sparkles: "sparkles", sparkles: "sparkles",
star: "star", star: "star",
} }
return ( return <Ionicons name={ionMap[name] ?? "musical-notes"} size={22} color={appleMusic.pink} />
<Ionicons
name={ionMap[name] ?? "musical-notes"}
size={22}
color={appleMusic.pink}
/>
)
} }
export default function LibraryScreen() { export default function LibraryScreen() {
const tabletLayout = useTabletLayout()
const { push } = useAppNavigation() const { push } = useAppNavigation()
const isTablet = tabletLayout
const colors = useThemeColors() const colors = useThemeColors()
const { results, status, loadMore, isCached } = useCachedPaginatedQuery( const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
api.library.browseRecentlyAddedPaginated, api.library.browseRecentlyAddedPaginated,
@@ -75,46 +58,31 @@ export default function LibraryScreen() {
const listHeader = useMemo( const listHeader = useMemo(
() => ( () => (
<View> <View>
{!isTablet ? ( {links.map((link) => (
<> <Pressable
{links.map((link) => ( key={link.href}
<Pressable style={styles.row}
key={link.href} onPress={() => push(link.href)}
style={styles.row} >
onPress={() => push(link.href)} <LibraryIcon name={link.icon} />
> <View style={[styles.rowContent, { borderBottomColor: colors.border }]}>
<LibraryIcon name={link.icon} /> <Text style={[styles.rowTitle, { color: colors.foreground }]}>{link.title}</Text>
<View <Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
style={[ </View>
styles.rowContent, </Pressable>
{ 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 <Pressable
style={[styles.section, { paddingHorizontal: spacing.lg }]} style={[styles.section, { paddingHorizontal: spacing.lg }]}
onPress={() => push("/recently-added")} onPress={() => push("/recently-added")}
> >
<Text style={[styles.sectionTitle, { color: colors.foreground }]}> <Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Recently Added Recently Added
</Text> </Text>
</Pressable> </Pressable>
</>
) : null}
</View> </View>
), ),
[colors.border, colors.foreground, colors.mutedForeground, push, isTablet] [colors.border, colors.foreground, colors.mutedForeground, push]
) )
if (status === "LoadingFirstPage" && !isCached) { if (status === "LoadingFirstPage" && !isCached) {
@@ -0,0 +1 @@
export { default } from "../home/queue"
@@ -1,4 +1,3 @@
import { renderTabScreenContent } from "@/components/tab-screen-content"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { ProfileHeaderButton } from "@/components/profile-header-button" import { ProfileHeaderButton } from "@/components/profile-header-button"
@@ -13,7 +12,6 @@ export default function SearchLayout() {
return ( return (
<Stack <Stack
screenLayout={renderTabScreenContent}
screenOptions={({ route }) => ({ screenOptions={({ route }) => ({
...baseOptions, ...baseOptions,
title: tabStackScreenTitles[route.name] ?? "Search", title: tabStackScreenTitles[route.name] ?? "Search",
@@ -1,5 +1,3 @@
import { Platform } from "react-native"
import { useThemeColors } from "@/lib/theme"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { useCallback } from "react" import { useCallback } from "react"
@@ -7,7 +5,6 @@ import { SearchResults } from "@/components/search-results"
import { useDebouncedSearch } from "@/hooks/use-debounced-search" import { useDebouncedSearch } from "@/hooks/use-debounced-search"
export default function SearchScreen() { export default function SearchScreen() {
const colors = useThemeColors()
const { searchQuery, onQueryChange, onSearchSubmit } = useDebouncedSearch() const { searchQuery, onQueryChange, onSearchSubmit } = useDebouncedSearch()
const handleChangeText = useCallback( const handleChangeText = useCallback(
@@ -24,15 +21,6 @@ export default function SearchScreen() {
onChangeText={handleChangeText} onChangeText={handleChangeText}
onSearchButtonPress={onSearchSubmit} onSearchButtonPress={onSearchSubmit}
autoCapitalize="none" autoCapitalize="none"
{...(Platform.OS === "android"
? {
barTintColor: colors.background,
textColor: colors.foreground,
tintColor: colors.primary,
hintTextColor: colors.mutedForeground,
headerIconColor: colors.foreground,
}
: {})}
/> />
<SearchResults searchQuery={searchQuery} /> <SearchResults searchQuery={searchQuery} />
@@ -0,0 +1 @@
export { default } from "../home/queue"
+6 -37
View File
@@ -1,10 +1,3 @@
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 useLocalConvexAuth } from "@convex-dev/auth/react"
import { import {
useConvexAuth as useServerConvexAuth, useConvexAuth as useServerConvexAuth,
@@ -12,7 +5,7 @@ import {
} from "convex/react" } from "convex/react"
import { Stack } from "expo-router" import { Stack } from "expo-router"
import { Platform } from "react-native" import { Platform } from "react-native"
import { useEffect, useSyncExternalStore } from "react" import { useEffect } from "react"
import { AppIntentBridge } from "@/components/app-intent-bridge" import { AppIntentBridge } from "@/components/app-intent-bridge"
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery" import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
@@ -31,18 +24,6 @@ export default function AppLayout() {
const { isWebSocketConnected } = useConvexConnectionState() const { isWebSocketConnected } = useConvexConnectionState()
const { invalidateSession } = useInvalidateAuthSession() const { invalidateSession } = useInvalidateAuthSession()
const stackOptions = useStackScreenOptions() 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(() => { useEffect(() => {
if ( if (
@@ -85,8 +66,7 @@ export default function AppLayout() {
<Stack.Screen <Stack.Screen
name="settings" name="settings"
options={{ options={{
headerShown: Platform.OS === "android", headerShown: false,
title: "Settings",
presentation: presentation:
Platform.OS === "ios" ? "modal" : "fullScreenModal", Platform.OS === "ios" ? "modal" : "fullScreenModal",
animation: "slide_from_bottom", animation: "slide_from_bottom",
@@ -94,25 +74,14 @@ export default function AppLayout() {
gestureDirection: "vertical", 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 <Stack.Screen
name="player" name="player"
options={{ options={{
headerShown: false, headerShown: false,
// Keep the library visible behind the custom swipe animation. presentation:
presentation: "transparentModal", Platform.OS === "ios"
contentStyle: { backgroundColor: "transparent" }, ? "transparentModal"
: "fullScreenModal",
animation: "slide_from_bottom", animation: "slide_from_bottom",
gestureEnabled: true, gestureEnabled: true,
gestureDirection: "vertical", gestureDirection: "vertical",
-199
View File
@@ -1,199 +0,0 @@
import { useAction, useQuery } from "convex/react"
import { ConvexError } from "convex/values"
import { router, Stack } from "expo-router"
import { useEffect, useRef, useState } from "react"
import {
KeyboardAvoidingView,
Platform,
ScrollView,
StyleSheet,
Switch,
Text,
View,
} from "react-native"
import { SafeAreaView } from "react-native-safe-area-context"
import { toast } from "sonner-native"
import { Button, Input, LoadingView } from "@/components/ui/primitives"
import { colors, spacing } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
export default function CreateAccountScreen() {
const user = useQuery(api.auth.currentUser)
const createUser = useAction(api.users.adminCreateUser)
const [name, setName] = useState("")
const [email, setEmail] = useState("")
const [password, setPassword] = useState("")
const [isAdmin, setIsAdmin] = useState(false)
const [submitting, setSubmitting] = useState(false)
const [error, setError] = useState<string | null>(null)
const pending = useRef(false)
const mounted = useRef(true)
useEffect(() => {
mounted.current = true
return () => {
mounted.current = false
}
}, [])
async function handleCreate() {
if (pending.current || !user?.isAdmin) return
setError(null)
if (!name.trim() || !email.trim().includes("@") || password.length < 8) {
setError(
"Enter a name, valid email, and password of at least 8 characters."
)
return
}
pending.current = true
setSubmitting(true)
try {
await createUser({
name: name.trim(),
email: email.trim().toLowerCase(),
password,
isAdmin,
})
toast.success("Account created")
if (mounted.current) router.back()
} catch (error) {
if (!mounted.current) return
setError(
error instanceof ConvexError && typeof error.data === "string"
? error.data
: "Could not create account. Try again."
)
} finally {
pending.current = false
if (mounted.current) setSubmitting(false)
}
}
return (
<SafeAreaView edges={["bottom", "left", "right"]} style={styles.screen}>
<Stack.Screen
options={{
gestureEnabled: !submitting,
}}
/>
{user === undefined ? (
<LoadingView />
) : !user?.isAdmin ? (
<Text style={[styles.text, styles.message]}>
Admin access required.
</Text>
) : (
<KeyboardAvoidingView
style={styles.screen}
behavior={Platform.OS === "ios" ? "padding" : undefined}
keyboardVerticalOffset={Platform.OS === "ios" ? 100 : 0}
>
<ScrollView
contentContainerStyle={styles.form}
keyboardShouldPersistTaps="handled"
keyboardDismissMode="on-drag"
>
<View style={styles.field}>
<Text style={styles.label}>Name</Text>
<Input
accessibilityLabel="Name"
value={name}
onChangeText={setName}
autoCapitalize="words"
autoComplete="off"
editable={!submitting}
style={styles.input}
/>
</View>
<View style={styles.field}>
<Text style={styles.label}>Email</Text>
<Input
accessibilityLabel="Email"
value={email}
onChangeText={setEmail}
keyboardType="email-address"
autoCapitalize="none"
autoCorrect={false}
autoComplete="off"
editable={!submitting}
style={styles.input}
/>
</View>
<View style={styles.field}>
<Text style={styles.label}>Password</Text>
<Input
accessibilityLabel="Password"
value={password}
onChangeText={setPassword}
secureTextEntry
autoCapitalize="none"
autoCorrect={false}
autoComplete="new-password"
placeholder="At least 8 characters"
editable={!submitting}
style={styles.input}
/>
</View>
<View style={styles.row}>
<Text style={styles.text}>Grant admin access</Text>
<Switch
accessibilityLabel="Grant admin access"
trackColor={{
false: colors.dark.muted,
true: colors.dark.primary,
}}
thumbColor={colors.dark.foreground}
value={isAdmin}
onValueChange={setIsAdmin}
disabled={submitting}
/>
</View>
{error ? (
<Text accessibilityRole="alert" style={styles.error}>
{error}
</Text>
) : null}
<Button
title={submitting ? "Creating account…" : "Create account"}
disabled={submitting}
onPress={() => void handleCreate()}
tint={{
background: colors.dark.primary,
foreground: colors.dark.primaryForeground,
}}
/>
</ScrollView>
</KeyboardAvoidingView>
)}
</SafeAreaView>
)
}
const styles = StyleSheet.create({
screen: { flex: 1, backgroundColor: "#000" },
form: { padding: spacing.lg, gap: spacing.lg },
field: { gap: spacing.sm },
label: {
color: colors.dark.mutedForeground,
fontSize: 12,
fontWeight: "600",
textTransform: "uppercase",
letterSpacing: 0.6,
},
text: { color: colors.dark.foreground, fontSize: 16, flexShrink: 1 },
input: {
backgroundColor: colors.dark.muted,
color: colors.dark.foreground,
borderColor: colors.dark.border,
},
row: {
flexDirection: "row",
alignItems: "center",
justifyContent: "space-between",
gap: spacing.md,
minHeight: 48,
},
message: { padding: spacing.lg },
error: { color: colors.dark.destructive, fontSize: 14, lineHeight: 20 },
})
+53 -97
View File
@@ -1,9 +1,5 @@
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 { MusicEntityView } from "@/components/music-entity-view"
import { Stack, useRouter, useLocalSearchParams } from "expo-router" import { useRouter } from "expo-router"
import * as Haptics from "expo-haptics" import * as Haptics from "expo-haptics"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { useEffect, useRef, useState } from "react" import { useEffect, useRef, useState } from "react"
@@ -33,18 +29,16 @@ import { api } from "@otunes/convex/_generated/api"
import { playbackFormat } from "@otunes/convex/playback-stream" import { playbackFormat } from "@otunes/convex/playback-stream"
import { AudioFormatBadge } from "@/components/audio-format-badge" import { AudioFormatBadge } from "@/components/audio-format-badge"
import { AudioOutputButton } from "@/components/audio-output-button"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { MarqueeText } from "@/components/marquee-text" import { MarqueeText } from "@/components/marquee-text"
import { import {
MediaActionMenu, MediaActionMenu,
type MediaAction, type MediaAction,
} from "@/components/media-context-menu" } from "@/components/media-actions-sheet"
import { import {
NowPlayingQueue, NowPlayingQueue,
QUEUE_HORIZONTAL_INSET, QUEUE_HORIZONTAL_INSET,
} from "@/components/now-playing-queue" } from "@/components/now-playing-queue"
import { PlayerArtistMenu } from "@/components/player-artist-menu"
import { PlayerSlider } from "@/components/player-slider" import { PlayerSlider } from "@/components/player-slider"
import { PlayerSymbol } from "@/components/player-symbol" import { PlayerSymbol } from "@/components/player-symbol"
import { useFavorites } from "@/contexts/favorites" import { useFavorites } from "@/contexts/favorites"
@@ -53,7 +47,6 @@ import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useCoverPalette } from "@/hooks/use-cover-palette" import { useCoverPalette } from "@/hooks/use-cover-palette"
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
import { useSystemVolume } from "@/hooks/use-system-volume"
import { formatDuration, formatRemainingDuration } from "@/lib/format" import { formatDuration, formatRemainingDuration } from "@/lib/format"
import { import {
nowPlayingColors, nowPlayingColors,
@@ -75,15 +68,10 @@ const DISMISS_VELOCITY = 900
const DISMISS_CORNER_RADIUS = 48 const DISMISS_CORNER_RADIUS = 48
export default function PlayerScreen() { export default function PlayerScreen() {
const tabletLayout = useTabletLayout()
const router = useRouter() const router = useRouter()
const hadSongRef = useRef(false) const hadSongRef = useRef(false)
const insets = useSafeAreaInsets() const insets = useSafeAreaInsets()
const { width: windowWidth, height: windowHeight } = useWindowDimensions() 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 { config } = useServerConfig()
const { const {
currentSong, currentSong,
@@ -92,16 +80,15 @@ export default function PlayerScreen() {
repeatEnabled, repeatEnabled,
currentTime, currentTime,
duration, duration,
volume,
queueSongIds, queueSongIds,
setIsPlaying, setIsPlaying,
setVolume,
seekTo, seekTo,
skipNext, skipNext,
skipPrevious, skipPrevious,
} = usePlayback() } = usePlayback()
const { volume, setVolume, available: volumeAvailable } = useSystemVolume() const [showQueue, setShowQueue] = useState(false)
const { queue } = useLocalSearchParams<{ queue?: string }>()
const [showQueue, setShowQueue] = useState(queue === "1")
const [isDismissing, setIsDismissing] = useState(false)
const [stageHeight, setStageHeight] = useState(0) const [stageHeight, setStageHeight] = useState(0)
const [scrubTime, setScrubTime] = useState<number | null>(null) const [scrubTime, setScrubTime] = useState<number | null>(null)
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
@@ -114,7 +101,7 @@ export default function PlayerScreen() {
? playbackFormat( ? playbackFormat(
playbackInfo.files, playbackInfo.files,
user.playbackQuality, user.playbackQuality,
dolbyAtmosSupported && (user.preferAtmos ?? false) user.preferAtmos ?? false
) )
: null : null
@@ -173,7 +160,6 @@ export default function PlayerScreen() {
event.translationY > DISMISS_DISTANCE || event.translationY > DISMISS_DISTANCE ||
event.velocityY > DISMISS_VELOCITY event.velocityY > DISMISS_VELOCITY
) { ) {
scheduleOnRN(setIsDismissing, true)
dismissY.value = withTiming( dismissY.value = withTiming(
windowHeight, windowHeight,
{ duration: 220 }, { duration: 220 },
@@ -227,37 +213,9 @@ export default function PlayerScreen() {
setShowQueue((value) => !value) 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 ( return (
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}> <Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
<StatusBar style={colors.isDark ? "light" : "dark"} /> <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 <MusicEntityView
kind="song" kind="song"
@@ -419,35 +377,31 @@ export default function PlayerScreen() {
</TransportButton> </TransportButton>
</View> </View>
{volumeAvailable ? ( <PlayerSlider
<PlayerSlider accessibilityLabel="Volume"
accessibilityLabel="Volume" value={volume}
commitHoldMs={0} maximumValue={1}
animateValueChanges fillColor={colors.sliderFill}
value={volume} activeFillColor={colors.foreground}
maximumValue={1} trackColor={colors.sliderTrack}
fillColor={colors.sliderFill} onValueChange={setVolume}
activeFillColor={colors.foreground} leading={
trackColor={colors.sliderTrack} <PlayerSymbol
onValueChange={setVolume} name="speaker.fill"
leading={ fallback="volume-low"
<PlayerSymbol size={14}
name="speaker.fill" color={colors.secondaryForeground}
fallback="volume-low" />
size={14} }
color={colors.secondaryForeground} trailing={
/> <PlayerSymbol
} name="speaker.wave.3.fill"
trailing={ fallback="volume-high"
<PlayerSymbol size={14}
name="speaker.wave.3.fill" color={colors.secondaryForeground}
fallback="volume-high" />
size={14} }
color={colors.secondaryForeground} />
/>
}
/>
) : null}
<View style={styles.footer}> <View style={styles.footer}>
<Pressable <Pressable
@@ -465,10 +419,21 @@ export default function PlayerScreen() {
color={colors.foreground} color={colors.foreground}
/> />
</Pressable> </Pressable>
<AudioOutputButton <Pressable
color={colors.foreground} disabled
style={styles.queueButton} accessibilityRole="button"
/> accessibilityLabel={Platform.OS === "ios" ? "AirPlay" : "Cast"}
accessibilityState={{ disabled: true }}
style={[styles.queueButton, styles.unavailable]}
>
<PlayerSymbol
name="airplay.audio"
fallback={{ material: "cast" }}
size={27}
weight="semibold"
color={colors.foreground}
/>
</Pressable>
<Pressable <Pressable
onPress={toggleQueue} onPress={toggleQueue}
hitSlop={8} hitSlop={8}
@@ -545,15 +510,13 @@ function SongMeta({
{ color: colors.foreground }, { color: colors.foreground },
]} ]}
/> />
<PlayerArtistMenu song={song} onAction={handleAction}> <MarqueeText
<MarqueeText text={song.artist.name}
text={song.artist.name} style={[
style={[ compact ? styles.compactArtist : styles.artist,
compact ? styles.compactArtist : styles.artist, { color: colors.secondaryForeground },
{ color: colors.secondaryForeground }, ]}
]} />
/>
</PlayerArtistMenu>
</View> </View>
<Pressable <Pressable
onPress={() => void toggleSongFavorite(song.id)} onPress={() => void toggleSongFavorite(song.id)}
@@ -570,12 +533,6 @@ function SongMeta({
/> />
</Pressable> </Pressable>
<MediaActionMenu <MediaActionMenu
share={{
type: "song",
songId: song.id,
albumId: song.album.id,
title: song.title,
}}
stationArtistId={song.artist.id} stationArtistId={song.artist.id}
favorited={favorited} favorited={favorited}
navigation={{ navigation={{
@@ -583,7 +540,6 @@ function SongMeta({
album: { id: song.album.id }, album: { id: song.album.id },
}} }}
includeActions={[ includeActions={[
"share",
"play-next", "play-next",
"play-last", "play-last",
"shuffle", "shuffle",
+1 -16
View File
@@ -1,16 +1 @@
import { Platform } from "react-native" export { default } from "./(tabs)/home/settings"
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>
)
}
-57
View File
@@ -1,57 +0,0 @@
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 "/"
}
}
+3 -6
View File
@@ -1,7 +1,7 @@
import { useConvexAuth } from "@convex-dev/auth/react" import { useConvexAuth } from "@convex-dev/auth/react"
import { DarkTheme, Stack, ThemeProvider } from "expo-router" import { DarkTheme, Stack, ThemeProvider } from "expo-router"
import { StatusBar } from "expo-status-bar" import { StatusBar } from "expo-status-bar"
import { useIsDark } from "@/lib/theme" import { useColorScheme } from "react-native"
import { GestureHandlerRootView } from "react-native-gesture-handler" import { GestureHandlerRootView } from "react-native-gesture-handler"
import { SafeAreaProvider } from "react-native-safe-area-context" import { SafeAreaProvider } from "react-native-safe-area-context"
@@ -9,8 +9,6 @@ import { Toaster } from "@/components/ui/toaster"
import { ConvexAppProvider } from "@/contexts/convex-app" import { ConvexAppProvider } from "@/contexts/convex-app"
import { ServerConfigProvider, useServerConfig } from "@/contexts/server-config" import { ServerConfigProvider, useServerConfig } from "@/contexts/server-config"
import { HandoffBridge } from "@/components/handoff-bridge"
const navigationTheme = { const navigationTheme = {
...DarkTheme, ...DarkTheme,
colors: { ...DarkTheme.colors, background: "#000", card: "#000" }, colors: { ...DarkTheme.colors, background: "#000", card: "#000" },
@@ -49,16 +47,15 @@ function RootNavigator() {
} }
export default function RootLayout() { export default function RootLayout() {
const isDark = useIsDark() const colorScheme = useColorScheme()
return ( return (
<GestureHandlerRootView style={{ flex: 1, backgroundColor: "#000" }}> <GestureHandlerRootView style={{ flex: 1, backgroundColor: "#000" }}>
<SafeAreaProvider> <SafeAreaProvider>
<ServerConfigProvider> <ServerConfigProvider>
<ConvexAppProvider> <ConvexAppProvider>
<StatusBar style={isDark ? "light" : "dark"} /> <StatusBar style={colorScheme === "dark" ? "light" : "dark"} />
<ThemeProvider value={navigationTheme}> <ThemeProvider value={navigationTheme}>
<HandoffBridge />
<RootNavigator /> <RootNavigator />
</ThemeProvider> </ThemeProvider>
<Toaster /> <Toaster />
+2 -10
View File
@@ -1,6 +1,5 @@
import { useConvexAuth } from "@convex-dev/auth/react" import { useConvexAuth } from "@convex-dev/auth/react"
import { incomingMediaLink } from "@/lib/incoming-media-link" import { Redirect } from "expo-router"
import { Redirect, type Href } from "expo-router"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
@@ -12,16 +11,9 @@ export default function Index() {
return <Redirect href="/server" /> return <Redirect href="/server" />
} }
const destination = auth?.isAuthenticated
? incomingMediaLink(config.serverUrl)
: null
return ( return (
<Redirect <Redirect
href={ href={auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin"}
(destination as Href) ??
(auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin")
}
/> />
) )
} }
+14 -15
View File
@@ -1,10 +1,13 @@
import { useLocalSearchParams } from "expo-router" import { useState } from "react"
import { useEffect, useState } from "react" import {
import { StyleSheet, Text, View } from "react-native" KeyboardAvoidingView,
Platform,
StyleSheet,
Text,
View,
} from "react-native"
import { SafeAreaView } from "react-native-safe-area-context" import { SafeAreaView } from "react-native-safe-area-context"
import { KeyboardForm } from "@/components/keyboard-form"
import { Button, Card, Input } from "@/components/ui/primitives" import { Button, Card, Input } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { spacing, useThemeColors } from "@/lib/theme" import { spacing, useThemeColors } from "@/lib/theme"
@@ -12,14 +15,7 @@ import { spacing, useThemeColors } from "@/lib/theme"
export default function ServerScreen() { export default function ServerScreen() {
const colors = useThemeColors() const colors = useThemeColors()
const { setServerHostname } = useServerConfig() const { setServerHostname } = useServerConfig()
const { hostname: linkedHostname } = useLocalSearchParams<{ const [hostname, setHostname] = useState("")
hostname?: string
}>()
const [hostname, setHostname] = useState(linkedHostname ?? "")
useEffect(() => {
if (linkedHostname) setHostname(linkedHostname)
}, [linkedHostname])
const [error, setError] = useState<string | null>(null) const [error, setError] = useState<string | null>(null)
const [submitting, setSubmitting] = useState(false) const [submitting, setSubmitting] = useState(false)
@@ -45,7 +41,10 @@ export default function ServerScreen() {
return ( return (
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}> <SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
<KeyboardForm style={styles.container}> <KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : undefined}
style={styles.container}
>
<View style={styles.hero}> <View style={styles.hero}>
<Text style={[styles.brand, { color: colors.foreground }]}> <Text style={[styles.brand, { color: colors.foreground }]}>
oTunes oTunes
@@ -83,7 +82,7 @@ export default function ServerScreen() {
onPress={() => void handleContinue()} onPress={() => void handleContinue()}
/> />
</Card> </Card>
</KeyboardForm> </KeyboardAvoidingView>
</SafeAreaView> </SafeAreaView>
) )
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 286 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 KiB

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 KiB

After

Width:  |  Height:  |  Size: 963 KiB

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

Before

Width:  |  Height:  |  Size: 8.8 KiB

@@ -1,53 +0,0 @@
{
"fill" : {
"linear-gradient" : [
"display-p3:0.00000,0.55106,0.91748,1.00000",
"display-p3:0.00320,0.24546,0.91602,1.00000"
]
},
"groups" : [
{
"layers" : [
{
"fill-specializations" : [
{
"value" : "automatic"
},
{
"appearance" : "dark",
"value" : {
"linear-gradient" : [
"display-p3:0.00000,0.55106,0.91748,1.00000",
"display-p3:0.00320,0.24546,0.91602,1.00000"
]
}
}
],
"image-name" : "music.note.png",
"name" : "music.note",
"position" : {
"scale" : 1.5,
"translation-in-points" : [
0,
0
]
}
}
],
"shadow" : {
"kind" : "neutral",
"opacity" : 0.6
},
"translucency" : {
"enabled" : false,
"value" : 0.2
}
}
],
"supported-platforms" : {
"circles" : [
"watchOS"
],
"squares" : "shared"
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

@@ -1,53 +0,0 @@
{
"fill" : {
"linear-gradient" : [
"display-p3:0.03297,0.65562,0.91748,1.00000",
"display-p3:0.01787,0.85470,0.91602,1.00000"
]
},
"groups" : [
{
"layers" : [
{
"fill-specializations" : [
{
"value" : "automatic"
},
{
"appearance" : "dark",
"value" : {
"linear-gradient" : [
"display-p3:0.03297,0.65562,0.91748,1.00000",
"display-p3:0.01787,0.85470,0.91602,1.00000"
]
}
}
],
"image-name" : "music.note.png",
"name" : "music.note",
"position" : {
"scale" : 1.5,
"translation-in-points" : [
0,
0
]
}
}
],
"shadow" : {
"kind" : "neutral",
"opacity" : 0.6
},
"translucency" : {
"enabled" : false,
"value" : 0.2
}
}
],
"supported-platforms" : {
"circles" : [
"watchOS"
],
"squares" : "shared"
}
}
-15
View File
@@ -1,15 +0,0 @@
import type { PropsWithChildren } from "react"
import { KeyboardAvoidingView, Platform } from "react-native"
import { SafeAreaView } from "react-native-safe-area-context"
/** RN modals have their own window; protect their actions from navigation and IME. */
export function AndroidSheet({ children }: PropsWithChildren) {
if (Platform.OS !== "android") return children
return (
<KeyboardAvoidingView behavior="height" style={{ flex: 1 }}>
<SafeAreaView edges={["bottom", "left", "right"]} style={{ flex: 1 }}>
{children}
</SafeAreaView>
</KeyboardAvoidingView>
)
}
+2 -10
View File
@@ -1,5 +1,4 @@
import { PaletteText } from "@/components/palette-text" import { StyleSheet, Text, View } from "react-native"
import { StyleSheet, View } from "react-native"
import Svg, { G, Path } from "react-native-svg" import Svg, { G, Path } from "react-native-svg"
import type { PlaybackFormat } from "@otunes/convex/playback-stream" import type { PlaybackFormat } from "@otunes/convex/playback-stream"
@@ -75,12 +74,10 @@ function LosslessMark({
/** The Dolby Atmos or Lossless label shown under the progress bar. */ /** The Dolby Atmos or Lossless label shown under the progress bar. */
export function AudioFormatBadge({ export function AudioFormatBadge({
artwork = false,
format, format,
color, color,
backgroundColor, backgroundColor,
}: { }: {
artwork?: boolean
format: PlaybackFormat format: PlaybackFormat
color: string color: string
backgroundColor: string backgroundColor: string
@@ -93,12 +90,7 @@ export function AudioFormatBadge({
) : ( ) : (
<LosslessMark color={color} backgroundColor={backgroundColor} /> <LosslessMark color={color} backgroundColor={backgroundColor} />
)} )}
<PaletteText <Text style={[styles.label, { color }]}>{label}</Text>
tone={artwork ? "secondaryForeground" : undefined}
style={[styles.label, { color }]}
>
{label}
</PaletteText>
</View> </View>
) )
} }
@@ -1,71 +0,0 @@
import {
requireNativeView,
requireOptionalNativeModule,
type NativeModule,
} from "expo"
import {
Platform,
Pressable,
type StyleProp,
type ViewProps,
type ViewStyle,
} from "react-native"
import { PlayerSymbol } from "@/components/player-symbol"
import { showError } from "@/lib/toast"
type AudioOutputModule = NativeModule & {
showPicker: () => Promise<boolean>
}
const audioOutput =
requireOptionalNativeModule<AudioOutputModule>("AudioOutput")
const AirPlayPicker =
Platform.OS === "ios" && audioOutput
? requireNativeView<ViewProps & { tint: string }>("AudioOutput")
: null
export function AudioOutputButton({
color,
style,
}: {
color: string
style: StyleProp<ViewStyle>
}) {
if (AirPlayPicker) {
return <AirPlayPicker tint={color} style={style} />
}
const available =
Platform.OS === "android" && Platform.Version >= 33 && audioOutput !== null
async function showPicker() {
try {
if (!(await audioOutput?.showPicker())) {
showError("Audio output selection is unavailable on this device.")
}
} catch {
showError("Audio output selection could not be opened.")
}
}
return (
<Pressable
onPress={showPicker}
disabled={!available}
hitSlop={8}
accessibilityRole="button"
accessibilityLabel={Platform.OS === "ios" ? "AirPlay" : "Audio output"}
accessibilityState={{ disabled: !available }}
style={[style, !available && { opacity: 0.35 }]}
>
<PlayerSymbol
name="airplay.audio"
fallback={{ material: "cast" }}
size={27}
weight="semibold"
color={color}
/>
</Pressable>
)
}
+22 -30
View File
@@ -2,11 +2,16 @@ import { useAuthActions } from "@convex-dev/auth/react"
import { Link } from "expo-router" import { Link } from "expo-router"
import { useQuery } from "convex/react" import { useQuery } from "convex/react"
import { useState } from "react" import { useState } from "react"
import { Pressable, StyleSheet, Text, View } from "react-native" import {
KeyboardAvoidingView,
Platform,
Pressable,
StyleSheet,
Text,
View,
} from "react-native"
import { SafeAreaView } from "react-native-safe-area-context" import { SafeAreaView } from "react-native-safe-area-context"
import { KeyboardForm } from "@/components/keyboard-form"
import { Button, Card, Input } from "@/components/ui/primitives" import { Button, Card, Input } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -87,15 +92,14 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
return ( return (
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}> <SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
<KeyboardForm style={styles.container}> <KeyboardAvoidingView
behavior={Platform.OS === "ios" ? "padding" : undefined}
style={styles.container}
>
<Card> <Card>
<View style={styles.header}> <View style={styles.header}>
<Text style={[styles.title, { color: colors.foreground }]}> <Text style={[styles.title, { color: colors.foreground }]}>{text.title}</Text>
{text.title} <Text style={[styles.description, { color: colors.mutedForeground }]}>
</Text>
<Text
style={[styles.description, { color: colors.mutedForeground }]}
>
{text.description} {text.description}
</Text> </Text>
{config ? ( {config ? (
@@ -107,8 +111,8 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
{signupsDisabled ? ( {signupsDisabled ? (
<Text style={{ color: colors.mutedForeground }}> <Text style={{ color: colors.mutedForeground }}>
New account registration is currently disabled. Contact an New account registration is currently disabled. Contact an administrator if you need
administrator if you need access. access.
</Text> </Text>
) : ( ) : (
<View style={styles.form}> <View style={styles.form}>
@@ -133,28 +137,16 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
onChangeText={setPassword} onChangeText={setPassword}
placeholder="Password" placeholder="Password"
secureTextEntry secureTextEntry
autoComplete={ autoComplete={flow === "signIn" ? "current-password" : "new-password"}
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 ? ( {!hideSignUpLink ? (
<View style={styles.switchRow}> <View style={styles.switchRow}>
<Text style={{ color: colors.mutedForeground }}> <Text style={{ color: colors.mutedForeground }}>{text.switchPrompt} </Text>
{text.switchPrompt}{" "}
</Text>
<Link href={text.switchHref} asChild> <Link href={text.switchHref} asChild>
<Pressable> <Pressable>
<Text <Text style={{ color: colors.foreground, fontWeight: "600" }}>
style={{ color: colors.foreground, fontWeight: "600" }}
>
{text.switchLabel} {text.switchLabel}
</Text> </Text>
</Pressable> </Pressable>
@@ -175,7 +167,7 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
> >
<Text style={{ color: colors.mutedForeground }}>Change server</Text> <Text style={{ color: colors.mutedForeground }}>Change server</Text>
</Pressable> </Pressable>
</KeyboardForm> </KeyboardAvoidingView>
</SafeAreaView> </SafeAreaView>
) )
} }
@@ -1,66 +0,0 @@
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 },
})
+3 -7
View File
@@ -1,6 +1,5 @@
import { PaletteText } from "@/components/palette-text"
import { memo } from "react" import { memo } from "react"
import { StyleSheet, View } from "react-native" import { StyleSheet, Text, View } from "react-native"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
@@ -26,12 +25,9 @@ export const DiscHeader = memo(function DiscHeader({
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<PaletteText <Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
tone={color ? "foreground" : undefined}
style={[styles.discHeader, { color: color ?? colors.foreground }]}
>
{label} {label}
</PaletteText> </Text>
) )
}) })
-6
View File
@@ -2,7 +2,6 @@ import { Ionicons } from "@expo/vector-icons"
import { Image, type ImageContentFit, type ImageStyle } from "expo-image" import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
import { memo, useMemo } from "react" import { memo, useMemo } from "react"
import { import {
Platform,
PixelRatio, PixelRatio,
StyleProp, StyleProp,
StyleSheet, StyleSheet,
@@ -10,8 +9,6 @@ import {
type ViewStyle, type ViewStyle,
} from "react-native" } from "react-native"
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
import { useThemeColors } from "@/lib/theme" import { useThemeColors } from "@/lib/theme"
import { import {
coverImageSizes, coverImageSizes,
@@ -109,9 +106,6 @@ export const CoverImage = memo(function CoverImage({
contentFit={contentFit} contentFit={contentFit}
transition={150} transition={150}
blurRadius={blurRadius} blurRadius={blurRadius}
onLoad={
Platform.OS === "android" ? () => prefetchCoverPalette(uri) : undefined
}
cachePolicy="memory-disk" cachePolicy="memory-disk"
recyclingKey={sourceUri} recyclingKey={sourceUri}
enforceEarlyResizing enforceEarlyResizing
-81
View File
@@ -1,81 +0,0 @@
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 || 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
@@ -1,42 +0,0 @@
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",
},
})
@@ -0,0 +1,7 @@
export type { MediaAction, MediaMenuConfig, MediaNavigation } from "@/components/media-context-menu"
export type { MediaShareContext } from "@/lib/media-links"
export {
buildMediaMenuActions,
MediaActionMenu,
MediaContextMenu,
} from "@/components/media-context-menu"
+84 -199
View File
@@ -1,17 +1,9 @@
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 { MusicEntityView } from "@/components/music-entity-view"
import { Link } from "expo-router"
import { Ionicons } from "@expo/vector-icons" import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react" import { memo, useCallback, type ReactElement } from "react"
import { import {
FlatList, FlatList,
Platform,
Pressable, Pressable,
ScrollView,
StyleSheet, StyleSheet,
Text, Text,
View, View,
@@ -30,84 +22,67 @@ import type {
PlaylistSummary, PlaylistSummary,
} from "@otunes/convex/types" } from "@otunes/convex/types"
import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls" import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme" import {
carouselCardWidth,
radius,
spacing,
useThemeColors,
useTwoColumnCardWidth,
} from "@/lib/theme"
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
const GRID_INITIAL_ROWS = 5 const GRID_INITIAL_ROWS = 5
const MAX_NON_VIRTUAL_CAROUSEL_ITEMS = 10
export const AlbumCard = memo(function AlbumCard({ export const AlbumCard = memo(function AlbumCard({
album, album,
width = carouselCardWidth, width = carouselCardWidth,
fluid = false,
}: { }: {
album: BrowseAlbum album: BrowseAlbum
width?: number width?: number
fluid?: boolean
}) { }) {
const { href } = useAppNavigation() const { push } = useAppNavigation()
const tabletLayout = useTabletLayout()
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions() const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
const onPress = useCallback(() => {
push(`/album/${album.id}`)
}, [push, album.id])
if (!config) return null if (!config) return null
const card = ( const card = (
<Link href={href(`/album/${album.id}`)} push asChild> <Pressable style={[styles.card, { width }]} onPress={onPress}>
<Pressable <CoverImage
style={StyleSheet.flatten([ uri={albumCoverUrl(config.serverUrl, album.id)}
styles.card, hasCover={album.cover != null}
{ width: fluid ? "100%" : width }, style={{ width, height: width, borderRadius: radius.md }}
])} />
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={2}
> >
<Link.AppleZoom> {album.title}
<View collapsable={false}> </Text>
<CoverImage <Text
uri={albumCoverUrl(config.serverUrl, album.id)} style={[styles.subtitle, { color: colors.mutedForeground }]}
hasCover={album.cover != null} numberOfLines={1}
style={ >
fluid {album.artist.name}
? { width: "100%", aspectRatio: 1, borderRadius: radius.md } </Text>
: { width, height: width, borderRadius: radius.md } </Pressable>
}
/>
</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 ( return (
<MediaContextMenu <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)} favorited={isAlbumFavorite(album.id)}
stationArtistId={album.artist.id} stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }} navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id, title: album.title }} share={{ type: "album", albumId: album.id }}
onAction={(action) => void handleAlbumAction(album, action)} onAction={(action) => void handleAlbumAction(album, action)}
> >
{card} <MusicEntityView kind="album" id={album.id}>
{card}
</MusicEntityView>
</MediaContextMenu> </MediaContextMenu>
) )
}) })
@@ -115,14 +90,11 @@ export const AlbumCard = memo(function AlbumCard({
export const ArtistCard = memo(function ArtistCard({ export const ArtistCard = memo(function ArtistCard({
artist, artist,
width = carouselCardWidth, width = carouselCardWidth,
fluid = false,
}: { }: {
artist: BrowseArtist artist: BrowseArtist
width?: number width?: number
fluid?: boolean
}) { }) {
const { push } = useAppNavigation() const { push } = useAppNavigation()
const tabletLayout = useTabletLayout()
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const { handleArtistAction, isArtistFavorite } = useMediaMenuActions() const { handleArtistAction, isArtistFavorite } = useMediaMenuActions()
@@ -132,22 +104,15 @@ export const ArtistCard = memo(function ArtistCard({
if (!config) return null if (!config) return null
const card = ( const card = (
<Pressable <Pressable style={[styles.card, { width }]} onPress={onPress}>
style={[styles.card, { width: fluid ? "100%" : width }]}
onPress={onPress}
>
<CoverImage <CoverImage
uri={artistCoverUrl(config.serverUrl, artist.id)} uri={artistCoverUrl(config.serverUrl, artist.id)}
hasCover={artist.photo != null} hasCover={artist.photo != null}
style={ style={{ width, height: width, borderRadius: width / 2 }}
fluid
? { width: "100%", aspectRatio: 1, borderRadius: 9999 }
: { width, height: width, borderRadius: width / 2 }
}
/> />
<Text <Text
style={[styles.title, { color: colors.foreground }]} style={[styles.title, { color: colors.foreground }]}
numberOfLines={tabletLayout ? 1 : 2} numberOfLines={2}
> >
{artist.name} {artist.name}
</Text> </Text>
@@ -156,14 +121,8 @@ export const ArtistCard = memo(function ArtistCard({
return ( return (
<MediaContextMenu <MediaContextMenu
preview={{
kind: "artist",
title: artist.name,
artworkUrl: artistCoverUrl(config.serverUrl, artist.id),
hasArtwork: artist.photo != null,
}}
favorited={isArtistFavorite(artist.id)} favorited={isArtistFavorite(artist.id)}
share={{ type: "artist", artistId: artist.id, title: artist.name }} share={{ type: "artist", artistId: artist.id }}
onAction={(action) => void handleArtistAction(artist, action)} onAction={(action) => void handleArtistAction(artist, action)}
> >
<MusicEntityView kind="artist" id={artist.id}> <MusicEntityView kind="artist" id={artist.id}>
@@ -176,69 +135,50 @@ export const ArtistCard = memo(function ArtistCard({
export const PlaylistCard = memo(function PlaylistCard({ export const PlaylistCard = memo(function PlaylistCard({
playlist, playlist,
width = carouselCardWidth, width = carouselCardWidth,
fluid = false,
}: { }: {
playlist: PlaylistSummary playlist: PlaylistSummary
width?: number width?: number
fluid?: boolean
}) { }) {
const { href } = useAppNavigation() const { push } = useAppNavigation()
const tabletLayout = useTabletLayout()
const { config } = useServerConfig() const { config } = useServerConfig()
const colors = useThemeColors() const colors = useThemeColors()
const { handlePlaylistAction } = useMediaMenuActions() const { handlePlaylistAction } = useMediaMenuActions()
const onPress = useCallback(() => {
push(`/playlist/${playlist.id}`)
}, [push, playlist.id])
if (!config) return null if (!config) return null
const card = ( const card = (
<Link href={href(`/playlist/${playlist.id}`)} push asChild> <Pressable style={[styles.card, { width }]} onPress={onPress}>
<Pressable <CoverImage
style={StyleSheet.flatten([ uri={playlistCoverUrl(config.serverUrl, playlist.id)}
styles.card, hasCover={playlist.cover != null}
{ width: fluid ? "100%" : width }, style={{ width, height: width, borderRadius: radius.md }}
])} />
<Text
style={[styles.title, { color: colors.foreground }]}
numberOfLines={2}
> >
<Link.AppleZoom> {playlist.title}
<View collapsable={false}> </Text>
<CoverImage <Text
uri={playlistCoverUrl(config.serverUrl, playlist.id)} style={[styles.subtitle, { color: colors.mutedForeground }]}
hasCover={playlist.cover != null} numberOfLines={1}
style={ >
fluid {playlist.owner}
? { width: "100%", aspectRatio: 1, borderRadius: radius.md } </Text>
: { width, height: width, borderRadius: radius.md } </Pressable>
}
/>
</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 ( return (
<MediaContextMenu <MediaContextMenu
showFavorite={false} showFavorite={false}
share={{ share={{ type: "playlist", playlistId: playlist.id }}
type: "playlist",
playlistId: playlist.id,
title: playlist.title,
}}
onAction={(action) => void handlePlaylistAction(playlist, action)} onAction={(action) => void handlePlaylistAction(playlist, action)}
> >
{card} <MusicEntityView kind="playlist" id={playlist.id}>
{card}
</MusicEntityView>
</MediaContextMenu> </MediaContextMenu>
) )
}) })
@@ -246,42 +186,29 @@ export const PlaylistCard = memo(function PlaylistCard({
const CarouselCard = memo(function CarouselCard({ const CarouselCard = memo(function CarouselCard({
item, item,
width, width,
fluid = false,
}: { }: {
item: MediaItem item: MediaItem
width: number width: number
fluid?: boolean
}) { }) {
if ("owner" in item) if ("owner" in item) return <PlaylistCard playlist={item} width={width} />
return <PlaylistCard playlist={item} width={width} fluid={fluid} /> if ("artist" in item) return <AlbumCard album={item} width={width} />
if ("artist" in item) return <ArtistCard artist={item} width={width} />
return <AlbumCard album={item} width={width} fluid={fluid} />
return <ArtistCard artist={item} width={width} fluid={fluid} />
}) })
export function MediaGrid({ content }: { content: MediaItem[] }) { export function MediaGrid({ content }: { content: MediaItem[] }) {
const tabletLayout = useTabletLayout() const cardWidth = useTwoColumnCardWidth()
const { cardWidth, onLayout, ready } = useMediaGridLayout()
return ( return (
<View style={styles.grid} onLayout={onLayout}> <View style={styles.grid}>
{(ready ? content : []).map((item) => ( {content.map((item) => (
<Animated.View <View key={item.id} style={{ width: cardWidth }}>
key={item.id} <CarouselCard item={item} width={cardWidth} />
layout={tabletLayout ? tabletLayoutTransition : undefined} </View>
style={{ width: cardWidth }}
>
<CarouselCard item={item} width={cardWidth} fluid={tabletLayout} />
</Animated.View>
))} ))}
</View> </View>
) )
} }
function renderTabletCard(item: MediaItem, width: number) {
return <CarouselCard item={item} width={width} fluid />
}
export function MediaGridList({ export function MediaGridList({
content, content,
paddingBottom, paddingBottom,
@@ -295,9 +222,7 @@ export function MediaGridList({
ListHeaderComponent?: ReactElement ListHeaderComponent?: ReactElement
contentInset?: boolean contentInset?: boolean
}) { }) {
const tabletLayout = useTabletLayout() const cardWidth = useTwoColumnCardWidth()
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
useMediaGridLayout()
const colors = useThemeColors() const colors = useThemeColors()
const renderItem = useCallback( const renderItem = useCallback(
({ item }: ListRenderItemInfo<MediaItem>) => ( ({ item }: ListRenderItemInfo<MediaItem>) => (
@@ -308,43 +233,23 @@ export function MediaGridList({
[cardWidth] [cardWidth]
) )
if (tabletLayout) {
return (
<TabletMediaGrid
content={content}
paddingBottom={paddingBottom}
onEndReached={onEndReached}
ListHeaderComponent={ListHeaderComponent}
contentInset={contentInset}
renderCard={renderTabletCard}
/>
)
}
return ( return (
<FlatList <FlatList
key={columns}
onLayout={onLayout}
data={content} data={content}
keyExtractor={mediaItemKey} keyExtractor={mediaItemKey}
renderItem={renderItem} renderItem={renderItem}
numColumns={columns} numColumns={2}
initialNumToRender={GRID_INITIAL_ROWS} initialNumToRender={GRID_INITIAL_ROWS}
maxToRenderPerBatch={GRID_INITIAL_ROWS} maxToRenderPerBatch={GRID_INITIAL_ROWS}
windowSize={longListProps.windowSize} windowSize={longListProps.windowSize}
style={{ flex: 1, backgroundColor: colors.background }} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[ contentContainerStyle={[
contentInset ? styles.gridListContent : styles.gridListContentInset, contentInset ? styles.gridListContent : styles.gridListContentInset,
{ { paddingBottom },
paddingBottom,
gap,
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
},
]} ]}
columnWrapperStyle={[ columnWrapperStyle={[
styles.gridListRow, styles.gridListRow,
!contentInset && { paddingHorizontal: horizontalPadding }, !contentInset && styles.gridListRowInset,
{ gap },
]} ]}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
ListHeaderComponent={ListHeaderComponent} ListHeaderComponent={ListHeaderComponent}
@@ -401,30 +306,14 @@ function ContentCarouselBody({
/> />
) : null} ) : null}
</Pressable> </Pressable>
{Platform.OS === "android" && <FlatList
content.length <= MAX_NON_VIRTUAL_CAROUSEL_ITEMS ? ( data={content}
<ScrollView keyExtractor={mediaItemKey}
horizontal renderItem={renderCarouselItem}
style={styles.androidCarousel} horizontal
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.carouselContent} 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> </View>
) )
} }
@@ -454,10 +343,6 @@ const styles = StyleSheet.create({
fontSize: 22, fontSize: 22,
fontWeight: "700", fontWeight: "700",
}, },
androidCarousel: {
// Horizontal lists should measure their cards, not stretch the Home sections.
flexGrow: 0,
},
carouselContent: { carouselContent: {
gap: spacing.md, gap: spacing.md,
}, },
+7 -122
View File
@@ -1,22 +1,14 @@
import type { MenuAction } from "@expo/ui/community/menu" import { MenuView, type MenuAction } from "@expo/ui/community/menu"
import { MenuView } from "@/components/media-menu"
import { requireNativeView } from "expo" import { requireNativeView } from "expo"
import type { ComponentType, ReactNode } from "react" import type { ComponentType, ReactNode } from "react"
import { import {
Platform, Platform,
Text,
useWindowDimensions,
View, View,
type StyleProp, type StyleProp,
type ViewProps, type ViewProps,
type ViewStyle, type ViewStyle,
} from "react-native" } 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 { useServerConfig } from "@/contexts/server-config"
import type { MediaShareContext } from "@/lib/media-links" import type { MediaShareContext } from "@/lib/media-links"
import { shouldShowShare } from "@/lib/media-links" import { shouldShowShare } from "@/lib/media-links"
@@ -39,17 +31,7 @@ export type MediaNavigation = {
album?: { id: string } album?: { id: string }
} }
export type MediaMenuPreview = {
title: string
artist?: string
album?: string
artworkUrl: string
hasArtwork: boolean
kind: "album" | "artist" | "song"
}
export type MediaMenuConfig = { export type MediaMenuConfig = {
preview?: MediaMenuPreview
selectedCount?: number selectedCount?: number
playlistLabel?: string playlistLabel?: string
favorited?: boolean favorited?: boolean
@@ -106,12 +88,12 @@ const MEDIA_ACTION_ITEMS: {
{ {
action: "go-artist", action: "go-artist",
label: () => "Go to Artist", label: () => "Go to Artist",
image: "music.mic", image: "person",
}, },
{ {
action: "go-album", action: "go-album",
label: () => "Go to Album", label: () => "Go to Album",
image: "square.stack", image: "opticaldisc",
}, },
{ {
action: "favorite", action: "favorite",
@@ -189,7 +171,8 @@ export function buildMediaMenuActions(
actions.push({ actions.push({
id: item.action, id: item.action,
title: item.label(countSuffix, favorited, playlistLabel), title: item.label(countSuffix, favorited, playlistLabel),
image: item.action === "favorite" && favorited ? "star.fill" : item.image, image:
item.action === "favorite" && favorited ? "star.fill" : item.image,
}) })
} }
@@ -231,95 +214,10 @@ function MediaMenuBase({
const NativeContextMenuView = const NativeContextMenuView =
Platform.OS === "ios" Platform.OS === "ios"
? requireNativeView< ? requireNativeView<
ViewProps & { ViewProps & { disableForceFlatten?: boolean; children: ReactNode }
disableForceFlatten?: boolean
children: ReactNode
onPreviewTappedAnimationCompleted?: () => void
}
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewView") >("ExpoRouterNativeLinkPreview", "NativeLinkPreviewView")
: null : 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<{ const NativeContextMenuAction: ComponentType<{
identifier: string identifier: string
title: string title: string
@@ -335,13 +233,11 @@ const NativeContextMenuAction: ComponentType<{
function NativeMediaContextMenu({ function NativeMediaContextMenu({
children, children,
preview,
onAction, onAction,
share, share,
...actionConfig ...actionConfig
}: MediaMenuWrapperProps) { }: MediaMenuWrapperProps) {
const { config } = useServerConfig() const { config } = useServerConfig()
const { push } = useAppNavigation()
if (!NativeContextMenuView || !NativeContextMenuAction) { if (!NativeContextMenuView || !NativeContextMenuAction) {
return children return children
@@ -356,21 +252,10 @@ function NativeMediaContextMenu({
} }
return ( return (
<NativeContextMenuView <NativeContextMenuView style={{ display: "contents" }} disableForceFlatten>
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 {/* The native menu retains its first trigger. Keep that view mounted when
focus changes replace the Siri entity wrapper inside it. */} focus changes replace the Siri entity wrapper inside it. */}
<View collapsable={false}>{children}</View> <View collapsable={false}>{children}</View>
{preview && (actionConfig.selectedCount ?? 1) === 1 ? (
<MediaPreview preview={preview} />
) : null}
{buildMediaMenuActions({ ...actionConfig, share }).map((action) => ( {buildMediaMenuActions({ ...actionConfig, share }).map((action) => (
<NativeContextMenuAction <NativeContextMenuAction
key={action.id} key={action.id}
@@ -1,140 +0,0 @@
import { Ionicons } from "@expo/vector-icons"
import type { ComponentProps } from "react"
import type { MediaAction } from "@/components/media-context-menu"
import type { MenuComponentProps } from "@expo/ui/community/menu"
import {
DropdownMenu,
DropdownMenuItem,
Host,
RNHostView,
Text,
} from "@expo/ui/jetpack-compose"
import { useState } from "react"
import { Pressable, View } from "react-native"
import { Gesture, GestureDetector } from "react-native-gesture-handler"
import { appleMusic } from "@/lib/theme"
const actionIcons = {
share: "share-outline",
playlist: "list-outline",
"play-next": "play-forward-outline",
"play-last": "list",
shuffle: "shuffle",
"create-station": "radio-outline",
favorite: "star-outline",
"go-artist": "person-outline",
"go-album": "disc-outline",
"delete-playlist": "trash-outline",
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
// The community MenuView creates a dynamic-color Host internally. Own this
// Android host so menus use the same fixed palette as the rest of the app.
export function MenuView({
actions,
children,
style,
shouldOpenOnLongPress,
onPressAction,
}: MenuComponentProps) {
const [expanded, setExpanded] = useState(false)
const longPress = Gesture.LongPress()
.runOnJS(true)
.onStart(() => setExpanded(true))
return (
<View style={style}>
<Host
colorScheme="dark"
seedColor={appleMusic.pink}
colorOverrides={{
primary: appleMusic.pink,
onPrimary: "#FFFFFF",
surface: "#000000",
onSurface: "#FFFFFF",
onSurfaceVariant: "#FFFFFF",
surfaceContainer: "#1C1C1E",
surfaceContainerHigh: "#1C1C1E",
surfaceTint: "#000000",
outline: "#545458",
outlineVariant: "#545458",
error: "#FF453A",
}}
// 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
@@ -1,45 +0,0 @@
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
@@ -1 +0,0 @@
export { MenuView } from "@expo/ui/community/menu"
+64 -114
View File
@@ -1,22 +1,20 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text" import { Ionicons } from "@expo/vector-icons"
import Animated from "react-native-reanimated"
import {
useAndroidTabPalette,
useAndroidTabBackgroundStyle,
useAndroidTabHasArtworkPalette,
} from "@/contexts/android-tab-theme"
import { NativeTabs } from "expo-router/native-tabs" import { NativeTabs } from "expo-router/native-tabs"
import { useRouter } from "expo-router" import { useRouter } from "expo-router"
import { Platform, Pressable, StyleSheet, View } from "react-native" import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
import { useSafeAreaInsets } from "react-native-safe-area-context"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback" import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config" import { useServerConfig } from "@/contexts/server-config"
import { albumCoverUrl } from "@/lib/urls" import { albumCoverUrl } from "@/lib/urls"
import { miniPlayerHeight, tabBarHeight, useThemeColors } from "@/lib/theme" import {
miniPlayerHeight,
tabBarHeight,
useBlurTint,
useMiniPlayerBackground,
useThemeColors,
} from "@/lib/theme"
function MiniPlayerContent({ function MiniPlayerContent({
placement, placement,
@@ -27,19 +25,10 @@ function MiniPlayerContent({
variant: "bar" | "accessory" variant: "bar" | "accessory"
onOpenPlayer: () => void onOpenPlayer: () => void
}) { }) {
const theme = useThemeColors() const colors = useThemeColors()
const palette = useAndroidTabPalette()
const colors =
Platform.OS === "android"
? {
...theme,
foreground: palette.foreground,
mutedForeground: palette.secondaryForeground,
}
: theme
const { config } = useServerConfig() const { config } = useServerConfig()
const { currentSong, isPlaying } = usePlaybackQueue() const { currentSong, isPlaying } = usePlaybackQueue()
const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions() const { setIsPlaying, skipNext } = usePlaybackActions()
if (!currentSong || !config) { if (!currentSong || !config) {
return null return null
@@ -67,8 +56,7 @@ function MiniPlayerContent({
<View <View
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta} style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
> >
<PaletteText <Text
tone="foreground"
style={[ style={[
isAccessory ? styles.accessoryTitle : styles.title, isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground }, { color: colors.foreground },
@@ -76,7 +64,7 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.title} {currentSong.title}
</PaletteText> </Text>
</View> </View>
<Pressable <Pressable
style={styles.controlButton} style={styles.controlButton}
@@ -86,8 +74,7 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<PaletteIcon <Ionicons
tone="foreground"
name={isPlaying ? "pause" : "play"} name={isPlaying ? "pause" : "play"}
size={20} size={20}
color={colors.foreground} color={colors.foreground}
@@ -105,8 +92,7 @@ function MiniPlayerContent({
style={artworkStyle} style={artworkStyle}
/> />
<View style={isAccessory ? styles.accessoryMeta : styles.meta}> <View style={isAccessory ? styles.accessoryMeta : styles.meta}>
<PaletteText <Text
tone="foreground"
style={[ style={[
isAccessory ? styles.accessoryTitle : styles.title, isAccessory ? styles.accessoryTitle : styles.title,
{ color: colors.foreground }, { color: colors.foreground },
@@ -114,9 +100,8 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.title} {currentSong.title}
</PaletteText> </Text>
<PaletteText <Text
tone="secondaryForeground"
style={[ style={[
isAccessory ? styles.accessoryArtist : styles.artist, isAccessory ? styles.accessoryArtist : styles.artist,
{ color: colors.mutedForeground }, { color: colors.mutedForeground },
@@ -124,28 +109,9 @@ function MiniPlayerContent({
numberOfLines={1} numberOfLines={1}
> >
{currentSong.artist.name} {currentSong.artist.name}
</PaletteText> </Text>
</View> </View>
<View style={styles.controls}> <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 <Pressable
style={styles.controlButton} style={styles.controlButton}
onPress={(event) => { onPress={(event) => {
@@ -154,8 +120,7 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<PaletteIcon <Ionicons
tone="foreground"
name={isPlaying ? "pause" : "play"} name={isPlaying ? "pause" : "play"}
size={24} size={24}
color={colors.foreground} color={colors.foreground}
@@ -169,12 +134,7 @@ function MiniPlayerContent({
}} }}
hitSlop={6} hitSlop={6}
> >
<PaletteIcon <Ionicons name="play-forward" size={24} color={colors.foreground} />
tone="foreground"
name="play-forward"
size={24}
color={colors.foreground}
/>
</Pressable> </Pressable>
</View> </View>
</Pressable> </Pressable>
@@ -182,30 +142,14 @@ function MiniPlayerContent({
} }
function MiniPlayerChrome({ children }: { children: React.ReactNode }) { function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
const palette = useAndroidTabPalette() const colors = useThemeColors()
const hasArtworkPalette = useAndroidTabHasArtworkPalette() const backgroundColor = useMiniPlayerBackground()
const backgroundStyle = useAndroidTabBackgroundStyle()
return ( return (
<Animated.View style={[styles.androidBar, backgroundStyle]}> <View style={[styles.androidBar, { backgroundColor }]}>
<View style={[styles.topBorder, { backgroundColor: colors.border }]} />
{children} {children}
{hasArtworkPalette ? ( </View>
<View
style={[
styles.separator,
styles.topBorder,
{ backgroundColor: palette.secondaryForeground },
]}
/>
) : null}
<View
style={[
styles.separator,
styles.bottomBorder,
{ backgroundColor: palette.secondaryForeground },
]}
/>
</Animated.View>
) )
} }
@@ -234,31 +178,43 @@ export function TabBottomAccessory() {
return content return content
} }
/** NativeTabs.BottomAccessory only renders on iOS. */ //
export function AndroidMiniPlayer() { // function useFloatingMiniPlayerLayout() {
const router = useRouter() // const segments = useSegments() as string[]
const insets = useSafeAreaInsets() // const insets = useSafeAreaInsets()
const { currentSong, queueSongIds } = usePlaybackQueue() //
if (Platform.OS !== "android" || !currentSong || queueSongIds.length === 0) { // const onPlayerModal = segments.includes("player")
return null // const onAuthFlow =
} // segments.includes("signin") ||
return ( // segments.includes("signup") ||
<View // segments.includes("server")
style={[ // const onTabs = segments.includes("(tabs)")
styles.floatingContainer, //
{ bottom: tabBarHeight + insets.bottom }, // const bottom = insets.bottom + (onTabs ? 0 : 0)
]} //
> // return {
<MiniPlayerChrome> // bottom,
<MiniPlayerContent // hidden: onPlayerModal || onAuthFlow || onTabs,
placement="regular" // }
variant="bar" // }
onOpenPlayer={() => router.push("/player")} //
/> // export function FloatingMiniPlayer() {
</MiniPlayerChrome> // const router = useRouter()
</View> // const { bottom, hidden } = useFloatingMiniPlayerLayout()
) // const { currentSong, queueSongIds } = usePlayback()
} //
// if (hidden || !currentSong || queueSongIds.length === 0) {
// return null
// }
//
// return (
// <View pointerEvents="box-none" style={[styles.floatingContainer, { bottom }]}>
// <MiniPlayerChrome>
// <MiniPlayerContent onOpenPlayer={() => router.push("/player")} />
// </MiniPlayerChrome>
// </View>
// )
// }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
floatingContainer: { floatingContainer: {
@@ -278,15 +234,9 @@ const styles = StyleSheet.create({
androidBar: { androidBar: {
overflow: "hidden", overflow: "hidden",
}, },
separator: { topBorder: {
position: "absolute", height: StyleSheet.hairlineWidth,
left: 0,
right: 0,
height: 1,
zIndex: 1,
}, },
topBorder: { top: 0 },
bottomBorder: { bottom: 0 },
content: { content: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
+33 -83
View File
@@ -61,7 +61,7 @@ type QueueListItem =
| { type: "history-header"; key: string } | { type: "history-header"; key: string }
| { type: "history"; key: string; songId: Id<"songs">; historyIndex: number } | { type: "history"; key: string; songId: Id<"songs">; historyIndex: number }
| { type: "current"; key: string } | { type: "current"; key: string }
| { type: "controls"; key: string; showTitle: boolean; tablet?: boolean } | { type: "controls"; key: string; showTitle: boolean }
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number } | { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
| { type: "empty"; key: string; height: number } | { type: "empty"; key: string; height: number }
@@ -72,11 +72,7 @@ function itemHeight(item: QueueListItem) {
case "current": case "current":
return CURRENT_HEIGHT return CURRENT_HEIGHT
case "controls": case "controls":
return item.tablet return item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT
? 44
: item.showTitle
? CONTROLS_HEIGHT
: TOGGLES_ONLY_HEIGHT
case "empty": case "empty":
return item.height return item.height
default: default:
@@ -101,14 +97,10 @@ export function NowPlayingQueue({
colors, colors,
viewportHeight, viewportHeight,
currentHeader, currentHeader,
tablet = false,
fadeColor,
}: { }: {
colors: NowPlayingColors colors: NowPlayingColors
viewportHeight: number viewportHeight: number
currentHeader: ReactNode currentHeader: ReactNode
tablet?: boolean
fadeColor?: string
}) { }) {
const { const {
queueSongIds, queueSongIds,
@@ -122,7 +114,6 @@ export function NowPlayingQueue({
skipToQueueIndex, skipToQueueIndex,
skipToHistoryIndex, skipToHistoryIndex,
} = usePlayback() } = usePlayback()
const [viewportWidth, setViewportWidth] = useState(0)
const swipeGroup = useSwipeRowGroup() const swipeGroup = useSwipeRowGroup()
const [scrollEnabled, setScrollEnabled] = useState(true) const [scrollEnabled, setScrollEnabled] = useState(true)
const dragFrom = useSharedValue(-1) const dragFrom = useSharedValue(-1)
@@ -151,14 +142,9 @@ export function NowPlayingQueue({
}) })
) )
} }
if (!tablet) list.push({ type: "current", key: "current" }) list.push({ type: "current", key: "current" })
const hasUpcoming = queueSongIds.length > 1 const hasUpcoming = queueSongIds.length > 1
list.push({ list.push({ type: "controls", key: "controls", showTitle: hasUpcoming })
type: "controls",
key: "controls",
showTitle: hasUpcoming,
tablet,
})
const occurrences = new Map<string, number>() const occurrences = new Map<string, number>()
queueSongIds.forEach((songId, queueIndex) => { queueSongIds.forEach((songId, queueIndex) => {
const occurrence = occurrences.get(songId) ?? 0 const occurrence = occurrences.get(songId) ?? 0
@@ -183,7 +169,7 @@ export function NowPlayingQueue({
}) })
} }
return list return list
}, [queueHistorySongIds, queueSongIds, viewportHeight, tablet]) }, [queueHistorySongIds, queueSongIds, viewportHeight])
const offsets = useMemo(() => { const offsets = useMemo(() => {
const result: number[] = [] const result: number[] = []
@@ -195,10 +181,8 @@ export function NowPlayingQueue({
return result return result
}, [items]) }, [items])
const currentIndex = items.findIndex( const currentIndex = items.findIndex((item) => item.type === "current")
(item) => item.type === (tablet ? "controls" : "current") const controlsIndex = currentIndex + 1
)
const controlsIndex = tablet ? currentIndex : currentIndex + 1
const belowCurrentHeight = items const belowCurrentHeight = items
.slice(currentIndex) .slice(currentIndex)
.reduce((sum, item) => sum + itemHeight(item), 0) .reduce((sum, item) => sum + itemHeight(item), 0)
@@ -341,31 +325,29 @@ export function NowPlayingQueue({
style={[ style={[
styles.controls, styles.controls,
{ {
height: itemHeight(item), height: item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT,
backgroundColor: tablet ? "transparent" : colors.background, backgroundColor: colors.background,
}, },
]} ]}
> >
{!tablet ? ( <View style={styles.toggles}>
<View style={styles.toggles}> <QueueToggle
<QueueToggle colors={colors}
colors={colors} selected={shuffleEnabled}
selected={shuffleEnabled} label="Shuffle"
label="Shuffle" symbol="shuffle"
symbol="shuffle" fallback="shuffle"
fallback="shuffle" onPress={toggleShuffle}
onPress={toggleShuffle} />
/> <QueueToggle
<QueueToggle colors={colors}
colors={colors} selected={repeatEnabled !== "none"}
selected={repeatEnabled !== "none"} label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"} symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"} fallback="repeat"
fallback="repeat" onPress={cycleRepeat}
onPress={cycleRepeat} />
/> </View>
</View>
) : null}
{item.showTitle ? ( {item.showTitle ? (
<Text style={[styles.sectionTitle, { color: colors.foreground }]}> <Text style={[styles.sectionTitle, { color: colors.foreground }]}>
Continue Playing Continue Playing
@@ -379,7 +361,6 @@ export function NowPlayingQueue({
songId={item.songId} songId={item.songId}
queueIndex={item.queueIndex} queueIndex={item.queueIndex}
lastIndex={queueSongIds.length - 1} lastIndex={queueSongIds.length - 1}
tablet={tablet}
colors={colors} colors={colors}
drag={drag} drag={drag}
swipeGroup={swipeGroup} swipeGroup={swipeGroup}
@@ -403,10 +384,7 @@ export function NowPlayingQueue({
} }
return ( return (
<View <View style={styles.root}>
style={styles.root}
onLayout={(event) => setViewportWidth(event.nativeEvent.layout.width)}
>
<FlatList <FlatList
ref={listRef} ref={listRef}
data={items} data={items}
@@ -425,31 +403,18 @@ export function NowPlayingQueue({
ListFooterComponent={<View style={{ height: footerHeight }} />} ListFooterComponent={<View style={{ height: footerHeight }} />}
/> />
<Svg <Svg
key={viewportWidth}
pointerEvents="none" pointerEvents="none"
style={styles.bottomFade} style={styles.bottomFade}
width={viewportWidth} width="100%"
height={BOTTOM_FADE_HEIGHT} height={BOTTOM_FADE_HEIGHT}
> >
<Defs> <Defs>
<LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1"> <LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1">
<Stop <Stop offset="0" stopColor={colors.background} stopOpacity={0} />
offset="0" <Stop offset="1" stopColor={colors.background} stopOpacity={1} />
stopColor={fadeColor ?? colors.background}
stopOpacity={0}
/>
<Stop
offset="1"
stopColor={fadeColor ?? colors.background}
stopOpacity={1}
/>
</LinearGradient> </LinearGradient>
</Defs> </Defs>
<Rect <Rect width="100%" height="100%" fill="url(#queue-fade)" />
width={viewportWidth}
height={BOTTOM_FADE_HEIGHT}
fill="url(#queue-fade)"
/>
</Svg> </Svg>
</View> </View>
) )
@@ -616,7 +581,6 @@ const UpcomingRow = memo(function UpcomingRow({
songId, songId,
queueIndex, queueIndex,
lastIndex, lastIndex,
tablet = false,
colors, colors,
drag, drag,
swipeGroup, swipeGroup,
@@ -628,7 +592,6 @@ const UpcomingRow = memo(function UpcomingRow({
songId: Id<"songs"> songId: Id<"songs">
queueIndex: number queueIndex: number
lastIndex: number lastIndex: number
tablet?: boolean
colors: NowPlayingColors colors: NowPlayingColors
drag: DragState drag: DragState
swipeGroup: SwipeRowGroup swipeGroup: SwipeRowGroup
@@ -722,19 +685,6 @@ const UpcomingRow = memo(function UpcomingRow({
</GestureDetector> </GestureDetector>
} }
/> />
{tablet ? (
<View
pointerEvents="none"
style={{
position: "absolute",
left: 88,
right: 26,
bottom: 0,
height: StyleSheet.hairlineWidth,
backgroundColor: colors.sliderTrack,
}}
/>
) : null}
<Animated.View <Animated.View
pointerEvents="none" pointerEvents="none"
style={[ style={[
@@ -751,7 +701,7 @@ const UpcomingRow = memo(function UpcomingRow({
{Platform.OS === "ios" ? ( {Platform.OS === "ios" ? (
<SwipeToRemoveRow <SwipeToRemoveRow
group={swipeGroup} group={swipeGroup}
backgroundColor={tablet ? "transparent" : colors.background} backgroundColor={colors.background}
actionAccessibilityLabel="Remove from queue" actionAccessibilityLabel="Remove from queue"
onRemove={handleRemove} onRemove={handleRemove}
> >
-49
View File
@@ -1,49 +0,0 @@
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 />
}
@@ -1,56 +0,0 @@
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" },
})
+4 -26
View File
@@ -2,7 +2,6 @@ import { useEffect, useMemo, useRef, type ReactNode } from "react"
import { StyleSheet, View } from "react-native" import { StyleSheet, View } from "react-native"
import { Gesture, GestureDetector } from "react-native-gesture-handler" import { Gesture, GestureDetector } from "react-native-gesture-handler"
import Animated, { import Animated, {
cancelAnimation,
interpolate, interpolate,
interpolateColor, interpolateColor,
useAnimatedStyle, useAnimatedStyle,
@@ -35,8 +34,6 @@ export function PlayerSlider({
leading, leading,
trailing, trailing,
accessibilityLabel, accessibilityLabel,
commitHoldMs = COMMIT_HOLD_MS,
animateValueChanges = false,
}: { }: {
value: number value: number
maximumValue: number maximumValue: number
@@ -49,9 +46,6 @@ export function PlayerSlider({
leading?: ReactNode leading?: ReactNode
trailing?: ReactNode trailing?: ReactNode
accessibilityLabel: string 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 max = maximumValue > 0 ? maximumValue : 1
const fraction = useSharedValue(clamp(value / max)) const fraction = useSharedValue(clamp(value / max))
@@ -63,38 +57,23 @@ export function PlayerSlider({
useEffect(() => { useEffect(() => {
if (dragging.value || Date.now() < holdUntil.current) return if (dragging.value || Date.now() < holdUntil.current) return
const next = clamp(value / max) fraction.value = clamp(value / max)
fraction.value = animateValueChanges }, [dragging, fraction, max, value])
? withTiming(next, { duration: 160 })
: next
}, [animateValueChanges, dragging, fraction, max, value])
const callbacks = useRef({ const callbacks = useRef({
onValueChange, onValueChange,
onSlidingStart, onSlidingStart,
onSlidingComplete, onSlidingComplete,
value,
commitHoldMs,
max, max,
}) })
callbacks.current = { callbacks.current = { onValueChange, onSlidingStart, onSlidingComplete, max }
onValueChange,
onSlidingStart,
onSlidingComplete,
value,
commitHoldMs,
max,
}
const gesture = useMemo(() => { const gesture = useMemo(() => {
const start = () => callbacks.current.onSlidingStart?.() const start = () => callbacks.current.onSlidingStart?.()
const change = (next: number) => const change = (next: number) =>
callbacks.current.onValueChange?.(next * callbacks.current.max) callbacks.current.onValueChange?.(next * callbacks.current.max)
const complete = (next: number) => { const complete = (next: number) => {
holdUntil.current = Date.now() + callbacks.current.commitHoldMs holdUntil.current = Date.now() + COMMIT_HOLD_MS
if (callbacks.current.commitHoldMs === 0) {
fraction.value = clamp(callbacks.current.value / callbacks.current.max)
}
callbacks.current.onSlidingComplete?.(next * callbacks.current.max) callbacks.current.onSlidingComplete?.(next * callbacks.current.max)
} }
@@ -106,7 +85,6 @@ export function PlayerSlider({
active.value = withSpring(1, { duration: 250, dampingRatio: 0.8 }) active.value = withSpring(1, { duration: 250, dampingRatio: 0.8 })
}) })
.onStart(() => { .onStart(() => {
cancelAnimation(fraction)
dragging.value = true dragging.value = true
startFraction.value = fraction.value startFraction.value = fraction.value
scheduleOnRN(start) scheduleOnRN(start)
+18 -89
View File
@@ -1,6 +1,3 @@
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 { MusicEntityView } from "@/components/music-entity-view"
import { collectionInset } from "@/components/collection-list" import { collectionInset } from "@/components/collection-list"
import { CoverImage } from "@/components/cover-image" import { CoverImage } from "@/components/cover-image"
@@ -9,14 +6,9 @@ import type { BrowseSong } from "@otunes/convex/types"
import type { CoverPalette } from "@/lib/cover-palette" import type { CoverPalette } from "@/lib/cover-palette"
import { formatDuration } from "@/lib/format" import { formatDuration } from "@/lib/format"
import { albumCoverUrl } from "@/lib/urls" import { albumCoverUrl } from "@/lib/urls"
import { import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
miniPlayerHeight,
tabletMiniPlayerHeight,
spacing,
useThemeColors,
} from "@/lib/theme"
import { memo, useCallback } from "react" import { memo, useCallback } from "react"
import { Platform, Pressable, StyleSheet, View } from "react-native" import { Pressable, StyleSheet, Text, View } from "react-native"
import { import {
MediaContextMenu, MediaContextMenu,
@@ -24,8 +16,6 @@ import {
type MediaMenuConfig, type MediaMenuConfig,
} from "@/components/media-context-menu" } from "@/components/media-context-menu"
function consumeLongPress() {}
export const SongRow = memo(function SongRow({ export const SongRow = memo(function SongRow({
song, song,
onPress, onPress,
@@ -33,7 +23,6 @@ export const SongRow = memo(function SongRow({
trailing, trailing,
palette, palette,
inset = false, inset = false,
swipe,
}: { }: {
song: BrowseSong song: BrowseSong
onPress?: () => void onPress?: () => void
@@ -42,13 +31,6 @@ export const SongRow = memo(function SongRow({
} }
trailing?: React.ReactNode trailing?: React.ReactNode
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider"> palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
swipe?: {
group: SwipeRowGroup
onPlayNext: () => void
onAddToQueue: () => void
onRemove?: () => void
backgroundColor: string
}
/** Album/playlist layout: the divider starts at the title, not the artwork. */ /** Album/playlist layout: the divider starts at the title, not the artwork. */
inset?: boolean inset?: boolean
}) { }) {
@@ -64,33 +46,33 @@ export const SongRow = memo(function SongRow({
const content = ( const content = (
<> <>
<View style={styles.rowMeta}> <View style={styles.rowMeta}>
<PaletteText <Text
tone={palette ? "foreground" : undefined}
style={[styles.rowTitle, { color: foreground }]} style={[styles.rowTitle, { color: foreground }]}
numberOfLines={1} numberOfLines={1}
> >
{song.title} {song.title}
</PaletteText> </Text>
<PaletteText <Text
tone={palette ? "secondaryForeground" : undefined}
style={[styles.rowSubtitle, { color: secondaryForeground }]} style={[styles.rowSubtitle, { color: secondaryForeground }]}
numberOfLines={1} numberOfLines={1}
> >
{song.artist.name} · {song.album.title} {song.artist.name} · {song.album.title}
</PaletteText> </Text>
</View> </View>
<PaletteText <Text style={[styles.duration, { color: secondaryForeground }]}>
tone={palette ? "secondaryForeground" : undefined}
style={[styles.duration, { color: secondaryForeground }]}
>
{formatDuration(song.durationSeconds)} {formatDuration(song.durationSeconds)}
</PaletteText> </Text>
{trailing} {trailing}
</> </>
) )
const rowContent = ( const row = (
<> <Pressable
style={
inset ? styles.insetRow : [styles.row, { borderBottomColor: divider }]
}
onPress={onPress}
>
<CoverImage <CoverImage
uri={albumCoverUrl(config.serverUrl, song.album.id)} uri={albumCoverUrl(config.serverUrl, song.album.id)}
hasCover={song.album.cover != null} hasCover={song.album.cover != null}
@@ -103,33 +85,8 @@ export const SongRow = memo(function SongRow({
) : ( ) : (
content content
)} )}
</> </Pressable>
) )
const rowStyle = inset
? styles.insetRow
: [styles.row, { borderBottomColor: divider }]
const row =
swipe && Platform.OS !== "web" ? (
<SongSwipeRow
group={swipe.group}
onPlayNext={swipe.onPlayNext}
onAddToQueue={swipe.onAddToQueue}
onRemove={swipe.onRemove}
backgroundColor={swipe.backgroundColor}
onPress={onPress}
style={rowStyle}
>
{rowContent}
</SongSwipeRow>
) : (
<Pressable
style={rowStyle}
onPress={onPress}
onLongPress={contextMenu ? consumeLongPress : undefined}
>
{rowContent}
</Pressable>
)
if (!contextMenu) { if (!contextMenu) {
return ( return (
@@ -159,7 +116,6 @@ export const SongListRow = memo(function SongListRow({
playlistLabel, playlistLabel,
palette, palette,
inset, inset,
swipe,
onPlay, onPlay,
onAction, onAction,
}: { }: {
@@ -168,17 +124,9 @@ export const SongListRow = memo(function SongListRow({
playlistLabel?: string playlistLabel?: string
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider"> palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
inset?: boolean inset?: boolean
swipe?: {
group: SwipeRowGroup
onPlayNext: () => void
onAddToQueue: () => void
onRemove?: () => void
backgroundColor: string
}
onPlay: (song: BrowseSong) => void onPlay: (song: BrowseSong) => void
onAction: (song: BrowseSong, action: MediaAction) => void onAction: (song: BrowseSong, action: MediaAction) => void
}) { }) {
const { config } = useServerConfig()
const handlePress = useCallback(() => onPlay(song), [onPlay, song]) const handlePress = useCallback(() => onPlay(song), [onPlay, song])
return ( return (
@@ -186,19 +134,8 @@ export const SongListRow = memo(function SongListRow({
song={song} song={song}
palette={palette} palette={palette}
inset={inset} inset={inset}
swipe={swipe}
onPress={handlePress} onPress={handlePress}
contextMenu={{ 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, stationArtistId: song.artist.id,
favorited, favorited,
playlistLabel, playlistLabel,
@@ -210,7 +147,6 @@ export const SongListRow = memo(function SongListRow({
type: "song", type: "song",
albumId: song.album.id, albumId: song.album.id,
songId: song.id, songId: song.id,
title: `${song.title} - ${song.album.title}`,
}, },
onAction: (action) => onAction(song, action), onAction: (action) => onAction(song, action),
}} }}
@@ -218,15 +154,8 @@ export const SongListRow = memo(function SongListRow({
) )
}) })
const tabletPlayerInset = tabletMiniPlayerHeight + spacing.sm + spacing.lg export const tabContentBottomInset = spacing.lg
export const tabContentBottomInset = export const contentBottomInset = miniPlayerHeight + spacing.lg
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({ const styles = StyleSheet.create({
row: { row: {
@@ -1,56 +0,0 @@
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,29 +1,23 @@
import { useTabletLayout } from "@/hooks/use-tablet-layout"
import { useOpenSettings } from "@/hooks/use-open-settings"
import { Image } from "expo-image" import { Image } from "expo-image"
import { useRouter } from "expo-router"
import { Pressable, StyleSheet, Text, View } from "react-native" import { Pressable, StyleSheet, Text, View } from "react-native"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { initialsFromName } from "@/lib/format" import { initialsFromName } from "@/lib/format"
import { radius, useThemeColors } from "@/lib/theme" import { radius, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
export function ProfileHeaderButton() { export function ProfileHeaderButton() {
const tabletLayout = useTabletLayout() const router = useRouter()
const openSettings = useOpenSettings()
const colors = useThemeColors() const colors = useThemeColors()
const user = useCachedQuery(api.auth.currentUser) const user = useCachedQuery(api.auth.currentUser)
const imageUrl = useProfileImageUrl(user?.image)
if (tabletLayout) return null
return ( return (
<Pressable <Pressable
accessibilityLabel="Open profile" accessibilityLabel="Open profile"
accessibilityRole="button" accessibilityRole="button"
hitSlop={8} hitSlop={8}
onPress={openSettings} onPress={() => router.push("/(app)/settings")}
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]} style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
> >
<View <View
@@ -35,12 +29,8 @@ export function ProfileHeaderButton() {
}, },
]} ]}
> >
{imageUrl ? ( {user?.image ? (
<Image <Image source={{ uri: user.image }} style={styles.image} contentFit="cover" />
source={{ uri: imageUrl }}
style={styles.image}
contentFit="cover"
/>
) : ( ) : (
<Text style={[styles.initials, { color: colors.foreground }]}> <Text style={[styles.initials, { color: colors.foreground }]}>
{initialsFromName(user?.name ?? "Me")} {initialsFromName(user?.name ?? "Me")}
+88 -180
View File
@@ -1,14 +1,6 @@
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout" import { useEffect, useRef } from "react"
import { import {
CollectionHero, Animated,
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, ScrollView,
StyleSheet, StyleSheet,
View, View,
@@ -18,43 +10,41 @@ import {
} from "react-native" } from "react-native"
import { contentBottomInset } from "@/components/player" import { contentBottomInset } from "@/components/player"
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme" import {
carouselCardWidth,
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */ radius,
function SkeletonContent({ spacing,
children, useThemeColors,
embedded = false, useTwoColumnCardWidth,
}: { } from "@/lib/theme"
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> }) { export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
const colors = useThemeColors() 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 ( return (
<View <Animated.View
style={[ style={[
{ backgroundColor: colors.muted, borderRadius: radius.sm }, { backgroundColor: colors.muted, borderRadius: radius.sm, opacity },
style, style,
]} ]}
/> />
@@ -84,21 +74,13 @@ export function SongRowSkeleton() {
) )
} }
export function SongListSkeleton({ export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
rows = 10,
embedded = false,
}: {
rows?: number
embedded?: boolean
}) {
return ( return (
<SkeletonContent embedded={embedded}> <View accessibilityLabel="Loading" accessibilityRole="progressbar">
<View accessibilityLabel="Loading" accessibilityRole="progressbar"> {Array.from({ length: rows }, (_, index) => (
{Array.from({ length: rows }, (_, index) => ( <SongRowSkeleton key={index} />
<SongRowSkeleton key={index} /> ))}
))} </View>
</View>
</SkeletonContent>
) )
} }
@@ -127,38 +109,24 @@ function CardSkeleton({
export function MediaGridSkeleton({ export function MediaGridSkeleton({
items = 6, items = 6,
contentInset = true, contentInset = true,
embedded = false,
}: { }: {
items?: number items?: number
contentInset?: boolean contentInset?: boolean
embedded?: boolean
}) { }) {
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } = const cardWidth = useTwoColumnCardWidth()
useMediaGridLayout()
return ( return (
<SkeletonContent embedded={embedded}> <View
<View accessibilityLabel="Loading"
onLayout={onLayout} accessibilityRole="progressbar"
accessibilityLabel="Loading" style={[
accessibilityRole="progressbar" styles.grid,
style={[ contentInset ? styles.gridInset : styles.gridRowInset,
styles.grid, ]}
contentInset ? styles.gridInset : styles.gridRowInset, >
{ {Array.from({ length: items }, (_, index) => (
paddingHorizontal: horizontalPadding, <CardSkeleton key={index} width={cardWidth} />
paddingTop: contentInset ? horizontalPadding : 0, ))}
gap, </View>
},
]}
>
{Array.from(
{ length: ready ? Math.max(items, columns * 3) : 0 },
(_, index) => (
<CardSkeleton key={index} width={cardWidth} />
)
)}
</View>
</SkeletonContent>
) )
} }
@@ -176,16 +144,12 @@ export function CarouselSkeleton() {
} }
export function HomeSkeleton() { export function HomeSkeleton() {
const headerHeight = useHeaderHeight()
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<ScrollView <ScrollView
style={{ flex: 1, backgroundColor: colors.background }} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[ contentContainerStyle={styles.home}
styles.home, contentInsetAdjustmentBehavior="automatic"
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
]}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false} scrollEnabled={false}
accessibilityLabel="Loading" accessibilityLabel="Loading"
> >
@@ -197,115 +161,59 @@ export function HomeSkeleton() {
/** Album and playlist pages: cover, title, play buttons, then tracks. */ /** Album and playlist pages: cover, title, play buttons, then tracks. */
export function CollectionDetailSkeleton({ export function CollectionDetailSkeleton({
zoomCoverSize,
style,
round = false, round = false,
backgroundColor,
onLayout,
}: { }: {
zoomCoverSize?: number
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
round?: boolean round?: boolean
backgroundColor?: string
onLayout?: () => void
}) { }) {
const colors = useThemeColors() const colors = useThemeColors()
const headerHeight = useHeaderHeight() const coverSize = round ? 180 : 210
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 ( return (
<Reanimated.ScrollView <ScrollView
onLayout={onLayout} style={{ flex: 1, backgroundColor: colors.background }}
style={[ contentContainerStyle={{ paddingBottom: contentBottomInset }}
{ flex: 1, backgroundColor: backgroundColor ?? colors.background }, contentInsetAdjustmentBehavior="automatic"
style,
]}
contentContainerStyle={{
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
paddingBottom: contentBottomInset,
}}
contentInsetAdjustmentBehavior="never"
scrollEnabled={false} scrollEnabled={false}
accessibilityLabel="Loading" accessibilityLabel="Loading"
> >
{round ? ( <View style={styles.hero}>
<View style={styles.artistHero}> <Skeleton
{zoomCoverSize ? ( style={{
<Link.AppleZoomTarget> width: coverSize,
<View collapsable={false}>{artwork}</View> height: coverSize,
</Link.AppleZoomTarget> borderRadius: round ? coverSize / 2 : radius.lg,
) : ( }}
artwork />
)} <TextLine width={200} height={24} />
<TextLine width={200} height={24} /> <TextLine width={120} height={16} />
<TextLine width={120} height={16} /> <View style={styles.actions}>
{actions} <Skeleton style={styles.iconAction} />
<Skeleton style={styles.playButton} />
<Skeleton style={styles.iconAction} />
</View> </View>
) : ( </View>
<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>
)}
{round ? ( {round ? (
<MediaGridSkeleton items={4} contentInset={false} embedded /> <MediaGridSkeleton items={4} contentInset={false} />
) : ( ) : (
<SongListSkeleton rows={8} embedded /> <SongListSkeleton rows={8} />
)} )}
</Reanimated.ScrollView> </ScrollView>
) )
} }
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) { export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<SkeletonContent> <View accessibilityLabel="Loading" accessibilityRole="progressbar">
<View accessibilityLabel="Loading" accessibilityRole="progressbar"> {Array.from({ length: rows }, (_, index) => (
{Array.from({ length: rows }, (_, index) => ( <View
<View key={index}
key={index} style={[styles.artistRow, { borderBottomColor: colors.border }]}
style={[styles.artistRow, { borderBottomColor: colors.border }]} >
> <Skeleton style={styles.artistAvatar} />
<Skeleton style={styles.artistAvatar} /> <TextLine width="50%" height={16} />
<TextLine width="50%" height={16} /> </View>
</View> ))}
))} </View>
</View>
</SkeletonContent>
) )
} }
@@ -325,10 +233,10 @@ const styles = StyleSheet.create({
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md }, grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
gridInset: { padding: spacing.lg }, gridInset: { padding: spacing.lg },
gridRowInset: { paddingHorizontal: spacing.lg }, gridRowInset: { paddingHorizontal: spacing.lg },
carousel: { gap: spacing.md, overflow: "hidden" }, carousel: { gap: spacing.md },
carouselRow: { flexDirection: "row", gap: spacing.md }, carouselRow: { flexDirection: "row", gap: spacing.md },
home: { padding: spacing.lg, gap: spacing.xl }, home: { padding: spacing.lg, gap: spacing.xl },
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm }, hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
actions: { actions: {
flexDirection: "row", flexDirection: "row",
alignItems: "center", alignItems: "center",
-461
View File
@@ -1,461 +0,0 @@
import { Ionicons } from "@expo/vector-icons"
import * as Haptics from "expo-haptics"
import { SymbolView } from "expo-symbols"
import {
useCallback,
useEffect,
useMemo,
useState,
type ReactNode,
} from "react"
import {
Platform,
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 IS_ANDROID = Platform.OS === "android"
const ACTION_WIDTH = 82
const LEADING_ACTION_WIDTH = 72
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,
onAddToQueue,
onRemove,
}: {
children: ReactNode
style?: StyleProp<ViewStyle>
backgroundColor: string
group: SwipeRowGroup
onPress?: () => void
onPlayNext: () => void
onAddToQueue: () => void
onRemove?: () => void
}) {
const hasRemove = IS_ANDROID && !!onRemove
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) onAddToQueue()
// Download is intentionally a placeholder.
},
[close, onAddToQueue]
)
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(
x.value > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1),
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 *
(target > 0
? LEADING_ACTION_WIDTH * 2
: ACTION_WIDTH * (hasRemove ? 2 : 1)),
{
...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,
hasRemove,
begin,
close,
commitProgress,
committed,
settle,
startX,
tapRow,
width,
x,
])
const rowStyle = useAnimatedStyle(() => ({
transform: [{ translateX: x.value }],
borderRadius: IS_ANDROID
? 0
: 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}
secondary
x={x}
height={height}
progress={commitProgress}
open={open === 1}
onPress={() => {
close()
onPlayNext()
}}
/>
{hasRemove && (
<SwipeAction
side={-1}
secondary
paired
remove
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => {
close()
onRemove?.()
}}
/>
)}
<SwipeAction
side={-1}
paired={hasRemove}
x={x}
height={height}
progress={commitProgress}
open={open === -1}
onPress={() => activate(-1)}
/>
<GestureDetector gesture={gesture}>
<Animated.View
accessible
accessibilityRole="button"
onAccessibilityTap={tapRow}
accessibilityActions={[
{ name: "addToQueue", label: "Add to Queue" },
{ name: "playNext", label: "Play Next" },
{ name: "download", label: "Download" },
...(hasRemove
? [{ name: "remove", label: "Remove from Playlist" }]
: []),
]}
onAccessibilityAction={(event) => {
if (event.nativeEvent.actionName === "remove" && hasRemove) {
close()
onRemove?.()
}
if (event.nativeEvent.actionName === "addToQueue") activate(1)
if (event.nativeEvent.actionName === "playNext") {
close()
onPlayNext()
}
}}
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,
secondary = false,
paired = side > 0,
remove = false,
x,
height,
progress,
open,
onPress,
}: {
side: 1 | -1
secondary?: boolean
paired?: boolean
remove?: boolean
x: SharedValue<number>
height: SharedValue<number>
progress: SharedValue<number>
open: boolean
onPress: () => void
}) {
const actionStyle = useAnimatedStyle(() => {
const revealed = Math.max(0, x.value * side)
const primaryWidth = (revealed * (1 + progress.value)) / 2
return {
width: !paired
? revealed
: secondary
? revealed - primaryWidth
: primaryWidth,
...(secondary
? side > 0
? { left: primaryWidth }
: { right: primaryWidth }
: {}),
}
})
const pillStyle = useAnimatedStyle(() => {
const total = Math.max(0, x.value * side)
const revealed = !paired
? total
: (total * (secondary ? 1 - progress.value : 1 + progress.value)) / 2
if (IS_ANDROID) {
return { width: revealed, height: height.value, borderRadius: 0 }
}
const resting = Math.max(
0,
Math.min(
revealed - (side > 0 ? 10 : 20),
interpolate(
revealed,
[24, side > 0 ? LEADING_ACTION_WIDTH : 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={
remove
? "Remove from Playlist"
: side > 0
? secondary
? "Play Next"
: "Add to Queue"
: "Download"
}
onPress={onPress}
style={styles.actionButton}
>
<Animated.View
style={[
styles.pill,
{
backgroundColor: remove
? "#d32f2f"
: side > 0
? secondary
? "#6b5bff"
: "#f29943"
: "#008dff",
},
pillStyle,
]}
>
<Animated.View style={iconStyle}>
{IS_ANDROID ? (
<Ionicons
name={
remove
? "trash-outline"
: side < 0
? "arrow-down"
: secondary
? "play-forward"
: "list"
}
size={22}
color="white"
/>
) : (
<SymbolView
name={
side > 0
? secondary
? "text.line.first.and.arrowtriangle.forward"
: "text.line.last.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" },
})
@@ -1,27 +0,0 @@
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>
}
@@ -1,139 +0,0 @@
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>
)
}
@@ -1,289 +0,0 @@
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-context-menu"
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 },
})
@@ -1,418 +0,0 @@
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",
},
})
-41
View File
@@ -1,41 +0,0 @@
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 { useProfileImageUrl } from "@/hooks/use-profile-image-url"
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 imageUrl = useProfileImageUrl(user?.image)
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={imageUrl}
active={active}
onProfilePress={openSettings}
/>
)
}
+3 -29
View File
@@ -1,7 +1,5 @@
import { PaletteText, PaletteIcon } from "@/components/palette-text"
import { import {
ActivityIndicator, ActivityIndicator,
Platform,
Pressable, Pressable,
PressableProps, PressableProps,
StyleProp, StyleProp,
@@ -74,20 +72,8 @@ export function Button({
<ActivityIndicator color={textColor} /> <ActivityIndicator color={textColor} />
) : ( ) : (
<View style={styles.buttonContent}> <View style={styles.buttonContent}>
{icon ? ( {icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
<PaletteIcon <Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
tone={tint ? "accentForeground" : undefined}
name={icon}
size={18}
color={textColor}
/>
) : null}
<PaletteText
tone={tint ? "accentForeground" : undefined}
style={[styles.buttonText, { color: textColor }]}
>
{title}
</PaletteText>
</View> </View>
)} )}
</Pressable> </Pressable>
@@ -99,13 +85,6 @@ export function Input({ style, ...props }: TextInputProps) {
return ( return (
<TextInput <TextInput
{...props} {...props}
{...(Platform.OS === "android"
? {
selectionColor: colors.primary,
cursorColor: colors.primary,
selectionHandleColor: colors.primary,
}
: {})}
placeholderTextColor={colors.mutedForeground} placeholderTextColor={colors.mutedForeground}
style={[ style={[
styles.input, styles.input,
@@ -123,12 +102,7 @@ export function Input({ style, ...props }: TextInputProps) {
export function Card({ children }: { children: React.ReactNode }) { export function Card({ children }: { children: React.ReactNode }) {
const colors = useThemeColors() const colors = useThemeColors()
return ( return (
<View <View style={[styles.card, { backgroundColor: colors.card, borderColor: colors.border }]}>
style={[
styles.card,
{ backgroundColor: colors.card, borderColor: colors.border },
]}
>
{children} {children}
</View> </View>
) )
+5 -4
View File
@@ -1,15 +1,16 @@
import { Toaster as SonnerToaster } from "sonner-native" import { Toaster as SonnerToaster } from "sonner-native"
import { useColorScheme } from "react-native"
import { radius, useIsDark, useThemeColors } from "@/lib/theme" import { colors, radius } from "@/lib/theme"
export function Toaster() { export function Toaster() {
const isDark = useIsDark() const scheme = useColorScheme()
const themeColors = useThemeColors() const themeColors = scheme === "dark" ? colors.dark : colors.light
return ( return (
<SonnerToaster <SonnerToaster
position="top-center" position="top-center"
theme={isDark ? "dark" : "light"} theme={scheme === "dark" ? "dark" : "light"}
toastOptions={{ toastOptions={{
style: { style: {
backgroundColor: themeColors.card, backgroundColor: themeColors.card,
+72 -80
View File
@@ -1,4 +1,3 @@
import { AndroidSheet } from "@/components/android-sheet"
import { useConvex, useMutation } from "convex/react" import { useConvex, useMutation } from "convex/react"
import { import {
createContext, createContext,
@@ -247,53 +246,51 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
transparent transparent
onRequestClose={closeAddToPlaylist} onRequestClose={closeAddToPlaylist}
> >
<AndroidSheet> <Pressable style={styles.overlay} onPress={closeAddToPlaylist}>
<Pressable style={styles.overlay} onPress={closeAddToPlaylist}> <Pressable
<Pressable style={[
style={[ styles.sheet,
styles.sheet, { backgroundColor: colors.card, borderColor: colors.border },
{ backgroundColor: colors.card, borderColor: colors.border }, ]}
]} onPress={(event) => event.stopPropagation()}
onPress={(event) => event.stopPropagation()} >
> <Text style={[styles.title, { color: colors.foreground }]}>
<Text style={[styles.title, { color: colors.foreground }]}> Add to Playlist
Add to Playlist </Text>
</Text> <FlatList
<FlatList style={styles.list}
style={styles.list} data={ownedPlaylists ?? []}
data={ownedPlaylists ?? []} keyExtractor={(playlist) => playlist.id}
keyExtractor={(playlist) => playlist.id} renderItem={({
renderItem={({ item: playlist,
item: playlist, }: {
}: { item: OwnedPlaylistForAdd
item: OwnedPlaylistForAdd }) => (
}) => ( <Pressable
<Pressable style={styles.row}
style={[styles.row, { borderBottomColor: colors.border }]} disabled={addingToPlaylistId !== null}
disabled={addingToPlaylistId !== null} onPress={() =>
onPress={() => void handleAddToPlaylist(playlist.id, playlist.songIds)
void handleAddToPlaylist(playlist.id, playlist.songIds) }
} >
> <Text style={{ color: colors.foreground }}>
<Text style={{ color: colors.foreground }}> {playlist.title}
{playlist.title} </Text>
</Text> </Pressable>
</Pressable> )}
)} />
/> <Button
<Button title="New Playlist"
title="New Playlist" variant="secondary"
variant="secondary" onPress={() => {
onPress={() => { selectionRequestIdRef.current += 1
selectionRequestIdRef.current += 1 setOpen(false)
setOpen(false) setNewPlaylistName("")
setNewPlaylistName("") setCreateOpen(true)
setCreateOpen(true) }}
}} />
/>
</Pressable>
</Pressable> </Pressable>
</AndroidSheet> </Pressable>
</Modal> </Modal>
<Modal <Modal
@@ -302,43 +299,38 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
transparent transparent
onRequestClose={() => setCreateOpen(false)} onRequestClose={() => setCreateOpen(false)}
> >
<AndroidSheet> <Pressable style={styles.overlay} onPress={() => setCreateOpen(false)}>
<Pressable <Pressable
style={styles.overlay} style={[
onPress={() => setCreateOpen(false)} styles.createSheet,
{ backgroundColor: colors.card, borderColor: colors.border },
]}
onPress={(event) => event.stopPropagation()}
> >
<Pressable <Text style={[styles.title, { color: colors.foreground }]}>
style={[ New Playlist
styles.createSheet, </Text>
{ backgroundColor: colors.card, borderColor: colors.border }, <Input
]} value={newPlaylistName}
onPress={(event) => event.stopPropagation()} onChangeText={setNewPlaylistName}
> placeholder="Playlist name"
<Text style={[styles.title, { color: colors.foreground }]}> autoFocus
New Playlist />
</Text> <View style={styles.createActions}>
<Input <Button
value={newPlaylistName} title="Cancel"
onChangeText={setNewPlaylistName} variant="ghost"
placeholder="Playlist name" onPress={() => setCreateOpen(false)}
autoFocus
/> />
<View style={styles.createActions}> <Button
<Button title="Create"
title="Cancel" loading={submitting}
variant="ghost" disabled={!newPlaylistName.trim()}
onPress={() => setCreateOpen(false)} onPress={() => void handleCreatePlaylist()}
/> />
<Button </View>
title="Create"
loading={submitting}
disabled={!newPlaylistName.trim()}
onPress={() => void handleCreatePlaylist()}
/>
</View>
</Pressable>
</Pressable> </Pressable>
</AndroidSheet> </Pressable>
</Modal> </Modal>
</AddToPlaylistContext.Provider> </AddToPlaylistContext.Provider>
) )
-250
View File
@@ -1,250 +0,0 @@
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,
}
}
+6 -8
View File
@@ -1,11 +1,12 @@
import { createContext, useContext, useMemo, type ReactNode } from "react" import { createContext, useContext, type ReactNode } from "react"
type ConvexAuthSessionContextValue = { type ConvexAuthSessionContextValue = {
invalidateSession: () => Promise<void> invalidateSession: () => Promise<void>
} }
const ConvexAuthSessionContext = const ConvexAuthSessionContext = createContext<ConvexAuthSessionContextValue | null>(
createContext<ConvexAuthSessionContextValue | null>(null) null
)
export function ConvexAuthSessionProvider({ export function ConvexAuthSessionProvider({
children, children,
@@ -14,9 +15,8 @@ export function ConvexAuthSessionProvider({
children: ReactNode children: ReactNode
invalidateSession: () => Promise<void> invalidateSession: () => Promise<void>
}) { }) {
const value = useMemo(() => ({ invalidateSession }), [invalidateSession])
return ( return (
<ConvexAuthSessionContext.Provider value={value}> <ConvexAuthSessionContext.Provider value={{ invalidateSession }}>
{children} {children}
</ConvexAuthSessionContext.Provider> </ConvexAuthSessionContext.Provider>
) )
@@ -25,9 +25,7 @@ export function ConvexAuthSessionProvider({
export function useInvalidateAuthSession() { export function useInvalidateAuthSession() {
const context = useContext(ConvexAuthSessionContext) const context = useContext(ConvexAuthSessionContext)
if (!context) { if (!context) {
throw new Error( throw new Error("useInvalidateAuthSession must be used within ConvexAppProvider")
"useInvalidateAuthSession must be used within ConvexAuthSessionProvider"
)
} }
return context return context
} }
File diff suppressed because it is too large. Load diff
Loaded 100 of 240 files, more files were not shown because too many files have changed in this diff. Show more