Compare commits
No files matched your search
@@ -23,60 +23,3 @@ 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.
|
||||
@@ -1,61 +1,31 @@
|
||||
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"
|
||||
) {
|
||||
const variant = process.env.APP_VARIANT ?? "production"
|
||||
if (!["development", "preview", "production"].includes(variant)) {
|
||||
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`,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -26,11 +26,10 @@
|
||||
"adaptiveIcon": {
|
||||
"monochromeImage": "./assets/android-icon-monochrome.png",
|
||||
"foregroundImage": "./assets/android-icon-foreground.png",
|
||||
"backgroundImage": "./assets/android-icon-background.png"
|
||||
"backgroundColor": "#C60322"
|
||||
},
|
||||
"userInterfaceStyle": "dark",
|
||||
"softwareKeyboardLayoutMode": "resize",
|
||||
"icon": "./assets/android-icon.png"
|
||||
"softwareKeyboardLayoutMode": "resize"
|
||||
},
|
||||
"plugins": [
|
||||
"expo-router",
|
||||
|
||||
@@ -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/queue"
|
||||
@@ -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"
|
||||
@@ -1,17 +1,12 @@
|
||||
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,
|
||||
AndroidTabThemeProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidNativeTabColors,
|
||||
useAndroidTabSelectedColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { DynamicColorIOS, Platform } from "react-native"
|
||||
import { DynamicColorIOS, Platform, View } from "react-native"
|
||||
import { useMemo } from "react"
|
||||
|
||||
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
|
||||
@@ -46,12 +41,10 @@ function useRouterTheme() {
|
||||
}
|
||||
|
||||
function useNativeTabColors() {
|
||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||
const selectedColor = colors.dark.primary
|
||||
const selectedColor = useAndroidTabSelectedColor()
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = colors.dark
|
||||
const artworkPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||
const androidPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -61,14 +54,14 @@ function useNativeTabColors() {
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
: {
|
||||
default: androidPalette.mutedForeground,
|
||||
default: androidPalette.secondaryForeground,
|
||||
selected: selectedColor,
|
||||
}
|
||||
|
||||
const labelColor =
|
||||
Platform.OS === "ios"
|
||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||
: androidPalette.mutedForeground
|
||||
: androidPalette.secondaryForeground
|
||||
|
||||
return {
|
||||
isDark,
|
||||
@@ -85,20 +78,15 @@ function useNativeTabColors() {
|
||||
blurEffect: isDark
|
||||
? "systemChromeMaterialDark"
|
||||
: "systemChromeMaterialLight",
|
||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
||||
backgroundColor:
|
||||
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||
}
|
||||
}
|
||||
|
||||
function TabsContent() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const homeColors = useAndroidNativeTabColors()
|
||||
const libraryColors = useAndroidNativeTabColors()
|
||||
const searchColors = useAndroidNativeTabColors()
|
||||
const keyboardVisible = useAndroidKeyboardVisible()
|
||||
const routerTheme = useRouterTheme()
|
||||
const tabColors = useNativeTabColors()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||
|
||||
@@ -113,12 +101,11 @@ function TabsContent() {
|
||||
|
||||
return (
|
||||
<ThemeProvider value={routerTheme}>
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
<View style={{ flex: 1 }}>
|
||||
{Platform.OS === "android" ? (
|
||||
<NavigationBar style={tabColors.isDark ? "light" : "dark"} />
|
||||
) : null}
|
||||
<NativeTabs
|
||||
sidebarAdaptable
|
||||
blurEffect={
|
||||
tabColors.blurEffect as
|
||||
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
||||
@@ -132,7 +119,7 @@ function TabsContent() {
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||
{Platform.OS === "ios" && showBottomAccessory ? (
|
||||
<NativeTabs.BottomAccessory>
|
||||
<TabBottomAccessory />
|
||||
</NativeTabs.BottomAccessory>
|
||||
@@ -140,9 +127,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? homeColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -152,9 +136,6 @@ function TabsContent() {
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? libraryColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
@@ -162,84 +143,29 @@ function TabsContent() {
|
||||
sf="music.note.square.stack.fill"
|
||||
md="library_music"
|
||||
/>
|
||||
<NativeTabs.Trigger.Label>
|
||||
{tabletLayout ? "Recently Added" : "Library"}
|
||||
</NativeTabs.Trigger.Label>
|
||||
<NativeTabs.Trigger.Label>Library</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? searchColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
||||
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(albums)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="square.stack" />
|
||||
<NativeTabs.Trigger.Label>Albums</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(artists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="mic" />
|
||||
<NativeTabs.Trigger.Label>Artists</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(songs)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="music.note" />
|
||||
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(playlists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="music.note.list" />
|
||||
<NativeTabs.Trigger.Label>All Playlists</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(favorites)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="star" />
|
||||
<NativeTabs.Trigger.Label>Favorites</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(recent)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="clock" />
|
||||
<NativeTabs.Trigger.Label>Recently Played</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
</NativeTabs>
|
||||
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
|
||||
{tabletLayout ? <TabletMiniPlayer /> : null}
|
||||
</Animated.View>
|
||||
</View>
|
||||
</ThemeProvider>
|
||||
)
|
||||
}
|
||||
|
||||
export default function TabsLayout() {
|
||||
if (Platform.OS !== "android") return <TabsContent />
|
||||
return (
|
||||
<ScreenPaletteProvider>
|
||||
<TabletPlayerLayoutProvider>
|
||||
<TabsContent />
|
||||
</TabletPlayerLayoutProvider>
|
||||
</ScreenPaletteProvider>
|
||||
<AndroidTabThemeProvider>
|
||||
<TabsContent />
|
||||
</AndroidTabThemeProvider>
|
||||
)
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -13,9 +13,12 @@ export default function HomeLayout() {
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
|
||||
@@ -1,29 +1,23 @@
|
||||
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 { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
||||
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 { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
collectionInset,
|
||||
DiscHeader,
|
||||
} from "@/components/collection-list"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import {
|
||||
@@ -71,32 +65,16 @@ export default function AlbumScreen() {
|
||||
const isFocused = useIsFocused()
|
||||
const coverUri =
|
||||
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
|
||||
const heroLayout = useCollectionHeroLayout()
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
album ? album.cover != null : album === null ? false : undefined
|
||||
)
|
||||
const { palette, onLayout, backgroundStyle } =
|
||||
useScreenPalette(artworkPalette)
|
||||
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
|
||||
const songIds = useMemo(
|
||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||
[album]
|
||||
)
|
||||
|
||||
// Older servers do not include album format availability yet.
|
||||
const formatTracks = useCachedQuery(
|
||||
api.library.getSongsForPlayback,
|
||||
album && (album.hasLossless === undefined || album.hasAtmos === undefined)
|
||||
? { ids: songIds }
|
||||
: "skip"
|
||||
)
|
||||
const hasLossless =
|
||||
album?.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album?.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
rememberSongs(albumDetailSongs(album))
|
||||
@@ -118,9 +96,7 @@ export default function AlbumScreen() {
|
||||
songIds={songIds}
|
||||
palette={palette}
|
||||
favorited={isSongFavorite(item.track.id)}
|
||||
onPlay={(songId, ids) =>
|
||||
playFromSong(songId, ids, `album:${album.id}`)
|
||||
}
|
||||
onPlay={playFromSong}
|
||||
onAction={handleAlbumTrackAction}
|
||||
/>
|
||||
) : null
|
||||
@@ -142,25 +118,9 @@ export default function AlbumScreen() {
|
||||
options={{
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={220}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
Platform.OS === "android" ? palette.background : undefined
|
||||
}
|
||||
/>
|
||||
<CollectionDetailSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -175,9 +135,9 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Album not found.
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -198,10 +158,7 @@ export default function AlbumScreen() {
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -212,7 +169,7 @@ export default function AlbumScreen() {
|
||||
stationArtistId={album.artist.id}
|
||||
selectedCount={album.tracks.length}
|
||||
favorited={isAlbumFav(album.id)}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
share={{ type: "album", albumId: album.id }}
|
||||
onAction={(action) =>
|
||||
void handleAlbumDetailAction(
|
||||
album.id as Id<"albums">,
|
||||
@@ -223,8 +180,7 @@ export default function AlbumScreen() {
|
||||
}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
@@ -234,175 +190,81 @@ export default function AlbumScreen() {
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<Animated.FlatList
|
||||
<FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={listItems}
|
||||
keyExtractor={albumListItemKey}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: palette.background },
|
||||
backgroundStyle,
|
||||
]}
|
||||
style={{ flex: 1, backgroundColor: palette.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||
ListHeaderComponent={
|
||||
<View>
|
||||
<MusicEntityView kind="album" id={album.id}>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={album.cover != null}
|
||||
style={[
|
||||
styles.cover,
|
||||
heroLayout.coverSize
|
||||
? {
|
||||
width: heroLayout.coverSize,
|
||||
height: heroLayout.coverSize,
|
||||
}
|
||||
: undefined,
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={
|
||||
<View
|
||||
style={[
|
||||
styles.actions,
|
||||
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||
]}
|
||||
>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
hitSlop={8}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={favorited ? "accent" : "foreground"}
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
}
|
||||
<MusicEntityView kind="album" id={album.id} style={styles.hero}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={album.cover != null}
|
||||
style={styles.cover}
|
||||
/>
|
||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text style={[styles.artist, { color: palette.accentText }]}>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata}
|
||||
</Text>
|
||||
) : null}
|
||||
<View style={styles.actions}>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
hitSlop={8}
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
{ color: palette.foreground },
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
{album.title}
|
||||
</PaletteText>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<PaletteText
|
||||
tone="accentText"
|
||||
style={[
|
||||
styles.artist,
|
||||
heroLayout.landscape && styles.artistLandscape,
|
||||
{ color: palette.accentText },
|
||||
]}
|
||||
>
|
||||
{album.artist.name}
|
||||
</PaletteText>
|
||||
<Ionicons
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: heroLayout.landscape
|
||||
? "flex-start"
|
||||
: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 8,
|
||||
<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 },
|
||||
]}
|
||||
>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{metadata}
|
||||
</PaletteText>
|
||||
) : null}
|
||||
{hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{hasAtmos ? (
|
||||
<>
|
||||
{metadata || hasLossless ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
</CollectionHero>
|
||||
<Ionicons
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
</MusicEntityView>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</View>
|
||||
@@ -489,7 +351,6 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
type: "song",
|
||||
albumId: album.id,
|
||||
songId: track.id,
|
||||
title: `${track.title} - ${album.title}`,
|
||||
}}
|
||||
onAction={(action) => void onAction(track, album, action)}
|
||||
>
|
||||
@@ -498,12 +359,11 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||
>
|
||||
{number}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
<View
|
||||
style={[
|
||||
styles.trackContent,
|
||||
@@ -511,29 +371,24 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
]}
|
||||
>
|
||||
<View style={styles.trackMeta}>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{track.artists ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
<Text
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</Pressable>
|
||||
</MusicEntityView>
|
||||
@@ -543,14 +398,17 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
hero: {
|
||||
alignItems: "center",
|
||||
padding: spacing.lg,
|
||||
gap: spacing.sm,
|
||||
},
|
||||
cover: {
|
||||
width: 220,
|
||||
height: 220,
|
||||
borderRadius: radius.lg,
|
||||
},
|
||||
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
||||
titleLandscape: { textAlign: "left", fontSize: 22 },
|
||||
artistLandscape: { textAlign: "left", fontSize: 22, fontWeight: "400" },
|
||||
artistPressable: { alignSelf: "stretch" },
|
||||
artist: { fontSize: 16, fontWeight: "600", textAlign: "center" },
|
||||
actions: {
|
||||
|
||||
@@ -75,11 +75,7 @@ export default function ArtistScreen() {
|
||||
<MediaActionMenu
|
||||
selectedCount={data.albums.length}
|
||||
favorited={isArtistFav(data.artist.id)}
|
||||
share={{
|
||||
type: "artist",
|
||||
artistId: data.artist.id,
|
||||
title: data.artist.name,
|
||||
}}
|
||||
share={{ type: "artist", artistId: data.artist.id }}
|
||||
onAction={(action) =>
|
||||
void handleArtistAction(data.artist, action)
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ const ArtistRow = memo(function ArtistRow({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
favorited={favorited}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
share={{ type: "artist", artistId: artist.id }}
|
||||
onAction={(action) => void onAction(artist, action)}
|
||||
>
|
||||
<Pressable
|
||||
|
||||
@@ -1,26 +1,8 @@
|
||||
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 { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import {
|
||||
Link,
|
||||
Stack,
|
||||
useIsFocused,
|
||||
useLocalSearchParams,
|
||||
@@ -28,13 +10,16 @@ import {
|
||||
} from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
@@ -96,8 +81,7 @@ export default function PlaylistScreen() {
|
||||
coverUri,
|
||||
playlist ? playlist.cover != null : playlist === null ? false : undefined
|
||||
)
|
||||
const { palette, onLayout, backgroundStyle } =
|
||||
useScreenPalette(artworkPalette)
|
||||
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
|
||||
|
||||
useEffect(() => {
|
||||
if (songs) rememberSongs(songs)
|
||||
@@ -110,25 +94,9 @@ export default function PlaylistScreen() {
|
||||
options={{
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={200}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
Platform.OS === "android" ? palette.background : undefined
|
||||
}
|
||||
/>
|
||||
<CollectionDetailSkeleton />
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -143,9 +111,9 @@ export default function PlaylistScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
Playlist not found.
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -153,7 +121,6 @@ export default function PlaylistScreen() {
|
||||
|
||||
return (
|
||||
<PlaylistContent
|
||||
backgroundStyle={backgroundStyle}
|
||||
onLayout={onLayout}
|
||||
playlist={playlist}
|
||||
songs={playlist.songs}
|
||||
@@ -164,7 +131,6 @@ export default function PlaylistScreen() {
|
||||
}
|
||||
|
||||
function PlaylistContent({
|
||||
backgroundStyle,
|
||||
onLayout,
|
||||
playlist,
|
||||
songs,
|
||||
@@ -172,7 +138,6 @@ function PlaylistContent({
|
||||
palette,
|
||||
}: {
|
||||
onLayout?: () => void
|
||||
backgroundStyle: ReturnType<typeof useScreenPalette>["backgroundStyle"]
|
||||
playlist: BrowsePlaylistDetail
|
||||
songs: BrowseSong[]
|
||||
coverUri: string
|
||||
@@ -193,14 +158,11 @@ function PlaylistContent({
|
||||
const isSubscribed = playlist.isSubscribed
|
||||
const canEdit = playlist.isOwner && playlistId !== null
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) =>
|
||||
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
|
||||
[playFromSong, songIds, playlistId]
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
[playFromSong, songIds]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
@@ -278,10 +240,7 @@ function PlaylistContent({
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerStyle: { backgroundColor: palette.background },
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
@@ -294,14 +253,12 @@ function PlaylistContent({
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlistId ?? "favorites",
|
||||
title: playlist?.title ?? "oTunes",
|
||||
}}
|
||||
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
|
||||
onAction={handlePlaylistMenuAction}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
@@ -318,7 +275,6 @@ function PlaylistContent({
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
playlist?.title,
|
||||
router,
|
||||
songIds,
|
||||
])
|
||||
@@ -353,35 +309,17 @@ function PlaylistContent({
|
||||
<StatusBar style={palette.isDark ? "light" : "dark"} />
|
||||
) : null}
|
||||
<Stack.Screen options={screenOptions} />
|
||||
<PlaylistSearchBar
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
/>
|
||||
<Animated.FlatList
|
||||
<FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={filteredSongs}
|
||||
data={songs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: palette.background },
|
||||
backgroundStyle,
|
||||
]}
|
||||
style={{ flex: 1, backgroundColor: palette.background }}
|
||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||
contentContainerStyle={styles.listContent}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListEmptyComponent={
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[
|
||||
styles.emptyResults,
|
||||
{ color: palette.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</PaletteText>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<PlaylistHero
|
||||
entityId={playlistId ?? "otunes:favorites"}
|
||||
@@ -474,19 +412,15 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
}}
|
||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||
>
|
||||
<PaletteIcon
|
||||
name="trash"
|
||||
size={22}
|
||||
color={colors.primaryForeground}
|
||||
/>
|
||||
<PaletteText
|
||||
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||
<Text
|
||||
style={[
|
||||
styles.removeActionText,
|
||||
{ color: colors.primaryForeground },
|
||||
]}
|
||||
>
|
||||
Remove
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</Pressable>
|
||||
)}
|
||||
>
|
||||
@@ -520,125 +454,76 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
onPlay: () => void
|
||||
onShuffle: () => void
|
||||
}) {
|
||||
const heroLayout = useCollectionHeroLayout()
|
||||
return (
|
||||
<MusicEntityView kind="playlist" id={entityId}>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={[
|
||||
styles.cover,
|
||||
heroLayout.coverSize
|
||||
? {
|
||||
width: heroLayout.coverSize,
|
||||
height: heroLayout.coverSize,
|
||||
}
|
||||
: undefined,
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={
|
||||
<View
|
||||
style={[
|
||||
styles.actions,
|
||||
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||
]}
|
||||
>
|
||||
{showSubscribe ? (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
||||
accessibilityState={{ selected: isSubscribed }}
|
||||
hitSlop={8}
|
||||
onPress={onSubscribeToggle}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{
|
||||
backgroundColor: isSubscribed
|
||||
? palette.surface
|
||||
: palette.accent,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={
|
||||
isSubscribed ? palette.foreground : palette.accentForeground
|
||||
}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<View style={styles.hero}>
|
||||
<CoverImage uri={coverUri} hasCover={hasCover} style={styles.cover} />
|
||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
||||
{title}
|
||||
</Text>
|
||||
<Text style={{ color: palette.secondaryForeground }}>{ownerName}</Text>
|
||||
<View style={styles.actions}>
|
||||
{showSubscribe ? (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
||||
accessibilityState={{ selected: isSubscribed }}
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
onPress={onSubscribeToggle}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{
|
||||
backgroundColor: isSubscribed
|
||||
? palette.surface
|
||||
: palette.accent,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
<Ionicons
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
color={
|
||||
isSubscribed ? palette.foreground : palette.accentForeground
|
||||
}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
{ color: palette.foreground },
|
||||
]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={{
|
||||
color: palette.foreground,
|
||||
fontSize: heroLayout.landscape ? 22 : 16,
|
||||
}}
|
||||
>
|
||||
{ownerName}
|
||||
</PaletteText>
|
||||
</CollectionHero>
|
||||
) : null}
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
</View>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</MusicEntityView>
|
||||
)
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
listContent: { paddingBottom: contentBottomInset },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
cover: {
|
||||
width: 200,
|
||||
height: 200,
|
||||
borderRadius: radius.lg,
|
||||
},
|
||||
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
||||
titleLandscape: { textAlign: "left", fontSize: 22 },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
@@ -41,8 +37,6 @@ export default function FavoritesScreen() {
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
|
||||
useEffect(() => {
|
||||
if (favorites) rememberSongs(favorites.songs)
|
||||
@@ -105,25 +99,14 @@ export default function FavoritesScreen() {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<PlaylistSearchBar
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
/>
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
data={filteredSongs}
|
||||
data={songs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={styles.listContent}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListEmptyComponent={
|
||||
<Text
|
||||
style={[styles.emptyResults, { color: colors.mutedForeground }]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</Text>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<FavoritesHero
|
||||
title={favorites.title}
|
||||
@@ -190,7 +173,6 @@ const FavoritesHero = memo(function FavoritesHero({
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
listContent: { paddingBottom: contentBottomInset },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -10,17 +9,17 @@ export const unstable_settings = {
|
||||
}
|
||||
|
||||
export default function LibraryLayout() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const baseOptions = useStackScreenOptions({ title: "Library" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Library",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { useMemo } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { SymbolView } from "expo-symbols"
|
||||
@@ -13,22 +12,14 @@ import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
const PAGE_SIZE = 24
|
||||
const PAGE_SIZE = 16
|
||||
|
||||
const links = [
|
||||
{
|
||||
title: "Playlists",
|
||||
href: "/browse/playlists",
|
||||
icon: "music.note.list" as const,
|
||||
},
|
||||
{ title: "Playlists", href: "/browse/playlists", icon: "music.note.list" as const },
|
||||
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
|
||||
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
|
||||
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
|
||||
{
|
||||
title: "Recently Played",
|
||||
href: "/recently-played",
|
||||
icon: "clock" as const,
|
||||
},
|
||||
{ title: "Recently Played", href: "/recently-played", icon: "clock" as const },
|
||||
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
|
||||
]
|
||||
|
||||
@@ -52,19 +43,11 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
||||
sparkles: "sparkles",
|
||||
star: "star",
|
||||
}
|
||||
return (
|
||||
<Ionicons
|
||||
name={ionMap[name] ?? "musical-notes"}
|
||||
size={22}
|
||||
color={appleMusic.pink}
|
||||
/>
|
||||
)
|
||||
return <Ionicons name={ionMap[name] ?? "musical-notes"} size={22} color={appleMusic.pink} />
|
||||
}
|
||||
|
||||
export default function LibraryScreen() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { push } = useAppNavigation()
|
||||
const isTablet = tabletLayout
|
||||
const colors = useThemeColors()
|
||||
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
|
||||
api.library.browseRecentlyAddedPaginated,
|
||||
@@ -75,46 +58,31 @@ export default function LibraryScreen() {
|
||||
const listHeader = useMemo(
|
||||
() => (
|
||||
<View>
|
||||
{!isTablet ? (
|
||||
<>
|
||||
{links.map((link) => (
|
||||
<Pressable
|
||||
key={link.href}
|
||||
style={styles.row}
|
||||
onPress={() => push(link.href)}
|
||||
>
|
||||
<LibraryIcon name={link.icon} />
|
||||
<View
|
||||
style={[
|
||||
styles.rowContent,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.rowTitle, { color: colors.foreground }]}>
|
||||
{link.title}
|
||||
</Text>
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={16}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</View>
|
||||
</Pressable>
|
||||
))}
|
||||
{links.map((link) => (
|
||||
<Pressable
|
||||
key={link.href}
|
||||
style={styles.row}
|
||||
onPress={() => push(link.href)}
|
||||
>
|
||||
<LibraryIcon name={link.icon} />
|
||||
<View style={[styles.rowContent, { borderBottomColor: colors.border }]}>
|
||||
<Text style={[styles.rowTitle, { color: colors.foreground }]}>{link.title}</Text>
|
||||
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
|
||||
</View>
|
||||
</Pressable>
|
||||
))}
|
||||
|
||||
<Pressable
|
||||
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
||||
onPress={() => push("/recently-added")}
|
||||
>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Recently Added
|
||||
</Text>
|
||||
</Pressable>
|
||||
</>
|
||||
) : null}
|
||||
<Pressable
|
||||
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
||||
onPress={() => push("/recently-added")}
|
||||
>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Recently Added
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
),
|
||||
[colors.border, colors.foreground, colors.mutedForeground, push, isTablet]
|
||||
[colors.border, colors.foreground, colors.mutedForeground, push]
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
@@ -13,9 +13,12 @@ export default function SearchLayout() {
|
||||
|
||||
return (
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
...(Platform.OS === "android" &&
|
||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
||||
? { animation: "none" as const }
|
||||
: {}),
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
|
||||
@@ -1,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 useServerConvexAuth,
|
||||
@@ -12,7 +5,7 @@ import {
|
||||
} from "convex/react"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
import { useEffect, useSyncExternalStore } from "react"
|
||||
import { useEffect } from "react"
|
||||
|
||||
import { AppIntentBridge } from "@/components/app-intent-bridge"
|
||||
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
||||
@@ -31,18 +24,6 @@ export default function AppLayout() {
|
||||
const { isWebSocketConnected } = useConvexConnectionState()
|
||||
const { invalidateSession } = useInvalidateAuthSession()
|
||||
const stackOptions = useStackScreenOptions()
|
||||
const { config } = useServerConfig()
|
||||
const pendingDestination = useSyncExternalStore(
|
||||
subscribeIncomingMediaLink,
|
||||
() => (config ? incomingMediaLink(config.serverUrl) : null),
|
||||
() => null
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
if (!config || !pendingDestination) return
|
||||
const destination = takeIncomingMediaLink(config.serverUrl)
|
||||
if (destination) router.replace(destination as Href)
|
||||
}, [config, pendingDestination])
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
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 { Stack, useRouter, useLocalSearchParams } from "expo-router"
|
||||
import { Stack, useRouter } from "expo-router"
|
||||
import * as Haptics from "expo-haptics"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
@@ -74,15 +72,10 @@ const DISMISS_VELOCITY = 900
|
||||
const DISMISS_CORNER_RADIUS = 48
|
||||
|
||||
export default function PlayerScreen() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const router = useRouter()
|
||||
const hadSongRef = useRef(false)
|
||||
const insets = useSafeAreaInsets()
|
||||
const { width: windowWidth, height: windowHeight } = useWindowDimensions()
|
||||
// Unfolded iPhones retain the phone idiom but have room for the iPad player.
|
||||
const isTablet =
|
||||
tabletLayout ||
|
||||
(Platform.OS === "ios" && Math.min(windowWidth, windowHeight) >= 600)
|
||||
const { config } = useServerConfig()
|
||||
const {
|
||||
currentSong,
|
||||
@@ -98,8 +91,7 @@ export default function PlayerScreen() {
|
||||
skipPrevious,
|
||||
} = usePlayback()
|
||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||
const { queue } = useLocalSearchParams<{ queue?: string }>()
|
||||
const [showQueue, setShowQueue] = useState(queue === "1")
|
||||
const [showQueue, setShowQueue] = useState(false)
|
||||
const [isDismissing, setIsDismissing] = useState(false)
|
||||
const [stageHeight, setStageHeight] = useState(0)
|
||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||
@@ -226,22 +218,6 @@ export default function PlayerScreen() {
|
||||
setShowQueue((value) => !value)
|
||||
}
|
||||
|
||||
if (isTablet) {
|
||||
return (
|
||||
<MusicEntityView kind="song" id={currentSong.id} style={{ flex: 1 }}>
|
||||
<TabletNowPlaying
|
||||
colors={colors}
|
||||
backgroundStyle={backgroundStyle}
|
||||
dismissStyle={dismissStyle}
|
||||
dismissGesture={dismissGesture}
|
||||
showQueue={showQueue}
|
||||
toggleQueue={toggleQueue}
|
||||
metadata={<SongMeta song={currentSong} colors={colors} />}
|
||||
/>
|
||||
</MusicEntityView>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||
|
||||
@@ -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 "/"
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,6 @@ import { Toaster } from "@/components/ui/toaster"
|
||||
import { ConvexAppProvider } from "@/contexts/convex-app"
|
||||
import { ServerConfigProvider, useServerConfig } from "@/contexts/server-config"
|
||||
|
||||
import { HandoffBridge } from "@/components/handoff-bridge"
|
||||
|
||||
const navigationTheme = {
|
||||
...DarkTheme,
|
||||
colors: { ...DarkTheme.colors, background: "#000", card: "#000" },
|
||||
@@ -58,7 +56,6 @@ export default function RootLayout() {
|
||||
<ConvexAppProvider>
|
||||
<StatusBar style={isDark ? "light" : "dark"} />
|
||||
<ThemeProvider value={navigationTheme}>
|
||||
<HandoffBridge />
|
||||
<RootNavigator />
|
||||
</ThemeProvider>
|
||||
<Toaster />
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { incomingMediaLink } from "@/lib/incoming-media-link"
|
||||
import { Redirect, type Href } from "expo-router"
|
||||
import { Redirect } from "expo-router"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
|
||||
@@ -12,16 +11,9 @@ export default function Index() {
|
||||
return <Redirect href="/server" />
|
||||
}
|
||||
|
||||
const destination = auth?.isAuthenticated
|
||||
? incomingMediaLink(config.serverUrl)
|
||||
: null
|
||||
|
||||
return (
|
||||
<Redirect
|
||||
href={
|
||||
(destination as Href) ??
|
||||
(auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin")
|
||||
}
|
||||
href={auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin"}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
import { useLocalSearchParams } from "expo-router"
|
||||
import { useEffect, useState } from "react"
|
||||
import { useState } from "react"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
|
||||
@@ -12,14 +11,7 @@ import { spacing, useThemeColors } from "@/lib/theme"
|
||||
export default function ServerScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { setServerHostname } = useServerConfig()
|
||||
const { hostname: linkedHostname } = useLocalSearchParams<{
|
||||
hostname?: string
|
||||
}>()
|
||||
const [hostname, setHostname] = useState(linkedHostname ?? "")
|
||||
useEffect(() => {
|
||||
if (linkedHostname) setHostname(linkedHostname)
|
||||
}, [linkedHostname])
|
||||
|
||||
const [hostname, setHostname] = useState("")
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 7.9 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 31 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 310 KiB |
|
Before Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 324 KiB After Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 963 KiB |
@@ -26,7 +26,7 @@
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"scale" : 1,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
|
||||
|
Before Width: | Height: | Size: 8.8 KiB |
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"fill" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.00000,0.55106,0.91748,1.00000",
|
||||
"display-p3:0.00320,0.24546,0.91602,1.00000"
|
||||
]
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : "automatic"
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.00000,0.55106,0.91748,1.00000",
|
||||
"display-p3:0.00320,0.24546,0.91602,1.00000"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.6
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : false,
|
||||
"value" : 0.2
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 8.8 KiB |
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"fill" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.03297,0.65562,0.91748,1.00000",
|
||||
"display-p3:0.01787,0.85470,0.91602,1.00000"
|
||||
]
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : "automatic"
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.03297,0.65562,0.91748,1.00000",
|
||||
"display-p3:0.01787,0.85470,0.91602,1.00000"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.6
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : false,
|
||||
"value" : 0.2
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,4 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import Svg, { G, Path } from "react-native-svg"
|
||||
|
||||
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. */
|
||||
export function AudioFormatBadge({
|
||||
artwork = false,
|
||||
format,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
artwork?: boolean
|
||||
format: PlaybackFormat
|
||||
color: string
|
||||
backgroundColor: string
|
||||
@@ -93,12 +90,7 @@ export function AudioFormatBadge({
|
||||
) : (
|
||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||
)}
|
||||
<PaletteText
|
||||
tone={artwork ? "secondaryForeground" : undefined}
|
||||
style={[styles.label, { color }]}
|
||||
>
|
||||
{label}
|
||||
</PaletteText>
|
||||
<Text style={[styles.label, { color }]}>{label}</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -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 },
|
||||
})
|
||||
@@ -1,6 +1,5 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { memo } from "react"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
@@ -26,12 +25,9 @@ export const DiscHeader = memo(function DiscHeader({
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<PaletteText
|
||||
tone={color ? "foreground" : undefined}
|
||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
||||
>
|
||||
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||
{label}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
|
||||
import { memo, useMemo } from "react"
|
||||
import {
|
||||
Platform,
|
||||
PixelRatio,
|
||||
StyleProp,
|
||||
StyleSheet,
|
||||
@@ -10,8 +9,6 @@ import {
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
coverImageSizes,
|
||||
@@ -109,9 +106,6 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit={contentFit}
|
||||
transition={150}
|
||||
blurRadius={blurRadius}
|
||||
onLoad={
|
||||
Platform.OS === "android" ? () => prefetchCoverPalette(uri) : undefined
|
||||
}
|
||||
cachePolicy="memory-disk"
|
||||
recyclingKey={sourceUri}
|
||||
enforceEarlyResizing
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -3,40 +3,30 @@ import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
/** Center account forms on wide windows; scroll when the keyboard reduces height. */
|
||||
/** Android resizes for the IME; scrolling keeps tall forms and actions reachable. */
|
||||
export function KeyboardForm({
|
||||
children,
|
||||
style,
|
||||
}: PropsWithChildren<{ style?: StyleProp<ViewStyle> }>) {
|
||||
return (
|
||||
<KeyboardAvoidingView
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
style={styles.fill}
|
||||
>
|
||||
if (Platform.OS === "android") {
|
||||
return (
|
||||
<ScrollView
|
||||
style={styles.fill}
|
||||
contentContainerStyle={[style, styles.content]}
|
||||
style={{ flex: 1 }}
|
||||
contentContainerStyle={[style, { flex: undefined, flexGrow: 1 }]}
|
||||
keyboardShouldPersistTaps="handled"
|
||||
keyboardDismissMode={Platform.OS === "ios" ? "interactive" : "on-drag"}
|
||||
keyboardDismissMode="on-drag"
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<KeyboardAvoidingView behavior="padding" style={style}>
|
||||
{children}
|
||||
</KeyboardAvoidingView>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
fill: { flex: 1 },
|
||||
content: {
|
||||
flex: undefined,
|
||||
flexGrow: 1,
|
||||
width: "100%",
|
||||
maxWidth: 528,
|
||||
alignSelf: "center",
|
||||
},
|
||||
})
|
||||
@@ -1,10 +1,4 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import Animated from "react-native-reanimated"
|
||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||
import { TabletMediaGrid } from "@/components/tablet-media-grid"
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link } from "expo-router"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { memo, useCallback, type ReactElement } from "react"
|
||||
import {
|
||||
@@ -30,7 +24,13 @@ import type {
|
||||
PlaylistSummary,
|
||||
} from "@otunes/convex/types"
|
||||
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
|
||||
|
||||
@@ -40,56 +40,39 @@ const MAX_NON_VIRTUAL_CAROUSEL_ITEMS = 10
|
||||
export const AlbumCard = memo(function AlbumCard({
|
||||
album,
|
||||
width = carouselCardWidth,
|
||||
fluid = false,
|
||||
}: {
|
||||
album: BrowseAlbum
|
||||
width?: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
const { href } = useAppNavigation()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { push } = useAppNavigation()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||
const onPress = useCallback(() => {
|
||||
push(`/album/${album.id}`)
|
||||
}, [push, album.id])
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Link href={href(`/album/${album.id}`)} push asChild>
|
||||
<Pressable
|
||||
style={StyleSheet.flatten([
|
||||
styles.card,
|
||||
{ width: fluid ? "100%" : width },
|
||||
])}
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, album.id)}
|
||||
hasCover={album.cover != null}
|
||||
style={{ width, height: width, borderRadius: radius.md }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={2}
|
||||
>
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, album.id)}
|
||||
hasCover={album.cover != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||
: { width, height: width, borderRadius: radius.md }
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoom>
|
||||
<MusicEntityView kind="album" id={album.id} style={styles.card}>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</MusicEntityView>
|
||||
</Pressable>
|
||||
</Link>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
|
||||
return (
|
||||
@@ -97,10 +80,12 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
stationArtistId={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)}
|
||||
>
|
||||
{card}
|
||||
<MusicEntityView kind="album" id={album.id}>
|
||||
{card}
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
})
|
||||
@@ -108,14 +93,11 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
export const ArtistCard = memo(function ArtistCard({
|
||||
artist,
|
||||
width = carouselCardWidth,
|
||||
fluid = false,
|
||||
}: {
|
||||
artist: BrowseArtist
|
||||
width?: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
const { push } = useAppNavigation()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleArtistAction, isArtistFavorite } = useMediaMenuActions()
|
||||
@@ -125,22 +107,15 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Pressable
|
||||
style={[styles.card, { width: fluid ? "100%" : width }]}
|
||||
onPress={onPress}
|
||||
>
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={artistCoverUrl(config.serverUrl, artist.id)}
|
||||
hasCover={artist.photo != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: 9999 }
|
||||
: { width, height: width, borderRadius: width / 2 }
|
||||
}
|
||||
style={{ width, height: width, borderRadius: width / 2 }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
numberOfLines={2}
|
||||
>
|
||||
{artist.name}
|
||||
</Text>
|
||||
@@ -150,7 +125,7 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
return (
|
||||
<MediaContextMenu
|
||||
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)}
|
||||
>
|
||||
<MusicEntityView kind="artist" id={artist.id}>
|
||||
@@ -163,69 +138,50 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
export const PlaylistCard = memo(function PlaylistCard({
|
||||
playlist,
|
||||
width = carouselCardWidth,
|
||||
fluid = false,
|
||||
}: {
|
||||
playlist: PlaylistSummary
|
||||
width?: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
const { href } = useAppNavigation()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { push } = useAppNavigation()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handlePlaylistAction } = useMediaMenuActions()
|
||||
const onPress = useCallback(() => {
|
||||
push(`/playlist/${playlist.id}`)
|
||||
}, [push, playlist.id])
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Link href={href(`/playlist/${playlist.id}`)} push asChild>
|
||||
<Pressable
|
||||
style={StyleSheet.flatten([
|
||||
styles.card,
|
||||
{ width: fluid ? "100%" : width },
|
||||
])}
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={{ width, height: width, borderRadius: radius.md }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={2}
|
||||
>
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||
: { width, height: width, borderRadius: radius.md }
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoom>
|
||||
<MusicEntityView kind="playlist" id={playlist.id} style={styles.card}>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{playlist.owner}
|
||||
</Text>
|
||||
</MusicEntityView>
|
||||
</Pressable>
|
||||
</Link>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{playlist.owner}
|
||||
</Text>
|
||||
</Pressable>
|
||||
)
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
showFavorite={false}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlist.id,
|
||||
title: playlist.title,
|
||||
}}
|
||||
share={{ type: "playlist", playlistId: playlist.id }}
|
||||
onAction={(action) => void handlePlaylistAction(playlist, action)}
|
||||
>
|
||||
{card}
|
||||
<MusicEntityView kind="playlist" id={playlist.id}>
|
||||
{card}
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
})
|
||||
@@ -233,42 +189,29 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
const CarouselCard = memo(function CarouselCard({
|
||||
item,
|
||||
width,
|
||||
fluid = false,
|
||||
}: {
|
||||
item: MediaItem
|
||||
width: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
if ("owner" in item)
|
||||
return <PlaylistCard playlist={item} width={width} fluid={fluid} />
|
||||
if ("artist" in item)
|
||||
return <AlbumCard album={item} width={width} fluid={fluid} />
|
||||
return <ArtistCard artist={item} width={width} fluid={fluid} />
|
||||
if ("owner" in item) return <PlaylistCard playlist={item} width={width} />
|
||||
if ("artist" in item) return <AlbumCard album={item} width={width} />
|
||||
return <ArtistCard artist={item} width={width} />
|
||||
})
|
||||
|
||||
export function MediaGrid({ content }: { content: MediaItem[] }) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { cardWidth, onLayout, ready } = useMediaGridLayout()
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
|
||||
return (
|
||||
<View style={styles.grid} onLayout={onLayout}>
|
||||
{(ready ? content : []).map((item) => (
|
||||
<Animated.View
|
||||
key={item.id}
|
||||
layout={tabletLayout ? tabletLayoutTransition : undefined}
|
||||
style={{ width: cardWidth }}
|
||||
>
|
||||
<CarouselCard item={item} width={cardWidth} fluid={tabletLayout} />
|
||||
</Animated.View>
|
||||
<View style={styles.grid}>
|
||||
{content.map((item) => (
|
||||
<View key={item.id} style={{ width: cardWidth }}>
|
||||
<CarouselCard item={item} width={cardWidth} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function renderTabletCard(item: MediaItem, width: number) {
|
||||
return <CarouselCard item={item} width={width} fluid />
|
||||
}
|
||||
|
||||
export function MediaGridList({
|
||||
content,
|
||||
paddingBottom,
|
||||
@@ -282,9 +225,7 @@ export function MediaGridList({
|
||||
ListHeaderComponent?: ReactElement
|
||||
contentInset?: boolean
|
||||
}) {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
|
||||
useMediaGridLayout()
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
const colors = useThemeColors()
|
||||
const renderItem = useCallback(
|
||||
({ item }: ListRenderItemInfo<MediaItem>) => (
|
||||
@@ -295,43 +236,23 @@ export function MediaGridList({
|
||||
[cardWidth]
|
||||
)
|
||||
|
||||
if (tabletLayout) {
|
||||
return (
|
||||
<TabletMediaGrid
|
||||
content={content}
|
||||
paddingBottom={paddingBottom}
|
||||
onEndReached={onEndReached}
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
contentInset={contentInset}
|
||||
renderCard={renderTabletCard}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<FlatList
|
||||
key={columns}
|
||||
onLayout={onLayout}
|
||||
data={content}
|
||||
keyExtractor={mediaItemKey}
|
||||
renderItem={renderItem}
|
||||
numColumns={columns}
|
||||
numColumns={2}
|
||||
initialNumToRender={GRID_INITIAL_ROWS}
|
||||
maxToRenderPerBatch={GRID_INITIAL_ROWS}
|
||||
windowSize={longListProps.windowSize}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
contentInset ? styles.gridListContent : styles.gridListContentInset,
|
||||
{
|
||||
paddingBottom,
|
||||
gap,
|
||||
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
|
||||
},
|
||||
{ paddingBottom },
|
||||
]}
|
||||
columnWrapperStyle={[
|
||||
styles.gridListRow,
|
||||
!contentInset && { paddingHorizontal: horizontalPadding },
|
||||
{ gap },
|
||||
!contentInset && styles.gridListRowInset,
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
|
||||
@@ -59,8 +59,7 @@ export function MenuView({
|
||||
outlineVariant: "#545458",
|
||||
error: "#FF453A",
|
||||
}}
|
||||
// Rows fill their parent width; compact action buttons keep intrinsic sizing.
|
||||
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||
matchContents
|
||||
>
|
||||
<DropdownMenu
|
||||
expanded={expanded}
|
||||
@@ -71,9 +70,7 @@ export function MenuView({
|
||||
properties={{ clippingEnabled: false }}
|
||||
>
|
||||
<DropdownMenu.Trigger>
|
||||
<RNHostView
|
||||
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||
>
|
||||
<RNHostView matchContents>
|
||||
{shouldOpenOnLongPress ? (
|
||||
<GestureDetector gesture={longPress}>
|
||||
<View collapsable={false}>{children}</View>
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { useRouter } from "expo-router"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
@@ -67,8 +65,7 @@ function MiniPlayerContent({
|
||||
<View
|
||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -76,7 +73,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
@@ -86,8 +83,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={20}
|
||||
color={colors.foreground}
|
||||
@@ -105,8 +101,7 @@ function MiniPlayerContent({
|
||||
style={artworkStyle}
|
||||
/>
|
||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -114,9 +109,8 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||
{ color: colors.mutedForeground },
|
||||
@@ -124,7 +118,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
@@ -138,12 +132,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-back"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
@@ -154,8 +143,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
<Ionicons
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
@@ -169,12 +157,7 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-forward"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
</Pressable>
|
||||
@@ -184,10 +167,9 @@ function MiniPlayerContent({
|
||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
const palette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
return (
|
||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||
{children}
|
||||
{hasArtworkPalette ? (
|
||||
<View
|
||||
@@ -205,7 +187,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</Animated.View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -61,7 +61,7 @@ type QueueListItem =
|
||||
| { type: "history-header"; key: string }
|
||||
| { type: "history"; key: string; songId: Id<"songs">; historyIndex: number }
|
||||
| { type: "current"; key: string }
|
||||
| { type: "controls"; key: string; showTitle: boolean; tablet?: boolean }
|
||||
| { type: "controls"; key: string; showTitle: boolean }
|
||||
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
|
||||
| { type: "empty"; key: string; height: number }
|
||||
|
||||
@@ -72,11 +72,7 @@ function itemHeight(item: QueueListItem) {
|
||||
case "current":
|
||||
return CURRENT_HEIGHT
|
||||
case "controls":
|
||||
return item.tablet
|
||||
? 44
|
||||
: item.showTitle
|
||||
? CONTROLS_HEIGHT
|
||||
: TOGGLES_ONLY_HEIGHT
|
||||
return item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT
|
||||
case "empty":
|
||||
return item.height
|
||||
default:
|
||||
@@ -101,14 +97,10 @@ export function NowPlayingQueue({
|
||||
colors,
|
||||
viewportHeight,
|
||||
currentHeader,
|
||||
tablet = false,
|
||||
fadeColor,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
viewportHeight: number
|
||||
currentHeader: ReactNode
|
||||
tablet?: boolean
|
||||
fadeColor?: string
|
||||
}) {
|
||||
const {
|
||||
queueSongIds,
|
||||
@@ -122,7 +114,6 @@ export function NowPlayingQueue({
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
} = usePlayback()
|
||||
const [viewportWidth, setViewportWidth] = useState(0)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const [scrollEnabled, setScrollEnabled] = useState(true)
|
||||
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
|
||||
list.push({
|
||||
type: "controls",
|
||||
key: "controls",
|
||||
showTitle: hasUpcoming,
|
||||
tablet,
|
||||
})
|
||||
list.push({ type: "controls", key: "controls", showTitle: hasUpcoming })
|
||||
const occurrences = new Map<string, number>()
|
||||
queueSongIds.forEach((songId, queueIndex) => {
|
||||
const occurrence = occurrences.get(songId) ?? 0
|
||||
@@ -183,7 +169,7 @@ export function NowPlayingQueue({
|
||||
})
|
||||
}
|
||||
return list
|
||||
}, [queueHistorySongIds, queueSongIds, viewportHeight, tablet])
|
||||
}, [queueHistorySongIds, queueSongIds, viewportHeight])
|
||||
|
||||
const offsets = useMemo(() => {
|
||||
const result: number[] = []
|
||||
@@ -195,10 +181,8 @@ export function NowPlayingQueue({
|
||||
return result
|
||||
}, [items])
|
||||
|
||||
const currentIndex = items.findIndex(
|
||||
(item) => item.type === (tablet ? "controls" : "current")
|
||||
)
|
||||
const controlsIndex = tablet ? currentIndex : currentIndex + 1
|
||||
const currentIndex = items.findIndex((item) => item.type === "current")
|
||||
const controlsIndex = currentIndex + 1
|
||||
const belowCurrentHeight = items
|
||||
.slice(currentIndex)
|
||||
.reduce((sum, item) => sum + itemHeight(item), 0)
|
||||
@@ -341,31 +325,29 @@ export function NowPlayingQueue({
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
height: item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT,
|
||||
backgroundColor: colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{!tablet ? (
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
{item.showTitle ? (
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Continue Playing
|
||||
@@ -379,7 +361,6 @@ export function NowPlayingQueue({
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={queueSongIds.length - 1}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
@@ -403,10 +384,7 @@ export function NowPlayingQueue({
|
||||
}
|
||||
|
||||
return (
|
||||
<View
|
||||
style={styles.root}
|
||||
onLayout={(event) => setViewportWidth(event.nativeEvent.layout.width)}
|
||||
>
|
||||
<View style={styles.root}>
|
||||
<FlatList
|
||||
ref={listRef}
|
||||
data={items}
|
||||
@@ -425,31 +403,18 @@ export function NowPlayingQueue({
|
||||
ListFooterComponent={<View style={{ height: footerHeight }} />}
|
||||
/>
|
||||
<Svg
|
||||
key={viewportWidth}
|
||||
pointerEvents="none"
|
||||
style={styles.bottomFade}
|
||||
width={viewportWidth}
|
||||
width="100%"
|
||||
height={BOTTOM_FADE_HEIGHT}
|
||||
>
|
||||
<Defs>
|
||||
<LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1">
|
||||
<Stop
|
||||
offset="0"
|
||||
stopColor={fadeColor ?? colors.background}
|
||||
stopOpacity={0}
|
||||
/>
|
||||
<Stop
|
||||
offset="1"
|
||||
stopColor={fadeColor ?? colors.background}
|
||||
stopOpacity={1}
|
||||
/>
|
||||
<Stop offset="0" stopColor={colors.background} stopOpacity={0} />
|
||||
<Stop offset="1" stopColor={colors.background} stopOpacity={1} />
|
||||
</LinearGradient>
|
||||
</Defs>
|
||||
<Rect
|
||||
width={viewportWidth}
|
||||
height={BOTTOM_FADE_HEIGHT}
|
||||
fill="url(#queue-fade)"
|
||||
/>
|
||||
<Rect width="100%" height="100%" fill="url(#queue-fade)" />
|
||||
</Svg>
|
||||
</View>
|
||||
)
|
||||
@@ -616,7 +581,6 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
songId,
|
||||
queueIndex,
|
||||
lastIndex,
|
||||
tablet = false,
|
||||
colors,
|
||||
drag,
|
||||
swipeGroup,
|
||||
@@ -628,7 +592,6 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
songId: Id<"songs">
|
||||
queueIndex: number
|
||||
lastIndex: number
|
||||
tablet?: boolean
|
||||
colors: NowPlayingColors
|
||||
drag: DragState
|
||||
swipeGroup: SwipeRowGroup
|
||||
@@ -722,19 +685,6 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
</GestureDetector>
|
||||
}
|
||||
/>
|
||||
{tablet ? (
|
||||
<View
|
||||
pointerEvents="none"
|
||||
style={{
|
||||
position: "absolute",
|
||||
left: 88,
|
||||
right: 26,
|
||||
bottom: 0,
|
||||
height: StyleSheet.hairlineWidth,
|
||||
backgroundColor: colors.sliderTrack,
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<Animated.View
|
||||
pointerEvents="none"
|
||||
style={[
|
||||
@@ -751,7 +701,7 @@ const UpcomingRow = memo(function UpcomingRow({
|
||||
{Platform.OS === "ios" ? (
|
||||
<SwipeToRemoveRow
|
||||
group={swipeGroup}
|
||||
backgroundColor={tablet ? "transparent" : colors.background}
|
||||
backgroundColor={colors.background}
|
||||
actionAccessibilityLabel="Remove from queue"
|
||||
onRemove={handleRemove}
|
||||
>
|
||||
|
||||
@@ -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,4 +1,3 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { collectionInset } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
@@ -7,14 +6,9 @@ import type { BrowseSong } from "@otunes/convex/types"
|
||||
import type { CoverPalette } from "@/lib/cover-palette"
|
||||
import { formatDuration } from "@/lib/format"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
import {
|
||||
miniPlayerHeight,
|
||||
tabletMiniPlayerHeight,
|
||||
spacing,
|
||||
useThemeColors,
|
||||
} from "@/lib/theme"
|
||||
import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { memo, useCallback } from "react"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -52,27 +46,22 @@ export const SongRow = memo(function SongRow({
|
||||
const content = (
|
||||
<>
|
||||
<View style={styles.rowMeta}>
|
||||
<PaletteText
|
||||
tone={palette ? "foreground" : undefined}
|
||||
<Text
|
||||
style={[styles.rowTitle, { color: foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.artist.name} · {song.album.title}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
</View>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.duration, { color: secondaryForeground }]}
|
||||
>
|
||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</PaletteText>
|
||||
</Text>
|
||||
{trailing}
|
||||
</>
|
||||
)
|
||||
@@ -158,7 +147,6 @@ export const SongListRow = memo(function SongListRow({
|
||||
type: "song",
|
||||
albumId: song.album.id,
|
||||
songId: song.id,
|
||||
title: `${song.title} - ${song.album.title}`,
|
||||
},
|
||||
onAction: (action) => onAction(song, action),
|
||||
}}
|
||||
@@ -166,15 +154,9 @@ export const SongListRow = memo(function SongListRow({
|
||||
)
|
||||
})
|
||||
|
||||
const tabletPlayerInset = tabletMiniPlayerHeight + spacing.sm + spacing.lg
|
||||
export const tabContentBottomInset =
|
||||
Platform.OS === "ios" && Platform.isPad ? tabletPlayerInset : spacing.lg
|
||||
export const tabContentBottomInset = spacing.lg
|
||||
export const contentBottomInset =
|
||||
Platform.OS === "ios" && Platform.isPad
|
||||
? tabletPlayerInset
|
||||
: Platform.OS === "android"
|
||||
? spacing.lg
|
||||
: miniPlayerHeight + spacing.lg
|
||||
Platform.OS === "android" ? spacing.lg : miniPlayerHeight + spacing.lg
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
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,6 +1,5 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||
import { Image } from "expo-image"
|
||||
import { useRouter } from "expo-router"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
@@ -9,19 +8,16 @@ import { radius, useThemeColors } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
export function ProfileHeaderButton() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const openSettings = useOpenSettings()
|
||||
const router = useRouter()
|
||||
const colors = useThemeColors()
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
|
||||
if (tabletLayout) return null
|
||||
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityLabel="Open profile"
|
||||
accessibilityRole="button"
|
||||
hitSlop={8}
|
||||
onPress={openSettings}
|
||||
onPress={() => router.push("/(app)/settings")}
|
||||
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
|
||||
>
|
||||
<View
|
||||
@@ -34,11 +30,7 @@ export function ProfileHeaderButton() {
|
||||
]}
|
||||
>
|
||||
{user?.image ? (
|
||||
<Image
|
||||
source={{ uri: user.image }}
|
||||
style={styles.image}
|
||||
contentFit="cover"
|
||||
/>
|
||||
<Image source={{ uri: user.image }} style={styles.image} contentFit="cover" />
|
||||
) : (
|
||||
<Text style={[styles.initials, { color: colors.foreground }]}>
|
||||
{initialsFromName(user?.name ?? "Me")}
|
||||
|
||||
@@ -1,14 +1,6 @@
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { useEffect, useRef } from "react"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import { Link } from "expo-router"
|
||||
import { useHeaderHeight } from "expo-router/react-navigation"
|
||||
import Reanimated from "react-native-reanimated"
|
||||
import { type ReactNode, type ComponentProps } from "react"
|
||||
import {
|
||||
Platform,
|
||||
Animated,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
View,
|
||||
@@ -18,43 +10,41 @@ import {
|
||||
} from "react-native"
|
||||
|
||||
import { contentBottomInset } from "@/components/player"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
||||
function SkeletonContent({
|
||||
children,
|
||||
embedded = false,
|
||||
}: {
|
||||
children: ReactNode
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
if (embedded) return <>{children}</>
|
||||
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
import {
|
||||
carouselCardWidth,
|
||||
radius,
|
||||
spacing,
|
||||
useThemeColors,
|
||||
useTwoColumnCardWidth,
|
||||
} from "@/lib/theme"
|
||||
|
||||
export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||
const colors = useThemeColors()
|
||||
const opacity = useRef(new Animated.Value(1)).current
|
||||
|
||||
useEffect(() => {
|
||||
const pulse = Animated.loop(
|
||||
Animated.sequence([
|
||||
Animated.timing(opacity, {
|
||||
toValue: 0.5,
|
||||
duration: 800,
|
||||
useNativeDriver: true,
|
||||
}),
|
||||
Animated.timing(opacity, {
|
||||
toValue: 1,
|
||||
duration: 800,
|
||||
useNativeDriver: true,
|
||||
}),
|
||||
])
|
||||
)
|
||||
pulse.start()
|
||||
return () => pulse.stop()
|
||||
}, [opacity])
|
||||
|
||||
return (
|
||||
<View
|
||||
<Animated.View
|
||||
style={[
|
||||
{ backgroundColor: colors.muted, borderRadius: radius.sm },
|
||||
{ backgroundColor: colors.muted, borderRadius: radius.sm, opacity },
|
||||
style,
|
||||
]}
|
||||
/>
|
||||
@@ -84,21 +74,13 @@ export function SongRowSkeleton() {
|
||||
)
|
||||
}
|
||||
|
||||
export function SongListSkeleton({
|
||||
rows = 10,
|
||||
embedded = false,
|
||||
}: {
|
||||
rows?: number
|
||||
embedded?: boolean
|
||||
}) {
|
||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<SongRowSkeleton key={index} />
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -127,38 +109,24 @@ function CardSkeleton({
|
||||
export function MediaGridSkeleton({
|
||||
items = 6,
|
||||
contentInset = true,
|
||||
embedded = false,
|
||||
}: {
|
||||
items?: number
|
||||
contentInset?: boolean
|
||||
embedded?: boolean
|
||||
}) {
|
||||
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||
useMediaGridLayout()
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
return (
|
||||
<SkeletonContent embedded={embedded}>
|
||||
<View
|
||||
onLayout={onLayout}
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
{
|
||||
paddingHorizontal: horizontalPadding,
|
||||
paddingTop: contentInset ? horizontalPadding : 0,
|
||||
gap,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{Array.from(
|
||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||
(_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View
|
||||
accessibilityLabel="Loading"
|
||||
accessibilityRole="progressbar"
|
||||
style={[
|
||||
styles.grid,
|
||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||
]}
|
||||
>
|
||||
{Array.from({ length: items }, (_, index) => (
|
||||
<CardSkeleton key={index} width={cardWidth} />
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -176,16 +144,12 @@ export function CarouselSkeleton() {
|
||||
}
|
||||
|
||||
export function HomeSkeleton() {
|
||||
const headerHeight = useHeaderHeight()
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
styles.home,
|
||||
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
contentContainerStyle={styles.home}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
@@ -197,115 +161,59 @@ export function HomeSkeleton() {
|
||||
|
||||
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
||||
export function CollectionDetailSkeleton({
|
||||
zoomCoverSize,
|
||||
style,
|
||||
round = false,
|
||||
backgroundColor,
|
||||
onLayout,
|
||||
}: {
|
||||
zoomCoverSize?: number
|
||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
||||
round?: boolean
|
||||
backgroundColor?: string
|
||||
onLayout?: () => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
const headerHeight = useHeaderHeight()
|
||||
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
||||
const coverSize =
|
||||
!round && landscape
|
||||
? tabletCoverSize!
|
||||
: (zoomCoverSize ?? (round ? 180 : 210))
|
||||
const actions = (
|
||||
<View style={styles.actions}>
|
||||
<Skeleton style={styles.iconAction} />
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
)
|
||||
const artwork = (
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
)
|
||||
const coverSize = round ? 180 : 210
|
||||
return (
|
||||
<Reanimated.ScrollView
|
||||
onLayout={onLayout}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
|
||||
style,
|
||||
]}
|
||||
contentContainerStyle={{
|
||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||
paddingBottom: contentBottomInset,
|
||||
}}
|
||||
contentInsetAdjustmentBehavior="never"
|
||||
<ScrollView
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
scrollEnabled={false}
|
||||
accessibilityLabel="Loading"
|
||||
>
|
||||
{round ? (
|
||||
<View style={styles.artistHero}>
|
||||
{zoomCoverSize ? (
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>{artwork}</View>
|
||||
</Link.AppleZoomTarget>
|
||||
) : (
|
||||
artwork
|
||||
)}
|
||||
<TextLine width={200} height={24} />
|
||||
<TextLine width={120} height={16} />
|
||||
{actions}
|
||||
<View style={styles.hero}>
|
||||
<Skeleton
|
||||
style={{
|
||||
width: coverSize,
|
||||
height: coverSize,
|
||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||
}}
|
||||
/>
|
||||
<TextLine width={200} height={24} />
|
||||
<TextLine width={120} height={16} />
|
||||
<View style={styles.actions}>
|
||||
<Skeleton style={styles.iconAction} />
|
||||
<Skeleton style={styles.playButton} />
|
||||
<Skeleton style={styles.iconAction} />
|
||||
</View>
|
||||
) : (
|
||||
<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>
|
||||
)}
|
||||
</View>
|
||||
{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 }) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" height={16} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
</SkeletonContent>
|
||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||
{Array.from({ length: rows }, (_, index) => (
|
||||
<View
|
||||
key={index}
|
||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||
>
|
||||
<Skeleton style={styles.artistAvatar} />
|
||||
<TextLine width="50%" height={16} />
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -325,10 +233,10 @@ const styles = StyleSheet.create({
|
||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
||||
gridInset: { padding: spacing.lg },
|
||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||
carousel: { gap: spacing.md },
|
||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||
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: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -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-actions-sheet"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { tabletMiniPlayerHeight } from "@/lib/theme"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
|
||||
export function TabletMiniPlayer() {
|
||||
const focused = useIsFocused()
|
||||
const router = useRouter()
|
||||
const insets = useTabletPlayerInsets()
|
||||
const { width } = useWindowDimensions()
|
||||
const left = useSharedValue(insets.left)
|
||||
const right = useSharedValue(insets.right)
|
||||
const bottom = useSharedValue(insets.bottom)
|
||||
useEffect(() => {
|
||||
left.value = withTiming(insets.left, tabletMotion)
|
||||
right.value = withTiming(insets.right, tabletMotion)
|
||||
bottom.value = withTiming(insets.bottom, tabletMotion)
|
||||
}, [insets.left, insets.right, insets.bottom, left, right, bottom])
|
||||
const positionStyle = useAnimatedStyle(() => ({
|
||||
left: left.value + 16,
|
||||
right: right.value + 16,
|
||||
bottom: bottom.value + 8,
|
||||
}))
|
||||
const { config } = useServerConfig()
|
||||
const {
|
||||
currentSong,
|
||||
queueSongIds,
|
||||
isPlaying,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
} = usePlaybackQueue()
|
||||
const { setIsPlaying, skipPrevious, skipNext, toggleShuffle, cycleRepeat } =
|
||||
usePlaybackActions()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const roomy = width - insets.left - insets.right >= 650
|
||||
|
||||
if (!focused || !config || !currentSong || queueSongIds.length === 0)
|
||||
return null
|
||||
|
||||
const color = "#fff"
|
||||
const inactive = "rgba(255,255,255,0.4)"
|
||||
const accent = "#FA2D48"
|
||||
|
||||
return (
|
||||
<Animated.View
|
||||
pointerEvents="box-none"
|
||||
style={[styles.position, positionStyle]}
|
||||
>
|
||||
<TabletPlayerSurface>
|
||||
<View style={styles.controls}>
|
||||
{roomy ? (
|
||||
<Control
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
color={shuffleEnabled ? accent : inactive}
|
||||
selected={shuffleEnabled}
|
||||
onPress={() => void toggleShuffle()}
|
||||
size={21}
|
||||
/>
|
||||
) : null}
|
||||
<Control
|
||||
label="Previous track"
|
||||
symbol="backward.fill"
|
||||
fallback="play-back"
|
||||
color={color}
|
||||
onPress={() => void skipPrevious()}
|
||||
size={27}
|
||||
/>
|
||||
<Control
|
||||
label={isPlaying ? "Pause" : "Play"}
|
||||
symbol={isPlaying ? "pause.fill" : "play.fill"}
|
||||
fallback={isPlaying ? "pause" : "play"}
|
||||
color={color}
|
||||
onPress={() => setIsPlaying(!isPlaying)}
|
||||
size={34}
|
||||
/>
|
||||
<Control
|
||||
label="Next track"
|
||||
symbol="forward.fill"
|
||||
fallback="play-forward"
|
||||
color={color}
|
||||
onPress={() => void skipNext()}
|
||||
size={27}
|
||||
/>
|
||||
{roomy ? (
|
||||
<Control
|
||||
label="Repeat"
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
color={repeatEnabled !== "none" ? accent : inactive}
|
||||
selected={repeatEnabled !== "none"}
|
||||
onPress={() => void cycleRepeat()}
|
||||
size={21}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
<Pressable
|
||||
onPress={() => router.push("/(app)/player")}
|
||||
style={styles.track}
|
||||
accessibilityLabel="Open Now Playing"
|
||||
>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, currentSong.album.id)}
|
||||
hasCover={currentSong.album.cover != null}
|
||||
style={styles.artwork}
|
||||
/>
|
||||
<View style={styles.meta}>
|
||||
<Text numberOfLines={1} style={styles.title}>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
<Text numberOfLines={1} style={styles.artist}>
|
||||
{currentSong.artist.name}
|
||||
</Text>
|
||||
</View>
|
||||
</Pressable>
|
||||
<MediaActionMenu
|
||||
style={{ alignSelf: "center" }}
|
||||
favorited={isSongFavorite(currentSong.id)}
|
||||
stationArtistId={currentSong.artist.id}
|
||||
navigation={{
|
||||
artist: { id: currentSong.artist.id },
|
||||
album: { id: currentSong.album.id },
|
||||
}}
|
||||
includeActions={["playlist", "favorite", "go-artist", "go-album"]}
|
||||
onAction={(action) => void handleSongAction(currentSong, action)}
|
||||
>
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="More"
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="ellipsis"
|
||||
fallback="ellipsis-horizontal"
|
||||
size={23}
|
||||
color={color}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
{roomy ? (
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
disabled
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Lyrics"
|
||||
accessibilityState={{ disabled: true }}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="quote.bubble"
|
||||
fallback="chatbox-outline"
|
||||
size={23}
|
||||
color={inactive}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Control
|
||||
label="Show queue"
|
||||
symbol="list.bullet"
|
||||
fallback="list"
|
||||
color={color}
|
||||
size={25}
|
||||
onPress={() =>
|
||||
router.push({ pathname: "/(app)/player", params: { queue: "1" } })
|
||||
}
|
||||
/>
|
||||
</TabletPlayerSurface>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
function TabletPlayerSurface({ children }: { children: ReactNode }) {
|
||||
if (isLiquidGlassAvailable()) {
|
||||
return (
|
||||
<GlassView
|
||||
glassEffectStyle="regular"
|
||||
colorScheme="dark"
|
||||
isInteractive
|
||||
style={styles.bar}
|
||||
>
|
||||
{children}
|
||||
</GlassView>
|
||||
)
|
||||
}
|
||||
return (
|
||||
<BlurView intensity={70} tint="dark" style={styles.bar}>
|
||||
{children}
|
||||
</BlurView>
|
||||
)
|
||||
}
|
||||
|
||||
function Control({
|
||||
label,
|
||||
symbol,
|
||||
fallback,
|
||||
color,
|
||||
size,
|
||||
onPress,
|
||||
selected,
|
||||
}: {
|
||||
label: string
|
||||
symbol: React.ComponentProps<typeof PlayerSymbol>["name"]
|
||||
fallback: React.ComponentProps<typeof PlayerSymbol>["fallback"]
|
||||
color: string
|
||||
size: number
|
||||
onPress: () => void
|
||||
selected?: boolean
|
||||
}) {
|
||||
return (
|
||||
<Pressable
|
||||
style={styles.control}
|
||||
onPress={onPress}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={label}
|
||||
accessibilityState={{ selected }}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name={symbol}
|
||||
fallback={fallback}
|
||||
color={color}
|
||||
size={size}
|
||||
weight="semibold"
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
position: { position: "absolute", alignItems: "center", zIndex: 100 },
|
||||
bar: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
width: "100%",
|
||||
maxWidth: 720,
|
||||
height: tabletMiniPlayerHeight,
|
||||
paddingHorizontal: 14,
|
||||
gap: 4,
|
||||
borderRadius: 34,
|
||||
overflow: "hidden",
|
||||
},
|
||||
controls: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 1,
|
||||
marginRight: 12,
|
||||
},
|
||||
control: {
|
||||
width: 40,
|
||||
height: 44,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
track: {
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 10,
|
||||
},
|
||||
artwork: { width: 50, height: 50, borderRadius: 5 },
|
||||
meta: { flex: 1, minWidth: 0 },
|
||||
title: { color: "#fff", fontSize: 15, lineHeight: 19, fontWeight: "500" },
|
||||
artist: { color: "rgba(255,255,255,0.7)", fontSize: 14, lineHeight: 18 },
|
||||
})
|
||||
@@ -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",
|
||||
},
|
||||
})
|
||||
@@ -1,39 +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 { initialsFromName } from "@/lib/format"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
const NativeSidebar =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
ViewProps & {
|
||||
accountName: string
|
||||
initials: string
|
||||
imageURL?: string
|
||||
active: boolean
|
||||
onProfilePress: () => void
|
||||
}
|
||||
>("TabletSidebar")
|
||||
: null
|
||||
|
||||
export function TabletSidebar() {
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const openSettings = useOpenSettings()
|
||||
const active = useIsFocused()
|
||||
|
||||
if (!NativeSidebar) return null
|
||||
return (
|
||||
<NativeSidebar
|
||||
style={{ position: "absolute", width: 0, height: 0 }}
|
||||
accountName={user?.name ?? "Account"}
|
||||
initials={initialsFromName(user?.name ?? "Me")}
|
||||
imageURL={user?.image}
|
||||
active={active}
|
||||
onProfilePress={openSettings}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import {
|
||||
ActivityIndicator,
|
||||
Platform,
|
||||
@@ -74,20 +73,8 @@ export function Button({
|
||||
<ActivityIndicator color={textColor} />
|
||||
) : (
|
||||
<View style={styles.buttonContent}>
|
||||
{icon ? (
|
||||
<PaletteIcon
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
name={icon}
|
||||
size={18}
|
||||
color={textColor}
|
||||
/>
|
||||
) : null}
|
||||
<PaletteText
|
||||
tone={tint ? "accentForeground" : undefined}
|
||||
style={[styles.buttonText, { color: textColor }]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
||||
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
||||
</View>
|
||||
)}
|
||||
</Pressable>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import {
|
||||
useIsFocused,
|
||||
useRoute,
|
||||
useNavigation,
|
||||
usePreventRemove,
|
||||
useRoute,
|
||||
type NativeStackNavigationProp,
|
||||
} from "expo-router"
|
||||
import {
|
||||
@@ -10,33 +11,17 @@ import {
|
||||
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 { Platform } from "react-native"
|
||||
|
||||
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>
|
||||
selectedColor: string
|
||||
hasArtworkPalette: boolean
|
||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||
}
|
||||
@@ -48,64 +33,37 @@ function useDefaultPalette() {
|
||||
return useMemo(() => themeCoverPalette(theme, isDark), [theme, isDark])
|
||||
}
|
||||
|
||||
export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
export function AndroidTabThemeProvider({ 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 palette = screen?.palette ?? 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((current) =>
|
||||
palette ? { palette, owner } : current?.owner === owner ? null : current
|
||||
)
|
||||
setScreen(palette ? { palette, owner } : null)
|
||||
},
|
||||
[animatedColors, defaultPalette]
|
||||
[]
|
||||
)
|
||||
const artworkPalette = hasArtwork ? palette : null
|
||||
const artworkPalette =
|
||||
palette &&
|
||||
(palette.background !== defaultPalette.background ||
|
||||
palette.foreground !== defaultPalette.foreground ||
|
||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||
palette.accent !== defaultPalette.accent)
|
||||
? palette
|
||||
: null
|
||||
const value = useMemo(
|
||||
() => ({
|
||||
palette: artworkPalette ?? defaultPalette,
|
||||
colors: animatedColors,
|
||||
selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText,
|
||||
hasArtworkPalette: artworkPalette !== null,
|
||||
setPalette,
|
||||
}),
|
||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
||||
[defaultPalette, artworkPalette, setPalette]
|
||||
)
|
||||
return (
|
||||
<AndroidTabTheme.Provider value={value}>
|
||||
@@ -114,50 +72,6 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* 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()
|
||||
@@ -168,83 +82,56 @@ export function useAndroidTabHasArtworkPalette() {
|
||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||
}
|
||||
|
||||
export function useAndroidTabBackgroundStyle() {
|
||||
export function useAndroidTabSelectedColor() {
|
||||
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 }
|
||||
: {}
|
||||
)
|
||||
const defaultPalette = useDefaultPalette()
|
||||
return theme?.selectedColor ?? defaultPalette.accentText
|
||||
}
|
||||
|
||||
/** 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) {
|
||||
/** Keep Android artwork screens and shared bars on the same displayed palette. */
|
||||
export function useAndroidScreenPalette(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 [appeared, setAppeared] = useState(false)
|
||||
const [leaving, setLeaving] = useState(false)
|
||||
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
|
||||
if (Platform.OS !== "android") return
|
||||
return navigation.addListener("transitionEnd", ({ data }) => {
|
||||
setAppeared(!data.closing)
|
||||
})
|
||||
}, [navigation])
|
||||
|
||||
usePreventRemove(Platform.OS === "android" && !leaving, ({ repeat }) => {
|
||||
setLeaving(true)
|
||||
setPalette?.(null, owner)
|
||||
// Let the page and bars paint their shared destination colors before the
|
||||
// native stack removes the page. React blur happens too early for this.
|
||||
requestAnimationFrame(() => requestAnimationFrame(repeat))
|
||||
})
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (
|
||||
Platform.OS !== "android" ||
|
||||
!setPalette ||
|
||||
!isFocused ||
|
||||
!laidOut ||
|
||||
!appeared ||
|
||||
leaving
|
||||
)
|
||||
return
|
||||
setPalette(palette, owner)
|
||||
return () => setPalette(null, owner)
|
||||
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
||||
}, [appeared, isFocused, laidOut, leaving, owner, palette, setPalette])
|
||||
|
||||
return {
|
||||
palette: Platform.OS === "android" ? target : palette,
|
||||
backgroundStyle,
|
||||
onLayout: sharesPalette ? onLayout : undefined,
|
||||
palette: Platform.OS === "android" && theme ? theme.palette : palette,
|
||||
onLayout: Platform.OS === "android" ? onLayout : undefined,
|
||||
}
|
||||
}
|
||||
@@ -87,11 +87,7 @@ type PlaybackContextValue = {
|
||||
playShuffled: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueNext: (songIds: Id<"songs">[]) => Promise<void>
|
||||
addToQueueLast: (songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromSong: (
|
||||
songId: Id<"songs">,
|
||||
songIds: Id<"songs">[],
|
||||
origin?: string
|
||||
) => Promise<void>
|
||||
playFromSong: (songId: Id<"songs">, songIds: Id<"songs">[]) => Promise<void>
|
||||
playFromLibrarySong: (
|
||||
songId: Id<"songs">,
|
||||
sort: {
|
||||
@@ -168,12 +164,7 @@ type PlaybackActionsValue = Pick<
|
||||
|
||||
type PlaybackQueueValue = Pick<
|
||||
PlaybackContextValue,
|
||||
| "queueSongIds"
|
||||
| "queueHistorySongIds"
|
||||
| "currentSong"
|
||||
| "isPlaying"
|
||||
| "shuffleEnabled"
|
||||
| "repeatEnabled"
|
||||
"queueSongIds" | "queueHistorySongIds" | "currentSong" | "isPlaying"
|
||||
>
|
||||
|
||||
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
|
||||
@@ -273,13 +264,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
const pendingSeekRef = useRef<number | null>(null)
|
||||
const seekInFlightRef = useRef(false)
|
||||
const loadRequestIdRef = useRef(0)
|
||||
const queueOriginRef = useRef<string | undefined>(undefined)
|
||||
const playRequestRef = useRef(0)
|
||||
const ignoreTrackChangeTimerRef = useRef<ReturnType<
|
||||
typeof setTimeout
|
||||
> | null>(null)
|
||||
|
||||
const [queueStartVersion, setQueueStartVersion] = useState(0)
|
||||
const [isPlaying, setIsPlayingState] = useState(false)
|
||||
const [currentTime, setCurrentTime] = useState(0)
|
||||
const [measuredDuration, setDuration] = useState(0)
|
||||
@@ -359,21 +348,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
loadedLoadKeyRef.current = null
|
||||
}, [])
|
||||
|
||||
// A new queue must not inherit the native player's position or a pending seek.
|
||||
const resetQueuePlayback = useCallback(() => {
|
||||
loadRequestIdRef.current += 1
|
||||
destroyPlaylist()
|
||||
pendingSeekRef.current = null
|
||||
seekInFlightRef.current = false
|
||||
progressRestoredForSongRef.current = null
|
||||
lastSavedProgressRef.current = -1
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
setDuration(0)
|
||||
setProgressToRestore(null)
|
||||
setQueueStartVersion((version) => version + 1)
|
||||
}, [destroyPlaylist])
|
||||
|
||||
const handlePlaylistStatusUpdate = useCallback(
|
||||
(status: AudioPlaylistStatus) => {
|
||||
if (!status.isLoaded) return
|
||||
@@ -591,12 +565,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
if (progressRestoredForSongRef.current === currentSongId) return
|
||||
progressRestoredForSongRef.current = currentSongId
|
||||
lastSavedProgressRef.current = -1
|
||||
pendingSeekRef.current = null
|
||||
currentTimeRef.current = 0
|
||||
setCurrentTime(0)
|
||||
setDuration(0)
|
||||
setProgressToRestore(store.getState().progressSeconds)
|
||||
}, [currentSongId, destroyPlaylist, queueStartVersion, store])
|
||||
}, [currentSongId, destroyPlaylist, store])
|
||||
|
||||
useEffect(() => {
|
||||
if (progressToRestore === null || progressToRestore <= 0) return
|
||||
@@ -834,7 +807,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
handlePlaybackLoadFailure,
|
||||
historySyncKey,
|
||||
queueSyncKey,
|
||||
queueStartVersion,
|
||||
repeatEnabled,
|
||||
scheduleTrackChangeHandling,
|
||||
userPlaybackKey,
|
||||
@@ -855,20 +827,18 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
) => playbackQueue.PlaybackQueueState,
|
||||
recorded: {
|
||||
playlistId?: Id<"playlists">
|
||||
origin?: string
|
||||
entity?: { kind: MusicEntityKind; id: string }
|
||||
} = {}
|
||||
) => {
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current =
|
||||
recorded.origin ??
|
||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||
resetQueuePlayback()
|
||||
store.update(playbackQueue.clearQueue)
|
||||
const previousSongId = store.getState().queue[0]
|
||||
store.update(recipe)
|
||||
const firstSongId = store.getState().queue[0]
|
||||
if (!firstSongId) return
|
||||
|
||||
if (firstSongId === previousSongId) {
|
||||
void seekTo(0)
|
||||
}
|
||||
setIsPlaying(true)
|
||||
void (async () => {
|
||||
const deadline = Date.now() + 20_000
|
||||
@@ -899,7 +869,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
: { songId: firstSongId }
|
||||
)
|
||||
},
|
||||
[store, resetQueuePlayback, setIsPlaying, recordPlay]
|
||||
[store, seekTo, setIsPlaying, recordPlay]
|
||||
)
|
||||
|
||||
const playCollection = useCallback(
|
||||
@@ -908,7 +878,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
shuffled: boolean,
|
||||
recorded: {
|
||||
playlistId?: Id<"playlists">
|
||||
origin?: string
|
||||
entity?: { kind: MusicEntityKind; id: string }
|
||||
} = {}
|
||||
) => {
|
||||
@@ -973,19 +942,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
)
|
||||
|
||||
const playFromSong = useCallback(
|
||||
async (songId: Id<"songs">, songIds: Id<"songs">[], origin?: string) => {
|
||||
if (
|
||||
origin &&
|
||||
queueOriginRef.current === origin &&
|
||||
store.getState().queue[0] === songId
|
||||
)
|
||||
return
|
||||
startPlayback(
|
||||
(state) => playbackQueue.startQueueFromSong(state, songId, songIds),
|
||||
{ origin }
|
||||
async (songId: Id<"songs">, songIds: Id<"songs">[]) => {
|
||||
startPlayback((state) =>
|
||||
playbackQueue.startQueueFromSong(state, songId, songIds)
|
||||
)
|
||||
},
|
||||
[startPlayback, store]
|
||||
[startPlayback]
|
||||
)
|
||||
|
||||
const playFromLibrarySong = useCallback(
|
||||
@@ -1055,7 +1017,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
(albumId: Id<"albums">, songIds?: Id<"songs">[]) =>
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), false, {
|
||||
entity: { kind: "album", id: albumId },
|
||||
origin: `album:${albumId}`,
|
||||
}),
|
||||
[playCollection, loadAlbumSongIds]
|
||||
)
|
||||
@@ -1064,7 +1025,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
(albumId: Id<"albums">, songIds?: Id<"songs">[]) =>
|
||||
playCollection(loadAlbumSongIds(albumId, songIds), true, {
|
||||
entity: { kind: "album", id: albumId },
|
||||
origin: `album:${albumId}`,
|
||||
}),
|
||||
[playCollection, loadAlbumSongIds]
|
||||
)
|
||||
@@ -1127,14 +1087,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
async (songIds: Id<"songs">[], shuffled: boolean) => {
|
||||
if (songIds.length === 0) return
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current = undefined
|
||||
resetQueuePlayback()
|
||||
store.update((state) =>
|
||||
playbackQueue.startQueue(state, songIds, shuffled)
|
||||
)
|
||||
setIsPlaying(false)
|
||||
},
|
||||
[store, resetQueuePlayback, setIsPlaying]
|
||||
[store, setIsPlaying]
|
||||
)
|
||||
|
||||
const startFromSong = useCallback(
|
||||
@@ -1145,20 +1103,17 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
play: boolean
|
||||
) => {
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current = undefined
|
||||
resetQueuePlayback()
|
||||
store.update((state) => playbackQueue.setShuffleEnabled(state, shuffled))
|
||||
store.update((state) =>
|
||||
playbackQueue.startQueueFromSong(state, songId, songIds)
|
||||
)
|
||||
setIsPlaying(play)
|
||||
},
|
||||
[store, resetQueuePlayback, setIsPlaying]
|
||||
[store, setIsPlaying]
|
||||
)
|
||||
|
||||
const clearQueue = useCallback(async () => {
|
||||
playRequestRef.current += 1
|
||||
queueOriginRef.current = undefined
|
||||
store.update(playbackQueue.clearQueue)
|
||||
setIsPlaying(false)
|
||||
}, [store, setIsPlaying])
|
||||
@@ -1323,21 +1278,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
||||
|
||||
const queueValue = useMemo<PlaybackQueueValue>(
|
||||
() => ({
|
||||
shuffleEnabled: playback.shuffleEnabled,
|
||||
repeatEnabled,
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
currentSong,
|
||||
isPlaying: isPlaybackActive,
|
||||
}),
|
||||
[
|
||||
currentSong,
|
||||
isPlaybackActive,
|
||||
queueHistorySongIds,
|
||||
queueSongIds,
|
||||
playback.shuffleEnabled,
|
||||
repeatEnabled,
|
||||
]
|
||||
[currentSong, isPlaybackActive, queueHistorySongIds, queueSongIds]
|
||||
)
|
||||
|
||||
const value = useMemo<PlaybackContextValue>(
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
import {
|
||||
createContext,
|
||||
useCallback,
|
||||
useContext,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
useState,
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import { useIsFocused } from "expo-router"
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
type PlayerInsets = { left: number; right: number; bottom: number }
|
||||
const TabletPlayerLayout = createContext<{
|
||||
insets: PlayerInsets
|
||||
setInsets: (insets: PlayerInsets) => void
|
||||
} | null>(null)
|
||||
|
||||
/** Keep one player above the navigator, positioned using the focused screen's safe area. */
|
||||
export function TabletPlayerLayoutProvider({
|
||||
children,
|
||||
}: {
|
||||
children: ReactNode
|
||||
}) {
|
||||
const safeArea = useSafeAreaInsets()
|
||||
const [insets, updateInsets] = useState<PlayerInsets>(safeArea)
|
||||
const setInsets = useCallback((next: PlayerInsets) => {
|
||||
updateInsets((current) =>
|
||||
current.left === next.left &&
|
||||
current.right === next.right &&
|
||||
current.bottom === next.bottom
|
||||
? current
|
||||
: next
|
||||
)
|
||||
}, [])
|
||||
const value = useMemo(() => ({ insets, setInsets }), [insets, setInsets])
|
||||
return <TabletPlayerLayout value={value}>{children}</TabletPlayerLayout>
|
||||
}
|
||||
|
||||
export function TabletPlayerLayoutSync() {
|
||||
const focused = useIsFocused()
|
||||
const { left, right, bottom } = useSafeAreaInsets()
|
||||
const setInsets = useContext(TabletPlayerLayout)?.setInsets
|
||||
useLayoutEffect(() => {
|
||||
if (focused) setInsets?.({ left, right, bottom })
|
||||
}, [focused, left, right, bottom, setInsets])
|
||||
return null
|
||||
}
|
||||
|
||||
export function useTabletPlayerInsets() {
|
||||
const layout = useContext(TabletPlayerLayout)
|
||||
const safeArea = useSafeAreaInsets()
|
||||
return layout?.insets ?? safeArea
|
||||
}
|
||||
@@ -69,11 +69,7 @@ function sameSwatches(
|
||||
|
||||
function cachedSwatches(key: string): CoverSwatches | null | undefined {
|
||||
if (swatchesByKey.has(key)) return swatchesByKey.get(key)
|
||||
const cached = readCache<CoverSwatches>(cacheKey(key))
|
||||
// Discard the background-only entries written by the tablet palette experiment.
|
||||
return cached && (!Array.isArray(cached.text) || !Array.isArray(cached.accent))
|
||||
? undefined
|
||||
: cached
|
||||
return readCache<CoverSwatches>(cacheKey(key))
|
||||
}
|
||||
|
||||
function extractSwatches(key: string) {
|
||||
@@ -99,13 +95,6 @@ function extractSwatches(key: string) {
|
||||
return request
|
||||
}
|
||||
|
||||
/** Warm visible artwork colors before a detail page is pushed. */
|
||||
export function prefetchCoverPalette(uri: string) {
|
||||
const key = withCoverImageSize(uri, 64)
|
||||
if (cachedSwatches(key) !== undefined) return
|
||||
void extractSwatches(key)
|
||||
}
|
||||
|
||||
/**
|
||||
* Colors for a screen tinted by `uri`'s cover art. Extraction runs once per
|
||||
* cover and is cached on device. Pass `hasCover` as `undefined` while it isn't
|
||||
@@ -149,10 +138,7 @@ export function useCoverPalette(
|
||||
// case the cover changed.
|
||||
const timer =
|
||||
known === undefined
|
||||
? setTimeout(
|
||||
() => !cancelled && setWaitedKey(key),
|
||||
COVER_PALETTE_WAIT_MS
|
||||
)
|
||||
? setTimeout(() => !cancelled && setWaitedKey(key), COVER_PALETTE_WAIT_MS)
|
||||
: null
|
||||
void extractSwatches(key).then((next) => {
|
||||
if (!cancelled) show(next ?? known ?? null)
|
||||
@@ -165,9 +151,7 @@ export function useCoverPalette(
|
||||
|
||||
const palette = useMemo(() => {
|
||||
const fromArt =
|
||||
hasCover !== false && swatches
|
||||
? deriveCoverPalette(swatches, isDark)
|
||||
: null
|
||||
hasCover !== false && swatches ? deriveCoverPalette(swatches, isDark) : null
|
||||
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||
}, [hasCover, isDark, swatches, theme])
|
||||
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { useCallback, useLayoutEffect, useState } from "react"
|
||||
import { useWindowDimensions, type LayoutChangeEvent } from "react-native"
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
import { spacing } from "@/lib/theme"
|
||||
|
||||
/** Measure the content pane because native sidebars reduce its available width. */
|
||||
export function useMediaGridLayout() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { width: windowWidth } = useWindowDimensions()
|
||||
const insets = useSafeAreaInsets()
|
||||
const [measuredWidth, setWidth] = useState<number | null>(null)
|
||||
const [ready, setReady] = useState(false)
|
||||
useLayoutEffect(() => {
|
||||
if (ready || measuredWidth === null) return
|
||||
let secondFrame = 0
|
||||
const firstFrame = requestAnimationFrame(() => {
|
||||
secondFrame = requestAnimationFrame(() => setReady(true))
|
||||
})
|
||||
return () => {
|
||||
cancelAnimationFrame(firstFrame)
|
||||
cancelAnimationFrame(secondFrame)
|
||||
}
|
||||
}, [measuredWidth, insets.left, insets.right, ready])
|
||||
const width = measuredWidth ?? windowWidth - insets.left - insets.right
|
||||
const onLayout = useCallback((event: LayoutChangeEvent) => {
|
||||
setWidth(event.nativeEvent.layout.width)
|
||||
}, [])
|
||||
const horizontalPadding = tabletLayout ? spacing.xxl : spacing.lg
|
||||
const gap = tabletLayout ? spacing.lg : spacing.md
|
||||
const columns = Math.max(
|
||||
2,
|
||||
Math.floor((width - horizontalPadding * 2 + gap) / (180 + gap))
|
||||
)
|
||||
const cardWidth = Math.max(
|
||||
1,
|
||||
Math.floor((width - horizontalPadding * 2 - gap * (columns - 1)) / columns)
|
||||
)
|
||||
return {
|
||||
columns,
|
||||
cardWidth,
|
||||
onLayout,
|
||||
horizontalPadding,
|
||||
gap,
|
||||
ready: ready && measuredWidth !== null,
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
import { useNavigation } from "expo-router"
|
||||
import { StackActions } from "expo-router/react-navigation"
|
||||
import { useCallback } from "react"
|
||||
|
||||
/** Present the app-level modal without resolving an overlapping tab settings route. */
|
||||
export function useOpenSettings() {
|
||||
const navigation = useNavigation("/(app)")
|
||||
return useCallback(() => {
|
||||
navigation.dispatch({
|
||||
...StackActions.push("settings"),
|
||||
target: navigation.getState()?.key,
|
||||
})
|
||||
}, [navigation])
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
import { Platform, useWindowDimensions } from "react-native"
|
||||
|
||||
/** Use the phone layout in compact iPad windows, including Split View. */
|
||||
export function useTabletLayout() {
|
||||
const { width } = useWindowDimensions()
|
||||
return Platform.OS === "ios" && Platform.isPad && width >= 600
|
||||
}
|
||||
@@ -1,14 +1,7 @@
|
||||
import { useRouter, useSegments, type Href } from "expo-router"
|
||||
import { useCallback } from "react"
|
||||
|
||||
import { tabletSections } from "@/lib/tablet-navigation"
|
||||
|
||||
export const APP_TABS = [
|
||||
"home",
|
||||
"library",
|
||||
"search",
|
||||
...tabletSections.map((section) => section.group),
|
||||
] as const
|
||||
export const APP_TABS = ["home", "library", "search"] as const
|
||||
export type AppTab = (typeof APP_TABS)[number]
|
||||
|
||||
const TAB_SET = new Set<string>(APP_TABS)
|
||||
@@ -44,26 +37,20 @@ export function AppNavigationSync() {
|
||||
export function useAppNavigation() {
|
||||
const router = useRouter()
|
||||
|
||||
const push = useCallback(
|
||||
(path: string) => {
|
||||
if (activeSegmentsRef.current.includes("player")) {
|
||||
// Leave the root player modal before navigating into the library stack.
|
||||
router.dismiss()
|
||||
router.navigate(tabPath("library", path))
|
||||
return
|
||||
}
|
||||
const push = useCallback((path: string) => {
|
||||
if (activeSegmentsRef.current.includes("player")) {
|
||||
// Leave the root player modal before navigating into the library stack.
|
||||
router.dismiss()
|
||||
router.navigate(tabPath("library", path))
|
||||
return
|
||||
}
|
||||
|
||||
router.push(tabPath(getActiveTabFromRef(), path))
|
||||
},
|
||||
[router]
|
||||
)
|
||||
router.push(tabPath(getActiveTabFromRef(), path))
|
||||
}, [router])
|
||||
|
||||
const replace = useCallback(
|
||||
(path: string) => {
|
||||
router.replace(tabPath(getActiveTabFromRef(), path))
|
||||
},
|
||||
[router]
|
||||
)
|
||||
const replace = useCallback((path: string) => {
|
||||
router.replace(tabPath(getActiveTabFromRef(), path))
|
||||
}, [router])
|
||||
|
||||
const href = useCallback(
|
||||
(path: string) => tabPath(getActiveTabFromRef(), path),
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
// Keep the destination while server setup or sign-in is on screen.
|
||||
const listeners = new Set<() => void>()
|
||||
|
||||
export function subscribeIncomingMediaLink(listener: () => void) {
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
let pendingLink: { path: string; serverOrigin: string } | null = null
|
||||
|
||||
export function incomingMediaLink(serverUrl: string) {
|
||||
if (!pendingLink) return null
|
||||
return new URL(serverUrl).origin === pendingLink.serverOrigin
|
||||
? pendingLink.path
|
||||
: null
|
||||
}
|
||||
|
||||
export function takeIncomingMediaLink(serverUrl: string) {
|
||||
const path = incomingMediaLink(serverUrl)
|
||||
pendingLink = null
|
||||
for (const listener of listeners) listener()
|
||||
return path
|
||||
}
|
||||
|
||||
export function rememberIncomingMediaLink(path: string, serverOrigin: string) {
|
||||
pendingLink = { path, serverOrigin }
|
||||
for (const listener of listeners) listener()
|
||||
}
|
||||
|
||||
// Shared by native links and Handoff. Only concrete media screens are routable.
|
||||
export function isMediaRoute(path: string) {
|
||||
return /^\/(album|artist|playlist)\/[a-zA-Z0-9_-]+$/.test(path)
|
||||
}
|
||||
@@ -1,9 +1,8 @@
|
||||
export type MediaShareContext = (
|
||||
export type MediaShareContext =
|
||||
| { type: "album"; albumId: string }
|
||||
| { type: "song"; albumId: string; songId: string }
|
||||
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
|
||||
| { type: "artist"; artistId: string }
|
||||
) & { title: string }
|
||||
|
||||
export function shouldShowShare(
|
||||
share: MediaShareContext | undefined,
|
||||
|
||||
@@ -28,7 +28,6 @@ export function useStackScreenOptions(
|
||||
headerBackButtonDisplayMode: "minimal",
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
animation: "slide_from_right",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: theme.background },
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { requireOptionalNativeModule } from "expo"
|
||||
import * as Sharing from "expo-sharing"
|
||||
import { Platform, Share } from "react-native"
|
||||
|
||||
@@ -6,10 +5,6 @@ import type { MediaShareContext } from "@/lib/media-links"
|
||||
import { mediaShareUrl } from "@/lib/media-links"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
const nativeShare = requireOptionalNativeModule<{
|
||||
share: (url: string, artwork: string, title: string) => Promise<void>
|
||||
}>("MediaLinkShare")
|
||||
|
||||
export async function shareMediaLink(
|
||||
serverUrl: string,
|
||||
share: MediaShareContext
|
||||
@@ -22,32 +17,12 @@ export async function shareMediaLink(
|
||||
showError("Sharing is not available on this device")
|
||||
return
|
||||
}
|
||||
await Sharing.shareAsync(url, { dialogTitle: share.title })
|
||||
return
|
||||
}
|
||||
|
||||
if (nativeShare) {
|
||||
const type = share.type === "song" ? "album" : share.type
|
||||
const id =
|
||||
share.type === "album" || share.type === "song"
|
||||
? share.albumId
|
||||
: share.type === "artist"
|
||||
? share.artistId
|
||||
: share.isFavorites
|
||||
? "favorites"
|
||||
: share.playlistId
|
||||
await nativeShare.share(
|
||||
url,
|
||||
`${serverUrl.replace(/\/+$/, "")}/api/${type}/${id}/cover?size=512`,
|
||||
share.title
|
||||
)
|
||||
await Sharing.shareAsync(url, { dialogTitle: "Share" })
|
||||
return
|
||||
}
|
||||
|
||||
await Share.share(
|
||||
Platform.OS === "ios"
|
||||
? { url, title: share.title }
|
||||
: { message: url, title: share.title }
|
||||
Platform.OS === "ios" ? { url } : { message: url }
|
||||
)
|
||||
} catch (error) {
|
||||
if (error instanceof Error && /cancel/i.test(error.message)) {
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
import { Easing, LinearTransition, ReduceMotion } from "react-native-reanimated"
|
||||
|
||||
/** Short, finite transitions for sidebar resizing and artwork changes. */
|
||||
export const tabletMotion = {
|
||||
duration: 360,
|
||||
easing: Easing.bezier(0.2, 0, 0, 1),
|
||||
reduceMotion: ReduceMotion.System,
|
||||
}
|
||||
export const tabletLayoutTransition = LinearTransition.duration(
|
||||
tabletMotion.duration
|
||||
)
|
||||
.easing(tabletMotion.easing)
|
||||
.reduceMotion(ReduceMotion.System)
|
||||
@@ -1,14 +0,0 @@
|
||||
import { createContext } from "react"
|
||||
|
||||
export const tabletSections = [
|
||||
{ name: "albums", group: "(albums)", title: "Albums" },
|
||||
{ name: "artists", group: "(artists)", title: "Artists" },
|
||||
{ name: "songs", group: "(songs)", title: "Songs" },
|
||||
{ name: "playlists", group: "(playlists)", title: "All Playlists" },
|
||||
{ name: "favorites", group: "(favorites)", title: "Favorites" },
|
||||
{ name: "recent", group: "(recent)", title: "Recently Played" },
|
||||
] as const
|
||||
|
||||
export const TabletSectionContext = createContext<
|
||||
(typeof tabletSections)[number] | undefined
|
||||
>(undefined)
|
||||
@@ -84,7 +84,6 @@ export const radius = {
|
||||
} as const
|
||||
|
||||
export const miniPlayerHeight = 56
|
||||
export const tabletMiniPlayerHeight = 68
|
||||
export const tabBarHeight = Platform.OS === "ios" ? 49 : 80
|
||||
export const playerBarHeight = miniPlayerHeight
|
||||
export const carouselCardWidth = 160
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"platforms": ["apple"],
|
||||
"apple": {
|
||||
"modules": ["HandoffModule"],
|
||||
"appDelegateSubscribers": ["HandoffAppDelegateSubscriber"]
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'Handoff'
|
||||
s.version = '1.0.0'
|
||||
s.summary = 'Native media screen Handoff for oTunes'
|
||||
s.description = s.summary
|
||||
s.license = { :type => 'MIT' }
|
||||
s.author = 'oTunes'
|
||||
s.homepage = 'https://otunes.abunchofknowitalls.com'
|
||||
s.platforms = { :ios => '16.4' }
|
||||
s.swift_version = '5.9'
|
||||
s.source = { :git => '' }
|
||||
s.static_framework = true
|
||||
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
|
||||
s.dependency 'ExpoModulesCore'
|
||||
s.source_files = '**/*.swift'
|
||||
end
|
||||
@@ -1,70 +0,0 @@
|
||||
import ExpoModulesCore
|
||||
import UIKit
|
||||
|
||||
// Retain the latest continuation until JS is mounted, including cold launches.
|
||||
private enum HandoffState {
|
||||
static var activity: NSUserActivity?
|
||||
static var pending: [String: String]?
|
||||
static var notify: (() -> Void)?
|
||||
|
||||
static var activityType: String {
|
||||
"\(Bundle.main.bundleIdentifier!).media"
|
||||
}
|
||||
}
|
||||
|
||||
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
|
||||
public func application(
|
||||
_ application: UIApplication,
|
||||
continue userActivity: NSUserActivity,
|
||||
restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
|
||||
) -> Bool {
|
||||
guard userActivity.activityType == HandoffState.activityType,
|
||||
let server = userActivity.userInfo?["server"] as? String,
|
||||
let route = userActivity.userInfo?["route"] as? String
|
||||
else { return false }
|
||||
HandoffState.pending = ["server": server, "route": route]
|
||||
HandoffState.notify?()
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
public final class HandoffModule: Module {
|
||||
public func definition() -> ModuleDefinition {
|
||||
Name("Handoff")
|
||||
Events("onActivity")
|
||||
|
||||
OnStartObserving {
|
||||
HandoffState.notify = { [weak self] in self?.sendEvent("onActivity") }
|
||||
if HandoffState.pending != nil { HandoffState.notify?() }
|
||||
}
|
||||
OnStopObserving { HandoffState.notify = nil }
|
||||
|
||||
AsyncFunction("takeActivity") { () -> [String: String]? in
|
||||
defer { HandoffState.pending = nil }
|
||||
return HandoffState.pending
|
||||
}.runOnQueue(.main)
|
||||
|
||||
AsyncFunction("publish") { (server: String?, route: String?) in
|
||||
HandoffState.activity?.invalidate()
|
||||
HandoffState.activity = nil
|
||||
guard let server, let route else { return }
|
||||
let activity = NSUserActivity(activityType: HandoffState.activityType)
|
||||
activity.title = "oTunes"
|
||||
activity.userInfo = ["server": server, "route": route]
|
||||
activity.requiredUserInfoKeys = ["server", "route"]
|
||||
activity.isEligibleForHandoff = true
|
||||
activity.isEligibleForSearch = false
|
||||
activity.isEligibleForPublicIndexing = false
|
||||
HandoffState.activity = activity
|
||||
activity.becomeCurrent()
|
||||
}.runOnQueue(.main)
|
||||
|
||||
OnDestroy {
|
||||
DispatchQueue.main.async {
|
||||
HandoffState.activity?.invalidate()
|
||||
HandoffState.activity = nil
|
||||
HandoffState.notify = nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"name": "otunes-handoff",
|
||||
"version": "1.0.0",
|
||||
"private": true
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
package com.abunchofknowitalls.otunes
|
||||
|
||||
import android.content.ClipData
|
||||
import android.content.Intent
|
||||
import androidx.core.content.FileProvider
|
||||
import expo.modules.kotlin.modules.Module
|
||||
import expo.modules.kotlin.modules.ModuleDefinition
|
||||
import java.io.File
|
||||
import java.net.URL
|
||||
|
||||
class MediaLinkShare : Module() {
|
||||
override fun definition() = ModuleDefinition {
|
||||
Name("MediaLinkShare")
|
||||
AsyncFunction("share") { link: String, artwork: String, title: String ->
|
||||
val context = requireNotNull(appContext.reactContext)
|
||||
val intent = Intent(Intent.ACTION_SEND).apply {
|
||||
type = "text/plain"
|
||||
putExtra(Intent.EXTRA_TEXT, link)
|
||||
putExtra(Intent.EXTRA_TITLE, title)
|
||||
putExtra(Intent.EXTRA_SUBJECT, title)
|
||||
}
|
||||
// ClipData supplies the chooser thumbnail while the shared item stays a URL.
|
||||
try {
|
||||
val connection = URL(artwork).openConnection().apply {
|
||||
connectTimeout = 8000
|
||||
readTimeout = 8000
|
||||
}
|
||||
context.cacheDir.listFiles()?.filter {
|
||||
it.name.startsWith("media-link-cover-") && it.lastModified() < System.currentTimeMillis() - 86400000
|
||||
}?.forEach { it.delete() }
|
||||
val extension = when (connection.contentType?.substringBefore(";")) {
|
||||
"image/webp" -> "webp"
|
||||
"image/png" -> "png"
|
||||
"image/jpeg" -> "jpg"
|
||||
"image/gif" -> "gif"
|
||||
else -> error("Artwork format is not supported")
|
||||
}
|
||||
val file = File(context.cacheDir, "media-link-cover-${java.util.UUID.randomUUID()}.${extension}")
|
||||
connection.getInputStream().use { input ->
|
||||
file.outputStream().use { output -> input.copyTo(output) }
|
||||
}
|
||||
val uri = FileProvider.getUriForFile(context, context.packageName + ".SharingFileProvider", file)
|
||||
intent.clipData = ClipData.newUri(context.contentResolver, "Artwork", uri)
|
||||
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||
} catch (_: Exception) {
|
||||
// A failed artwork download must not prevent sharing the link.
|
||||
}
|
||||
appContext.throwingActivity.runOnUiThread {
|
||||
appContext.throwingActivity.startActivity(Intent.createChooser(intent, "Share"))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
import UIKit
|
||||
import LinkPresentation
|
||||
internal import ExpoModulesCore
|
||||
|
||||
private final class MediaLinkItem: NSObject, UIActivityItemSource {
|
||||
let url: URL
|
||||
let image: UIImage?
|
||||
let title: String
|
||||
init(url: URL, image: UIImage?, title: String) {
|
||||
self.url = url
|
||||
self.image = image
|
||||
self.title = title
|
||||
}
|
||||
func activityViewControllerPlaceholderItem(_ controller: UIActivityViewController) -> Any { url }
|
||||
func activityViewController(_ controller: UIActivityViewController, itemForActivityType: UIActivity.ActivityType?) -> Any? { url }
|
||||
func activityViewControllerLinkMetadata(_ controller: UIActivityViewController) -> LPLinkMetadata? {
|
||||
let metadata = LPLinkMetadata()
|
||||
metadata.originalURL = url
|
||||
metadata.url = url
|
||||
metadata.title = title
|
||||
if let image {
|
||||
metadata.imageProvider = NSItemProvider(object: image)
|
||||
metadata.iconProvider = NSItemProvider(object: image)
|
||||
}
|
||||
return metadata
|
||||
}
|
||||
}
|
||||
|
||||
final class MediaLinkShare: Module {
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("MediaLinkShare")
|
||||
AsyncFunction("share") { (link: String, artwork: String, title: String) in
|
||||
guard let url = URL(string: link), let artworkURL = URL(string: artwork) else { return }
|
||||
var image: UIImage?
|
||||
var request = URLRequest(url: artworkURL)
|
||||
request.timeoutInterval = 8
|
||||
if let (data, response) = try? await URLSession.shared.data(for: request),
|
||||
(response as? HTTPURLResponse)?.statusCode == 200 {
|
||||
image = UIImage(data: data)
|
||||
}
|
||||
let artworkImage = image
|
||||
await MainActor.run {
|
||||
guard let presenter = self.appContext?.utilities?.currentViewController() else { return }
|
||||
let controller = UIActivityViewController(
|
||||
activityItems: [MediaLinkItem(url: url, image: artworkImage, title: title)], applicationActivities: nil)
|
||||
if let popover = controller.popoverPresentationController {
|
||||
popover.sourceView = presenter.view
|
||||
popover.sourceRect = CGRect(x: presenter.view.bounds.midX, y: presenter.view.bounds.midY, width: 0, height: 0)
|
||||
popover.permittedArrowDirections = []
|
||||
}
|
||||
presenter.present(controller, animated: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,6 @@ import MediaPlayer
|
||||
import UIKit
|
||||
internal import ExpoModulesCore
|
||||
|
||||
#if !targetEnvironment(macCatalyst)
|
||||
/// Bridges system volume without changing the playback audio session or player gain.
|
||||
final class SystemVolume: Module {
|
||||
private var volumeView: MPVolumeView?
|
||||
@@ -85,18 +84,3 @@ final class SystemVolume: Module {
|
||||
return ["volume": AVAudioSession.sharedInstance().outputVolume, "available": available]
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
// macOS owns system volume. Keep the bridge available without MPVolumeView.
|
||||
final class SystemVolume: Module {
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("SystemVolume")
|
||||
Events("onVolumeChange")
|
||||
AsyncFunction("getState") { () -> [String: Any] in
|
||||
["volume": 0, "available": false]
|
||||
}
|
||||
AsyncFunction("setPlayerVisible") { (_: Bool) in }
|
||||
AsyncFunction("setVolume") { (_: Double) in }
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -1,246 +0,0 @@
|
||||
import UIKit
|
||||
internal import ExpoModulesCore
|
||||
|
||||
final class TabletSidebar: Module {
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("TabletSidebar")
|
||||
View(TabletSidebarView.self) {
|
||||
Events("onProfilePress")
|
||||
Prop("accountName") { (view: TabletSidebarView, value: String) in
|
||||
view.accountName = value
|
||||
view.configure()
|
||||
}
|
||||
Prop("initials") { (view: TabletSidebarView, value: String) in
|
||||
view.initials = value
|
||||
view.configure()
|
||||
}
|
||||
Prop("imageURL") { (view: TabletSidebarView, value: String?) in
|
||||
view.imageURL = value
|
||||
view.configure()
|
||||
}
|
||||
Prop("active") { (view: TabletSidebarView, value: Bool) in
|
||||
view.active = value
|
||||
view.configure()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
|
||||
final class TabletSidebarView: ExpoView {
|
||||
let onProfilePress = EventDispatcher()
|
||||
var accountName = ""
|
||||
var initials = ""
|
||||
var imageURL: String?
|
||||
var active = false
|
||||
private var tabsObserver: NSObjectProtocol?
|
||||
|
||||
override func didMoveToWindow() {
|
||||
super.didMoveToWindow()
|
||||
if let tabsObserver {
|
||||
NotificationCenter.default.removeObserver(tabsObserver)
|
||||
self.tabsObserver = nil
|
||||
}
|
||||
if window != nil {
|
||||
tabsObserver = NotificationCenter.default.addObserver(
|
||||
forName: Notification.Name("oTunesTabsDidUpdate"), object: nil, queue: .main
|
||||
) { [weak self] notification in
|
||||
guard let self, self.active, self.window != nil,
|
||||
let controller = notification.object as? UITabBarController,
|
||||
self.owningTabController() === controller else { return }
|
||||
if #available(iOS 18.0, *) { self.configure(controller) }
|
||||
}
|
||||
}
|
||||
configure()
|
||||
}
|
||||
|
||||
override func layoutSubviews() {
|
||||
super.layoutSubviews()
|
||||
configure()
|
||||
}
|
||||
|
||||
func configure() {
|
||||
guard active, window != nil, UIDevice.current.userInterfaceIdiom == .pad else { return }
|
||||
DispatchQueue.main.async { [weak self] in
|
||||
guard let self, self.active else { return }
|
||||
if let tabs = self.owningTabController(), #available(iOS 18.0, *) {
|
||||
self.configure(tabs)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func owningTabController() -> UITabBarController? {
|
||||
var responder: UIResponder? = self
|
||||
while let current = responder {
|
||||
if let controller = current as? UIViewController, let tabs = controller.tabBarController {
|
||||
return tabs
|
||||
}
|
||||
responder = current.next
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
deinit {
|
||||
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
|
||||
}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
private func configure(_ controller: UITabBarController) {
|
||||
configureGroups(controller)
|
||||
|
||||
let footer: SidebarAccountButton
|
||||
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
|
||||
footer = existing
|
||||
} else {
|
||||
footer = SidebarAccountButton()
|
||||
controller.sidebar.bottomBarView = footer
|
||||
}
|
||||
configureTabBar(controller, footer: footer)
|
||||
footer.update(name: accountName, initials: initials, imageURL: imageURL)
|
||||
footer.onPress = { [weak self] in self?.onProfilePress() }
|
||||
}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
|
||||
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
|
||||
let selected = destinations.first { $0 === controller.selectedTab }
|
||||
let contextualTab = selected ?? footer.contextualTab ?? destinations.first
|
||||
footer.contextualTab = contextualTab
|
||||
for tab in destinations {
|
||||
let placement: UITab.Placement = tab === contextualTab ? .fixed : .sidebarOnly
|
||||
if tab.preferredPlacement != placement {
|
||||
tab.preferredPlacement = placement
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
private func configureGroups(_ controller: UITabBarController) {
|
||||
// Reuse the router's UITab instances so selection and stack state stay native.
|
||||
if !controller.tabs.contains(where: { $0.identifier == "otunes.library" }) {
|
||||
let tabs = controller.tabs
|
||||
guard tabs.count >= 9 else { return }
|
||||
let selected = controller.selectedTab
|
||||
func tab(_ route: String) -> UITab? {
|
||||
tabs.first { $0.identifier == route }
|
||||
}
|
||||
let library = ["library", "(artists)", "(albums)", "(songs)", "(recent)"].compactMap(tab)
|
||||
let playlists = ["(playlists)", "(favorites)"].compactMap(tab)
|
||||
guard library.count == 5, playlists.count == 2,
|
||||
let home = tab("home"), let search = tab("search") else { return }
|
||||
let libraryGroup = UITabGroup(
|
||||
title: "Library", image: nil, identifier: "otunes.library", children: library,
|
||||
viewControllerProvider: { _ in UIViewController() })
|
||||
let playlistGroup = UITabGroup(
|
||||
title: "Playlists", image: nil, identifier: "otunes.playlists", children: playlists,
|
||||
viewControllerProvider: { _ in UIViewController() })
|
||||
// UIKit requires a managing controller to display the selected child of a group.
|
||||
let libraryNavigation = UINavigationController()
|
||||
libraryNavigation.isNavigationBarHidden = true
|
||||
libraryGroup.managingNavigationController = libraryNavigation
|
||||
let playlistNavigation = UINavigationController()
|
||||
playlistNavigation.isNavigationBarHidden = true
|
||||
playlistGroup.managingNavigationController = playlistNavigation
|
||||
libraryGroup.sidebarAppearance = .rootSection
|
||||
playlistGroup.sidebarAppearance = .rootSection
|
||||
libraryGroup.preferredPlacement = .sidebarOnly
|
||||
playlistGroup.preferredPlacement = .sidebarOnly
|
||||
home.preferredPlacement = .fixed
|
||||
search.preferredPlacement = .pinned
|
||||
let contextualTab = (library + playlists).first { $0 === selected } ?? library.first
|
||||
for tab in library + playlists {
|
||||
tab.preferredPlacement = tab === contextualTab ? .fixed : .sidebarOnly
|
||||
}
|
||||
let delegate = controller.delegate
|
||||
controller.delegate = nil
|
||||
controller.setTabs([home, search, libraryGroup, playlistGroup], animated: false)
|
||||
controller.selectedTab = selected
|
||||
controller.delegate = delegate
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
private final class SidebarAccountButton: UIView {
|
||||
var onPress: (() -> Void)?
|
||||
var contextualTab: UITab?
|
||||
private let button = UIButton(type: .system)
|
||||
private let avatar = UILabel()
|
||||
private let imageView = UIImageView()
|
||||
private var currentURL: String?
|
||||
private var imageTask: URLSessionDataTask?
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
let separator = UIView()
|
||||
separator.backgroundColor = .separator
|
||||
addSubview(separator)
|
||||
addSubview(button)
|
||||
button.addSubview(avatar)
|
||||
avatar.addSubview(imageView)
|
||||
avatar.backgroundColor = .secondarySystemFill
|
||||
avatar.textColor = .white
|
||||
avatar.font = .systemFont(ofSize: 13, weight: .semibold)
|
||||
avatar.textAlignment = .center
|
||||
avatar.layer.cornerRadius = 16
|
||||
avatar.clipsToBounds = true
|
||||
imageView.contentMode = .scaleAspectFill
|
||||
button.contentHorizontalAlignment = .leading
|
||||
button.titleLabel?.font = .systemFont(ofSize: 17, weight: .medium)
|
||||
button.setTitleColor(.white, for: .normal)
|
||||
button.addAction(UIAction { [weak self] _ in self?.onPress?() }, for: .touchUpInside)
|
||||
for view in [separator, button, avatar, imageView] {
|
||||
view.translatesAutoresizingMaskIntoConstraints = false
|
||||
}
|
||||
NSLayoutConstraint.activate([
|
||||
separator.topAnchor.constraint(equalTo: topAnchor),
|
||||
separator.leadingAnchor.constraint(equalTo: leadingAnchor),
|
||||
separator.trailingAnchor.constraint(equalTo: trailingAnchor),
|
||||
separator.heightAnchor.constraint(equalToConstant: 1 / UIScreen.main.scale),
|
||||
button.topAnchor.constraint(equalTo: topAnchor),
|
||||
button.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 20),
|
||||
button.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -16),
|
||||
button.bottomAnchor.constraint(equalTo: bottomAnchor),
|
||||
avatar.leadingAnchor.constraint(equalTo: button.leadingAnchor),
|
||||
avatar.centerYAnchor.constraint(equalTo: button.centerYAnchor),
|
||||
avatar.widthAnchor.constraint(equalToConstant: 32),
|
||||
avatar.heightAnchor.constraint(equalToConstant: 32),
|
||||
imageView.topAnchor.constraint(equalTo: avatar.topAnchor),
|
||||
imageView.bottomAnchor.constraint(equalTo: avatar.bottomAnchor),
|
||||
imageView.leadingAnchor.constraint(equalTo: avatar.leadingAnchor),
|
||||
imageView.trailingAnchor.constraint(equalTo: avatar.trailingAnchor),
|
||||
])
|
||||
button.titleEdgeInsets = UIEdgeInsets(top: 0, left: 44, bottom: 0, right: 0)
|
||||
}
|
||||
|
||||
required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
|
||||
|
||||
override func systemLayoutSizeFitting(
|
||||
_ targetSize: CGSize,
|
||||
withHorizontalFittingPriority horizontalFittingPriority: UILayoutPriority,
|
||||
verticalFittingPriority: UILayoutPriority
|
||||
) -> CGSize {
|
||||
CGSize(width: targetSize.width, height: 76)
|
||||
}
|
||||
|
||||
func update(name: String, initials: String, imageURL: String?) {
|
||||
button.setTitle(name, for: .normal)
|
||||
button.accessibilityLabel = "Open profile, " + name
|
||||
avatar.text = initials
|
||||
guard imageURL != currentURL else { return }
|
||||
currentURL = imageURL
|
||||
imageTask?.cancel()
|
||||
imageView.image = nil
|
||||
guard let imageURL, let url = URL(string: imageURL) else { return }
|
||||
imageTask = URLSession.shared.dataTask(with: url) { [weak self] data, _, _ in
|
||||
guard let data, let image = UIImage(data: data) else { return }
|
||||
DispatchQueue.main.async {
|
||||
guard let self, self.currentURL == imageURL else { return }
|
||||
self.imageView.image = image
|
||||
}
|
||||
}
|
||||
imageTask?.resume()
|
||||
}
|
||||
|
||||
deinit { imageTask?.cancel() }
|
||||
}
|
||||
@@ -30,7 +30,6 @@
|
||||
"expo-constants": "~58.0.13",
|
||||
"expo-dev-client": "~58.0.14",
|
||||
"expo-font": "~58.0.9",
|
||||
"expo-glass-effect": "~58.0.5",
|
||||
"expo-haptics": "~58.0.7",
|
||||
"expo-image": "~58.0.16",
|
||||
"expo-image-picker": "~58.0.10",
|
||||
|
||||