Compare commits
18
Commits
No files matched your search
@@ -42,3 +42,41 @@ Native sharing supplies media titles and artwork through iOS link metadata and A
|
|||||||
thumbnail, while sharing the original HTTPS URL. Receiving apps control whether
|
thumbnail, while sharing the original HTTPS URL. Receiving apps control whether
|
||||||
they display previews. If artwork cannot load, the URL is still shared. Existing
|
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.
|
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.
|
||||||
@@ -28,6 +28,12 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
...config,
|
...config,
|
||||||
|
plugins: [
|
||||||
|
...(config.plugins ?? []),
|
||||||
|
...(process.env.MAC_CATALYST === "1"
|
||||||
|
? ["./plugins/with-mac-catalyst"]
|
||||||
|
: []),
|
||||||
|
],
|
||||||
name: `${config.name}${nameSuffix}`,
|
name: `${config.name}${nameSuffix}`,
|
||||||
slug: config.slug!,
|
slug: config.slug!,
|
||||||
scheme: variant === "production" ? "otunes" : `otunes-${variant}`,
|
scheme: variant === "production" ? "otunes" : `otunes-${variant}`,
|
||||||
@@ -36,6 +42,10 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
...config.ios,
|
...config.ios,
|
||||||
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
||||||
icon: `./assets/${composer}.icon`,
|
icon: `./assets/${composer}.icon`,
|
||||||
|
infoPlist: {
|
||||||
|
...config.ios?.infoPlist,
|
||||||
|
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
|
||||||
|
},
|
||||||
},
|
},
|
||||||
android: {
|
android: {
|
||||||
...config.android,
|
...config.android,
|
||||||
|
|||||||
+25
@@ -0,0 +1,25 @@
|
|||||||
|
import { Stack } from "expo-router"
|
||||||
|
|
||||||
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
|
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
|
||||||
|
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
|
||||||
|
|
||||||
|
export default function TabletSectionLayout({ segment }: { segment: string }) {
|
||||||
|
const section = tabletSections.find((item) => item.group === segment)
|
||||||
|
const options = useStackScreenOptions()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TabletSectionContext value={section}>
|
||||||
|
<Stack
|
||||||
|
screenLayout={renderTabScreenContent}
|
||||||
|
screenOptions={({ route }) => ({
|
||||||
|
...options,
|
||||||
|
title:
|
||||||
|
route.name === "index"
|
||||||
|
? section?.title
|
||||||
|
: tabStackScreenTitles[route.name],
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
</TabletSectionContext>
|
||||||
|
)
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/album/[id]"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/artist/[id]"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/browse/albums"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/browse/artists"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/browse/playlists"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/browse/songs"
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
import { useContext } from "react"
|
||||||
|
import Albums from "../home/browse/albums"
|
||||||
|
import Artists from "../home/browse/artists"
|
||||||
|
import Songs from "../home/browse/songs"
|
||||||
|
import Playlists from "../home/browse/playlists"
|
||||||
|
import Favorites from "../home/playlist/favorites"
|
||||||
|
import RecentlyPlayed from "../home/recently-played"
|
||||||
|
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||||
|
|
||||||
|
const screens = {
|
||||||
|
albums: Albums,
|
||||||
|
artists: Artists,
|
||||||
|
songs: Songs,
|
||||||
|
playlists: Playlists,
|
||||||
|
favorites: Favorites,
|
||||||
|
recent: RecentlyPlayed,
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function TabletSectionScreen() {
|
||||||
|
const section = useContext(TabletSectionContext)
|
||||||
|
const Screen = screens[section?.name ?? "albums"]
|
||||||
|
return <Screen />
|
||||||
|
}
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/playlist/[id]"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../../library/playlist/favorites"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../library/queue"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../library/recently-added"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../library/recently-played"
|
||||||
+1
@@ -0,0 +1 @@
|
|||||||
|
export { default } from "../library/settings"
|
||||||
@@ -1,12 +1,17 @@
|
|||||||
|
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 { NavigationBar } from "expo-navigation-bar"
|
||||||
import {
|
import {
|
||||||
AndroidTabThemeProvider,
|
ScreenPaletteProvider,
|
||||||
useAndroidTabPalette,
|
useAndroidTabPalette,
|
||||||
useAndroidTabSelectedColor,
|
useAndroidTabBackgroundStyle,
|
||||||
|
useAndroidNativeTabColors,
|
||||||
} from "@/contexts/android-tab-theme"
|
} from "@/contexts/android-tab-theme"
|
||||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||||
import { NativeTabs } from "expo-router/native-tabs"
|
import { NativeTabs } from "expo-router/native-tabs"
|
||||||
import { DynamicColorIOS, Platform, View } from "react-native"
|
import { DynamicColorIOS, Platform } from "react-native"
|
||||||
import { useMemo } from "react"
|
import { useMemo } from "react"
|
||||||
|
|
||||||
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
|
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
|
||||||
@@ -41,10 +46,12 @@ function useRouterTheme() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function useNativeTabColors() {
|
function useNativeTabColors() {
|
||||||
const selectedColor = useAndroidTabSelectedColor()
|
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||||
|
const selectedColor = colors.dark.primary
|
||||||
const themeIsDark = useIsDark()
|
const themeIsDark = useIsDark()
|
||||||
const androidPalette = useAndroidTabPalette()
|
const androidPalette = colors.dark
|
||||||
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
const artworkPalette = useAndroidTabPalette()
|
||||||
|
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||||
const inactive = appleMusic.tabInactive
|
const inactive = appleMusic.tabInactive
|
||||||
|
|
||||||
const iconColor =
|
const iconColor =
|
||||||
@@ -54,14 +61,14 @@ function useNativeTabColors() {
|
|||||||
selected: appleMusic.pink,
|
selected: appleMusic.pink,
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
default: androidPalette.secondaryForeground,
|
default: androidPalette.mutedForeground,
|
||||||
selected: selectedColor,
|
selected: selectedColor,
|
||||||
}
|
}
|
||||||
|
|
||||||
const labelColor =
|
const labelColor =
|
||||||
Platform.OS === "ios"
|
Platform.OS === "ios"
|
||||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||||
: androidPalette.secondaryForeground
|
: androidPalette.mutedForeground
|
||||||
|
|
||||||
return {
|
return {
|
||||||
isDark,
|
isDark,
|
||||||
@@ -78,15 +85,20 @@ function useNativeTabColors() {
|
|||||||
blurEffect: isDark
|
blurEffect: isDark
|
||||||
? "systemChromeMaterialDark"
|
? "systemChromeMaterialDark"
|
||||||
: "systemChromeMaterialLight",
|
: "systemChromeMaterialLight",
|
||||||
backgroundColor:
|
// Reveal the shared UI-thread background beneath the native tab bar.
|
||||||
Platform.OS === "ios" ? undefined : androidPalette.background,
|
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function TabsContent() {
|
function TabsContent() {
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
|
const homeColors = useAndroidNativeTabColors()
|
||||||
|
const libraryColors = useAndroidNativeTabColors()
|
||||||
|
const searchColors = useAndroidNativeTabColors()
|
||||||
const keyboardVisible = useAndroidKeyboardVisible()
|
const keyboardVisible = useAndroidKeyboardVisible()
|
||||||
const routerTheme = useRouterTheme()
|
const routerTheme = useRouterTheme()
|
||||||
const tabColors = useNativeTabColors()
|
const tabColors = useNativeTabColors()
|
||||||
|
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||||
|
|
||||||
@@ -101,11 +113,12 @@ function TabsContent() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<ThemeProvider value={routerTheme}>
|
<ThemeProvider value={routerTheme}>
|
||||||
<View style={{ flex: 1 }}>
|
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||||
{Platform.OS === "android" ? (
|
{Platform.OS === "android" ? (
|
||||||
<NavigationBar style={tabColors.isDark ? "light" : "dark"} />
|
<NavigationBar style={tabColors.isDark ? "light" : "dark"} />
|
||||||
) : null}
|
) : null}
|
||||||
<NativeTabs
|
<NativeTabs
|
||||||
|
sidebarAdaptable
|
||||||
blurEffect={
|
blurEffect={
|
||||||
tabColors.blurEffect as
|
tabColors.blurEffect as
|
||||||
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
||||||
@@ -119,7 +132,7 @@ function TabsContent() {
|
|||||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||||
: {})}
|
: {})}
|
||||||
>
|
>
|
||||||
{Platform.OS === "ios" && showBottomAccessory ? (
|
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||||
<NativeTabs.BottomAccessory>
|
<NativeTabs.BottomAccessory>
|
||||||
<TabBottomAccessory />
|
<TabBottomAccessory />
|
||||||
</NativeTabs.BottomAccessory>
|
</NativeTabs.BottomAccessory>
|
||||||
@@ -127,6 +140,9 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="home"
|
name="home"
|
||||||
|
unstable_nativeProps={
|
||||||
|
Platform.OS === "android" ? homeColors : undefined
|
||||||
|
}
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
@@ -136,6 +152,9 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="library"
|
name="library"
|
||||||
|
unstable_nativeProps={
|
||||||
|
Platform.OS === "android" ? libraryColors : undefined
|
||||||
|
}
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
@@ -143,29 +162,84 @@ function TabsContent() {
|
|||||||
sf="music.note.square.stack.fill"
|
sf="music.note.square.stack.fill"
|
||||||
md="library_music"
|
md="library_music"
|
||||||
/>
|
/>
|
||||||
<NativeTabs.Trigger.Label>Library</NativeTabs.Trigger.Label>
|
<NativeTabs.Trigger.Label>
|
||||||
|
{tabletLayout ? "Recently Added" : "Library"}
|
||||||
|
</NativeTabs.Trigger.Label>
|
||||||
</NativeTabs.Trigger>
|
</NativeTabs.Trigger>
|
||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="search"
|
name="search"
|
||||||
|
unstable_nativeProps={
|
||||||
|
Platform.OS === "android" ? searchColors : undefined
|
||||||
|
}
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
||||||
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||||
</NativeTabs.Trigger>
|
</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>
|
</NativeTabs>
|
||||||
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
|
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
|
||||||
</View>
|
{tabletLayout ? <TabletMiniPlayer /> : null}
|
||||||
|
</Animated.View>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function TabsLayout() {
|
export default function TabsLayout() {
|
||||||
if (Platform.OS !== "android") return <TabsContent />
|
|
||||||
return (
|
return (
|
||||||
<AndroidTabThemeProvider>
|
<ScreenPaletteProvider>
|
||||||
<TabsContent />
|
<TabletPlayerLayoutProvider>
|
||||||
</AndroidTabThemeProvider>
|
<TabsContent />
|
||||||
|
</TabletPlayerLayoutProvider>
|
||||||
|
</ScreenPaletteProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
import { Platform } from "react-native"
|
|
||||||
|
|
||||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||||
@@ -13,12 +13,9 @@ export default function HomeLayout() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<Stack
|
||||||
|
screenLayout={renderTabScreenContent}
|
||||||
screenOptions={({ route }) => ({
|
screenOptions={({ route }) => ({
|
||||||
...baseOptions,
|
...baseOptions,
|
||||||
...(Platform.OS === "android" &&
|
|
||||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
|
||||||
? { animation: "none" as const }
|
|
||||||
: {}),
|
|
||||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||||
headerRight:
|
headerRight:
|
||||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||||
|
|||||||
@@ -1,17 +1,22 @@
|
|||||||
import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
import {
|
||||||
|
CollectionHero,
|
||||||
|
useCollectionHeroLayout,
|
||||||
|
} from "@/components/collection-hero"
|
||||||
|
import {
|
||||||
|
PaletteText,
|
||||||
|
PaletteIcon,
|
||||||
|
renderArtworkBackButton,
|
||||||
|
} from "@/components/palette-text"
|
||||||
|
import Animated from "react-native-reanimated"
|
||||||
|
import {
|
||||||
|
renderAndroidArtworkBackground,
|
||||||
|
useScreenPalette,
|
||||||
|
} from "@/contexts/android-tab-theme"
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
import { Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||||
import { StatusBar } from "expo-status-bar"
|
import { StatusBar } from "expo-status-bar"
|
||||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||||
import {
|
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||||
FlatList,
|
|
||||||
Platform,
|
|
||||||
Pressable,
|
|
||||||
StyleSheet,
|
|
||||||
Text,
|
|
||||||
View,
|
|
||||||
} from "react-native"
|
|
||||||
import { Ionicons } from "@expo/vector-icons"
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CollectionDivider,
|
CollectionDivider,
|
||||||
@@ -66,11 +71,13 @@ export default function AlbumScreen() {
|
|||||||
const isFocused = useIsFocused()
|
const isFocused = useIsFocused()
|
||||||
const coverUri =
|
const coverUri =
|
||||||
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
|
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
|
||||||
|
const heroLayout = useCollectionHeroLayout()
|
||||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||||
coverUri,
|
coverUri,
|
||||||
album ? album.cover != null : album === null ? false : undefined
|
album ? album.cover != null : album === null ? false : undefined
|
||||||
)
|
)
|
||||||
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
|
const { palette, onLayout, backgroundStyle } =
|
||||||
|
useScreenPalette(artworkPalette)
|
||||||
const songIds = useMemo(
|
const songIds = useMemo(
|
||||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||||
[album]
|
[album]
|
||||||
@@ -135,9 +142,25 @@ export default function AlbumScreen() {
|
|||||||
options={{
|
options={{
|
||||||
title: "",
|
title: "",
|
||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
|
...(Platform.OS === "android"
|
||||||
|
? {
|
||||||
|
headerStyle: { backgroundColor: "transparent" },
|
||||||
|
headerBackground: renderAndroidArtworkBackground,
|
||||||
|
headerBackVisible: false,
|
||||||
|
headerLeft: renderArtworkBackButton,
|
||||||
|
headerTintColor: palette.foreground,
|
||||||
|
}
|
||||||
|
: {}),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton />
|
<CollectionDetailSkeleton
|
||||||
|
zoomCoverSize={220}
|
||||||
|
onLayout={onLayout}
|
||||||
|
style={backgroundStyle}
|
||||||
|
backgroundColor={
|
||||||
|
Platform.OS === "android" ? palette.background : undefined
|
||||||
|
}
|
||||||
|
/>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -152,9 +175,9 @@ export default function AlbumScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||||
<Text style={{ color: colors.mutedForeground }}>
|
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||||
Album not found.
|
Album not found.
|
||||||
</Text>
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -175,7 +198,10 @@ export default function AlbumScreen() {
|
|||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: palette.background },
|
headerStyle: { backgroundColor: "transparent" },
|
||||||
|
headerBackground: renderAndroidArtworkBackground,
|
||||||
|
headerBackVisible: false,
|
||||||
|
headerLeft: renderArtworkBackButton,
|
||||||
statusBarStyle: palette.isDark
|
statusBarStyle: palette.isDark
|
||||||
? ("light" as const)
|
? ("light" as const)
|
||||||
: ("dark" as const),
|
: ("dark" as const),
|
||||||
@@ -197,7 +223,8 @@ export default function AlbumScreen() {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Pressable hitSlop={8}>
|
<Pressable hitSlop={8}>
|
||||||
<Ionicons
|
<PaletteIcon
|
||||||
|
tone="foreground"
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={palette.isDark ? "#fff" : "#000"}
|
color={palette.isDark ? "#fff" : "#000"}
|
||||||
@@ -207,119 +234,175 @@ export default function AlbumScreen() {
|
|||||||
),
|
),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<FlatList
|
<Animated.FlatList
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
{...longListProps}
|
{...longListProps}
|
||||||
data={listItems}
|
data={listItems}
|
||||||
keyExtractor={albumListItemKey}
|
keyExtractor={albumListItemKey}
|
||||||
style={{ flex: 1, backgroundColor: palette.background }}
|
style={[
|
||||||
|
{ flex: 1, backgroundColor: palette.background },
|
||||||
|
backgroundStyle,
|
||||||
|
]}
|
||||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||||
contentInsetAdjustmentBehavior="automatic"
|
contentInsetAdjustmentBehavior="automatic"
|
||||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<View>
|
<View>
|
||||||
<MusicEntityView kind="album" id={album.id} style={styles.hero}>
|
<MusicEntityView kind="album" id={album.id}>
|
||||||
<CoverImage
|
<CollectionHero
|
||||||
uri={coverUri}
|
artwork={
|
||||||
hasCover={album.cover != null}
|
<Link.AppleZoomTarget>
|
||||||
style={styles.cover}
|
<View collapsable={false}>
|
||||||
/>
|
<CoverImage
|
||||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
uri={coverUri}
|
||||||
{album.title}
|
hasCover={album.cover != null}
|
||||||
</Text>
|
style={[
|
||||||
<Pressable
|
styles.cover,
|
||||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
heroLayout.coverSize
|
||||||
style={styles.artistPressable}
|
? {
|
||||||
>
|
width: heroLayout.coverSize,
|
||||||
<Text style={[styles.artist, { color: palette.accentText }]}>
|
height: heroLayout.coverSize,
|
||||||
{album.artist.name}
|
}
|
||||||
</Text>
|
: undefined,
|
||||||
</Pressable>
|
]}
|
||||||
<View
|
/>
|
||||||
style={{
|
</View>
|
||||||
flexDirection: "row",
|
</Link.AppleZoomTarget>
|
||||||
alignItems: "center",
|
}
|
||||||
justifyContent: "center",
|
actions={
|
||||||
flexWrap: "wrap",
|
<View
|
||||||
gap: 8,
|
style={[
|
||||||
}}
|
styles.actions,
|
||||||
>
|
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||||
{metadata ? (
|
]}
|
||||||
<Text style={{ color: palette.secondaryForeground }}>
|
>
|
||||||
{metadata}
|
<Pressable
|
||||||
</Text>
|
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||||
) : null}
|
hitSlop={8}
|
||||||
{hasLossless ? (
|
style={[
|
||||||
<>
|
styles.iconAction,
|
||||||
{metadata ? (
|
{ backgroundColor: palette.surface },
|
||||||
<Text style={{ color: palette.secondaryForeground }}>
|
]}
|
||||||
·
|
>
|
||||||
</Text>
|
<PaletteIcon
|
||||||
) : null}
|
tone={favorited ? "accent" : "foreground"}
|
||||||
<AudioFormatBadge
|
name={favorited ? "star" : "star-outline"}
|
||||||
format="lossless"
|
size={24}
|
||||||
color={palette.secondaryForeground}
|
color={favorited ? palette.accent : palette.foreground}
|
||||||
backgroundColor={palette.background}
|
/>
|
||||||
|
</Pressable>
|
||||||
|
<Button
|
||||||
|
title="Play"
|
||||||
|
icon="play"
|
||||||
|
onPress={() => void playAlbum(album.id, songIds)}
|
||||||
|
style={styles.playButton}
|
||||||
|
tint={{
|
||||||
|
background: palette.accent,
|
||||||
|
foreground: palette.accentForeground,
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</>
|
<Pressable
|
||||||
) : null}
|
accessibilityRole="button"
|
||||||
{hasAtmos ? (
|
accessibilityLabel="Shuffle"
|
||||||
<>
|
hitSlop={8}
|
||||||
{metadata || hasLossless ? (
|
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||||
<Text style={{ color: palette.secondaryForeground }}>
|
style={[
|
||||||
·
|
styles.iconAction,
|
||||||
</Text>
|
{ backgroundColor: palette.surface },
|
||||||
) : null}
|
]}
|
||||||
<AudioFormatBadge
|
>
|
||||||
format="atmos"
|
<PaletteIcon
|
||||||
color={palette.secondaryForeground}
|
tone="foreground"
|
||||||
backgroundColor={palette.background}
|
name="shuffle"
|
||||||
/>
|
size={24}
|
||||||
</>
|
color={palette.foreground}
|
||||||
) : null}
|
/>
|
||||||
</View>
|
</Pressable>
|
||||||
<View style={styles.actions}>
|
</View>
|
||||||
<Pressable
|
}
|
||||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
>
|
||||||
hitSlop={8}
|
<PaletteText
|
||||||
|
tone="foreground"
|
||||||
style={[
|
style={[
|
||||||
styles.iconAction,
|
styles.title,
|
||||||
{ backgroundColor: palette.surface },
|
heroLayout.landscape && styles.titleLandscape,
|
||||||
|
{ color: palette.foreground },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<Ionicons
|
{album.title}
|
||||||
name={favorited ? "star" : "star-outline"}
|
</PaletteText>
|
||||||
size={24}
|
<Pressable
|
||||||
color={favorited ? palette.accent : palette.foreground}
|
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||||
/>
|
style={styles.artistPressable}
|
||||||
|
>
|
||||||
|
<PaletteText
|
||||||
|
tone="accentText"
|
||||||
|
style={[
|
||||||
|
styles.artist,
|
||||||
|
heroLayout.landscape && styles.artistLandscape,
|
||||||
|
{ color: palette.accentText },
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
{album.artist.name}
|
||||||
|
</PaletteText>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
<Button
|
<View
|
||||||
title="Play"
|
style={{
|
||||||
icon="play"
|
flexDirection: "row",
|
||||||
onPress={() => void playAlbum(album.id, songIds)}
|
alignItems: "center",
|
||||||
style={styles.playButton}
|
justifyContent: heroLayout.landscape
|
||||||
tint={{
|
? "flex-start"
|
||||||
background: palette.accent,
|
: "center",
|
||||||
foreground: palette.accentForeground,
|
flexWrap: "wrap",
|
||||||
|
gap: 8,
|
||||||
}}
|
}}
|
||||||
/>
|
|
||||||
<Pressable
|
|
||||||
accessibilityRole="button"
|
|
||||||
accessibilityLabel="Shuffle"
|
|
||||||
hitSlop={8}
|
|
||||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
|
||||||
style={[
|
|
||||||
styles.iconAction,
|
|
||||||
{ backgroundColor: palette.surface },
|
|
||||||
]}
|
|
||||||
>
|
>
|
||||||
<Ionicons
|
{metadata ? (
|
||||||
name="shuffle"
|
<PaletteText
|
||||||
size={24}
|
tone="secondaryForeground"
|
||||||
color={palette.foreground}
|
style={{ color: palette.secondaryForeground }}
|
||||||
/>
|
>
|
||||||
</Pressable>
|
{metadata}
|
||||||
</View>
|
</PaletteText>
|
||||||
|
) : null}
|
||||||
|
{hasLossless ? (
|
||||||
|
<>
|
||||||
|
{metadata ? (
|
||||||
|
<PaletteText
|
||||||
|
tone="secondaryForeground"
|
||||||
|
style={{ color: palette.secondaryForeground }}
|
||||||
|
>
|
||||||
|
·
|
||||||
|
</PaletteText>
|
||||||
|
) : null}
|
||||||
|
<AudioFormatBadge
|
||||||
|
artwork
|
||||||
|
format="lossless"
|
||||||
|
color={palette.secondaryForeground}
|
||||||
|
backgroundColor={palette.background}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
{hasAtmos ? (
|
||||||
|
<>
|
||||||
|
{metadata || hasLossless ? (
|
||||||
|
<PaletteText
|
||||||
|
tone="secondaryForeground"
|
||||||
|
style={{ color: palette.secondaryForeground }}
|
||||||
|
>
|
||||||
|
·
|
||||||
|
</PaletteText>
|
||||||
|
) : null}
|
||||||
|
<AudioFormatBadge
|
||||||
|
artwork
|
||||||
|
format="atmos"
|
||||||
|
color={palette.secondaryForeground}
|
||||||
|
backgroundColor={palette.background}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
</View>
|
||||||
|
</CollectionHero>
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
<CollectionDivider color={palette.divider} />
|
<CollectionDivider color={palette.divider} />
|
||||||
</View>
|
</View>
|
||||||
@@ -415,11 +498,12 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
style={styles.trackRow}
|
style={styles.trackRow}
|
||||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||||
>
|
>
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone="secondaryForeground"
|
||||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||||
>
|
>
|
||||||
{number}
|
{number}
|
||||||
</Text>
|
</PaletteText>
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.trackContent,
|
styles.trackContent,
|
||||||
@@ -427,24 +511,29 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<View style={styles.trackMeta}>
|
<View style={styles.trackMeta}>
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone="foreground"
|
||||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{track.title}
|
{track.title}
|
||||||
</Text>
|
</PaletteText>
|
||||||
{track.artists ? (
|
{track.artists ? (
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone="secondaryForeground"
|
||||||
style={{ color: palette.secondaryForeground }}
|
style={{ color: palette.secondaryForeground }}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{track.artists.join(", ")}
|
{track.artists.join(", ")}
|
||||||
</Text>
|
</PaletteText>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
<Text style={{ color: palette.secondaryForeground }}>
|
<PaletteText
|
||||||
|
tone="secondaryForeground"
|
||||||
|
style={{ color: palette.secondaryForeground }}
|
||||||
|
>
|
||||||
{formatDuration(track.durationSeconds)}
|
{formatDuration(track.durationSeconds)}
|
||||||
</Text>
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
@@ -454,17 +543,14 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||||
hero: {
|
|
||||||
alignItems: "center",
|
|
||||||
padding: spacing.lg,
|
|
||||||
gap: spacing.sm,
|
|
||||||
},
|
|
||||||
cover: {
|
cover: {
|
||||||
width: 220,
|
width: 220,
|
||||||
height: 220,
|
height: 220,
|
||||||
borderRadius: radius.lg,
|
borderRadius: radius.lg,
|
||||||
},
|
},
|
||||||
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
||||||
|
titleLandscape: { textAlign: "left", fontSize: 22 },
|
||||||
|
artistLandscape: { textAlign: "left", fontSize: 22, fontWeight: "400" },
|
||||||
artistPressable: { alignSelf: "stretch" },
|
artistPressable: { alignSelf: "stretch" },
|
||||||
artist: { fontSize: 16, fontWeight: "600", textAlign: "center" },
|
artist: { fontSize: 16, fontWeight: "600", textAlign: "center" },
|
||||||
actions: {
|
actions: {
|
||||||
|
|||||||
@@ -1,12 +1,26 @@
|
|||||||
|
import {
|
||||||
|
CollectionHero,
|
||||||
|
useCollectionHeroLayout,
|
||||||
|
} from "@/components/collection-hero"
|
||||||
|
import {
|
||||||
|
PaletteText,
|
||||||
|
PaletteIcon,
|
||||||
|
renderArtworkBackButton,
|
||||||
|
} from "@/components/palette-text"
|
||||||
|
import Animated from "react-native-reanimated"
|
||||||
import {
|
import {
|
||||||
PlaylistSearchBar,
|
PlaylistSearchBar,
|
||||||
usePlaylistSearch,
|
usePlaylistSearch,
|
||||||
} from "@/components/playlist-search-bar"
|
} from "@/components/playlist-search-bar"
|
||||||
import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
|
import {
|
||||||
|
renderAndroidArtworkBackground,
|
||||||
|
useScreenPalette,
|
||||||
|
} from "@/contexts/android-tab-theme"
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
import { useMutation } from "convex/react"
|
import { useMutation } from "convex/react"
|
||||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||||
import {
|
import {
|
||||||
|
Link,
|
||||||
Stack,
|
Stack,
|
||||||
useIsFocused,
|
useIsFocused,
|
||||||
useLocalSearchParams,
|
useLocalSearchParams,
|
||||||
@@ -14,16 +28,13 @@ import {
|
|||||||
} from "expo-router"
|
} from "expo-router"
|
||||||
import { StatusBar } from "expo-status-bar"
|
import { StatusBar } from "expo-status-bar"
|
||||||
import {
|
import {
|
||||||
FlatList,
|
|
||||||
Platform,
|
Platform,
|
||||||
Pressable,
|
Pressable,
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
Text,
|
|
||||||
View,
|
View,
|
||||||
type ListRenderItemInfo,
|
type ListRenderItemInfo,
|
||||||
} from "react-native"
|
} from "react-native"
|
||||||
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
||||||
import { Ionicons } from "@expo/vector-icons"
|
|
||||||
|
|
||||||
import { CollectionDivider } from "@/components/collection-list"
|
import { CollectionDivider } from "@/components/collection-list"
|
||||||
import { CoverImage } from "@/components/cover-image"
|
import { CoverImage } from "@/components/cover-image"
|
||||||
@@ -85,7 +96,8 @@ export default function PlaylistScreen() {
|
|||||||
coverUri,
|
coverUri,
|
||||||
playlist ? playlist.cover != null : playlist === null ? false : undefined
|
playlist ? playlist.cover != null : playlist === null ? false : undefined
|
||||||
)
|
)
|
||||||
const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
|
const { palette, onLayout, backgroundStyle } =
|
||||||
|
useScreenPalette(artworkPalette)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (songs) rememberSongs(songs)
|
if (songs) rememberSongs(songs)
|
||||||
@@ -98,9 +110,25 @@ export default function PlaylistScreen() {
|
|||||||
options={{
|
options={{
|
||||||
title: "",
|
title: "",
|
||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
|
...(Platform.OS === "android"
|
||||||
|
? {
|
||||||
|
headerStyle: { backgroundColor: "transparent" },
|
||||||
|
headerBackground: renderAndroidArtworkBackground,
|
||||||
|
headerBackVisible: false,
|
||||||
|
headerLeft: renderArtworkBackButton,
|
||||||
|
headerTintColor: palette.foreground,
|
||||||
|
}
|
||||||
|
: {}),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton />
|
<CollectionDetailSkeleton
|
||||||
|
zoomCoverSize={200}
|
||||||
|
onLayout={onLayout}
|
||||||
|
style={backgroundStyle}
|
||||||
|
backgroundColor={
|
||||||
|
Platform.OS === "android" ? palette.background : undefined
|
||||||
|
}
|
||||||
|
/>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -115,9 +143,9 @@ export default function PlaylistScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||||
<Text style={{ color: colors.mutedForeground }}>
|
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||||
Playlist not found.
|
Playlist not found.
|
||||||
</Text>
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -125,6 +153,7 @@ export default function PlaylistScreen() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<PlaylistContent
|
<PlaylistContent
|
||||||
|
backgroundStyle={backgroundStyle}
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
playlist={playlist}
|
playlist={playlist}
|
||||||
songs={playlist.songs}
|
songs={playlist.songs}
|
||||||
@@ -135,6 +164,7 @@ export default function PlaylistScreen() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function PlaylistContent({
|
function PlaylistContent({
|
||||||
|
backgroundStyle,
|
||||||
onLayout,
|
onLayout,
|
||||||
playlist,
|
playlist,
|
||||||
songs,
|
songs,
|
||||||
@@ -142,6 +172,7 @@ function PlaylistContent({
|
|||||||
palette,
|
palette,
|
||||||
}: {
|
}: {
|
||||||
onLayout?: () => void
|
onLayout?: () => void
|
||||||
|
backgroundStyle: ReturnType<typeof useScreenPalette>["backgroundStyle"]
|
||||||
playlist: BrowsePlaylistDetail
|
playlist: BrowsePlaylistDetail
|
||||||
songs: BrowseSong[]
|
songs: BrowseSong[]
|
||||||
coverUri: string
|
coverUri: string
|
||||||
@@ -247,7 +278,10 @@ function PlaylistContent({
|
|||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: palette.background },
|
headerStyle: { backgroundColor: "transparent" },
|
||||||
|
headerBackground: renderAndroidArtworkBackground,
|
||||||
|
headerBackVisible: false,
|
||||||
|
headerLeft: renderArtworkBackButton,
|
||||||
statusBarStyle: palette.isDark
|
statusBarStyle: palette.isDark
|
||||||
? ("light" as const)
|
? ("light" as const)
|
||||||
: ("dark" as const),
|
: ("dark" as const),
|
||||||
@@ -266,7 +300,8 @@ function PlaylistContent({
|
|||||||
onAction={handlePlaylistMenuAction}
|
onAction={handlePlaylistMenuAction}
|
||||||
>
|
>
|
||||||
<Pressable hitSlop={8}>
|
<Pressable hitSlop={8}>
|
||||||
<Ionicons
|
<PaletteIcon
|
||||||
|
tone="foreground"
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={palette.isDark ? "#fff" : "#000"}
|
color={palette.isDark ? "#fff" : "#000"}
|
||||||
@@ -322,26 +357,30 @@ function PlaylistContent({
|
|||||||
onQueryChange={onQueryChange}
|
onQueryChange={onQueryChange}
|
||||||
onSearchSubmit={onSearchSubmit}
|
onSearchSubmit={onSearchSubmit}
|
||||||
/>
|
/>
|
||||||
<FlatList
|
<Animated.FlatList
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
{...longListProps}
|
{...longListProps}
|
||||||
data={filteredSongs}
|
data={filteredSongs}
|
||||||
keyExtractor={songKey}
|
keyExtractor={songKey}
|
||||||
renderItem={renderItem}
|
renderItem={renderItem}
|
||||||
style={{ flex: 1, backgroundColor: palette.background }}
|
style={[
|
||||||
|
{ flex: 1, backgroundColor: palette.background },
|
||||||
|
backgroundStyle,
|
||||||
|
]}
|
||||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||||
contentContainerStyle={styles.listContent}
|
contentContainerStyle={styles.listContent}
|
||||||
contentInsetAdjustmentBehavior="automatic"
|
contentInsetAdjustmentBehavior="automatic"
|
||||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||||
ListEmptyComponent={
|
ListEmptyComponent={
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone="secondaryForeground"
|
||||||
style={[
|
style={[
|
||||||
styles.emptyResults,
|
styles.emptyResults,
|
||||||
{ color: palette.secondaryForeground },
|
{ color: palette.secondaryForeground },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||||
</Text>
|
</PaletteText>
|
||||||
}
|
}
|
||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<PlaylistHero
|
<PlaylistHero
|
||||||
@@ -435,15 +474,19 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
|||||||
}}
|
}}
|
||||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||||
>
|
>
|
||||||
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
<PaletteIcon
|
||||||
<Text
|
name="trash"
|
||||||
|
size={22}
|
||||||
|
color={colors.primaryForeground}
|
||||||
|
/>
|
||||||
|
<PaletteText
|
||||||
style={[
|
style={[
|
||||||
styles.removeActionText,
|
styles.removeActionText,
|
||||||
{ color: colors.primaryForeground },
|
{ color: colors.primaryForeground },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
Remove
|
Remove
|
||||||
</Text>
|
</PaletteText>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
@@ -477,61 +520,109 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
onPlay: () => void
|
onPlay: () => void
|
||||||
onShuffle: () => void
|
onShuffle: () => void
|
||||||
}) {
|
}) {
|
||||||
|
const heroLayout = useCollectionHeroLayout()
|
||||||
return (
|
return (
|
||||||
<MusicEntityView kind="playlist" id={entityId}>
|
<MusicEntityView kind="playlist" id={entityId}>
|
||||||
<View style={styles.hero}>
|
<CollectionHero
|
||||||
<CoverImage uri={coverUri} hasCover={hasCover} style={styles.cover} />
|
artwork={
|
||||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
<Link.AppleZoomTarget>
|
||||||
{title}
|
<View collapsable={false}>
|
||||||
</Text>
|
<CoverImage
|
||||||
<Text style={{ color: palette.secondaryForeground }}>{ownerName}</Text>
|
uri={coverUri}
|
||||||
<View style={styles.actions}>
|
hasCover={hasCover}
|
||||||
{showSubscribe ? (
|
style={[
|
||||||
|
styles.cover,
|
||||||
|
heroLayout.coverSize
|
||||||
|
? {
|
||||||
|
width: heroLayout.coverSize,
|
||||||
|
height: heroLayout.coverSize,
|
||||||
|
}
|
||||||
|
: undefined,
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</Link.AppleZoomTarget>
|
||||||
|
}
|
||||||
|
actions={
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.actions,
|
||||||
|
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
{showSubscribe ? (
|
||||||
|
<Pressable
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
||||||
|
accessibilityState={{ selected: isSubscribed }}
|
||||||
|
hitSlop={8}
|
||||||
|
onPress={onSubscribeToggle}
|
||||||
|
style={[
|
||||||
|
styles.iconAction,
|
||||||
|
{
|
||||||
|
backgroundColor: isSubscribed
|
||||||
|
? palette.surface
|
||||||
|
: palette.accent,
|
||||||
|
},
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<PaletteIcon
|
||||||
|
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||||
|
name={isSubscribed ? "checkmark" : "add"}
|
||||||
|
size={24}
|
||||||
|
color={
|
||||||
|
isSubscribed ? palette.foreground : palette.accentForeground
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
) : null}
|
||||||
|
<Button
|
||||||
|
title="Play"
|
||||||
|
icon="play"
|
||||||
|
onPress={onPlay}
|
||||||
|
style={styles.playButton}
|
||||||
|
tint={{
|
||||||
|
background: palette.accent,
|
||||||
|
foreground: palette.accentForeground,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
<Pressable
|
<Pressable
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
accessibilityLabel="Shuffle"
|
||||||
accessibilityState={{ selected: isSubscribed }}
|
|
||||||
hitSlop={8}
|
hitSlop={8}
|
||||||
onPress={onSubscribeToggle}
|
onPress={onShuffle}
|
||||||
style={[
|
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||||
styles.iconAction,
|
|
||||||
{
|
|
||||||
backgroundColor: isSubscribed
|
|
||||||
? palette.surface
|
|
||||||
: palette.accent,
|
|
||||||
},
|
|
||||||
]}
|
|
||||||
>
|
>
|
||||||
<Ionicons
|
<PaletteIcon
|
||||||
name={isSubscribed ? "checkmark" : "add"}
|
tone="foreground"
|
||||||
|
name="shuffle"
|
||||||
size={24}
|
size={24}
|
||||||
color={
|
color={palette.foreground}
|
||||||
isSubscribed ? palette.foreground : palette.accentForeground
|
|
||||||
}
|
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
) : null}
|
</View>
|
||||||
<Button
|
}
|
||||||
title="Play"
|
>
|
||||||
icon="play"
|
<PaletteText
|
||||||
onPress={onPlay}
|
tone="foreground"
|
||||||
style={styles.playButton}
|
style={[
|
||||||
tint={{
|
styles.title,
|
||||||
background: palette.accent,
|
heroLayout.landscape && styles.titleLandscape,
|
||||||
foreground: palette.accentForeground,
|
{ color: palette.foreground },
|
||||||
}}
|
]}
|
||||||
/>
|
>
|
||||||
<Pressable
|
{title}
|
||||||
accessibilityRole="button"
|
</PaletteText>
|
||||||
accessibilityLabel="Shuffle"
|
<PaletteText
|
||||||
hitSlop={8}
|
tone="foreground"
|
||||||
onPress={onShuffle}
|
style={{
|
||||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
color: palette.foreground,
|
||||||
>
|
fontSize: heroLayout.landscape ? 22 : 16,
|
||||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
}}
|
||||||
</Pressable>
|
>
|
||||||
</View>
|
{ownerName}
|
||||||
</View>
|
</PaletteText>
|
||||||
|
</CollectionHero>
|
||||||
<CollectionDivider color={palette.divider} />
|
<CollectionDivider color={palette.divider} />
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
)
|
)
|
||||||
@@ -541,13 +632,13 @@ const styles = StyleSheet.create({
|
|||||||
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
||||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||||
listContent: { paddingBottom: contentBottomInset },
|
listContent: { paddingBottom: contentBottomInset },
|
||||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
|
||||||
cover: {
|
cover: {
|
||||||
width: 200,
|
width: 200,
|
||||||
height: 200,
|
height: 200,
|
||||||
borderRadius: radius.lg,
|
borderRadius: radius.lg,
|
||||||
},
|
},
|
||||||
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
||||||
|
titleLandscape: { textAlign: "left", fontSize: 22 },
|
||||||
actions: {
|
actions: {
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
|
|||||||
@@ -20,6 +20,11 @@ import { contentBottomInset } from "@/components/player"
|
|||||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||||
import { useServerConfig } from "@/contexts/server-config"
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
|
import {
|
||||||
|
setArtworkColorsEnabled,
|
||||||
|
useArtworkColorsEnabled,
|
||||||
|
useArtworkColorPreferenceLoaded,
|
||||||
|
} from "@/lib/artwork-color-preference"
|
||||||
import { initialsFromName } from "@/lib/format"
|
import { initialsFromName } from "@/lib/format"
|
||||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||||
import { changeServer, signOut } from "@/lib/session"
|
import { changeServer, signOut } from "@/lib/session"
|
||||||
@@ -143,7 +148,12 @@ export default function SettingsScreen() {
|
|||||||
})}
|
})}
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
{section === "profile" ? <ProfileSection user={user} /> : null}
|
{section === "profile" ? (
|
||||||
|
<>
|
||||||
|
<AppearanceSection />
|
||||||
|
<ProfileSection user={user} />
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
{section === "quality" ? <QualitySection user={user} /> : null}
|
{section === "quality" ? <QualitySection user={user} /> : null}
|
||||||
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
||||||
{section === "users" && isAdmin && allUsers ? (
|
{section === "users" && isAdmin && allUsers ? (
|
||||||
@@ -160,6 +170,33 @@ export default function SettingsScreen() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function AppearanceSection() {
|
||||||
|
const enabled = useArtworkColorsEnabled()
|
||||||
|
const loaded = useArtworkColorPreferenceLoaded()
|
||||||
|
const [saving, setSaving] = useState(false)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SettingsCard title="Appearance">
|
||||||
|
<SwitchRow
|
||||||
|
title="New artwork colors"
|
||||||
|
subtitle="Use the new color algorithm on this device."
|
||||||
|
value={enabled}
|
||||||
|
disabled={!loaded || saving}
|
||||||
|
onValueChange={async (checked) => {
|
||||||
|
setSaving(true)
|
||||||
|
try {
|
||||||
|
await setArtworkColorsEnabled(checked)
|
||||||
|
} catch {
|
||||||
|
showError("Could not save artwork colors preference.")
|
||||||
|
} finally {
|
||||||
|
setSaving(false)
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</SettingsCard>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
function ProfileSection({ user }: { user: CurrentUser }) {
|
function ProfileSection({ user }: { user: CurrentUser }) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const updateName = useMutation(api.users.updateProfileName)
|
const updateName = useMutation(api.users.updateProfileName)
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
|
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||||
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
import { Platform } from "react-native"
|
|
||||||
|
|
||||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||||
@@ -9,17 +10,17 @@ export const unstable_settings = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function LibraryLayout() {
|
export default function LibraryLayout() {
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
const baseOptions = useStackScreenOptions({ title: "Library" })
|
const baseOptions = useStackScreenOptions({ title: "Library" })
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<Stack
|
||||||
|
screenLayout={renderTabScreenContent}
|
||||||
screenOptions={({ route }) => ({
|
screenOptions={({ route }) => ({
|
||||||
...baseOptions,
|
...baseOptions,
|
||||||
...(Platform.OS === "android" &&
|
title:
|
||||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
tabStackScreenTitles[route.name] ??
|
||||||
? { animation: "none" as const }
|
(tabletLayout ? "Recently Added" : "Library"),
|
||||||
: {}),
|
|
||||||
title: tabStackScreenTitles[route.name] ?? "Library",
|
|
||||||
headerRight:
|
headerRight:
|
||||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||||
unstable_headerRightItems:
|
unstable_headerRightItems:
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||||
import { useMemo } from "react"
|
import { useMemo } from "react"
|
||||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
import { SymbolView } from "expo-symbols"
|
import { SymbolView } from "expo-symbols"
|
||||||
@@ -12,14 +13,22 @@ import { useAppNavigation } from "@/lib/app-navigation"
|
|||||||
import { api } from "@otunes/convex/_generated/api"
|
import { api } from "@otunes/convex/_generated/api"
|
||||||
import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
|
import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
const PAGE_SIZE = 16
|
const PAGE_SIZE = 24
|
||||||
|
|
||||||
const links = [
|
const links = [
|
||||||
{ title: "Playlists", href: "/browse/playlists", icon: "music.note.list" as const },
|
{
|
||||||
|
title: "Playlists",
|
||||||
|
href: "/browse/playlists",
|
||||||
|
icon: "music.note.list" as const,
|
||||||
|
},
|
||||||
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
|
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
|
||||||
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
|
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
|
||||||
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
|
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
|
||||||
{ title: "Recently Played", href: "/recently-played", icon: "clock" as const },
|
{
|
||||||
|
title: "Recently Played",
|
||||||
|
href: "/recently-played",
|
||||||
|
icon: "clock" as const,
|
||||||
|
},
|
||||||
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
|
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -43,11 +52,19 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
|||||||
sparkles: "sparkles",
|
sparkles: "sparkles",
|
||||||
star: "star",
|
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() {
|
export default function LibraryScreen() {
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
const { push } = useAppNavigation()
|
const { push } = useAppNavigation()
|
||||||
|
const isTablet = tabletLayout
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
|
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
|
||||||
api.library.browseRecentlyAddedPaginated,
|
api.library.browseRecentlyAddedPaginated,
|
||||||
@@ -58,31 +75,46 @@ export default function LibraryScreen() {
|
|||||||
const listHeader = useMemo(
|
const listHeader = useMemo(
|
||||||
() => (
|
() => (
|
||||||
<View>
|
<View>
|
||||||
{links.map((link) => (
|
{!isTablet ? (
|
||||||
<Pressable
|
<>
|
||||||
key={link.href}
|
{links.map((link) => (
|
||||||
style={styles.row}
|
<Pressable
|
||||||
onPress={() => push(link.href)}
|
key={link.href}
|
||||||
>
|
style={styles.row}
|
||||||
<LibraryIcon name={link.icon} />
|
onPress={() => push(link.href)}
|
||||||
<View style={[styles.rowContent, { borderBottomColor: colors.border }]}>
|
>
|
||||||
<Text style={[styles.rowTitle, { color: colors.foreground }]}>{link.title}</Text>
|
<LibraryIcon name={link.icon} />
|
||||||
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
|
<View
|
||||||
</View>
|
style={[
|
||||||
</Pressable>
|
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
|
<Pressable
|
||||||
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
||||||
onPress={() => push("/recently-added")}
|
onPress={() => push("/recently-added")}
|
||||||
>
|
>
|
||||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||||
Recently Added
|
Recently Added
|
||||||
</Text>
|
</Text>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
),
|
),
|
||||||
[colors.border, colors.foreground, colors.mutedForeground, push]
|
[colors.border, colors.foreground, colors.mutedForeground, push, isTablet]
|
||||||
)
|
)
|
||||||
|
|
||||||
if (status === "LoadingFirstPage" && !isCached) {
|
if (status === "LoadingFirstPage" && !isCached) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||||
import { Stack } from "expo-router"
|
import { Stack } from "expo-router"
|
||||||
import { Platform } from "react-native"
|
|
||||||
|
|
||||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||||
@@ -13,12 +13,9 @@ export default function SearchLayout() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<Stack
|
||||||
|
screenLayout={renderTabScreenContent}
|
||||||
screenOptions={({ route }) => ({
|
screenOptions={({ route }) => ({
|
||||||
...baseOptions,
|
...baseOptions,
|
||||||
...(Platform.OS === "android" &&
|
|
||||||
(route.name === "album/[id]" || route.name === "playlist/[id]")
|
|
||||||
? { animation: "none" as const }
|
|
||||||
: {}),
|
|
||||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||||
headerRight:
|
headerRight:
|
||||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||||
|
import { TabletNowPlaying } from "@/components/tablet-now-playing"
|
||||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||||
import { NavigationBar } from "expo-navigation-bar"
|
import { NavigationBar } from "expo-navigation-bar"
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
import { Stack, useRouter } from "expo-router"
|
import { Stack, useRouter, useLocalSearchParams } from "expo-router"
|
||||||
import * as Haptics from "expo-haptics"
|
import * as Haptics from "expo-haptics"
|
||||||
import { StatusBar } from "expo-status-bar"
|
import { StatusBar } from "expo-status-bar"
|
||||||
import { useEffect, useRef, useState } from "react"
|
import { useEffect, useRef, useState } from "react"
|
||||||
@@ -72,10 +74,15 @@ const DISMISS_VELOCITY = 900
|
|||||||
const DISMISS_CORNER_RADIUS = 48
|
const DISMISS_CORNER_RADIUS = 48
|
||||||
|
|
||||||
export default function PlayerScreen() {
|
export default function PlayerScreen() {
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const hadSongRef = useRef(false)
|
const hadSongRef = useRef(false)
|
||||||
const insets = useSafeAreaInsets()
|
const insets = useSafeAreaInsets()
|
||||||
const { width: windowWidth, height: windowHeight } = useWindowDimensions()
|
const { width: windowWidth, height: windowHeight } = useWindowDimensions()
|
||||||
|
// Unfolded iPhones retain the phone idiom but have room for the iPad player.
|
||||||
|
const isTablet =
|
||||||
|
tabletLayout ||
|
||||||
|
(Platform.OS === "ios" && Math.min(windowWidth, windowHeight) >= 600)
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const {
|
const {
|
||||||
currentSong,
|
currentSong,
|
||||||
@@ -91,7 +98,8 @@ export default function PlayerScreen() {
|
|||||||
skipPrevious,
|
skipPrevious,
|
||||||
} = usePlayback()
|
} = usePlayback()
|
||||||
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||||
const [showQueue, setShowQueue] = useState(false)
|
const { queue } = useLocalSearchParams<{ queue?: string }>()
|
||||||
|
const [showQueue, setShowQueue] = useState(queue === "1")
|
||||||
const [isDismissing, setIsDismissing] = useState(false)
|
const [isDismissing, setIsDismissing] = useState(false)
|
||||||
const [stageHeight, setStageHeight] = useState(0)
|
const [stageHeight, setStageHeight] = useState(0)
|
||||||
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||||
@@ -218,6 +226,22 @@ export default function PlayerScreen() {
|
|||||||
setShowQueue((value) => !value)
|
setShowQueue((value) => !value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isTablet) {
|
||||||
|
return (
|
||||||
|
<MusicEntityView kind="song" id={currentSong.id} style={{ flex: 1 }}>
|
||||||
|
<TabletNowPlaying
|
||||||
|
colors={colors}
|
||||||
|
backgroundStyle={backgroundStyle}
|
||||||
|
dismissStyle={dismissStyle}
|
||||||
|
dismissGesture={dismissGesture}
|
||||||
|
showQueue={showQueue}
|
||||||
|
toggleQueue={toggleQueue}
|
||||||
|
metadata={<SongMeta song={currentSong} colors={colors} />}
|
||||||
|
/>
|
||||||
|
</MusicEntityView>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||||
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
import { loadServerConfig, parseServerHostname } from "@/lib/server-config"
|
import { loadServerConfig, parseServerHostname } from "@/lib/server-config"
|
||||||
import { secureGetItem } from "@/lib/auth-storage"
|
import { secureGetItem } from "@/lib/auth-storage"
|
||||||
import { rememberIncomingMediaLink } from "@/lib/incoming-media-link"
|
import {
|
||||||
|
isMediaRoute,
|
||||||
|
rememberIncomingMediaLink,
|
||||||
|
} from "@/lib/incoming-media-link"
|
||||||
import { showError } from "@/lib/toast"
|
import { showError } from "@/lib/toast"
|
||||||
|
|
||||||
export async function redirectSystemPath({
|
export async function redirectSystemPath({
|
||||||
@@ -28,7 +31,7 @@ export async function redirectSystemPath({
|
|||||||
target.username ||
|
target.username ||
|
||||||
target.password ||
|
target.password ||
|
||||||
new URL(server.serverUrl).origin !== target.origin ||
|
new URL(server.serverUrl).origin !== target.origin ||
|
||||||
!/^\/(album|artist|playlist)\/[a-zA-Z0-9_-]+$/.test(target.pathname)
|
!isMediaRoute(target.pathname)
|
||||||
) {
|
) {
|
||||||
return "/"
|
return "/"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import { Toaster } from "@/components/ui/toaster"
|
|||||||
import { ConvexAppProvider } from "@/contexts/convex-app"
|
import { ConvexAppProvider } from "@/contexts/convex-app"
|
||||||
import { ServerConfigProvider, useServerConfig } from "@/contexts/server-config"
|
import { ServerConfigProvider, useServerConfig } from "@/contexts/server-config"
|
||||||
|
|
||||||
|
import { HandoffBridge } from "@/components/handoff-bridge"
|
||||||
|
|
||||||
const navigationTheme = {
|
const navigationTheme = {
|
||||||
...DarkTheme,
|
...DarkTheme,
|
||||||
colors: { ...DarkTheme.colors, background: "#000", card: "#000" },
|
colors: { ...DarkTheme.colors, background: "#000", card: "#000" },
|
||||||
@@ -56,6 +58,7 @@ export default function RootLayout() {
|
|||||||
<ConvexAppProvider>
|
<ConvexAppProvider>
|
||||||
<StatusBar style={isDark ? "light" : "dark"} />
|
<StatusBar style={isDark ? "light" : "dark"} />
|
||||||
<ThemeProvider value={navigationTheme}>
|
<ThemeProvider value={navigationTheme}>
|
||||||
|
<HandoffBridge />
|
||||||
<RootNavigator />
|
<RootNavigator />
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
<Toaster />
|
<Toaster />
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { StyleSheet, Text, View } from "react-native"
|
import { PaletteText } from "@/components/palette-text"
|
||||||
|
import { StyleSheet, View } from "react-native"
|
||||||
import Svg, { G, Path } from "react-native-svg"
|
import Svg, { G, Path } from "react-native-svg"
|
||||||
|
|
||||||
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
|
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
|
||||||
@@ -74,10 +75,12 @@ function LosslessMark({
|
|||||||
|
|
||||||
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
||||||
export function AudioFormatBadge({
|
export function AudioFormatBadge({
|
||||||
|
artwork = false,
|
||||||
format,
|
format,
|
||||||
color,
|
color,
|
||||||
backgroundColor,
|
backgroundColor,
|
||||||
}: {
|
}: {
|
||||||
|
artwork?: boolean
|
||||||
format: PlaybackFormat
|
format: PlaybackFormat
|
||||||
color: string
|
color: string
|
||||||
backgroundColor: string
|
backgroundColor: string
|
||||||
@@ -90,7 +93,12 @@ export function AudioFormatBadge({
|
|||||||
) : (
|
) : (
|
||||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||||
)}
|
)}
|
||||||
<Text style={[styles.label, { color }]}>{label}</Text>
|
<PaletteText
|
||||||
|
tone={artwork ? "secondaryForeground" : undefined}
|
||||||
|
style={[styles.label, { color }]}
|
||||||
|
>
|
||||||
|
{label}
|
||||||
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||||
|
import type { ReactNode } from "react"
|
||||||
|
import { Platform, StyleSheet, useWindowDimensions, View } from "react-native"
|
||||||
|
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||||
|
|
||||||
|
export function useCollectionHeroLayout() {
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
|
const { width, height } = useWindowDimensions()
|
||||||
|
const insets = useSafeAreaInsets()
|
||||||
|
const paneWidth = width - insets.left - insets.right
|
||||||
|
const isTablet =
|
||||||
|
Platform.OS === "ios" ? tabletLayout : Math.min(width, height) >= 600
|
||||||
|
const landscape = isTablet && width > height && paneWidth >= 640
|
||||||
|
return {
|
||||||
|
landscape,
|
||||||
|
coverSize: landscape
|
||||||
|
? Math.min(300, Math.max(180, (paneWidth - 100) * 0.4))
|
||||||
|
: undefined,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tablet artwork and controls share a bottom edge, with metadata above the controls. */
|
||||||
|
export function CollectionHero({
|
||||||
|
artwork,
|
||||||
|
actions,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
artwork: ReactNode
|
||||||
|
actions: ReactNode
|
||||||
|
children: ReactNode
|
||||||
|
}) {
|
||||||
|
const { landscape } = useCollectionHeroLayout()
|
||||||
|
return (
|
||||||
|
<View style={[styles.hero, landscape && styles.landscape]}>
|
||||||
|
{artwork}
|
||||||
|
<View style={[styles.details, landscape && styles.landscapeDetails]}>
|
||||||
|
<View style={[styles.metadata, landscape && styles.landscapeMetadata]}>
|
||||||
|
{children}
|
||||||
|
</View>
|
||||||
|
{actions}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
hero: { padding: 16, gap: 8, alignItems: "center" },
|
||||||
|
landscape: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "stretch",
|
||||||
|
paddingHorizontal: 32,
|
||||||
|
paddingTop: 34,
|
||||||
|
paddingBottom: 40,
|
||||||
|
gap: 34,
|
||||||
|
},
|
||||||
|
details: { alignItems: "center", gap: 8, alignSelf: "stretch" },
|
||||||
|
landscapeDetails: {
|
||||||
|
flex: 1,
|
||||||
|
minWidth: 0,
|
||||||
|
paddingTop: 64,
|
||||||
|
justifyContent: "space-between",
|
||||||
|
alignItems: "flex-start",
|
||||||
|
},
|
||||||
|
metadata: { gap: 8, alignSelf: "stretch", alignItems: "center" },
|
||||||
|
landscapeMetadata: { alignItems: "flex-start", gap: 4 },
|
||||||
|
})
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
|
import { PaletteText } from "@/components/palette-text"
|
||||||
import { memo } from "react"
|
import { memo } from "react"
|
||||||
import { StyleSheet, Text, View } from "react-native"
|
import { StyleSheet, View } from "react-native"
|
||||||
|
|
||||||
import { useThemeColors } from "@/lib/theme"
|
import { useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
@@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({
|
|||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
return (
|
return (
|
||||||
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
<PaletteText
|
||||||
|
tone={color ? "foreground" : undefined}
|
||||||
|
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
||||||
|
>
|
||||||
{label}
|
{label}
|
||||||
</Text>
|
</PaletteText>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Ionicons } from "@expo/vector-icons"
|
|||||||
import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
|
import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
|
||||||
import { memo, useMemo } from "react"
|
import { memo, useMemo } from "react"
|
||||||
import {
|
import {
|
||||||
|
Platform,
|
||||||
PixelRatio,
|
PixelRatio,
|
||||||
StyleProp,
|
StyleProp,
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
@@ -9,6 +10,8 @@ import {
|
|||||||
type ViewStyle,
|
type ViewStyle,
|
||||||
} from "react-native"
|
} from "react-native"
|
||||||
|
|
||||||
|
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||||
|
|
||||||
import { useThemeColors } from "@/lib/theme"
|
import { useThemeColors } from "@/lib/theme"
|
||||||
import {
|
import {
|
||||||
coverImageSizes,
|
coverImageSizes,
|
||||||
@@ -106,6 +109,9 @@ export const CoverImage = memo(function CoverImage({
|
|||||||
contentFit={contentFit}
|
contentFit={contentFit}
|
||||||
transition={150}
|
transition={150}
|
||||||
blurRadius={blurRadius}
|
blurRadius={blurRadius}
|
||||||
|
onLoad={
|
||||||
|
Platform.OS === "android" ? () => prefetchCoverPalette(uri) : undefined
|
||||||
|
}
|
||||||
cachePolicy="memory-disk"
|
cachePolicy="memory-disk"
|
||||||
recyclingKey={sourceUri}
|
recyclingKey={sourceUri}
|
||||||
enforceEarlyResizing
|
enforceEarlyResizing
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
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,30 +3,40 @@ import {
|
|||||||
KeyboardAvoidingView,
|
KeyboardAvoidingView,
|
||||||
Platform,
|
Platform,
|
||||||
ScrollView,
|
ScrollView,
|
||||||
|
StyleSheet,
|
||||||
type StyleProp,
|
type StyleProp,
|
||||||
type ViewStyle,
|
type ViewStyle,
|
||||||
} from "react-native"
|
} from "react-native"
|
||||||
|
|
||||||
/** Android resizes for the IME; scrolling keeps tall forms and actions reachable. */
|
/** Center account forms on wide windows; scroll when the keyboard reduces height. */
|
||||||
export function KeyboardForm({
|
export function KeyboardForm({
|
||||||
children,
|
children,
|
||||||
style,
|
style,
|
||||||
}: PropsWithChildren<{ style?: StyleProp<ViewStyle> }>) {
|
}: PropsWithChildren<{ style?: StyleProp<ViewStyle> }>) {
|
||||||
if (Platform.OS === "android") {
|
return (
|
||||||
return (
|
<KeyboardAvoidingView
|
||||||
|
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||||
|
style={styles.fill}
|
||||||
|
>
|
||||||
<ScrollView
|
<ScrollView
|
||||||
style={{ flex: 1 }}
|
style={styles.fill}
|
||||||
contentContainerStyle={[style, { flex: undefined, flexGrow: 1 }]}
|
contentContainerStyle={[style, styles.content]}
|
||||||
keyboardShouldPersistTaps="handled"
|
keyboardShouldPersistTaps="handled"
|
||||||
keyboardDismissMode="on-drag"
|
keyboardDismissMode={Platform.OS === "ios" ? "interactive" : "on-drag"}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
)
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<KeyboardAvoidingView behavior="padding" style={style}>
|
|
||||||
{children}
|
|
||||||
</KeyboardAvoidingView>
|
</KeyboardAvoidingView>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
fill: { flex: 1 },
|
||||||
|
content: {
|
||||||
|
flex: undefined,
|
||||||
|
flexGrow: 1,
|
||||||
|
width: "100%",
|
||||||
|
maxWidth: 528,
|
||||||
|
alignSelf: "center",
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -1,4 +1,10 @@
|
|||||||
|
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||||
|
import Animated from "react-native-reanimated"
|
||||||
|
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||||
|
import { TabletMediaGrid } from "@/components/tablet-media-grid"
|
||||||
|
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
|
import { Link } from "expo-router"
|
||||||
import { Ionicons } from "@expo/vector-icons"
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
import { memo, useCallback, type ReactElement } from "react"
|
import { memo, useCallback, type ReactElement } from "react"
|
||||||
import {
|
import {
|
||||||
@@ -24,13 +30,7 @@ import type {
|
|||||||
PlaylistSummary,
|
PlaylistSummary,
|
||||||
} from "@otunes/convex/types"
|
} from "@otunes/convex/types"
|
||||||
import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||||
import {
|
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||||
carouselCardWidth,
|
|
||||||
radius,
|
|
||||||
spacing,
|
|
||||||
useThemeColors,
|
|
||||||
useTwoColumnCardWidth,
|
|
||||||
} from "@/lib/theme"
|
|
||||||
|
|
||||||
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
|
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
|
||||||
|
|
||||||
@@ -40,39 +40,56 @@ const MAX_NON_VIRTUAL_CAROUSEL_ITEMS = 10
|
|||||||
export const AlbumCard = memo(function AlbumCard({
|
export const AlbumCard = memo(function AlbumCard({
|
||||||
album,
|
album,
|
||||||
width = carouselCardWidth,
|
width = carouselCardWidth,
|
||||||
|
fluid = false,
|
||||||
}: {
|
}: {
|
||||||
album: BrowseAlbum
|
album: BrowseAlbum
|
||||||
width?: number
|
width?: number
|
||||||
|
fluid?: boolean
|
||||||
}) {
|
}) {
|
||||||
const { push } = useAppNavigation()
|
const { href } = useAppNavigation()
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||||
const onPress = useCallback(() => {
|
|
||||||
push(`/album/${album.id}`)
|
|
||||||
}, [push, album.id])
|
|
||||||
if (!config) return null
|
if (!config) return null
|
||||||
|
|
||||||
const card = (
|
const card = (
|
||||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
<Link href={href(`/album/${album.id}`)} push asChild>
|
||||||
<CoverImage
|
<Pressable
|
||||||
uri={albumCoverUrl(config.serverUrl, album.id)}
|
style={StyleSheet.flatten([
|
||||||
hasCover={album.cover != null}
|
styles.card,
|
||||||
style={{ width, height: width, borderRadius: radius.md }}
|
{ width: fluid ? "100%" : width },
|
||||||
/>
|
])}
|
||||||
<Text
|
|
||||||
style={[styles.title, { color: colors.foreground }]}
|
|
||||||
numberOfLines={2}
|
|
||||||
>
|
>
|
||||||
{album.title}
|
<Link.AppleZoom>
|
||||||
</Text>
|
<View collapsable={false}>
|
||||||
<Text
|
<CoverImage
|
||||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
uri={albumCoverUrl(config.serverUrl, album.id)}
|
||||||
numberOfLines={1}
|
hasCover={album.cover != null}
|
||||||
>
|
style={
|
||||||
{album.artist.name}
|
fluid
|
||||||
</Text>
|
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||||
</Pressable>
|
: { width, height: width, borderRadius: radius.md }
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</Link.AppleZoom>
|
||||||
|
<MusicEntityView kind="album" id={album.id} style={styles.card}>
|
||||||
|
<Text
|
||||||
|
style={[styles.title, { color: colors.foreground }]}
|
||||||
|
numberOfLines={tabletLayout ? 1 : 2}
|
||||||
|
>
|
||||||
|
{album.title}
|
||||||
|
</Text>
|
||||||
|
<Text
|
||||||
|
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||||
|
numberOfLines={1}
|
||||||
|
>
|
||||||
|
{album.artist.name}
|
||||||
|
</Text>
|
||||||
|
</MusicEntityView>
|
||||||
|
</Pressable>
|
||||||
|
</Link>
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -83,9 +100,7 @@ export const AlbumCard = memo(function AlbumCard({
|
|||||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||||
onAction={(action) => void handleAlbumAction(album, action)}
|
onAction={(action) => void handleAlbumAction(album, action)}
|
||||||
>
|
>
|
||||||
<MusicEntityView kind="album" id={album.id}>
|
{card}
|
||||||
{card}
|
|
||||||
</MusicEntityView>
|
|
||||||
</MediaContextMenu>
|
</MediaContextMenu>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -93,11 +108,14 @@ export const AlbumCard = memo(function AlbumCard({
|
|||||||
export const ArtistCard = memo(function ArtistCard({
|
export const ArtistCard = memo(function ArtistCard({
|
||||||
artist,
|
artist,
|
||||||
width = carouselCardWidth,
|
width = carouselCardWidth,
|
||||||
|
fluid = false,
|
||||||
}: {
|
}: {
|
||||||
artist: BrowseArtist
|
artist: BrowseArtist
|
||||||
width?: number
|
width?: number
|
||||||
|
fluid?: boolean
|
||||||
}) {
|
}) {
|
||||||
const { push } = useAppNavigation()
|
const { push } = useAppNavigation()
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { handleArtistAction, isArtistFavorite } = useMediaMenuActions()
|
const { handleArtistAction, isArtistFavorite } = useMediaMenuActions()
|
||||||
@@ -107,15 +125,22 @@ export const ArtistCard = memo(function ArtistCard({
|
|||||||
if (!config) return null
|
if (!config) return null
|
||||||
|
|
||||||
const card = (
|
const card = (
|
||||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
<Pressable
|
||||||
|
style={[styles.card, { width: fluid ? "100%" : width }]}
|
||||||
|
onPress={onPress}
|
||||||
|
>
|
||||||
<CoverImage
|
<CoverImage
|
||||||
uri={artistCoverUrl(config.serverUrl, artist.id)}
|
uri={artistCoverUrl(config.serverUrl, artist.id)}
|
||||||
hasCover={artist.photo != null}
|
hasCover={artist.photo != null}
|
||||||
style={{ width, height: width, borderRadius: width / 2 }}
|
style={
|
||||||
|
fluid
|
||||||
|
? { width: "100%", aspectRatio: 1, borderRadius: 9999 }
|
||||||
|
: { width, height: width, borderRadius: width / 2 }
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
<Text
|
<Text
|
||||||
style={[styles.title, { color: colors.foreground }]}
|
style={[styles.title, { color: colors.foreground }]}
|
||||||
numberOfLines={2}
|
numberOfLines={tabletLayout ? 1 : 2}
|
||||||
>
|
>
|
||||||
{artist.name}
|
{artist.name}
|
||||||
</Text>
|
</Text>
|
||||||
@@ -138,39 +163,56 @@ export const ArtistCard = memo(function ArtistCard({
|
|||||||
export const PlaylistCard = memo(function PlaylistCard({
|
export const PlaylistCard = memo(function PlaylistCard({
|
||||||
playlist,
|
playlist,
|
||||||
width = carouselCardWidth,
|
width = carouselCardWidth,
|
||||||
|
fluid = false,
|
||||||
}: {
|
}: {
|
||||||
playlist: PlaylistSummary
|
playlist: PlaylistSummary
|
||||||
width?: number
|
width?: number
|
||||||
|
fluid?: boolean
|
||||||
}) {
|
}) {
|
||||||
const { push } = useAppNavigation()
|
const { href } = useAppNavigation()
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
const { config } = useServerConfig()
|
const { config } = useServerConfig()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const { handlePlaylistAction } = useMediaMenuActions()
|
const { handlePlaylistAction } = useMediaMenuActions()
|
||||||
const onPress = useCallback(() => {
|
|
||||||
push(`/playlist/${playlist.id}`)
|
|
||||||
}, [push, playlist.id])
|
|
||||||
if (!config) return null
|
if (!config) return null
|
||||||
|
|
||||||
const card = (
|
const card = (
|
||||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
<Link href={href(`/playlist/${playlist.id}`)} push asChild>
|
||||||
<CoverImage
|
<Pressable
|
||||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
style={StyleSheet.flatten([
|
||||||
hasCover={playlist.cover != null}
|
styles.card,
|
||||||
style={{ width, height: width, borderRadius: radius.md }}
|
{ width: fluid ? "100%" : width },
|
||||||
/>
|
])}
|
||||||
<Text
|
|
||||||
style={[styles.title, { color: colors.foreground }]}
|
|
||||||
numberOfLines={2}
|
|
||||||
>
|
>
|
||||||
{playlist.title}
|
<Link.AppleZoom>
|
||||||
</Text>
|
<View collapsable={false}>
|
||||||
<Text
|
<CoverImage
|
||||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||||
numberOfLines={1}
|
hasCover={playlist.cover != null}
|
||||||
>
|
style={
|
||||||
{playlist.owner}
|
fluid
|
||||||
</Text>
|
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||||
</Pressable>
|
: { width, height: width, borderRadius: radius.md }
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</Link.AppleZoom>
|
||||||
|
<MusicEntityView kind="playlist" id={playlist.id} style={styles.card}>
|
||||||
|
<Text
|
||||||
|
style={[styles.title, { color: colors.foreground }]}
|
||||||
|
numberOfLines={tabletLayout ? 1 : 2}
|
||||||
|
>
|
||||||
|
{playlist.title}
|
||||||
|
</Text>
|
||||||
|
<Text
|
||||||
|
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||||
|
numberOfLines={1}
|
||||||
|
>
|
||||||
|
{playlist.owner}
|
||||||
|
</Text>
|
||||||
|
</MusicEntityView>
|
||||||
|
</Pressable>
|
||||||
|
</Link>
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -183,9 +225,7 @@ export const PlaylistCard = memo(function PlaylistCard({
|
|||||||
}}
|
}}
|
||||||
onAction={(action) => void handlePlaylistAction(playlist, action)}
|
onAction={(action) => void handlePlaylistAction(playlist, action)}
|
||||||
>
|
>
|
||||||
<MusicEntityView kind="playlist" id={playlist.id}>
|
{card}
|
||||||
{card}
|
|
||||||
</MusicEntityView>
|
|
||||||
</MediaContextMenu>
|
</MediaContextMenu>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -193,29 +233,42 @@ export const PlaylistCard = memo(function PlaylistCard({
|
|||||||
const CarouselCard = memo(function CarouselCard({
|
const CarouselCard = memo(function CarouselCard({
|
||||||
item,
|
item,
|
||||||
width,
|
width,
|
||||||
|
fluid = false,
|
||||||
}: {
|
}: {
|
||||||
item: MediaItem
|
item: MediaItem
|
||||||
width: number
|
width: number
|
||||||
|
fluid?: boolean
|
||||||
}) {
|
}) {
|
||||||
if ("owner" in item) return <PlaylistCard playlist={item} width={width} />
|
if ("owner" in item)
|
||||||
if ("artist" in item) return <AlbumCard album={item} width={width} />
|
return <PlaylistCard playlist={item} width={width} fluid={fluid} />
|
||||||
return <ArtistCard artist={item} width={width} />
|
if ("artist" in item)
|
||||||
|
return <AlbumCard album={item} width={width} fluid={fluid} />
|
||||||
|
return <ArtistCard artist={item} width={width} fluid={fluid} />
|
||||||
})
|
})
|
||||||
|
|
||||||
export function MediaGrid({ content }: { content: MediaItem[] }) {
|
export function MediaGrid({ content }: { content: MediaItem[] }) {
|
||||||
const cardWidth = useTwoColumnCardWidth()
|
const tabletLayout = useTabletLayout()
|
||||||
|
const { cardWidth, onLayout, ready } = useMediaGridLayout()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.grid}>
|
<View style={styles.grid} onLayout={onLayout}>
|
||||||
{content.map((item) => (
|
{(ready ? content : []).map((item) => (
|
||||||
<View key={item.id} style={{ width: cardWidth }}>
|
<Animated.View
|
||||||
<CarouselCard item={item} width={cardWidth} />
|
key={item.id}
|
||||||
</View>
|
layout={tabletLayout ? tabletLayoutTransition : undefined}
|
||||||
|
style={{ width: cardWidth }}
|
||||||
|
>
|
||||||
|
<CarouselCard item={item} width={cardWidth} fluid={tabletLayout} />
|
||||||
|
</Animated.View>
|
||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renderTabletCard(item: MediaItem, width: number) {
|
||||||
|
return <CarouselCard item={item} width={width} fluid />
|
||||||
|
}
|
||||||
|
|
||||||
export function MediaGridList({
|
export function MediaGridList({
|
||||||
content,
|
content,
|
||||||
paddingBottom,
|
paddingBottom,
|
||||||
@@ -229,7 +282,9 @@ export function MediaGridList({
|
|||||||
ListHeaderComponent?: ReactElement
|
ListHeaderComponent?: ReactElement
|
||||||
contentInset?: boolean
|
contentInset?: boolean
|
||||||
}) {
|
}) {
|
||||||
const cardWidth = useTwoColumnCardWidth()
|
const tabletLayout = useTabletLayout()
|
||||||
|
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
|
||||||
|
useMediaGridLayout()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const renderItem = useCallback(
|
const renderItem = useCallback(
|
||||||
({ item }: ListRenderItemInfo<MediaItem>) => (
|
({ item }: ListRenderItemInfo<MediaItem>) => (
|
||||||
@@ -240,23 +295,43 @@ export function MediaGridList({
|
|||||||
[cardWidth]
|
[cardWidth]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (tabletLayout) {
|
||||||
|
return (
|
||||||
|
<TabletMediaGrid
|
||||||
|
content={content}
|
||||||
|
paddingBottom={paddingBottom}
|
||||||
|
onEndReached={onEndReached}
|
||||||
|
ListHeaderComponent={ListHeaderComponent}
|
||||||
|
contentInset={contentInset}
|
||||||
|
renderCard={renderTabletCard}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FlatList
|
<FlatList
|
||||||
|
key={columns}
|
||||||
|
onLayout={onLayout}
|
||||||
data={content}
|
data={content}
|
||||||
keyExtractor={mediaItemKey}
|
keyExtractor={mediaItemKey}
|
||||||
renderItem={renderItem}
|
renderItem={renderItem}
|
||||||
numColumns={2}
|
numColumns={columns}
|
||||||
initialNumToRender={GRID_INITIAL_ROWS}
|
initialNumToRender={GRID_INITIAL_ROWS}
|
||||||
maxToRenderPerBatch={GRID_INITIAL_ROWS}
|
maxToRenderPerBatch={GRID_INITIAL_ROWS}
|
||||||
windowSize={longListProps.windowSize}
|
windowSize={longListProps.windowSize}
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
style={{ flex: 1, backgroundColor: colors.background }}
|
||||||
contentContainerStyle={[
|
contentContainerStyle={[
|
||||||
contentInset ? styles.gridListContent : styles.gridListContentInset,
|
contentInset ? styles.gridListContent : styles.gridListContentInset,
|
||||||
{ paddingBottom },
|
{
|
||||||
|
paddingBottom,
|
||||||
|
gap,
|
||||||
|
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
|
||||||
|
},
|
||||||
]}
|
]}
|
||||||
columnWrapperStyle={[
|
columnWrapperStyle={[
|
||||||
styles.gridListRow,
|
styles.gridListRow,
|
||||||
!contentInset && styles.gridListRowInset,
|
!contentInset && { paddingHorizontal: horizontalPadding },
|
||||||
|
{ gap },
|
||||||
]}
|
]}
|
||||||
contentInsetAdjustmentBehavior="automatic"
|
contentInsetAdjustmentBehavior="automatic"
|
||||||
ListHeaderComponent={ListHeaderComponent}
|
ListHeaderComponent={ListHeaderComponent}
|
||||||
|
|||||||
@@ -59,7 +59,8 @@ export function MenuView({
|
|||||||
outlineVariant: "#545458",
|
outlineVariant: "#545458",
|
||||||
error: "#FF453A",
|
error: "#FF453A",
|
||||||
}}
|
}}
|
||||||
matchContents
|
// Rows fill their parent width; compact action buttons keep intrinsic sizing.
|
||||||
|
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||||
>
|
>
|
||||||
<DropdownMenu
|
<DropdownMenu
|
||||||
expanded={expanded}
|
expanded={expanded}
|
||||||
@@ -70,7 +71,9 @@ export function MenuView({
|
|||||||
properties={{ clippingEnabled: false }}
|
properties={{ clippingEnabled: false }}
|
||||||
>
|
>
|
||||||
<DropdownMenu.Trigger>
|
<DropdownMenu.Trigger>
|
||||||
<RNHostView matchContents>
|
<RNHostView
|
||||||
|
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||||
|
>
|
||||||
{shouldOpenOnLongPress ? (
|
{shouldOpenOnLongPress ? (
|
||||||
<GestureDetector gesture={longPress}>
|
<GestureDetector gesture={longPress}>
|
||||||
<View collapsable={false}>{children}</View>
|
<View collapsable={false}>{children}</View>
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
|
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||||
|
import Animated from "react-native-reanimated"
|
||||||
import {
|
import {
|
||||||
useAndroidTabPalette,
|
useAndroidTabPalette,
|
||||||
|
useAndroidTabBackgroundStyle,
|
||||||
useAndroidTabHasArtworkPalette,
|
useAndroidTabHasArtworkPalette,
|
||||||
} from "@/contexts/android-tab-theme"
|
} from "@/contexts/android-tab-theme"
|
||||||
import { Ionicons } from "@expo/vector-icons"
|
|
||||||
import { NativeTabs } from "expo-router/native-tabs"
|
import { NativeTabs } from "expo-router/native-tabs"
|
||||||
import { useRouter } from "expo-router"
|
import { useRouter } from "expo-router"
|
||||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||||
|
|
||||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||||
|
|
||||||
@@ -65,7 +67,8 @@ function MiniPlayerContent({
|
|||||||
<View
|
<View
|
||||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||||
>
|
>
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone="foreground"
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryTitle : styles.title,
|
isAccessory ? styles.accessoryTitle : styles.title,
|
||||||
{ color: colors.foreground },
|
{ color: colors.foreground },
|
||||||
@@ -73,7 +76,7 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.title}
|
{currentSong.title}
|
||||||
</Text>
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
<Pressable
|
<Pressable
|
||||||
style={styles.controlButton}
|
style={styles.controlButton}
|
||||||
@@ -83,7 +86,8 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<Ionicons
|
<PaletteIcon
|
||||||
|
tone="foreground"
|
||||||
name={isPlaying ? "pause" : "play"}
|
name={isPlaying ? "pause" : "play"}
|
||||||
size={20}
|
size={20}
|
||||||
color={colors.foreground}
|
color={colors.foreground}
|
||||||
@@ -101,7 +105,8 @@ function MiniPlayerContent({
|
|||||||
style={artworkStyle}
|
style={artworkStyle}
|
||||||
/>
|
/>
|
||||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone="foreground"
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryTitle : styles.title,
|
isAccessory ? styles.accessoryTitle : styles.title,
|
||||||
{ color: colors.foreground },
|
{ color: colors.foreground },
|
||||||
@@ -109,8 +114,9 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.title}
|
{currentSong.title}
|
||||||
</Text>
|
</PaletteText>
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone="secondaryForeground"
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||||
{ color: colors.mutedForeground },
|
{ color: colors.mutedForeground },
|
||||||
@@ -118,7 +124,7 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.artist.name}
|
{currentSong.artist.name}
|
||||||
</Text>
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.controls}>
|
<View style={styles.controls}>
|
||||||
{Platform.OS === "android" && !isAccessory ? (
|
{Platform.OS === "android" && !isAccessory ? (
|
||||||
@@ -132,7 +138,12 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
<PaletteIcon
|
||||||
|
tone="foreground"
|
||||||
|
name="play-back"
|
||||||
|
size={24}
|
||||||
|
color={colors.foreground}
|
||||||
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
) : null}
|
) : null}
|
||||||
<Pressable
|
<Pressable
|
||||||
@@ -143,7 +154,8 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<Ionicons
|
<PaletteIcon
|
||||||
|
tone="foreground"
|
||||||
name={isPlaying ? "pause" : "play"}
|
name={isPlaying ? "pause" : "play"}
|
||||||
size={24}
|
size={24}
|
||||||
color={colors.foreground}
|
color={colors.foreground}
|
||||||
@@ -157,7 +169,12 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
<PaletteIcon
|
||||||
|
tone="foreground"
|
||||||
|
name="play-forward"
|
||||||
|
size={24}
|
||||||
|
color={colors.foreground}
|
||||||
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</View>
|
</View>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
@@ -167,9 +184,10 @@ function MiniPlayerContent({
|
|||||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||||
const palette = useAndroidTabPalette()
|
const palette = useAndroidTabPalette()
|
||||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||||
|
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
||||||
{children}
|
{children}
|
||||||
{hasArtworkPalette ? (
|
{hasArtworkPalette ? (
|
||||||
<View
|
<View
|
||||||
@@ -187,7 +205,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
|||||||
{ backgroundColor: palette.secondaryForeground },
|
{ backgroundColor: palette.secondaryForeground },
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
</View>
|
</Animated.View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ type QueueListItem =
|
|||||||
| { type: "history-header"; key: string }
|
| { type: "history-header"; key: string }
|
||||||
| { type: "history"; key: string; songId: Id<"songs">; historyIndex: number }
|
| { type: "history"; key: string; songId: Id<"songs">; historyIndex: number }
|
||||||
| { type: "current"; key: string }
|
| { type: "current"; key: string }
|
||||||
| { type: "controls"; key: string; showTitle: boolean }
|
| { type: "controls"; key: string; showTitle: boolean; tablet?: boolean }
|
||||||
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
|
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
|
||||||
| { type: "empty"; key: string; height: number }
|
| { type: "empty"; key: string; height: number }
|
||||||
|
|
||||||
@@ -72,7 +72,11 @@ function itemHeight(item: QueueListItem) {
|
|||||||
case "current":
|
case "current":
|
||||||
return CURRENT_HEIGHT
|
return CURRENT_HEIGHT
|
||||||
case "controls":
|
case "controls":
|
||||||
return item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT
|
return item.tablet
|
||||||
|
? 44
|
||||||
|
: item.showTitle
|
||||||
|
? CONTROLS_HEIGHT
|
||||||
|
: TOGGLES_ONLY_HEIGHT
|
||||||
case "empty":
|
case "empty":
|
||||||
return item.height
|
return item.height
|
||||||
default:
|
default:
|
||||||
@@ -97,10 +101,14 @@ export function NowPlayingQueue({
|
|||||||
colors,
|
colors,
|
||||||
viewportHeight,
|
viewportHeight,
|
||||||
currentHeader,
|
currentHeader,
|
||||||
|
tablet = false,
|
||||||
|
fadeColor,
|
||||||
}: {
|
}: {
|
||||||
colors: NowPlayingColors
|
colors: NowPlayingColors
|
||||||
viewportHeight: number
|
viewportHeight: number
|
||||||
currentHeader: ReactNode
|
currentHeader: ReactNode
|
||||||
|
tablet?: boolean
|
||||||
|
fadeColor?: string
|
||||||
}) {
|
}) {
|
||||||
const {
|
const {
|
||||||
queueSongIds,
|
queueSongIds,
|
||||||
@@ -114,6 +122,7 @@ export function NowPlayingQueue({
|
|||||||
skipToQueueIndex,
|
skipToQueueIndex,
|
||||||
skipToHistoryIndex,
|
skipToHistoryIndex,
|
||||||
} = usePlayback()
|
} = usePlayback()
|
||||||
|
const [viewportWidth, setViewportWidth] = useState(0)
|
||||||
const swipeGroup = useSwipeRowGroup()
|
const swipeGroup = useSwipeRowGroup()
|
||||||
const [scrollEnabled, setScrollEnabled] = useState(true)
|
const [scrollEnabled, setScrollEnabled] = useState(true)
|
||||||
const dragFrom = useSharedValue(-1)
|
const dragFrom = useSharedValue(-1)
|
||||||
@@ -142,9 +151,14 @@ export function NowPlayingQueue({
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
list.push({ type: "current", key: "current" })
|
if (!tablet) list.push({ type: "current", key: "current" })
|
||||||
const hasUpcoming = queueSongIds.length > 1
|
const hasUpcoming = queueSongIds.length > 1
|
||||||
list.push({ type: "controls", key: "controls", showTitle: hasUpcoming })
|
list.push({
|
||||||
|
type: "controls",
|
||||||
|
key: "controls",
|
||||||
|
showTitle: hasUpcoming,
|
||||||
|
tablet,
|
||||||
|
})
|
||||||
const occurrences = new Map<string, number>()
|
const occurrences = new Map<string, number>()
|
||||||
queueSongIds.forEach((songId, queueIndex) => {
|
queueSongIds.forEach((songId, queueIndex) => {
|
||||||
const occurrence = occurrences.get(songId) ?? 0
|
const occurrence = occurrences.get(songId) ?? 0
|
||||||
@@ -169,7 +183,7 @@ export function NowPlayingQueue({
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
return list
|
return list
|
||||||
}, [queueHistorySongIds, queueSongIds, viewportHeight])
|
}, [queueHistorySongIds, queueSongIds, viewportHeight, tablet])
|
||||||
|
|
||||||
const offsets = useMemo(() => {
|
const offsets = useMemo(() => {
|
||||||
const result: number[] = []
|
const result: number[] = []
|
||||||
@@ -181,8 +195,10 @@ export function NowPlayingQueue({
|
|||||||
return result
|
return result
|
||||||
}, [items])
|
}, [items])
|
||||||
|
|
||||||
const currentIndex = items.findIndex((item) => item.type === "current")
|
const currentIndex = items.findIndex(
|
||||||
const controlsIndex = currentIndex + 1
|
(item) => item.type === (tablet ? "controls" : "current")
|
||||||
|
)
|
||||||
|
const controlsIndex = tablet ? currentIndex : currentIndex + 1
|
||||||
const belowCurrentHeight = items
|
const belowCurrentHeight = items
|
||||||
.slice(currentIndex)
|
.slice(currentIndex)
|
||||||
.reduce((sum, item) => sum + itemHeight(item), 0)
|
.reduce((sum, item) => sum + itemHeight(item), 0)
|
||||||
@@ -325,29 +341,31 @@ export function NowPlayingQueue({
|
|||||||
style={[
|
style={[
|
||||||
styles.controls,
|
styles.controls,
|
||||||
{
|
{
|
||||||
height: item.showTitle ? CONTROLS_HEIGHT : TOGGLES_ONLY_HEIGHT,
|
height: itemHeight(item),
|
||||||
backgroundColor: colors.background,
|
backgroundColor: tablet ? "transparent" : colors.background,
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<View style={styles.toggles}>
|
{!tablet ? (
|
||||||
<QueueToggle
|
<View style={styles.toggles}>
|
||||||
colors={colors}
|
<QueueToggle
|
||||||
selected={shuffleEnabled}
|
colors={colors}
|
||||||
label="Shuffle"
|
selected={shuffleEnabled}
|
||||||
symbol="shuffle"
|
label="Shuffle"
|
||||||
fallback="shuffle"
|
symbol="shuffle"
|
||||||
onPress={toggleShuffle}
|
fallback="shuffle"
|
||||||
/>
|
onPress={toggleShuffle}
|
||||||
<QueueToggle
|
/>
|
||||||
colors={colors}
|
<QueueToggle
|
||||||
selected={repeatEnabled !== "none"}
|
colors={colors}
|
||||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
selected={repeatEnabled !== "none"}
|
||||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||||
fallback="repeat"
|
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||||
onPress={cycleRepeat}
|
fallback="repeat"
|
||||||
/>
|
onPress={cycleRepeat}
|
||||||
</View>
|
/>
|
||||||
|
</View>
|
||||||
|
) : null}
|
||||||
{item.showTitle ? (
|
{item.showTitle ? (
|
||||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||||
Continue Playing
|
Continue Playing
|
||||||
@@ -361,6 +379,7 @@ export function NowPlayingQueue({
|
|||||||
songId={item.songId}
|
songId={item.songId}
|
||||||
queueIndex={item.queueIndex}
|
queueIndex={item.queueIndex}
|
||||||
lastIndex={queueSongIds.length - 1}
|
lastIndex={queueSongIds.length - 1}
|
||||||
|
tablet={tablet}
|
||||||
colors={colors}
|
colors={colors}
|
||||||
drag={drag}
|
drag={drag}
|
||||||
swipeGroup={swipeGroup}
|
swipeGroup={swipeGroup}
|
||||||
@@ -384,7 +403,10 @@ export function NowPlayingQueue({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={styles.root}>
|
<View
|
||||||
|
style={styles.root}
|
||||||
|
onLayout={(event) => setViewportWidth(event.nativeEvent.layout.width)}
|
||||||
|
>
|
||||||
<FlatList
|
<FlatList
|
||||||
ref={listRef}
|
ref={listRef}
|
||||||
data={items}
|
data={items}
|
||||||
@@ -403,18 +425,31 @@ export function NowPlayingQueue({
|
|||||||
ListFooterComponent={<View style={{ height: footerHeight }} />}
|
ListFooterComponent={<View style={{ height: footerHeight }} />}
|
||||||
/>
|
/>
|
||||||
<Svg
|
<Svg
|
||||||
|
key={viewportWidth}
|
||||||
pointerEvents="none"
|
pointerEvents="none"
|
||||||
style={styles.bottomFade}
|
style={styles.bottomFade}
|
||||||
width="100%"
|
width={viewportWidth}
|
||||||
height={BOTTOM_FADE_HEIGHT}
|
height={BOTTOM_FADE_HEIGHT}
|
||||||
>
|
>
|
||||||
<Defs>
|
<Defs>
|
||||||
<LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1">
|
<LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1">
|
||||||
<Stop offset="0" stopColor={colors.background} stopOpacity={0} />
|
<Stop
|
||||||
<Stop offset="1" stopColor={colors.background} stopOpacity={1} />
|
offset="0"
|
||||||
|
stopColor={fadeColor ?? colors.background}
|
||||||
|
stopOpacity={0}
|
||||||
|
/>
|
||||||
|
<Stop
|
||||||
|
offset="1"
|
||||||
|
stopColor={fadeColor ?? colors.background}
|
||||||
|
stopOpacity={1}
|
||||||
|
/>
|
||||||
</LinearGradient>
|
</LinearGradient>
|
||||||
</Defs>
|
</Defs>
|
||||||
<Rect width="100%" height="100%" fill="url(#queue-fade)" />
|
<Rect
|
||||||
|
width={viewportWidth}
|
||||||
|
height={BOTTOM_FADE_HEIGHT}
|
||||||
|
fill="url(#queue-fade)"
|
||||||
|
/>
|
||||||
</Svg>
|
</Svg>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
@@ -581,6 +616,7 @@ const UpcomingRow = memo(function UpcomingRow({
|
|||||||
songId,
|
songId,
|
||||||
queueIndex,
|
queueIndex,
|
||||||
lastIndex,
|
lastIndex,
|
||||||
|
tablet = false,
|
||||||
colors,
|
colors,
|
||||||
drag,
|
drag,
|
||||||
swipeGroup,
|
swipeGroup,
|
||||||
@@ -592,6 +628,7 @@ const UpcomingRow = memo(function UpcomingRow({
|
|||||||
songId: Id<"songs">
|
songId: Id<"songs">
|
||||||
queueIndex: number
|
queueIndex: number
|
||||||
lastIndex: number
|
lastIndex: number
|
||||||
|
tablet?: boolean
|
||||||
colors: NowPlayingColors
|
colors: NowPlayingColors
|
||||||
drag: DragState
|
drag: DragState
|
||||||
swipeGroup: SwipeRowGroup
|
swipeGroup: SwipeRowGroup
|
||||||
@@ -685,6 +722,19 @@ const UpcomingRow = memo(function UpcomingRow({
|
|||||||
</GestureDetector>
|
</GestureDetector>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
{tablet ? (
|
||||||
|
<View
|
||||||
|
pointerEvents="none"
|
||||||
|
style={{
|
||||||
|
position: "absolute",
|
||||||
|
left: 88,
|
||||||
|
right: 26,
|
||||||
|
bottom: 0,
|
||||||
|
height: StyleSheet.hairlineWidth,
|
||||||
|
backgroundColor: colors.sliderTrack,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
<Animated.View
|
<Animated.View
|
||||||
pointerEvents="none"
|
pointerEvents="none"
|
||||||
style={[
|
style={[
|
||||||
@@ -701,7 +751,7 @@ const UpcomingRow = memo(function UpcomingRow({
|
|||||||
{Platform.OS === "ios" ? (
|
{Platform.OS === "ios" ? (
|
||||||
<SwipeToRemoveRow
|
<SwipeToRemoveRow
|
||||||
group={swipeGroup}
|
group={swipeGroup}
|
||||||
backgroundColor={colors.background}
|
backgroundColor={tablet ? "transparent" : colors.background}
|
||||||
actionAccessibilityLabel="Remove from queue"
|
actionAccessibilityLabel="Remove from queue"
|
||||||
onRemove={handleRemove}
|
onRemove={handleRemove}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
|
import type { ComponentProps } from "react"
|
||||||
|
import { Pressable, type TextProps } from "react-native"
|
||||||
|
import { useRouter } from "expo-router"
|
||||||
|
import Animated from "react-native-reanimated"
|
||||||
|
|
||||||
|
import {
|
||||||
|
useAnimatedPaletteColor,
|
||||||
|
type PaletteColor,
|
||||||
|
} from "@/contexts/android-tab-theme"
|
||||||
|
|
||||||
|
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
|
||||||
|
|
||||||
|
/** Keep artwork text colors on the same UI-thread animation as the background. */
|
||||||
|
export function PaletteText({
|
||||||
|
tone,
|
||||||
|
style,
|
||||||
|
...props
|
||||||
|
}: TextProps & { tone?: PaletteColor }) {
|
||||||
|
const colorStyle = useAnimatedPaletteColor(tone)
|
||||||
|
return <Animated.Text {...props} style={[style, colorStyle]} />
|
||||||
|
}
|
||||||
|
|
||||||
|
export function PaletteIcon({
|
||||||
|
tone,
|
||||||
|
style,
|
||||||
|
...props
|
||||||
|
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
|
||||||
|
const colorStyle = useAnimatedPaletteColor(tone)
|
||||||
|
return <AnimatedIcon {...props} style={[style, colorStyle]} />
|
||||||
|
}
|
||||||
|
|
||||||
|
function ArtworkBackButton() {
|
||||||
|
const router = useRouter()
|
||||||
|
return (
|
||||||
|
<Pressable
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="Navigate up"
|
||||||
|
hitSlop={8}
|
||||||
|
onPress={() => router.back()}
|
||||||
|
>
|
||||||
|
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
|
||||||
|
</Pressable>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function renderArtworkBackButton() {
|
||||||
|
return <ArtworkBackButton />
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { PaletteText } from "@/components/palette-text"
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
import { collectionInset } from "@/components/collection-list"
|
import { collectionInset } from "@/components/collection-list"
|
||||||
import { CoverImage } from "@/components/cover-image"
|
import { CoverImage } from "@/components/cover-image"
|
||||||
@@ -6,9 +7,14 @@ import type { BrowseSong } from "@otunes/convex/types"
|
|||||||
import type { CoverPalette } from "@/lib/cover-palette"
|
import type { CoverPalette } from "@/lib/cover-palette"
|
||||||
import { formatDuration } from "@/lib/format"
|
import { formatDuration } from "@/lib/format"
|
||||||
import { albumCoverUrl } from "@/lib/urls"
|
import { albumCoverUrl } from "@/lib/urls"
|
||||||
import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
|
import {
|
||||||
|
miniPlayerHeight,
|
||||||
|
tabletMiniPlayerHeight,
|
||||||
|
spacing,
|
||||||
|
useThemeColors,
|
||||||
|
} from "@/lib/theme"
|
||||||
import { memo, useCallback } from "react"
|
import { memo, useCallback } from "react"
|
||||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
MediaContextMenu,
|
MediaContextMenu,
|
||||||
@@ -46,22 +52,27 @@ export const SongRow = memo(function SongRow({
|
|||||||
const content = (
|
const content = (
|
||||||
<>
|
<>
|
||||||
<View style={styles.rowMeta}>
|
<View style={styles.rowMeta}>
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone={palette ? "foreground" : undefined}
|
||||||
style={[styles.rowTitle, { color: foreground }]}
|
style={[styles.rowTitle, { color: foreground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{song.title}
|
{song.title}
|
||||||
</Text>
|
</PaletteText>
|
||||||
<Text
|
<PaletteText
|
||||||
|
tone={palette ? "secondaryForeground" : undefined}
|
||||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{song.artist.name} · {song.album.title}
|
{song.artist.name} · {song.album.title}
|
||||||
</Text>
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
<PaletteText
|
||||||
|
tone={palette ? "secondaryForeground" : undefined}
|
||||||
|
style={[styles.duration, { color: secondaryForeground }]}
|
||||||
|
>
|
||||||
{formatDuration(song.durationSeconds)}
|
{formatDuration(song.durationSeconds)}
|
||||||
</Text>
|
</PaletteText>
|
||||||
{trailing}
|
{trailing}
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -155,9 +166,15 @@ export const SongListRow = memo(function SongListRow({
|
|||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
export const tabContentBottomInset = spacing.lg
|
const tabletPlayerInset = tabletMiniPlayerHeight + spacing.sm + spacing.lg
|
||||||
|
export const tabContentBottomInset =
|
||||||
|
Platform.OS === "ios" && Platform.isPad ? tabletPlayerInset : spacing.lg
|
||||||
export const contentBottomInset =
|
export const contentBottomInset =
|
||||||
Platform.OS === "android" ? spacing.lg : miniPlayerHeight + spacing.lg
|
Platform.OS === "ios" && Platform.isPad
|
||||||
|
? tabletPlayerInset
|
||||||
|
: Platform.OS === "android"
|
||||||
|
? spacing.lg
|
||||||
|
: miniPlayerHeight + spacing.lg
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
row: {
|
row: {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
|
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||||
|
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||||
import { Image } from "expo-image"
|
import { Image } from "expo-image"
|
||||||
import { useRouter } from "expo-router"
|
|
||||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||||
@@ -8,16 +9,19 @@ import { radius, useThemeColors } from "@/lib/theme"
|
|||||||
import { api } from "@otunes/convex/_generated/api"
|
import { api } from "@otunes/convex/_generated/api"
|
||||||
|
|
||||||
export function ProfileHeaderButton() {
|
export function ProfileHeaderButton() {
|
||||||
const router = useRouter()
|
const tabletLayout = useTabletLayout()
|
||||||
|
const openSettings = useOpenSettings()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const user = useCachedQuery(api.auth.currentUser)
|
const user = useCachedQuery(api.auth.currentUser)
|
||||||
|
|
||||||
|
if (tabletLayout) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Pressable
|
<Pressable
|
||||||
accessibilityLabel="Open profile"
|
accessibilityLabel="Open profile"
|
||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
hitSlop={8}
|
hitSlop={8}
|
||||||
onPress={() => router.push("/(app)/settings")}
|
onPress={openSettings}
|
||||||
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
|
style={({ pressed }) => [styles.button, { opacity: pressed ? 0.75 : 1 }]}
|
||||||
>
|
>
|
||||||
<View
|
<View
|
||||||
@@ -30,7 +34,11 @@ export function ProfileHeaderButton() {
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{user?.image ? (
|
{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 }]}>
|
<Text style={[styles.initials, { color: colors.foreground }]}>
|
||||||
{initialsFromName(user?.name ?? "Me")}
|
{initialsFromName(user?.name ?? "Me")}
|
||||||
|
|||||||
@@ -1,6 +1,14 @@
|
|||||||
import { useEffect, useRef, type ReactNode } from "react"
|
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||||
import {
|
import {
|
||||||
Animated,
|
CollectionHero,
|
||||||
|
useCollectionHeroLayout,
|
||||||
|
} from "@/components/collection-hero"
|
||||||
|
import { Link } from "expo-router"
|
||||||
|
import { useHeaderHeight } from "expo-router/react-navigation"
|
||||||
|
import Reanimated from "react-native-reanimated"
|
||||||
|
import { type ReactNode, type ComponentProps } from "react"
|
||||||
|
import {
|
||||||
|
Platform,
|
||||||
ScrollView,
|
ScrollView,
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
View,
|
View,
|
||||||
@@ -10,15 +18,9 @@ import {
|
|||||||
} from "react-native"
|
} from "react-native"
|
||||||
|
|
||||||
import { contentBottomInset } from "@/components/player"
|
import { contentBottomInset } from "@/components/player"
|
||||||
import {
|
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||||
carouselCardWidth,
|
|
||||||
radius,
|
|
||||||
spacing,
|
|
||||||
useThemeColors,
|
|
||||||
useTwoColumnCardWidth,
|
|
||||||
} from "@/lib/theme"
|
|
||||||
|
|
||||||
/** Match the inset-adjusted lists used once screen data is available. */
|
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
||||||
function SkeletonContent({
|
function SkeletonContent({
|
||||||
children,
|
children,
|
||||||
embedded = false,
|
embedded = false,
|
||||||
@@ -27,13 +29,17 @@ function SkeletonContent({
|
|||||||
embedded?: boolean
|
embedded?: boolean
|
||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
|
const headerHeight = useHeaderHeight()
|
||||||
if (embedded) return <>{children}</>
|
if (embedded) return <>{children}</>
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollView
|
<ScrollView
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
style={{ flex: 1, backgroundColor: colors.background }}
|
||||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
contentContainerStyle={{
|
||||||
contentInsetAdjustmentBehavior="automatic"
|
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||||
|
paddingBottom: contentBottomInset,
|
||||||
|
}}
|
||||||
|
contentInsetAdjustmentBehavior="never"
|
||||||
scrollEnabled={false}
|
scrollEnabled={false}
|
||||||
accessibilityLabel="Loading"
|
accessibilityLabel="Loading"
|
||||||
>
|
>
|
||||||
@@ -44,31 +50,11 @@ function SkeletonContent({
|
|||||||
|
|
||||||
export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const opacity = useRef(new Animated.Value(1)).current
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const pulse = Animated.loop(
|
|
||||||
Animated.sequence([
|
|
||||||
Animated.timing(opacity, {
|
|
||||||
toValue: 0.5,
|
|
||||||
duration: 800,
|
|
||||||
useNativeDriver: true,
|
|
||||||
}),
|
|
||||||
Animated.timing(opacity, {
|
|
||||||
toValue: 1,
|
|
||||||
duration: 800,
|
|
||||||
useNativeDriver: true,
|
|
||||||
}),
|
|
||||||
])
|
|
||||||
)
|
|
||||||
pulse.start()
|
|
||||||
return () => pulse.stop()
|
|
||||||
}, [opacity])
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Animated.View
|
<View
|
||||||
style={[
|
style={[
|
||||||
{ backgroundColor: colors.muted, borderRadius: radius.sm, opacity },
|
{ backgroundColor: colors.muted, borderRadius: radius.sm },
|
||||||
style,
|
style,
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
@@ -147,20 +133,30 @@ export function MediaGridSkeleton({
|
|||||||
contentInset?: boolean
|
contentInset?: boolean
|
||||||
embedded?: boolean
|
embedded?: boolean
|
||||||
}) {
|
}) {
|
||||||
const cardWidth = useTwoColumnCardWidth()
|
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||||
|
useMediaGridLayout()
|
||||||
return (
|
return (
|
||||||
<SkeletonContent embedded={embedded}>
|
<SkeletonContent embedded={embedded}>
|
||||||
<View
|
<View
|
||||||
|
onLayout={onLayout}
|
||||||
accessibilityLabel="Loading"
|
accessibilityLabel="Loading"
|
||||||
accessibilityRole="progressbar"
|
accessibilityRole="progressbar"
|
||||||
style={[
|
style={[
|
||||||
styles.grid,
|
styles.grid,
|
||||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
contentInset ? styles.gridInset : styles.gridRowInset,
|
||||||
|
{
|
||||||
|
paddingHorizontal: horizontalPadding,
|
||||||
|
paddingTop: contentInset ? horizontalPadding : 0,
|
||||||
|
gap,
|
||||||
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{Array.from({ length: items }, (_, index) => (
|
{Array.from(
|
||||||
<CardSkeleton key={index} width={cardWidth} />
|
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||||
))}
|
(_, index) => (
|
||||||
|
<CardSkeleton key={index} width={cardWidth} />
|
||||||
|
)
|
||||||
|
)}
|
||||||
</View>
|
</View>
|
||||||
</SkeletonContent>
|
</SkeletonContent>
|
||||||
)
|
)
|
||||||
@@ -180,12 +176,16 @@ export function CarouselSkeleton() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function HomeSkeleton() {
|
export function HomeSkeleton() {
|
||||||
|
const headerHeight = useHeaderHeight()
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
return (
|
return (
|
||||||
<ScrollView
|
<ScrollView
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
style={{ flex: 1, backgroundColor: colors.background }}
|
||||||
contentContainerStyle={styles.home}
|
contentContainerStyle={[
|
||||||
contentInsetAdjustmentBehavior="automatic"
|
styles.home,
|
||||||
|
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
||||||
|
]}
|
||||||
|
contentInsetAdjustmentBehavior="never"
|
||||||
scrollEnabled={false}
|
scrollEnabled={false}
|
||||||
accessibilityLabel="Loading"
|
accessibilityLabel="Loading"
|
||||||
>
|
>
|
||||||
@@ -197,42 +197,96 @@ export function HomeSkeleton() {
|
|||||||
|
|
||||||
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
/** Album and playlist pages: cover, title, play buttons, then tracks. */
|
||||||
export function CollectionDetailSkeleton({
|
export function CollectionDetailSkeleton({
|
||||||
|
zoomCoverSize,
|
||||||
|
style,
|
||||||
round = false,
|
round = false,
|
||||||
|
backgroundColor,
|
||||||
|
onLayout,
|
||||||
}: {
|
}: {
|
||||||
|
zoomCoverSize?: number
|
||||||
|
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
||||||
round?: boolean
|
round?: boolean
|
||||||
|
backgroundColor?: string
|
||||||
|
onLayout?: () => void
|
||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const coverSize = round ? 180 : 210
|
const headerHeight = useHeaderHeight()
|
||||||
|
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
||||||
|
const coverSize =
|
||||||
|
!round && landscape
|
||||||
|
? tabletCoverSize!
|
||||||
|
: (zoomCoverSize ?? (round ? 180 : 210))
|
||||||
|
const actions = (
|
||||||
|
<View style={styles.actions}>
|
||||||
|
<Skeleton style={styles.iconAction} />
|
||||||
|
<Skeleton style={styles.playButton} />
|
||||||
|
<Skeleton style={styles.iconAction} />
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
const artwork = (
|
||||||
|
<Skeleton
|
||||||
|
style={{
|
||||||
|
width: coverSize,
|
||||||
|
height: coverSize,
|
||||||
|
borderRadius: round ? coverSize / 2 : radius.lg,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)
|
||||||
return (
|
return (
|
||||||
<ScrollView
|
<Reanimated.ScrollView
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
onLayout={onLayout}
|
||||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
style={[
|
||||||
contentInsetAdjustmentBehavior="automatic"
|
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
|
||||||
|
style,
|
||||||
|
]}
|
||||||
|
contentContainerStyle={{
|
||||||
|
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||||
|
paddingBottom: contentBottomInset,
|
||||||
|
}}
|
||||||
|
contentInsetAdjustmentBehavior="never"
|
||||||
scrollEnabled={false}
|
scrollEnabled={false}
|
||||||
accessibilityLabel="Loading"
|
accessibilityLabel="Loading"
|
||||||
>
|
>
|
||||||
<View style={styles.hero}>
|
{round ? (
|
||||||
<Skeleton
|
<View style={styles.artistHero}>
|
||||||
style={{
|
{zoomCoverSize ? (
|
||||||
width: coverSize,
|
<Link.AppleZoomTarget>
|
||||||
height: coverSize,
|
<View collapsable={false}>{artwork}</View>
|
||||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
</Link.AppleZoomTarget>
|
||||||
}}
|
) : (
|
||||||
/>
|
artwork
|
||||||
<TextLine width={200} height={24} />
|
)}
|
||||||
<TextLine width={120} height={16} />
|
<TextLine width={200} height={24} />
|
||||||
<View style={styles.actions}>
|
<TextLine width={120} height={16} />
|
||||||
<Skeleton style={styles.iconAction} />
|
{actions}
|
||||||
<Skeleton style={styles.playButton} />
|
|
||||||
<Skeleton style={styles.iconAction} />
|
|
||||||
</View>
|
</View>
|
||||||
</View>
|
) : (
|
||||||
|
<CollectionHero
|
||||||
|
artwork={
|
||||||
|
zoomCoverSize ? (
|
||||||
|
<Link.AppleZoomTarget>
|
||||||
|
<View collapsable={false}>{artwork}</View>
|
||||||
|
</Link.AppleZoomTarget>
|
||||||
|
) : (
|
||||||
|
artwork
|
||||||
|
)
|
||||||
|
}
|
||||||
|
actions={actions}
|
||||||
|
>
|
||||||
|
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
|
||||||
|
<TextLine
|
||||||
|
width={landscape && !round ? "60%" : 120}
|
||||||
|
height={landscape && !round ? 22 : 16}
|
||||||
|
/>
|
||||||
|
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
|
||||||
|
</CollectionHero>
|
||||||
|
)}
|
||||||
{round ? (
|
{round ? (
|
||||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
||||||
) : (
|
) : (
|
||||||
<SongListSkeleton rows={8} embedded />
|
<SongListSkeleton rows={8} embedded />
|
||||||
)}
|
)}
|
||||||
</ScrollView>
|
</Reanimated.ScrollView>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,7 +328,7 @@ const styles = StyleSheet.create({
|
|||||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||||
home: { padding: spacing.lg, gap: spacing.xl },
|
home: { padding: spacing.lg, gap: spacing.xl },
|
||||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||||
actions: {
|
actions: {
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import Animated from "react-native-reanimated"
|
||||||
|
import { SafeAreaView } from "react-native-safe-area-context"
|
||||||
|
import { Platform } from "react-native"
|
||||||
|
import type { ReactNode } from "react"
|
||||||
|
|
||||||
|
import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||||
|
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||||
|
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||||
|
|
||||||
|
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
||||||
|
export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||||
|
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||||
|
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
||||||
|
return (
|
||||||
|
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||||
|
<SafeAreaView edges={["left", "right"]} style={{ flex: 1 }}>
|
||||||
|
{children}
|
||||||
|
</SafeAreaView>
|
||||||
|
<TabletSidebar />
|
||||||
|
<TabletPlayerLayoutSync />
|
||||||
|
</Animated.View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function renderTabScreenContent({ children }: { children: ReactNode }) {
|
||||||
|
return <TabScreenContent>{children}</TabScreenContent>
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
import {
|
||||||
|
useEffect,
|
||||||
|
useCallback,
|
||||||
|
useRef,
|
||||||
|
useState,
|
||||||
|
type ReactElement,
|
||||||
|
} from "react"
|
||||||
|
import {
|
||||||
|
ScrollView,
|
||||||
|
View,
|
||||||
|
type NativeSyntheticEvent,
|
||||||
|
type NativeScrollEvent,
|
||||||
|
} from "react-native"
|
||||||
|
import Animated from "react-native-reanimated"
|
||||||
|
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||||
|
|
||||||
|
import type { MediaItem } from "@/components/media-cards"
|
||||||
|
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||||
|
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||||
|
import { useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
|
type GridProps = {
|
||||||
|
content: MediaItem[]
|
||||||
|
paddingBottom: number
|
||||||
|
onEndReached?: () => void
|
||||||
|
ListHeaderComponent?: ReactElement
|
||||||
|
contentInset?: boolean
|
||||||
|
renderCard: (item: MediaItem, width: number) => ReactElement
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keep tiles keyed by media ID across column changes. Only the viewport plus
|
||||||
|
* two rows on either side is mounted, even when a large library is loaded.
|
||||||
|
*/
|
||||||
|
export function TabletMediaGrid({
|
||||||
|
content,
|
||||||
|
paddingBottom,
|
||||||
|
onEndReached,
|
||||||
|
ListHeaderComponent,
|
||||||
|
contentInset = true,
|
||||||
|
renderCard,
|
||||||
|
}: GridProps) {
|
||||||
|
const colors = useThemeColors()
|
||||||
|
const insets = useSafeAreaInsets()
|
||||||
|
const { columns, cardWidth, onLayout, horizontalPadding, gap, ready } =
|
||||||
|
useMediaGridLayout()
|
||||||
|
const [viewportHeight, setViewportHeight] = useState(900)
|
||||||
|
const [headerHeight, setHeaderHeight] = useState(0)
|
||||||
|
const [scrollY, setScrollY] = useState(0)
|
||||||
|
const lastRequestedLength = useRef(-1)
|
||||||
|
const rowHeight = cardWidth + 48 + gap
|
||||||
|
const firstRow = Math.max(
|
||||||
|
0,
|
||||||
|
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||||
|
)
|
||||||
|
const visibleRows = Math.ceil(viewportHeight / rowHeight) + 5
|
||||||
|
const start = firstRow * columns
|
||||||
|
const end = Math.min(content.length, (firstRow + visibleRows) * columns)
|
||||||
|
const rows = Math.ceil(content.length / columns)
|
||||||
|
const gridHeight = rows * rowHeight
|
||||||
|
|
||||||
|
const onScroll = useCallback(
|
||||||
|
(event: NativeSyntheticEvent<NativeScrollEvent>) => {
|
||||||
|
const { contentOffset, layoutMeasurement, contentSize } =
|
||||||
|
event.nativeEvent
|
||||||
|
const nextY = Math.max(0, contentOffset.y)
|
||||||
|
setScrollY((current) =>
|
||||||
|
Math.floor(current / rowHeight) === Math.floor(nextY / rowHeight)
|
||||||
|
? current
|
||||||
|
: nextY
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
contentOffset.y + layoutMeasurement.height * 1.5 >=
|
||||||
|
contentSize.height &&
|
||||||
|
lastRequestedLength.current !== content.length
|
||||||
|
) {
|
||||||
|
lastRequestedLength.current = content.length
|
||||||
|
onEndReached?.()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[content.length, onEndReached, rowHeight]
|
||||||
|
)
|
||||||
|
useEffect(() => {
|
||||||
|
if (
|
||||||
|
content.length > 0 &&
|
||||||
|
gridHeight + headerHeight <= viewportHeight * 1.5 &&
|
||||||
|
lastRequestedLength.current !== content.length
|
||||||
|
) {
|
||||||
|
lastRequestedLength.current = content.length
|
||||||
|
onEndReached?.()
|
||||||
|
}
|
||||||
|
}, [content.length, gridHeight, headerHeight, viewportHeight, onEndReached])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Animated.View
|
||||||
|
style={{ flex: 1, backgroundColor: colors.background }}
|
||||||
|
onLayout={(event) => {
|
||||||
|
onLayout(event)
|
||||||
|
setViewportHeight(event.nativeEvent.layout.height)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ScrollView
|
||||||
|
onScroll={onScroll}
|
||||||
|
scrollEventThrottle={32}
|
||||||
|
contentInsetAdjustmentBehavior="automatic"
|
||||||
|
contentContainerStyle={{
|
||||||
|
paddingTop: contentInset ? horizontalPadding : 0,
|
||||||
|
paddingBottom: paddingBottom + insets.bottom,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<View
|
||||||
|
onLayout={(event) => setHeaderHeight(event.nativeEvent.layout.height)}
|
||||||
|
>
|
||||||
|
{ListHeaderComponent}
|
||||||
|
</View>
|
||||||
|
<View style={{ height: gridHeight }}>
|
||||||
|
{(ready ? content.slice(start, end) : []).map((item, offset) => {
|
||||||
|
const index = start + offset
|
||||||
|
return (
|
||||||
|
<Animated.View
|
||||||
|
key={item.id}
|
||||||
|
layout={tabletLayoutTransition}
|
||||||
|
style={{
|
||||||
|
position: "absolute",
|
||||||
|
left:
|
||||||
|
horizontalPadding + (index % columns) * (cardWidth + gap),
|
||||||
|
top: Math.floor(index / columns) * rowHeight,
|
||||||
|
width: cardWidth,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{renderCard(item, cardWidth)}
|
||||||
|
</Animated.View>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</View>
|
||||||
|
</ScrollView>
|
||||||
|
</Animated.View>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,289 @@
|
|||||||
|
import { useEffect, type ReactNode } from "react"
|
||||||
|
import Animated, {
|
||||||
|
useAnimatedStyle,
|
||||||
|
useSharedValue,
|
||||||
|
withTiming,
|
||||||
|
} from "react-native-reanimated"
|
||||||
|
import { GlassView, isLiquidGlassAvailable } from "expo-glass-effect"
|
||||||
|
import { tabletMotion } from "@/lib/tablet-motion"
|
||||||
|
import { BlurView } from "expo-blur"
|
||||||
|
import { useIsFocused, useRouter } from "expo-router"
|
||||||
|
import {
|
||||||
|
Pressable,
|
||||||
|
StyleSheet,
|
||||||
|
Text,
|
||||||
|
useWindowDimensions,
|
||||||
|
View,
|
||||||
|
} from "react-native"
|
||||||
|
import { useTabletPlayerInsets } from "@/contexts/tablet-player-layout"
|
||||||
|
|
||||||
|
import { CoverImage } from "@/components/cover-image"
|
||||||
|
import { MediaActionMenu } from "@/components/media-actions-sheet"
|
||||||
|
import { PlayerSymbol } from "@/components/player-symbol"
|
||||||
|
import { useFavorites } from "@/contexts/favorites"
|
||||||
|
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
|
||||||
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
|
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||||
|
import { tabletMiniPlayerHeight } from "@/lib/theme"
|
||||||
|
import { albumCoverUrl } from "@/lib/urls"
|
||||||
|
|
||||||
|
export function TabletMiniPlayer() {
|
||||||
|
const focused = useIsFocused()
|
||||||
|
const router = useRouter()
|
||||||
|
const insets = useTabletPlayerInsets()
|
||||||
|
const { width } = useWindowDimensions()
|
||||||
|
const left = useSharedValue(insets.left)
|
||||||
|
const right = useSharedValue(insets.right)
|
||||||
|
const bottom = useSharedValue(insets.bottom)
|
||||||
|
useEffect(() => {
|
||||||
|
left.value = withTiming(insets.left, tabletMotion)
|
||||||
|
right.value = withTiming(insets.right, tabletMotion)
|
||||||
|
bottom.value = withTiming(insets.bottom, tabletMotion)
|
||||||
|
}, [insets.left, insets.right, insets.bottom, left, right, bottom])
|
||||||
|
const positionStyle = useAnimatedStyle(() => ({
|
||||||
|
left: left.value + 16,
|
||||||
|
right: right.value + 16,
|
||||||
|
bottom: bottom.value + 8,
|
||||||
|
}))
|
||||||
|
const { config } = useServerConfig()
|
||||||
|
const {
|
||||||
|
currentSong,
|
||||||
|
queueSongIds,
|
||||||
|
isPlaying,
|
||||||
|
shuffleEnabled,
|
||||||
|
repeatEnabled,
|
||||||
|
} = usePlaybackQueue()
|
||||||
|
const { setIsPlaying, skipPrevious, skipNext, toggleShuffle, cycleRepeat } =
|
||||||
|
usePlaybackActions()
|
||||||
|
const { handleSongAction } = useMediaMenuActions()
|
||||||
|
const { isSongFavorite } = useFavorites()
|
||||||
|
const roomy = width - insets.left - insets.right >= 650
|
||||||
|
|
||||||
|
if (!focused || !config || !currentSong || queueSongIds.length === 0)
|
||||||
|
return null
|
||||||
|
|
||||||
|
const color = "#fff"
|
||||||
|
const inactive = "rgba(255,255,255,0.4)"
|
||||||
|
const accent = "#FA2D48"
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Animated.View
|
||||||
|
pointerEvents="box-none"
|
||||||
|
style={[styles.position, positionStyle]}
|
||||||
|
>
|
||||||
|
<TabletPlayerSurface>
|
||||||
|
<View style={styles.controls}>
|
||||||
|
{roomy ? (
|
||||||
|
<Control
|
||||||
|
label="Shuffle"
|
||||||
|
symbol="shuffle"
|
||||||
|
fallback="shuffle"
|
||||||
|
color={shuffleEnabled ? accent : inactive}
|
||||||
|
selected={shuffleEnabled}
|
||||||
|
onPress={() => void toggleShuffle()}
|
||||||
|
size={21}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
<Control
|
||||||
|
label="Previous track"
|
||||||
|
symbol="backward.fill"
|
||||||
|
fallback="play-back"
|
||||||
|
color={color}
|
||||||
|
onPress={() => void skipPrevious()}
|
||||||
|
size={27}
|
||||||
|
/>
|
||||||
|
<Control
|
||||||
|
label={isPlaying ? "Pause" : "Play"}
|
||||||
|
symbol={isPlaying ? "pause.fill" : "play.fill"}
|
||||||
|
fallback={isPlaying ? "pause" : "play"}
|
||||||
|
color={color}
|
||||||
|
onPress={() => setIsPlaying(!isPlaying)}
|
||||||
|
size={34}
|
||||||
|
/>
|
||||||
|
<Control
|
||||||
|
label="Next track"
|
||||||
|
symbol="forward.fill"
|
||||||
|
fallback="play-forward"
|
||||||
|
color={color}
|
||||||
|
onPress={() => void skipNext()}
|
||||||
|
size={27}
|
||||||
|
/>
|
||||||
|
{roomy ? (
|
||||||
|
<Control
|
||||||
|
label="Repeat"
|
||||||
|
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||||
|
fallback="repeat"
|
||||||
|
color={repeatEnabled !== "none" ? accent : inactive}
|
||||||
|
selected={repeatEnabled !== "none"}
|
||||||
|
onPress={() => void cycleRepeat()}
|
||||||
|
size={21}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
</View>
|
||||||
|
<Pressable
|
||||||
|
onPress={() => router.push("/(app)/player")}
|
||||||
|
style={styles.track}
|
||||||
|
accessibilityLabel="Open Now Playing"
|
||||||
|
>
|
||||||
|
<CoverImage
|
||||||
|
uri={albumCoverUrl(config.serverUrl, currentSong.album.id)}
|
||||||
|
hasCover={currentSong.album.cover != null}
|
||||||
|
style={styles.artwork}
|
||||||
|
/>
|
||||||
|
<View style={styles.meta}>
|
||||||
|
<Text numberOfLines={1} style={styles.title}>
|
||||||
|
{currentSong.title}
|
||||||
|
</Text>
|
||||||
|
<Text numberOfLines={1} style={styles.artist}>
|
||||||
|
{currentSong.artist.name}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
</Pressable>
|
||||||
|
<MediaActionMenu
|
||||||
|
style={{ alignSelf: "center" }}
|
||||||
|
favorited={isSongFavorite(currentSong.id)}
|
||||||
|
stationArtistId={currentSong.artist.id}
|
||||||
|
navigation={{
|
||||||
|
artist: { id: currentSong.artist.id },
|
||||||
|
album: { id: currentSong.album.id },
|
||||||
|
}}
|
||||||
|
includeActions={["playlist", "favorite", "go-artist", "go-album"]}
|
||||||
|
onAction={(action) => void handleSongAction(currentSong, action)}
|
||||||
|
>
|
||||||
|
<Pressable
|
||||||
|
style={styles.control}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="More"
|
||||||
|
>
|
||||||
|
<PlayerSymbol
|
||||||
|
name="ellipsis"
|
||||||
|
fallback="ellipsis-horizontal"
|
||||||
|
size={23}
|
||||||
|
color={color}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
</MediaActionMenu>
|
||||||
|
{roomy ? (
|
||||||
|
<Pressable
|
||||||
|
style={styles.control}
|
||||||
|
disabled
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="Lyrics"
|
||||||
|
accessibilityState={{ disabled: true }}
|
||||||
|
>
|
||||||
|
<PlayerSymbol
|
||||||
|
name="quote.bubble"
|
||||||
|
fallback="chatbox-outline"
|
||||||
|
size={23}
|
||||||
|
color={inactive}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
) : null}
|
||||||
|
<Control
|
||||||
|
label="Show queue"
|
||||||
|
symbol="list.bullet"
|
||||||
|
fallback="list"
|
||||||
|
color={color}
|
||||||
|
size={25}
|
||||||
|
onPress={() =>
|
||||||
|
router.push({ pathname: "/(app)/player", params: { queue: "1" } })
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</TabletPlayerSurface>
|
||||||
|
</Animated.View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function TabletPlayerSurface({ children }: { children: ReactNode }) {
|
||||||
|
if (isLiquidGlassAvailable()) {
|
||||||
|
return (
|
||||||
|
<GlassView
|
||||||
|
glassEffectStyle="regular"
|
||||||
|
colorScheme="dark"
|
||||||
|
isInteractive
|
||||||
|
style={styles.bar}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</GlassView>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<BlurView intensity={70} tint="dark" style={styles.bar}>
|
||||||
|
{children}
|
||||||
|
</BlurView>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function Control({
|
||||||
|
label,
|
||||||
|
symbol,
|
||||||
|
fallback,
|
||||||
|
color,
|
||||||
|
size,
|
||||||
|
onPress,
|
||||||
|
selected,
|
||||||
|
}: {
|
||||||
|
label: string
|
||||||
|
symbol: React.ComponentProps<typeof PlayerSymbol>["name"]
|
||||||
|
fallback: React.ComponentProps<typeof PlayerSymbol>["fallback"]
|
||||||
|
color: string
|
||||||
|
size: number
|
||||||
|
onPress: () => void
|
||||||
|
selected?: boolean
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<Pressable
|
||||||
|
style={styles.control}
|
||||||
|
onPress={onPress}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel={label}
|
||||||
|
accessibilityState={{ selected }}
|
||||||
|
>
|
||||||
|
<PlayerSymbol
|
||||||
|
name={symbol}
|
||||||
|
fallback={fallback}
|
||||||
|
color={color}
|
||||||
|
size={size}
|
||||||
|
weight="semibold"
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
position: { position: "absolute", alignItems: "center", zIndex: 100 },
|
||||||
|
bar: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
width: "100%",
|
||||||
|
maxWidth: 720,
|
||||||
|
height: tabletMiniPlayerHeight,
|
||||||
|
paddingHorizontal: 14,
|
||||||
|
gap: 4,
|
||||||
|
borderRadius: 34,
|
||||||
|
overflow: "hidden",
|
||||||
|
},
|
||||||
|
controls: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
gap: 1,
|
||||||
|
marginRight: 12,
|
||||||
|
},
|
||||||
|
control: {
|
||||||
|
width: 40,
|
||||||
|
height: 44,
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
},
|
||||||
|
track: {
|
||||||
|
flex: 1,
|
||||||
|
minWidth: 0,
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
gap: 10,
|
||||||
|
},
|
||||||
|
artwork: { width: 50, height: 50, borderRadius: 5 },
|
||||||
|
meta: { flex: 1, minWidth: 0 },
|
||||||
|
title: { color: "#fff", fontSize: 15, lineHeight: 19, fontWeight: "500" },
|
||||||
|
artist: { color: "rgba(255,255,255,0.7)", fontSize: 14, lineHeight: 18 },
|
||||||
|
})
|
||||||
@@ -0,0 +1,418 @@
|
|||||||
|
import { useEffect, useState, type ComponentProps, type ReactNode } from "react"
|
||||||
|
import {
|
||||||
|
Pressable,
|
||||||
|
StyleSheet,
|
||||||
|
Text,
|
||||||
|
View,
|
||||||
|
useWindowDimensions,
|
||||||
|
} from "react-native"
|
||||||
|
import Animated, {
|
||||||
|
Easing,
|
||||||
|
ReduceMotion,
|
||||||
|
interpolate,
|
||||||
|
useAnimatedStyle,
|
||||||
|
useSharedValue,
|
||||||
|
withTiming,
|
||||||
|
} from "react-native-reanimated"
|
||||||
|
import { GestureDetector, Gesture } from "react-native-gesture-handler"
|
||||||
|
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||||
|
import { useRouter } from "expo-router"
|
||||||
|
import { StatusBar } from "expo-status-bar"
|
||||||
|
|
||||||
|
import { AudioOutputButton } from "@/components/audio-output-button"
|
||||||
|
import { CoverImage } from "@/components/cover-image"
|
||||||
|
import { NowPlayingQueue } from "@/components/now-playing-queue"
|
||||||
|
import { PlayerSlider } from "@/components/player-slider"
|
||||||
|
import { PlayerSymbol } from "@/components/player-symbol"
|
||||||
|
import { usePlayback } from "@/contexts/playback"
|
||||||
|
import { useServerConfig } from "@/contexts/server-config"
|
||||||
|
import { useSystemVolume } from "@/hooks/use-system-volume"
|
||||||
|
import { formatDuration, formatRemainingDuration } from "@/lib/format"
|
||||||
|
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||||
|
import { albumCoverUrl } from "@/lib/urls"
|
||||||
|
|
||||||
|
const queueMotion = {
|
||||||
|
duration: 420,
|
||||||
|
easing: Easing.bezier(0.22, 1, 0.36, 1),
|
||||||
|
reduceMotion: ReduceMotion.System,
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tablet player keeps transport controls visible while the queue opens beside them. */
|
||||||
|
export function TabletNowPlaying({
|
||||||
|
colors,
|
||||||
|
backgroundStyle,
|
||||||
|
dismissStyle,
|
||||||
|
dismissGesture,
|
||||||
|
showQueue,
|
||||||
|
toggleQueue,
|
||||||
|
metadata,
|
||||||
|
}: {
|
||||||
|
colors: NowPlayingColors
|
||||||
|
backgroundStyle: ComponentProps<typeof Animated.View>["style"]
|
||||||
|
dismissStyle: ComponentProps<typeof Animated.View>["style"]
|
||||||
|
dismissGesture: () => ReturnType<typeof Gesture.Pan>
|
||||||
|
showQueue: boolean
|
||||||
|
toggleQueue: () => void
|
||||||
|
metadata: ReactNode
|
||||||
|
}) {
|
||||||
|
const router = useRouter()
|
||||||
|
const insets = useSafeAreaInsets()
|
||||||
|
const { width, height } = useWindowDimensions()
|
||||||
|
const { config } = useServerConfig()
|
||||||
|
const {
|
||||||
|
currentSong,
|
||||||
|
currentTime,
|
||||||
|
duration,
|
||||||
|
isPlaying,
|
||||||
|
setIsPlaying,
|
||||||
|
seekTo,
|
||||||
|
skipNext,
|
||||||
|
skipPrevious,
|
||||||
|
shuffleEnabled,
|
||||||
|
repeatEnabled,
|
||||||
|
toggleShuffle,
|
||||||
|
cycleRepeat,
|
||||||
|
} = usePlayback()
|
||||||
|
const { volume, setVolume, available: volumeAvailable } = useSystemVolume()
|
||||||
|
const [scrubTime, setScrubTime] = useState<number | null>(null)
|
||||||
|
const [queueHeight, setQueueHeight] = useState(0)
|
||||||
|
const wideLayout = width >= 700
|
||||||
|
const sideBySide = showQueue && wideLayout
|
||||||
|
const progress = useSharedValue(sideBySide ? 1 : 0)
|
||||||
|
useEffect(() => {
|
||||||
|
progress.value = withTiming(sideBySide ? 1 : 0, queueMotion)
|
||||||
|
}, [sideBySide, progress])
|
||||||
|
const closedCoverSize = Math.max(
|
||||||
|
160,
|
||||||
|
Math.min(322, width * 0.52, height - 460)
|
||||||
|
)
|
||||||
|
const openCoverSize = Math.max(160, Math.min(322, width * 0.34, height - 460))
|
||||||
|
const mainMotion = useAnimatedStyle(() => ({
|
||||||
|
transform: [{ translateX: -width * 0.2625 * progress.value }],
|
||||||
|
}))
|
||||||
|
const artworkMotion = useAnimatedStyle(() => ({
|
||||||
|
width: interpolate(
|
||||||
|
progress.value,
|
||||||
|
[0, 1],
|
||||||
|
[closedCoverSize, openCoverSize]
|
||||||
|
),
|
||||||
|
height: interpolate(
|
||||||
|
progress.value,
|
||||||
|
[0, 1],
|
||||||
|
[closedCoverSize, openCoverSize]
|
||||||
|
),
|
||||||
|
}))
|
||||||
|
const controlsMotion = useAnimatedStyle(() => ({
|
||||||
|
width: interpolate(
|
||||||
|
progress.value,
|
||||||
|
[0, 1],
|
||||||
|
[Math.min(456, width - 80), Math.min(456, width * 0.475 - 80)]
|
||||||
|
),
|
||||||
|
}))
|
||||||
|
const queueStyle = useAnimatedStyle(() => ({
|
||||||
|
opacity: interpolate(progress.value, [0, 0.15, 1], [0, 0, 1]),
|
||||||
|
transform: [{ translateX: (1 - progress.value) * 48 }],
|
||||||
|
}))
|
||||||
|
const time = scrubTime ?? currentTime
|
||||||
|
if (!currentSong || !config) return null
|
||||||
|
const control = (
|
||||||
|
label: string,
|
||||||
|
symbol: React.ComponentProps<typeof PlayerSymbol>["name"],
|
||||||
|
fallback: React.ComponentProps<typeof PlayerSymbol>["fallback"],
|
||||||
|
onPress: () => void,
|
||||||
|
size = 32,
|
||||||
|
selected = false,
|
||||||
|
inactive = false
|
||||||
|
) => (
|
||||||
|
<Pressable
|
||||||
|
onPress={onPress}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel={label}
|
||||||
|
accessibilityState={{ selected }}
|
||||||
|
style={[styles.button, selected && { backgroundColor: colors.control }]}
|
||||||
|
>
|
||||||
|
<PlayerSymbol
|
||||||
|
name={symbol}
|
||||||
|
fallback={fallback}
|
||||||
|
size={size}
|
||||||
|
color={inactive ? colors.secondaryForeground : colors.foreground}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
)
|
||||||
|
const queue = (
|
||||||
|
<NowPlayingQueue
|
||||||
|
tablet
|
||||||
|
colors={colors}
|
||||||
|
viewportHeight={queueHeight}
|
||||||
|
currentHeader={null}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
return (
|
||||||
|
<Animated.View style={[styles.root, backgroundStyle, dismissStyle]}>
|
||||||
|
<StatusBar style={colors.isDark ? "light" : "dark"} />
|
||||||
|
<GestureDetector gesture={dismissGesture()}>
|
||||||
|
<Pressable
|
||||||
|
onPress={() => router.back()}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="Close player"
|
||||||
|
style={[styles.handleRow, { marginTop: insets.top }]}
|
||||||
|
>
|
||||||
|
<View
|
||||||
|
style={[styles.handle, { backgroundColor: colors.sliderFill }]}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
</GestureDetector>
|
||||||
|
<View style={styles.body}>
|
||||||
|
<Animated.View style={[styles.main, mainMotion]}>
|
||||||
|
<GestureDetector gesture={dismissGesture()}>
|
||||||
|
<View style={styles.artworkArea}>
|
||||||
|
<Animated.View style={artworkMotion}>
|
||||||
|
<CoverImage
|
||||||
|
uri={albumCoverUrl(config.serverUrl, currentSong.album.id)}
|
||||||
|
hasCover={currentSong.album.cover != null}
|
||||||
|
style={{ width: "100%", height: "100%", borderRadius: 10 }}
|
||||||
|
/>
|
||||||
|
</Animated.View>
|
||||||
|
</View>
|
||||||
|
</GestureDetector>
|
||||||
|
<Animated.View style={[styles.controls, controlsMotion]}>
|
||||||
|
<View style={styles.meta}>{metadata}</View>
|
||||||
|
<PlayerSlider
|
||||||
|
accessibilityLabel="Playback position"
|
||||||
|
value={time}
|
||||||
|
maximumValue={duration}
|
||||||
|
fillColor={colors.sliderFill}
|
||||||
|
activeFillColor={colors.foreground}
|
||||||
|
trackColor={colors.sliderTrack}
|
||||||
|
onValueChange={setScrubTime}
|
||||||
|
onSlidingComplete={(value) => {
|
||||||
|
void seekTo(value)
|
||||||
|
setScrubTime(null)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<View style={styles.times}>
|
||||||
|
<Text
|
||||||
|
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||||
|
>
|
||||||
|
{formatDuration(time)}
|
||||||
|
</Text>
|
||||||
|
<Text
|
||||||
|
style={[styles.time, { color: colors.secondaryForeground }]}
|
||||||
|
>
|
||||||
|
{formatRemainingDuration(time, duration).replace("-", "−")}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
<View style={styles.transport}>
|
||||||
|
{control(
|
||||||
|
"Shuffle",
|
||||||
|
"shuffle",
|
||||||
|
"shuffle",
|
||||||
|
() => void toggleShuffle(),
|
||||||
|
21,
|
||||||
|
shuffleEnabled
|
||||||
|
)}
|
||||||
|
{control(
|
||||||
|
"Previous",
|
||||||
|
"backward.fill",
|
||||||
|
"play-back",
|
||||||
|
() => void skipPrevious(),
|
||||||
|
38
|
||||||
|
)}
|
||||||
|
{control(
|
||||||
|
isPlaying ? "Pause" : "Play",
|
||||||
|
isPlaying ? "pause.fill" : "play.fill",
|
||||||
|
isPlaying ? "pause" : "play",
|
||||||
|
() => setIsPlaying(!isPlaying),
|
||||||
|
44
|
||||||
|
)}
|
||||||
|
{control(
|
||||||
|
"Next",
|
||||||
|
"forward.fill",
|
||||||
|
"play-forward",
|
||||||
|
() => void skipNext(),
|
||||||
|
38
|
||||||
|
)}
|
||||||
|
{control(
|
||||||
|
"Repeat",
|
||||||
|
repeatEnabled === "once" ? "repeat.1" : "repeat",
|
||||||
|
"repeat",
|
||||||
|
() => void cycleRepeat(),
|
||||||
|
21,
|
||||||
|
repeatEnabled !== "none",
|
||||||
|
repeatEnabled === "none"
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
<View style={styles.volume}>
|
||||||
|
<View
|
||||||
|
pointerEvents={volumeAvailable ? "auto" : "none"}
|
||||||
|
accessibilityState={{ disabled: !volumeAvailable }}
|
||||||
|
>
|
||||||
|
<PlayerSlider
|
||||||
|
accessibilityLabel="Volume"
|
||||||
|
commitHoldMs={0}
|
||||||
|
animateValueChanges
|
||||||
|
value={volume}
|
||||||
|
maximumValue={1}
|
||||||
|
fillColor={colors.sliderFill}
|
||||||
|
activeFillColor={colors.foreground}
|
||||||
|
trackColor={colors.sliderTrack}
|
||||||
|
onValueChange={volumeAvailable ? setVolume : undefined}
|
||||||
|
leading={
|
||||||
|
<PlayerSymbol
|
||||||
|
name="speaker.fill"
|
||||||
|
fallback="volume-low"
|
||||||
|
size={14}
|
||||||
|
color={colors.secondaryForeground}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
trailing={
|
||||||
|
<PlayerSymbol
|
||||||
|
name="speaker.wave.3.fill"
|
||||||
|
fallback="volume-high"
|
||||||
|
size={18}
|
||||||
|
color={colors.secondaryForeground}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</Animated.View>
|
||||||
|
</Animated.View>
|
||||||
|
{wideLayout ? (
|
||||||
|
<Animated.View
|
||||||
|
pointerEvents={showQueue ? "auto" : "none"}
|
||||||
|
accessibilityElementsHidden={!showQueue}
|
||||||
|
importantForAccessibility={
|
||||||
|
showQueue ? "auto" : "no-hide-descendants"
|
||||||
|
}
|
||||||
|
style={[styles.queue, queueStyle]}
|
||||||
|
onLayout={(event) =>
|
||||||
|
setQueueHeight(event.nativeEvent.layout.height)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{queueHeight > 0 ? queue : null}
|
||||||
|
</Animated.View>
|
||||||
|
) : null}
|
||||||
|
{showQueue && !sideBySide ? (
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.portraitQueue,
|
||||||
|
{ backgroundColor: colors.background },
|
||||||
|
]}
|
||||||
|
onLayout={(event) =>
|
||||||
|
setQueueHeight(event.nativeEvent.layout.height)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{queueHeight > 0 ? queue : null}
|
||||||
|
</View>
|
||||||
|
) : null}
|
||||||
|
</View>
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.footer,
|
||||||
|
{ paddingBottom: Math.max(insets.bottom, 24) + 12 },
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<AudioOutputButton
|
||||||
|
color={colors.foreground}
|
||||||
|
style={styles.footerButton}
|
||||||
|
/>
|
||||||
|
<View style={styles.footerActions}>
|
||||||
|
<Pressable
|
||||||
|
disabled
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="Lyrics"
|
||||||
|
accessibilityState={{ disabled: true }}
|
||||||
|
style={[styles.footerButton, { opacity: 0.4 }]}
|
||||||
|
>
|
||||||
|
<PlayerSymbol
|
||||||
|
name="quote.bubble"
|
||||||
|
fallback="chatbox-outline"
|
||||||
|
size={25}
|
||||||
|
color={colors.foreground}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
<Pressable
|
||||||
|
onPress={toggleQueue}
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel={showQueue ? "Hide queue" : "Show queue"}
|
||||||
|
accessibilityState={{ selected: showQueue }}
|
||||||
|
style={[
|
||||||
|
styles.footerButton,
|
||||||
|
showQueue && { backgroundColor: colors.selected },
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<PlayerSymbol
|
||||||
|
name="list.bullet"
|
||||||
|
fallback="list"
|
||||||
|
size={25}
|
||||||
|
color={showQueue ? colors.selectedForeground : colors.foreground}
|
||||||
|
/>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
</Animated.View>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
root: { flex: 1, overflow: "hidden" },
|
||||||
|
handleRow: { height: 32, alignItems: "center", justifyContent: "center" },
|
||||||
|
handle: { width: 60, height: 4, borderRadius: 2 },
|
||||||
|
body: { flex: 1, flexDirection: "row", minHeight: 0 },
|
||||||
|
main: {
|
||||||
|
flex: 1,
|
||||||
|
minWidth: 0,
|
||||||
|
alignItems: "center",
|
||||||
|
paddingTop: 20,
|
||||||
|
paddingBottom: 0,
|
||||||
|
},
|
||||||
|
artworkArea: {
|
||||||
|
flex: 1,
|
||||||
|
width: "100%",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
paddingBottom: 36,
|
||||||
|
},
|
||||||
|
controls: { width: "100%", maxWidth: 456, paddingHorizontal: 0 },
|
||||||
|
meta: { height: 48 },
|
||||||
|
times: {
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
marginTop: -4,
|
||||||
|
},
|
||||||
|
time: { fontSize: 12, fontVariant: ["tabular-nums"] },
|
||||||
|
transport: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
height: 80,
|
||||||
|
paddingHorizontal: 14,
|
||||||
|
},
|
||||||
|
button: {
|
||||||
|
width: 64,
|
||||||
|
minWidth: 36,
|
||||||
|
flexShrink: 1,
|
||||||
|
height: 64,
|
||||||
|
borderRadius: 32,
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
},
|
||||||
|
volume: { height: 36, justifyContent: "center" },
|
||||||
|
queue: { position: "absolute", left: "47.5%", right: 20, top: 0, bottom: 0 },
|
||||||
|
portraitQueue: { ...StyleSheet.absoluteFill, bottom: 270 },
|
||||||
|
footer: {
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
paddingHorizontal: 44,
|
||||||
|
paddingTop: 12,
|
||||||
|
},
|
||||||
|
footerActions: { flexDirection: "row", gap: 16 },
|
||||||
|
footerButton: {
|
||||||
|
width: 40,
|
||||||
|
height: 40,
|
||||||
|
borderRadius: 20,
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
},
|
||||||
|
})
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import { useOpenSettings } from "@/hooks/use-open-settings"
|
||||||
|
import { requireNativeView } from "expo"
|
||||||
|
import { useIsFocused } from "expo-router"
|
||||||
|
import { Platform, type ViewProps } from "react-native"
|
||||||
|
|
||||||
|
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||||
|
import { initialsFromName } from "@/lib/format"
|
||||||
|
import { api } from "@otunes/convex/_generated/api"
|
||||||
|
|
||||||
|
const NativeSidebar =
|
||||||
|
Platform.OS === "ios"
|
||||||
|
? requireNativeView<
|
||||||
|
ViewProps & {
|
||||||
|
accountName: string
|
||||||
|
initials: string
|
||||||
|
imageURL?: string
|
||||||
|
active: boolean
|
||||||
|
onProfilePress: () => void
|
||||||
|
}
|
||||||
|
>("TabletSidebar")
|
||||||
|
: null
|
||||||
|
|
||||||
|
export function TabletSidebar() {
|
||||||
|
const user = useCachedQuery(api.auth.currentUser)
|
||||||
|
const openSettings = useOpenSettings()
|
||||||
|
const active = useIsFocused()
|
||||||
|
|
||||||
|
if (!NativeSidebar) return null
|
||||||
|
return (
|
||||||
|
<NativeSidebar
|
||||||
|
style={{ position: "absolute", width: 0, height: 0 }}
|
||||||
|
accountName={user?.name ?? "Account"}
|
||||||
|
initials={initialsFromName(user?.name ?? "Me")}
|
||||||
|
imageURL={user?.image}
|
||||||
|
active={active}
|
||||||
|
onProfilePress={openSettings}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||||
import {
|
import {
|
||||||
ActivityIndicator,
|
ActivityIndicator,
|
||||||
Platform,
|
Platform,
|
||||||
@@ -73,8 +74,20 @@ export function Button({
|
|||||||
<ActivityIndicator color={textColor} />
|
<ActivityIndicator color={textColor} />
|
||||||
) : (
|
) : (
|
||||||
<View style={styles.buttonContent}>
|
<View style={styles.buttonContent}>
|
||||||
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
{icon ? (
|
||||||
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
<PaletteIcon
|
||||||
|
tone={tint ? "accentForeground" : undefined}
|
||||||
|
name={icon}
|
||||||
|
size={18}
|
||||||
|
color={textColor}
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
<PaletteText
|
||||||
|
tone={tint ? "accentForeground" : undefined}
|
||||||
|
style={[styles.buttonText, { color: textColor }]}
|
||||||
|
>
|
||||||
|
{title}
|
||||||
|
</PaletteText>
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
</Pressable>
|
</Pressable>
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
useIsFocused,
|
useIsFocused,
|
||||||
useNavigation,
|
|
||||||
usePreventRemove,
|
|
||||||
useRoute,
|
useRoute,
|
||||||
|
useNavigation,
|
||||||
type NativeStackNavigationProp,
|
type NativeStackNavigationProp,
|
||||||
} from "expo-router"
|
} from "expo-router"
|
||||||
import {
|
import {
|
||||||
@@ -11,17 +10,33 @@ import {
|
|||||||
useContext,
|
useContext,
|
||||||
useLayoutEffect,
|
useLayoutEffect,
|
||||||
useMemo,
|
useMemo,
|
||||||
|
useRef,
|
||||||
useState,
|
useState,
|
||||||
type PropsWithChildren,
|
type PropsWithChildren,
|
||||||
} from "react"
|
} from "react"
|
||||||
import { Platform } from "react-native"
|
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
||||||
|
import Reanimated, {
|
||||||
|
useSharedValue,
|
||||||
|
useAnimatedStyle,
|
||||||
|
useAnimatedReaction,
|
||||||
|
useAnimatedRef,
|
||||||
|
setNativeProps,
|
||||||
|
processColor,
|
||||||
|
withTiming,
|
||||||
|
type SharedValue,
|
||||||
|
} from "react-native-reanimated"
|
||||||
|
|
||||||
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
|
||||||
import { useIsDark, useThemeColors } from "@/lib/theme"
|
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
|
export type PaletteColor = Exclude<keyof CoverPalette, "isDark">
|
||||||
|
type PaletteColors = Pick<CoverPalette, PaletteColor> & {
|
||||||
|
selectedColor: string
|
||||||
|
}
|
||||||
|
|
||||||
type TabTheme = {
|
type TabTheme = {
|
||||||
palette: CoverPalette
|
palette: CoverPalette
|
||||||
selectedColor: string
|
colors: SharedValue<PaletteColors>
|
||||||
hasArtworkPalette: boolean
|
hasArtworkPalette: boolean
|
||||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||||
}
|
}
|
||||||
@@ -33,37 +48,64 @@ function useDefaultPalette() {
|
|||||||
return useMemo(() => themeCoverPalette(theme, isDark), [theme, isDark])
|
return useMemo(() => themeCoverPalette(theme, isDark), [theme, isDark])
|
||||||
}
|
}
|
||||||
|
|
||||||
export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
|
export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
||||||
const defaultPalette = useDefaultPalette()
|
const defaultPalette = useDefaultPalette()
|
||||||
const [screen, setScreen] = useState<{
|
const [screen, setScreen] = useState<{
|
||||||
palette: CoverPalette
|
palette: CoverPalette
|
||||||
owner: string
|
owner: string
|
||||||
} | null>(null)
|
} | null>(null)
|
||||||
const palette = screen?.palette ?? null
|
const palette = screen?.palette ?? defaultPalette
|
||||||
|
const hasArtwork =
|
||||||
|
palette.background !== defaultPalette.background ||
|
||||||
|
palette.foreground !== defaultPalette.foreground ||
|
||||||
|
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||||
|
palette.accent !== defaultPalette.accent
|
||||||
|
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
|
||||||
|
const animatedColors = useSharedValue<PaletteColors>({
|
||||||
|
...defaultColors,
|
||||||
|
selectedColor: defaultPalette.accentText,
|
||||||
|
})
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
const { isDark: _isDark, ...colors } = palette
|
||||||
|
animatedColors.value = withTiming(
|
||||||
|
{
|
||||||
|
...colors,
|
||||||
|
selectedColor: hasArtwork
|
||||||
|
? palette.foreground
|
||||||
|
: defaultPalette.accentText,
|
||||||
|
},
|
||||||
|
{ duration: PALETTE_FADE_MS }
|
||||||
|
)
|
||||||
|
}, [animatedColors, palette, defaultPalette, hasArtwork])
|
||||||
|
const paletteOwner = useRef<string | null>(null)
|
||||||
const setPalette = useCallback(
|
const setPalette = useCallback(
|
||||||
(palette: CoverPalette | null, owner: string) => {
|
(palette: CoverPalette | null, owner: string) => {
|
||||||
setScreen((current) =>
|
if (!palette && paletteOwner.current !== owner) return
|
||||||
palette ? { palette, owner } : current?.owner === owner ? null : current
|
paletteOwner.current = palette ? owner : null
|
||||||
|
// Start on the UI thread immediately. React may defer commits while
|
||||||
|
// the native stack is animating, including transitionStart state updates.
|
||||||
|
const target = palette ?? defaultPalette
|
||||||
|
const { isDark: _isDark, ...colors } = target
|
||||||
|
animatedColors.value = withTiming(
|
||||||
|
{
|
||||||
|
...colors,
|
||||||
|
selectedColor: palette ? target.foreground : target.accentText,
|
||||||
|
},
|
||||||
|
{ duration: PALETTE_FADE_MS }
|
||||||
)
|
)
|
||||||
|
setScreen(palette ? { palette, owner } : null)
|
||||||
},
|
},
|
||||||
[]
|
[animatedColors, defaultPalette]
|
||||||
)
|
)
|
||||||
const artworkPalette =
|
const artworkPalette = hasArtwork ? palette : null
|
||||||
palette &&
|
|
||||||
(palette.background !== defaultPalette.background ||
|
|
||||||
palette.foreground !== defaultPalette.foreground ||
|
|
||||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
|
||||||
palette.accent !== defaultPalette.accent)
|
|
||||||
? palette
|
|
||||||
: null
|
|
||||||
const value = useMemo(
|
const value = useMemo(
|
||||||
() => ({
|
() => ({
|
||||||
palette: artworkPalette ?? defaultPalette,
|
palette: artworkPalette ?? defaultPalette,
|
||||||
selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText,
|
colors: animatedColors,
|
||||||
hasArtworkPalette: artworkPalette !== null,
|
hasArtworkPalette: artworkPalette !== null,
|
||||||
setPalette,
|
setPalette,
|
||||||
}),
|
}),
|
||||||
[defaultPalette, artworkPalette, setPalette]
|
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
||||||
)
|
)
|
||||||
return (
|
return (
|
||||||
<AndroidTabTheme.Provider value={value}>
|
<AndroidTabTheme.Provider value={value}>
|
||||||
@@ -72,6 +114,50 @@ export function AndroidTabThemeProvider({ 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() {
|
export function useAndroidTabPalette() {
|
||||||
const theme = useContext(AndroidTabTheme)
|
const theme = useContext(AndroidTabTheme)
|
||||||
const defaultPalette = useDefaultPalette()
|
const defaultPalette = useDefaultPalette()
|
||||||
@@ -82,56 +168,83 @@ export function useAndroidTabHasArtworkPalette() {
|
|||||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useAndroidTabSelectedColor() {
|
export function useAndroidTabBackgroundStyle() {
|
||||||
const theme = useContext(AndroidTabTheme)
|
const theme = useContext(AndroidTabTheme)
|
||||||
const defaultPalette = useDefaultPalette()
|
const fallback = useDefaultPalette().background
|
||||||
return theme?.selectedColor ?? defaultPalette.accentText
|
const colors = theme?.colors
|
||||||
|
return useAnimatedStyle(() =>
|
||||||
|
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||||
|
? { backgroundColor: colors?.value.background ?? fallback }
|
||||||
|
: {}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Keep Android artwork screens and shared bars on the same displayed palette. */
|
/** Color tokens share the background's UI-thread timing. */
|
||||||
export function useAndroidScreenPalette(palette: CoverPalette) {
|
export function useAnimatedPaletteColor(tone: PaletteColor | undefined) {
|
||||||
|
const colors = useContext(AndroidTabTheme)?.colors
|
||||||
|
return useAnimatedStyle(() =>
|
||||||
|
Platform.OS === "android" && tone && colors
|
||||||
|
? { color: colors.value[tone] }
|
||||||
|
: {}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Native headers draw this same UI-thread background as the page and bars. */
|
||||||
|
function AndroidArtworkBackground() {
|
||||||
|
const style = useAndroidTabBackgroundStyle()
|
||||||
|
return <Reanimated.View style={[StyleSheet.absoluteFill, style]} />
|
||||||
|
}
|
||||||
|
|
||||||
|
export function renderAndroidArtworkBackground() {
|
||||||
|
return <AndroidArtworkBackground />
|
||||||
|
}
|
||||||
|
|
||||||
|
const PALETTE_FADE_MS = 400
|
||||||
|
|
||||||
|
/** The focused artwork screen selects the shared background for page and bars. */
|
||||||
|
export function useScreenPalette(palette: CoverPalette) {
|
||||||
const isFocused = useIsFocused()
|
const isFocused = useIsFocused()
|
||||||
|
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||||
|
const sharesPalette =
|
||||||
|
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
||||||
const owner = useRoute().key
|
const owner = useRoute().key
|
||||||
const navigation =
|
const navigation =
|
||||||
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
|
useNavigation<NativeStackNavigationProp<Record<string, undefined>>>()
|
||||||
const [appeared, setAppeared] = useState(false)
|
|
||||||
const [leaving, setLeaving] = useState(false)
|
|
||||||
const [laidOut, setLaidOut] = useState(false)
|
const [laidOut, setLaidOut] = useState(false)
|
||||||
|
const [closing, setClosing] = useState(false)
|
||||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||||
const theme = useContext(AndroidTabTheme)
|
const theme = useContext(AndroidTabTheme)
|
||||||
const setPalette = theme?.setPalette
|
const setPalette = theme?.setPalette
|
||||||
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
if (Platform.OS !== "android") return
|
if (!sharesPalette) return
|
||||||
return navigation.addListener("transitionEnd", ({ data }) => {
|
const start = navigation.addListener("transitionStart", ({ data }) => {
|
||||||
setAppeared(!data.closing)
|
if (data.closing) setPalette?.(null, owner)
|
||||||
|
else setPalette?.(palette, owner)
|
||||||
|
setClosing(data.closing)
|
||||||
})
|
})
|
||||||
}, [navigation])
|
const cancel = navigation.addListener("gestureCancel", () => {
|
||||||
|
setPalette?.(palette, owner)
|
||||||
usePreventRemove(Platform.OS === "android" && !leaving, ({ repeat }) => {
|
setClosing(false)
|
||||||
setLeaving(true)
|
})
|
||||||
setPalette?.(null, owner)
|
return () => {
|
||||||
// Let the page and bars paint their shared destination colors before the
|
start()
|
||||||
// native stack removes the page. React blur happens too early for this.
|
cancel()
|
||||||
requestAnimationFrame(() => requestAnimationFrame(repeat))
|
}
|
||||||
})
|
}, [navigation, sharesPalette, setPalette, owner, palette])
|
||||||
|
const defaultPalette = useDefaultPalette()
|
||||||
|
const ready = laidOut || isTablet
|
||||||
|
const target = isFocused && ready && !closing ? palette : defaultPalette
|
||||||
|
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||||
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
if (
|
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
||||||
Platform.OS !== "android" ||
|
|
||||||
!setPalette ||
|
|
||||||
!isFocused ||
|
|
||||||
!laidOut ||
|
|
||||||
!appeared ||
|
|
||||||
leaving
|
|
||||||
)
|
|
||||||
return
|
|
||||||
setPalette(palette, owner)
|
setPalette(palette, owner)
|
||||||
return () => setPalette(null, owner)
|
return () => setPalette(null, owner)
|
||||||
}, [appeared, isFocused, laidOut, leaving, owner, palette, setPalette])
|
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
palette: Platform.OS === "android" && theme ? theme.palette : palette,
|
palette: Platform.OS === "android" ? target : palette,
|
||||||
onLayout: Platform.OS === "android" ? onLayout : undefined,
|
backgroundStyle,
|
||||||
|
onLayout: sharesPalette ? onLayout : undefined,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -168,7 +168,12 @@ type PlaybackActionsValue = Pick<
|
|||||||
|
|
||||||
type PlaybackQueueValue = Pick<
|
type PlaybackQueueValue = Pick<
|
||||||
PlaybackContextValue,
|
PlaybackContextValue,
|
||||||
"queueSongIds" | "queueHistorySongIds" | "currentSong" | "isPlaying"
|
| "queueSongIds"
|
||||||
|
| "queueHistorySongIds"
|
||||||
|
| "currentSong"
|
||||||
|
| "isPlaying"
|
||||||
|
| "shuffleEnabled"
|
||||||
|
| "repeatEnabled"
|
||||||
>
|
>
|
||||||
|
|
||||||
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
|
const PlaybackContext = createContext<PlaybackContextValue | null>(null)
|
||||||
@@ -859,6 +864,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
recorded.origin ??
|
recorded.origin ??
|
||||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||||
resetQueuePlayback()
|
resetQueuePlayback()
|
||||||
|
store.update(playbackQueue.clearQueue)
|
||||||
store.update(recipe)
|
store.update(recipe)
|
||||||
const firstSongId = store.getState().queue[0]
|
const firstSongId = store.getState().queue[0]
|
||||||
if (!firstSongId) return
|
if (!firstSongId) return
|
||||||
@@ -1317,12 +1323,21 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
|
|
||||||
const queueValue = useMemo<PlaybackQueueValue>(
|
const queueValue = useMemo<PlaybackQueueValue>(
|
||||||
() => ({
|
() => ({
|
||||||
|
shuffleEnabled: playback.shuffleEnabled,
|
||||||
|
repeatEnabled,
|
||||||
queueSongIds,
|
queueSongIds,
|
||||||
queueHistorySongIds,
|
queueHistorySongIds,
|
||||||
currentSong,
|
currentSong,
|
||||||
isPlaying: isPlaybackActive,
|
isPlaying: isPlaybackActive,
|
||||||
}),
|
}),
|
||||||
[currentSong, isPlaybackActive, queueHistorySongIds, queueSongIds]
|
[
|
||||||
|
currentSong,
|
||||||
|
isPlaybackActive,
|
||||||
|
queueHistorySongIds,
|
||||||
|
queueSongIds,
|
||||||
|
playback.shuffleEnabled,
|
||||||
|
repeatEnabled,
|
||||||
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
const value = useMemo<PlaybackContextValue>(
|
const value = useMemo<PlaybackContextValue>(
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import {
|
||||||
|
createContext,
|
||||||
|
useCallback,
|
||||||
|
useContext,
|
||||||
|
useLayoutEffect,
|
||||||
|
useMemo,
|
||||||
|
useState,
|
||||||
|
type ReactNode,
|
||||||
|
} from "react"
|
||||||
|
import { useIsFocused } from "expo-router"
|
||||||
|
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||||
|
|
||||||
|
type PlayerInsets = { left: number; right: number; bottom: number }
|
||||||
|
const TabletPlayerLayout = createContext<{
|
||||||
|
insets: PlayerInsets
|
||||||
|
setInsets: (insets: PlayerInsets) => void
|
||||||
|
} | null>(null)
|
||||||
|
|
||||||
|
/** Keep one player above the navigator, positioned using the focused screen's safe area. */
|
||||||
|
export function TabletPlayerLayoutProvider({
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
children: ReactNode
|
||||||
|
}) {
|
||||||
|
const safeArea = useSafeAreaInsets()
|
||||||
|
const [insets, updateInsets] = useState<PlayerInsets>(safeArea)
|
||||||
|
const setInsets = useCallback((next: PlayerInsets) => {
|
||||||
|
updateInsets((current) =>
|
||||||
|
current.left === next.left &&
|
||||||
|
current.right === next.right &&
|
||||||
|
current.bottom === next.bottom
|
||||||
|
? current
|
||||||
|
: next
|
||||||
|
)
|
||||||
|
}, [])
|
||||||
|
const value = useMemo(() => ({ insets, setInsets }), [insets, setInsets])
|
||||||
|
return <TabletPlayerLayout value={value}>{children}</TabletPlayerLayout>
|
||||||
|
}
|
||||||
|
|
||||||
|
export function TabletPlayerLayoutSync() {
|
||||||
|
const focused = useIsFocused()
|
||||||
|
const { left, right, bottom } = useSafeAreaInsets()
|
||||||
|
const setInsets = useContext(TabletPlayerLayout)?.setInsets
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (focused) setInsets?.({ left, right, bottom })
|
||||||
|
}, [focused, left, right, bottom, setInsets])
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useTabletPlayerInsets() {
|
||||||
|
const layout = useContext(TabletPlayerLayout)
|
||||||
|
const safeArea = useSafeAreaInsets()
|
||||||
|
return layout?.insets ?? safeArea
|
||||||
|
}
|
||||||
@@ -1,5 +1,10 @@
|
|||||||
import { useEffect, useMemo, useState } from "react"
|
import { useEffect, useMemo, useState } from "react"
|
||||||
import { getColors, type ImageColorsResult } from "react-native-image-colors"
|
import {
|
||||||
|
artworkColorsEnabled,
|
||||||
|
useArtworkColorsEnabled,
|
||||||
|
} from "@/lib/artwork-color-preference"
|
||||||
|
import { prefetchLegacyCoverPalette, useLegacyCoverPalette } from "@/hooks/use-legacy-cover-palette"
|
||||||
|
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
deriveCoverPalette,
|
deriveCoverPalette,
|
||||||
@@ -15,49 +20,11 @@ import { withCoverImageSize } from "@/lib/urls"
|
|||||||
// so rows render once with final colors instead of flashing from the theme.
|
// so rows render once with final colors instead of flashing from the theme.
|
||||||
export const COVER_PALETTE_WAIT_MS = 400
|
export const COVER_PALETTE_WAIT_MS = 400
|
||||||
|
|
||||||
// image-colors substitutes this for swatches it couldn't find.
|
|
||||||
const MISSING = "#010203"
|
|
||||||
|
|
||||||
const swatchesByKey = new Map<string, CoverSwatches | null>()
|
const swatchesByKey = new Map<string, CoverSwatches | null>()
|
||||||
const pending = new Map<string, Promise<CoverSwatches | null>>()
|
const pending = new Map<string, Promise<CoverSwatches | null>>()
|
||||||
|
|
||||||
function cacheKey(colorSourceUri: string) {
|
function cacheKey(colorSourceUri: string) {
|
||||||
return `palette:${colorSourceUri}`
|
return `palette:v2:${colorSourceUri}`
|
||||||
}
|
|
||||||
|
|
||||||
function present(colors: (string | undefined)[]) {
|
|
||||||
return colors.filter(
|
|
||||||
(color): color is string => !!color && color.toLowerCase() !== MISSING
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function toSwatches(result: ImageColorsResult): CoverSwatches | null {
|
|
||||||
if (result.platform === "ios") {
|
|
||||||
const text = present([result.primary, result.secondary, result.detail])
|
|
||||||
return result.background.toLowerCase() === MISSING
|
|
||||||
? null
|
|
||||||
: { background: result.background, text, accent: text }
|
|
||||||
}
|
|
||||||
|
|
||||||
const background = present([result.dominant, result.muted])[0]
|
|
||||||
if (!background) return null
|
|
||||||
return {
|
|
||||||
background,
|
|
||||||
text: present([
|
|
||||||
result.lightVibrant,
|
|
||||||
result.lightMuted,
|
|
||||||
result.darkVibrant,
|
|
||||||
result.darkMuted,
|
|
||||||
result.vibrant,
|
|
||||||
result.muted,
|
|
||||||
]),
|
|
||||||
accent: present([
|
|
||||||
result.vibrant,
|
|
||||||
result.lightVibrant,
|
|
||||||
result.darkVibrant,
|
|
||||||
result.muted,
|
|
||||||
]),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function sameSwatches(
|
function sameSwatches(
|
||||||
@@ -76,14 +43,7 @@ function extractSwatches(key: string) {
|
|||||||
const inFlight = pending.get(key)
|
const inFlight = pending.get(key)
|
||||||
if (inFlight) return inFlight
|
if (inFlight) return inFlight
|
||||||
|
|
||||||
const request = getColors(key, {
|
const request = extractCoverSwatches(key)
|
||||||
fallback: MISSING,
|
|
||||||
cache: true,
|
|
||||||
key,
|
|
||||||
quality: "low",
|
|
||||||
pixelSpacing: 4,
|
|
||||||
})
|
|
||||||
.then(toSwatches)
|
|
||||||
.catch(() => null)
|
.catch(() => null)
|
||||||
.then((swatches) => {
|
.then((swatches) => {
|
||||||
swatchesByKey.set(key, swatches)
|
swatchesByKey.set(key, swatches)
|
||||||
@@ -95,6 +55,17 @@ function extractSwatches(key: string) {
|
|||||||
return request
|
return request
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Warm visible artwork colors before a detail page is pushed. */
|
||||||
|
export function prefetchCoverPalette(uri: string) {
|
||||||
|
if (!artworkColorsEnabled()) {
|
||||||
|
prefetchLegacyCoverPalette(uri)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
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
|
* 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
|
* cover and is cached on device. Pass `hasCover` as `undefined` while it isn't
|
||||||
@@ -103,7 +74,7 @@ function extractSwatches(key: string) {
|
|||||||
* `settled` turns true once the palette is final or after
|
* `settled` turns true once the palette is final or after
|
||||||
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
|
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
|
||||||
*/
|
*/
|
||||||
export function useCoverPalette(
|
function useRegionCoverPalette(
|
||||||
uri: string,
|
uri: string,
|
||||||
hasCover: boolean | undefined
|
hasCover: boolean | undefined
|
||||||
): { palette: CoverPalette; settled: boolean } {
|
): { palette: CoverPalette; settled: boolean } {
|
||||||
@@ -138,7 +109,10 @@ export function useCoverPalette(
|
|||||||
// case the cover changed.
|
// case the cover changed.
|
||||||
const timer =
|
const timer =
|
||||||
known === undefined
|
known === undefined
|
||||||
? setTimeout(() => !cancelled && setWaitedKey(key), COVER_PALETTE_WAIT_MS)
|
? setTimeout(
|
||||||
|
() => !cancelled && setWaitedKey(key),
|
||||||
|
COVER_PALETTE_WAIT_MS
|
||||||
|
)
|
||||||
: null
|
: null
|
||||||
void extractSwatches(key).then((next) => {
|
void extractSwatches(key).then((next) => {
|
||||||
if (!cancelled) show(next ?? known ?? null)
|
if (!cancelled) show(next ?? known ?? null)
|
||||||
@@ -151,7 +125,9 @@ export function useCoverPalette(
|
|||||||
|
|
||||||
const palette = useMemo(() => {
|
const palette = useMemo(() => {
|
||||||
const fromArt =
|
const fromArt =
|
||||||
hasCover !== false && swatches ? deriveCoverPalette(swatches, isDark) : null
|
hasCover !== false && swatches
|
||||||
|
? deriveCoverPalette(swatches)
|
||||||
|
: null
|
||||||
return fromArt ?? themeCoverPalette(theme, isDark)
|
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||||
}, [hasCover, isDark, swatches, theme])
|
}, [hasCover, isDark, swatches, theme])
|
||||||
|
|
||||||
@@ -161,3 +137,11 @@ export function useCoverPalette(
|
|||||||
!key || hasCover === false || swatches !== undefined || waitedKey === key,
|
!key || hasCover === false || swatches !== undefined || waitedKey === key,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Switch both extraction and palette derivation without mixing their caches. */
|
||||||
|
export function useCoverPalette(uri: string, hasCover: boolean | undefined) {
|
||||||
|
const enabled = useArtworkColorsEnabled()
|
||||||
|
const region = useRegionCoverPalette(enabled ? uri : "", hasCover)
|
||||||
|
const legacy = useLegacyCoverPalette(enabled ? "" : uri, hasCover)
|
||||||
|
return enabled ? region : legacy
|
||||||
|
}
|
||||||
@@ -0,0 +1,178 @@
|
|||||||
|
import { useEffect, useMemo, useState } from "react"
|
||||||
|
import { getColors, type ImageColorsResult } from "react-native-image-colors"
|
||||||
|
|
||||||
|
import {
|
||||||
|
themeCoverPalette,
|
||||||
|
type CoverPalette,
|
||||||
|
} from "@/lib/cover-palette"
|
||||||
|
import { deriveCoverPalette, type LegacyCoverSwatches as CoverSwatches } from "@/lib/legacy-cover-palette"
|
||||||
|
import { readCache, writeCache } from "@/lib/persistent-cache"
|
||||||
|
import { useIsDark, useThemeColors } from "@/lib/theme"
|
||||||
|
import { withCoverImageSize } from "@/lib/urls"
|
||||||
|
|
||||||
|
// How long a screen holds its skeleton for the first extraction of a cover,
|
||||||
|
// so rows render once with final colors instead of flashing from the theme.
|
||||||
|
const COVER_PALETTE_WAIT_MS = 400
|
||||||
|
|
||||||
|
// image-colors substitutes this for swatches it couldn't find.
|
||||||
|
const MISSING = "#010203"
|
||||||
|
|
||||||
|
const swatchesByKey = new Map<string, CoverSwatches | null>()
|
||||||
|
const pending = new Map<string, Promise<CoverSwatches | null>>()
|
||||||
|
|
||||||
|
function cacheKey(colorSourceUri: string) {
|
||||||
|
return `palette:${colorSourceUri}`
|
||||||
|
}
|
||||||
|
|
||||||
|
function present(colors: (string | undefined)[]) {
|
||||||
|
return colors.filter(
|
||||||
|
(color): color is string => !!color && color.toLowerCase() !== MISSING
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function toSwatches(result: ImageColorsResult): CoverSwatches | null {
|
||||||
|
if (result.platform === "ios") {
|
||||||
|
const text = present([result.primary, result.secondary, result.detail])
|
||||||
|
return result.background.toLowerCase() === MISSING
|
||||||
|
? null
|
||||||
|
: { background: result.background, text, accent: text }
|
||||||
|
}
|
||||||
|
|
||||||
|
const background = present([result.dominant, result.muted])[0]
|
||||||
|
if (!background) return null
|
||||||
|
return {
|
||||||
|
background,
|
||||||
|
text: present([
|
||||||
|
result.lightVibrant,
|
||||||
|
result.lightMuted,
|
||||||
|
result.darkVibrant,
|
||||||
|
result.darkMuted,
|
||||||
|
result.vibrant,
|
||||||
|
result.muted,
|
||||||
|
]),
|
||||||
|
accent: present([
|
||||||
|
result.vibrant,
|
||||||
|
result.lightVibrant,
|
||||||
|
result.darkVibrant,
|
||||||
|
result.muted,
|
||||||
|
]),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function sameSwatches(
|
||||||
|
a: CoverSwatches | null | undefined,
|
||||||
|
b: CoverSwatches | null | undefined
|
||||||
|
) {
|
||||||
|
return a === b || JSON.stringify(a) === JSON.stringify(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
function extractSwatches(key: string) {
|
||||||
|
const inFlight = pending.get(key)
|
||||||
|
if (inFlight) return inFlight
|
||||||
|
|
||||||
|
const request = getColors(key, {
|
||||||
|
fallback: MISSING,
|
||||||
|
cache: true,
|
||||||
|
key,
|
||||||
|
quality: "low",
|
||||||
|
pixelSpacing: 4,
|
||||||
|
})
|
||||||
|
.then(toSwatches)
|
||||||
|
.catch(() => null)
|
||||||
|
.then((swatches) => {
|
||||||
|
swatchesByKey.set(key, swatches)
|
||||||
|
if (swatches) writeCache(cacheKey(key), swatches)
|
||||||
|
pending.delete(key)
|
||||||
|
return swatches
|
||||||
|
})
|
||||||
|
pending.set(key, request)
|
||||||
|
return request
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Warm visible artwork colors before a detail page is pushed. */
|
||||||
|
export function prefetchLegacyCoverPalette(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
|
||||||
|
* known yet so extraction can start early.
|
||||||
|
*
|
||||||
|
* `settled` turns true once the palette is final or after
|
||||||
|
* `COVER_PALETTE_WAIT_MS`, whichever comes first.
|
||||||
|
*/
|
||||||
|
export function useLegacyCoverPalette(
|
||||||
|
uri: string,
|
||||||
|
hasCover: boolean | undefined
|
||||||
|
): { palette: CoverPalette; settled: boolean } {
|
||||||
|
const theme = useThemeColors()
|
||||||
|
const isDark = useIsDark()
|
||||||
|
const key = uri ? withCoverImageSize(uri, 64) : ""
|
||||||
|
const [resolved, setResolved] = useState(() => ({
|
||||||
|
key,
|
||||||
|
swatches: key ? cachedSwatches(key) : null,
|
||||||
|
}))
|
||||||
|
const [waitedKey, setWaitedKey] = useState<string | null>(null)
|
||||||
|
|
||||||
|
const swatches =
|
||||||
|
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!key || hasCover === false) return
|
||||||
|
let cancelled = false
|
||||||
|
const known = cachedSwatches(key)
|
||||||
|
const show = (next: CoverSwatches | null) =>
|
||||||
|
setResolved((prev) =>
|
||||||
|
prev.key === key && sameSwatches(prev.swatches, next)
|
||||||
|
? prev
|
||||||
|
: { key, swatches: next }
|
||||||
|
)
|
||||||
|
if (known !== undefined && swatchesByKey.has(key)) {
|
||||||
|
show(known)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Persisted swatches render immediately; refresh them in the background in
|
||||||
|
// case the cover changed.
|
||||||
|
const timer =
|
||||||
|
known === undefined
|
||||||
|
? setTimeout(
|
||||||
|
() => !cancelled && setWaitedKey(key),
|
||||||
|
COVER_PALETTE_WAIT_MS
|
||||||
|
)
|
||||||
|
: null
|
||||||
|
void extractSwatches(key).then((next) => {
|
||||||
|
if (!cancelled) show(next ?? known ?? null)
|
||||||
|
})
|
||||||
|
return () => {
|
||||||
|
cancelled = true
|
||||||
|
if (timer) clearTimeout(timer)
|
||||||
|
}
|
||||||
|
}, [hasCover, key])
|
||||||
|
|
||||||
|
const palette = useMemo(() => {
|
||||||
|
const fromArt =
|
||||||
|
hasCover !== false && swatches
|
||||||
|
? deriveCoverPalette(swatches, isDark)
|
||||||
|
: null
|
||||||
|
return fromArt ?? themeCoverPalette(theme, isDark)
|
||||||
|
}, [hasCover, isDark, swatches, theme])
|
||||||
|
|
||||||
|
return {
|
||||||
|
palette,
|
||||||
|
settled:
|
||||||
|
!key || hasCover === false || swatches !== undefined || waitedKey === key,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
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,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
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])
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
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,7 +1,14 @@
|
|||||||
import { useRouter, useSegments, type Href } from "expo-router"
|
import { useRouter, useSegments, type Href } from "expo-router"
|
||||||
import { useCallback } from "react"
|
import { useCallback } from "react"
|
||||||
|
|
||||||
export const APP_TABS = ["home", "library", "search"] as const
|
import { tabletSections } from "@/lib/tablet-navigation"
|
||||||
|
|
||||||
|
export const APP_TABS = [
|
||||||
|
"home",
|
||||||
|
"library",
|
||||||
|
"search",
|
||||||
|
...tabletSections.map((section) => section.group),
|
||||||
|
] as const
|
||||||
export type AppTab = (typeof APP_TABS)[number]
|
export type AppTab = (typeof APP_TABS)[number]
|
||||||
|
|
||||||
const TAB_SET = new Set<string>(APP_TABS)
|
const TAB_SET = new Set<string>(APP_TABS)
|
||||||
@@ -37,20 +44,26 @@ export function AppNavigationSync() {
|
|||||||
export function useAppNavigation() {
|
export function useAppNavigation() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const push = useCallback((path: string) => {
|
const push = useCallback(
|
||||||
if (activeSegmentsRef.current.includes("player")) {
|
(path: string) => {
|
||||||
// Leave the root player modal before navigating into the library stack.
|
if (activeSegmentsRef.current.includes("player")) {
|
||||||
router.dismiss()
|
// Leave the root player modal before navigating into the library stack.
|
||||||
router.navigate(tabPath("library", path))
|
router.dismiss()
|
||||||
return
|
router.navigate(tabPath("library", path))
|
||||||
}
|
return
|
||||||
|
}
|
||||||
|
|
||||||
router.push(tabPath(getActiveTabFromRef(), path))
|
router.push(tabPath(getActiveTabFromRef(), path))
|
||||||
}, [router])
|
},
|
||||||
|
[router]
|
||||||
|
)
|
||||||
|
|
||||||
const replace = useCallback((path: string) => {
|
const replace = useCallback(
|
||||||
router.replace(tabPath(getActiveTabFromRef(), path))
|
(path: string) => {
|
||||||
}, [router])
|
router.replace(tabPath(getActiveTabFromRef(), path))
|
||||||
|
},
|
||||||
|
[router]
|
||||||
|
)
|
||||||
|
|
||||||
const href = useCallback(
|
const href = useCallback(
|
||||||
(path: string) => tabPath(getActiveTabFromRef(), path),
|
(path: string) => tabPath(getActiveTabFromRef(), path),
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import AsyncStorage from "@react-native-async-storage/async-storage"
|
||||||
|
import { useSyncExternalStore } from "react"
|
||||||
|
|
||||||
|
const STORAGE_KEY = "otunes:artwork-colors"
|
||||||
|
const listeners = new Set<() => void>()
|
||||||
|
let enabled = true
|
||||||
|
let loaded = false
|
||||||
|
let loading: Promise<void> | undefined
|
||||||
|
|
||||||
|
function notify() {
|
||||||
|
for (const listener of listeners) listener()
|
||||||
|
}
|
||||||
|
|
||||||
|
function load() {
|
||||||
|
return (loading ??= AsyncStorage.getItem(STORAGE_KEY)
|
||||||
|
.then((value) => {
|
||||||
|
enabled = value !== "false"
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
// Keep the default when local storage is unavailable.
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
loaded = true
|
||||||
|
notify()
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
function subscribe(listener: () => void) {
|
||||||
|
listeners.add(listener)
|
||||||
|
void load()
|
||||||
|
return () => {
|
||||||
|
listeners.delete(listener)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Device preference, kept outside account data and the disposable query cache. */
|
||||||
|
export function useArtworkColorsEnabled() {
|
||||||
|
return useSyncExternalStore(subscribe, () => loaded && enabled, () => false)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useArtworkColorPreferenceLoaded() {
|
||||||
|
return useSyncExternalStore(subscribe, () => loaded, () => false)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function artworkColorsEnabled() {
|
||||||
|
return loaded && enabled
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function setArtworkColorsEnabled(value: boolean) {
|
||||||
|
await load()
|
||||||
|
await AsyncStorage.setItem(STORAGE_KEY, String(value))
|
||||||
|
enabled = value
|
||||||
|
notify()
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import { requireNativeModule } from "expo"
|
||||||
|
|
||||||
|
import { swatchesFromHistogram, type ColorBin } from "./color-histogram"
|
||||||
|
|
||||||
|
const native = requireNativeModule<{
|
||||||
|
histogram(uri: string): Promise<ColorBin[]>
|
||||||
|
}>("ArtworkColors")
|
||||||
|
|
||||||
|
export async function extractCoverSwatches(uri: string) {
|
||||||
|
return swatchesFromHistogram(await native.histogram(uri))
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { getColors } from "react-native-image-colors"
|
||||||
|
import type { CoverSwatches } from "./cover-palette"
|
||||||
|
|
||||||
|
const MISSING = "#010203"
|
||||||
|
|
||||||
|
/** Android and web retain their platform quantizers; iOS uses the sRGB histogram. */
|
||||||
|
export async function extractCoverSwatches(
|
||||||
|
uri: string
|
||||||
|
): Promise<CoverSwatches | null> {
|
||||||
|
const result = await getColors(uri, {
|
||||||
|
fallback: MISSING,
|
||||||
|
cache: true,
|
||||||
|
key: uri,
|
||||||
|
quality: "low",
|
||||||
|
pixelSpacing: 4,
|
||||||
|
})
|
||||||
|
if (result.platform === "ios") return null
|
||||||
|
const background = [result.dominant, result.muted].find(
|
||||||
|
(color) => color && color.toLowerCase() !== MISSING
|
||||||
|
)
|
||||||
|
if (!background) return null
|
||||||
|
return {
|
||||||
|
background,
|
||||||
|
...(result.platform === "android" &&
|
||||||
|
result.average.toLowerCase() !== MISSING
|
||||||
|
? { average: result.average }
|
||||||
|
: {}),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
const { test } = require("node:test")
|
||||||
|
const assert = require("node:assert/strict")
|
||||||
|
const fs = require("node:fs")
|
||||||
|
const ts = require("typescript")
|
||||||
|
|
||||||
|
const compiled = ts.transpileModule(
|
||||||
|
fs.readFileSync(`${__dirname}/color-histogram.ts`, "utf8"),
|
||||||
|
{
|
||||||
|
compilerOptions: {
|
||||||
|
module: ts.ModuleKind.CommonJS,
|
||||||
|
target: ts.ScriptTarget.ES2022,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
).outputText
|
||||||
|
const loaded = { exports: {} }
|
||||||
|
new Function("exports", compiled)(loaded.exports)
|
||||||
|
const { swatchesFromHistogram } = loaded.exports
|
||||||
|
|
||||||
|
test("a noisy background outranks a smaller flat logo, independent of bin order", () => {
|
||||||
|
const background = Array.from({ length: 30 }, (_, i) => [
|
||||||
|
30 + i,
|
||||||
|
110 + i,
|
||||||
|
30 + i,
|
||||||
|
100,
|
||||||
|
])
|
||||||
|
const bins = [...background, [240, 10, 10, 500]]
|
||||||
|
const palette = swatchesFromHistogram(bins)
|
||||||
|
assert.equal(palette.background, "#2d7d2d")
|
||||||
|
assert.ok(palette.dominantFraction > 0.85)
|
||||||
|
assert.deepEqual(palette, swatchesFromHistogram([...bins].reverse()))
|
||||||
|
})
|
||||||
|
|
||||||
|
test("dominant black stays black beside white and a saturated accent", () => {
|
||||||
|
const palette = swatchesFromHistogram([
|
||||||
|
[0, 0, 0, 60],
|
||||||
|
[255, 255, 255, 30],
|
||||||
|
[140, 200, 50, 10],
|
||||||
|
])
|
||||||
|
assert.equal(palette.background, "#000000")
|
||||||
|
assert.equal(palette.darkFraction, 0.6)
|
||||||
|
assert.equal(palette.dominantFraction, 0.6)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("empty and invalid histograms cannot produce NaN colors", () => {
|
||||||
|
assert.equal(swatchesFromHistogram([]), null)
|
||||||
|
assert.equal(
|
||||||
|
swatchesFromHistogram([
|
||||||
|
[NaN, 0, 0, 1],
|
||||||
|
[256, 0, 0, 1],
|
||||||
|
[0, 0, 0, 0],
|
||||||
|
]),
|
||||||
|
null
|
||||||
|
)
|
||||||
|
assert.equal(swatchesFromHistogram([[80, 100, 120, 4]]).background, "#506478")
|
||||||
|
})
|
||||||
@@ -0,0 +1,162 @@
|
|||||||
|
import type { CoverSwatches } from "./cover-palette"
|
||||||
|
|
||||||
|
type Rgb = [number, number, number]
|
||||||
|
export type ColorBin = [red: number, green: number, blue: number, count: number]
|
||||||
|
type Cluster = { rgb: Rgb; lab: Rgb; count: number }
|
||||||
|
|
||||||
|
function lab([r, g, b]: Rgb): Rgb {
|
||||||
|
const linear = (v: number) =>
|
||||||
|
v <= 0.04045 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4
|
||||||
|
const red = linear(r / 255)
|
||||||
|
const green = linear(g / 255)
|
||||||
|
const blue = linear(b / 255)
|
||||||
|
const l = Math.cbrt(
|
||||||
|
0.4122214708 * red + 0.5363325363 * green + 0.0514459929 * blue
|
||||||
|
)
|
||||||
|
const m = Math.cbrt(
|
||||||
|
0.2119034982 * red + 0.6806995451 * green + 0.1073969566 * blue
|
||||||
|
)
|
||||||
|
const s = Math.cbrt(
|
||||||
|
0.0883024619 * red + 0.2817188376 * green + 0.6299787005 * blue
|
||||||
|
)
|
||||||
|
return [
|
||||||
|
0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s,
|
||||||
|
1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s,
|
||||||
|
0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s,
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
function distance(a: Rgb, b: Rgb) {
|
||||||
|
return (a[0] - b[0]) ** 2 + (a[1] - b[1]) ** 2 + (a[2] - b[2]) ** 2
|
||||||
|
}
|
||||||
|
|
||||||
|
function hex(rgb: Rgb) {
|
||||||
|
return `#${rgb.map((v) => Math.round(v).toString(16).padStart(2, "0")).join("")}`
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Group nearby colors by perceived distance, retaining black and white regions. */
|
||||||
|
export function swatchesFromHistogram(bins: ColorBin[]): CoverSwatches | null {
|
||||||
|
const samples: Cluster[] = bins
|
||||||
|
.filter(
|
||||||
|
(bin) =>
|
||||||
|
bin.length === 4 &&
|
||||||
|
bin.every(Number.isFinite) &&
|
||||||
|
bin[3] > 0 &&
|
||||||
|
bin.slice(0, 3).every((v) => v >= 0 && v <= 255)
|
||||||
|
)
|
||||||
|
.map<Cluster>(([r, g, b, count]) => ({
|
||||||
|
rgb: [r, g, b],
|
||||||
|
lab: lab([r, g, b]),
|
||||||
|
count,
|
||||||
|
}))
|
||||||
|
.sort(
|
||||||
|
(a, b) =>
|
||||||
|
b.count - a.count ||
|
||||||
|
a.rgb[0] - b.rgb[0] ||
|
||||||
|
a.rgb[1] - b.rgb[1] ||
|
||||||
|
a.rgb[2] - b.rgb[2]
|
||||||
|
)
|
||||||
|
if (!samples.length) return null
|
||||||
|
|
||||||
|
const centers = [samples[0].lab]
|
||||||
|
// Deterministic weighted seeding avoids random palette changes between launches.
|
||||||
|
while (centers.length < Math.min(8, samples.length)) {
|
||||||
|
let candidate = samples[0]
|
||||||
|
let best = 0
|
||||||
|
for (const sample of samples) {
|
||||||
|
const score =
|
||||||
|
Math.min(...centers.map((center) => distance(sample.lab, center))) *
|
||||||
|
sample.count
|
||||||
|
if (score > best) {
|
||||||
|
candidate = sample
|
||||||
|
best = score
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (best === 0) break
|
||||||
|
centers.push(candidate.lab)
|
||||||
|
}
|
||||||
|
|
||||||
|
let clusters: Cluster[] = []
|
||||||
|
for (let iteration = 0; iteration < 12; iteration++) {
|
||||||
|
clusters = centers.map(() => ({ rgb: [0, 0, 0], lab: [0, 0, 0], count: 0 }))
|
||||||
|
for (const sample of samples) {
|
||||||
|
let nearest = 0
|
||||||
|
for (let index = 1; index < centers.length; index++) {
|
||||||
|
if (
|
||||||
|
distance(sample.lab, centers[index]) <
|
||||||
|
distance(sample.lab, centers[nearest])
|
||||||
|
)
|
||||||
|
nearest = index
|
||||||
|
}
|
||||||
|
const cluster = clusters[nearest]
|
||||||
|
cluster.count += sample.count
|
||||||
|
for (let channel = 0; channel < 3; channel++) {
|
||||||
|
cluster.rgb[channel] += sample.rgb[channel] * sample.count
|
||||||
|
cluster.lab[channel] += sample.lab[channel] * sample.count
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let movement = 0
|
||||||
|
clusters.forEach((cluster, index) => {
|
||||||
|
if (!cluster.count) return
|
||||||
|
for (let channel = 0; channel < 3; channel++) {
|
||||||
|
cluster.rgb[channel] /= cluster.count
|
||||||
|
cluster.lab[channel] /= cluster.count
|
||||||
|
}
|
||||||
|
movement += distance(centers[index], cluster.lab)
|
||||||
|
centers[index] = cluster.lab
|
||||||
|
})
|
||||||
|
if (movement < 0.000001) break
|
||||||
|
}
|
||||||
|
|
||||||
|
// K-means can divide a textured region across several centers. Combine those
|
||||||
|
// centers before ranking coverage so a small flat logo cannot outrank it.
|
||||||
|
clusters = clusters.filter((cluster) => cluster.count > 0)
|
||||||
|
while (clusters.length > 1) {
|
||||||
|
let pair: [number, number] | undefined
|
||||||
|
let closest = 0.06 ** 2
|
||||||
|
for (let a = 0; a < clusters.length; a++) {
|
||||||
|
for (let b = a + 1; b < clusters.length; b++) {
|
||||||
|
const separation = distance(clusters[a].lab, clusters[b].lab)
|
||||||
|
if (separation < closest) {
|
||||||
|
closest = separation
|
||||||
|
pair = [a, b]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!pair) break
|
||||||
|
const [a, b] = pair
|
||||||
|
const first = clusters[a]
|
||||||
|
const second = clusters[b]
|
||||||
|
const count = first.count + second.count
|
||||||
|
for (let channel = 0; channel < 3; channel++) {
|
||||||
|
first.rgb[channel] =
|
||||||
|
(first.rgb[channel] * first.count +
|
||||||
|
second.rgb[channel] * second.count) /
|
||||||
|
count
|
||||||
|
first.lab[channel] =
|
||||||
|
(first.lab[channel] * first.count +
|
||||||
|
second.lab[channel] * second.count) /
|
||||||
|
count
|
||||||
|
}
|
||||||
|
first.count = count
|
||||||
|
clusters.splice(b, 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
const total = samples.reduce((sum, sample) => sum + sample.count, 0)
|
||||||
|
const average: Rgb = [0, 0, 0]
|
||||||
|
for (const sample of samples) {
|
||||||
|
for (let channel = 0; channel < 3; channel++)
|
||||||
|
average[channel] += (sample.rgb[channel] * sample.count) / total
|
||||||
|
}
|
||||||
|
clusters.sort((a, b) => b.count - a.count)
|
||||||
|
return {
|
||||||
|
background: hex(clusters[0].rgb),
|
||||||
|
average: hex(average),
|
||||||
|
dominantFraction: clusters[0].count / total,
|
||||||
|
darkFraction:
|
||||||
|
samples.reduce(
|
||||||
|
(sum, sample) => sum + (sample.lab[0] < 0.3 ? sample.count : 0),
|
||||||
|
0
|
||||||
|
) / total,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
type Color = [number, number, number]
|
||||||
|
|
||||||
|
/** Convert sRGB byte values to Oklab without quantizing intermediate colors. */
|
||||||
|
export function toOklab(rgb: Color): Color {
|
||||||
|
const [r, g, b] = rgb.map((byte) => {
|
||||||
|
const v = byte / 255
|
||||||
|
return v <= 0.04045 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4
|
||||||
|
})
|
||||||
|
const l = Math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
|
||||||
|
const m = Math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
|
||||||
|
const s = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
|
||||||
|
return [
|
||||||
|
0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s,
|
||||||
|
1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s,
|
||||||
|
0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s,
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Map an Oklab color back into the display's sRGB gamut. */
|
||||||
|
export function fromOklab([L, a, b]: Color): Color {
|
||||||
|
const l = (L + 0.3963377774 * a + 0.2158037573 * b) ** 3
|
||||||
|
const m = (L - 0.1055613458 * a - 0.0638541728 * b) ** 3
|
||||||
|
const s = (L - 0.0894841775 * a - 1.291485548 * b) ** 3
|
||||||
|
return [
|
||||||
|
4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
|
||||||
|
-1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
|
||||||
|
-0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s,
|
||||||
|
].map((v) => {
|
||||||
|
const encoded = v <= 0.0031308 ? 12.92 * v : 1.055 * v ** (1 / 2.4) - 0.055
|
||||||
|
return Math.round(Math.max(0, Math.min(1, encoded)) * 255)
|
||||||
|
}) as Color
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
// Measurement targets belong here and in the fixture, never in palette derivation.
|
||||||
|
const fs = require("node:fs")
|
||||||
|
const ts = require("typescript")
|
||||||
|
const references = require("./cover-palette.references.json")
|
||||||
|
function load(name) {
|
||||||
|
const exports = {}
|
||||||
|
const code = ts.transpileModule(
|
||||||
|
fs.readFileSync(`${__dirname}/${name}.ts`, "utf8"),
|
||||||
|
{
|
||||||
|
compilerOptions: {
|
||||||
|
module: ts.ModuleKind.CommonJS,
|
||||||
|
target: ts.ScriptTarget.ES2022,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
).outputText
|
||||||
|
new Function("exports", "require", code)(exports, (name) =>
|
||||||
|
load(name.replace("./", ""))
|
||||||
|
)
|
||||||
|
return exports
|
||||||
|
}
|
||||||
|
const { deriveCoverPalette } = load("cover-palette")
|
||||||
|
const rgb = (hex) => [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16))
|
||||||
|
const measurements = references.map(
|
||||||
|
({ label, swatches, expectedBackground }) => {
|
||||||
|
const actual = deriveCoverPalette(swatches).background
|
||||||
|
const errors = rgb(actual).map((v, i) =>
|
||||||
|
Math.abs(v - rgb(expectedBackground)[i])
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
label,
|
||||||
|
expectedBackground,
|
||||||
|
actual,
|
||||||
|
maxChannelError: Math.max(...errors),
|
||||||
|
squaredError: errors.reduce((s, v) => s + v * v, 0),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
console.table(measurements.map(({ squaredError, ...row }) => row))
|
||||||
|
console.log(
|
||||||
|
"RGB RMSE:",
|
||||||
|
Math.sqrt(
|
||||||
|
measurements.reduce((s, r) => s + r.squaredError, 0) /
|
||||||
|
(measurements.length * 3)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if (
|
||||||
|
process.argv.includes("--exact") &&
|
||||||
|
measurements.some((row) => row.maxChannelError !== 0)
|
||||||
|
)
|
||||||
|
process.exitCode = 1
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
[
|
||||||
|
{
|
||||||
|
"label": "wicked-soundtrack",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#4f4e33",
|
||||||
|
"average": "#74664d",
|
||||||
|
"dominantFraction": 0.184814453125,
|
||||||
|
"darkFraction": 0.195556640625
|
||||||
|
},
|
||||||
|
"expectedBackground": "#1a1c0e"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "wicked-broadway",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#030605",
|
||||||
|
"average": "#74786c",
|
||||||
|
"dominantFraction": 0.423828125,
|
||||||
|
"darkFraction": 0.43798828125
|
||||||
|
},
|
||||||
|
"expectedBackground": "#111111"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "prince-of-egypt",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#16101f",
|
||||||
|
"average": "#584546",
|
||||||
|
"dominantFraction": 0.585693359375,
|
||||||
|
"darkFraction": 0.587158203125
|
||||||
|
},
|
||||||
|
"expectedBackground": "#191718"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "civilization-vi",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#ccaf90",
|
||||||
|
"average": "#b79e80",
|
||||||
|
"dominantFraction": 0.20703125,
|
||||||
|
"darkFraction": 0.001220703125
|
||||||
|
},
|
||||||
|
"expectedBackground": "#3f280c"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "ramblin-rover",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#457522",
|
||||||
|
"average": "#548133",
|
||||||
|
"dominantFraction": 0.7802734375,
|
||||||
|
"darkFraction": 0
|
||||||
|
},
|
||||||
|
"expectedBackground": "#0e3900"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "cavalry",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#0d131f",
|
||||||
|
"average": "#404954",
|
||||||
|
"dominantFraction": 0.317138671875,
|
||||||
|
"darkFraction": 0.38623046875
|
||||||
|
},
|
||||||
|
"expectedBackground": "#151d2f"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "city-of-angels",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#1895cb",
|
||||||
|
"average": "#6c7c8b",
|
||||||
|
"dominantFraction": 0.241943359375,
|
||||||
|
"darkFraction": 0.075927734375
|
||||||
|
},
|
||||||
|
"expectedBackground": "#003262"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "we-the-kings",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#ab3a33",
|
||||||
|
"average": "#923b32",
|
||||||
|
"dominantFraction": 0.577880859375,
|
||||||
|
"darkFraction": 0.16552734375
|
||||||
|
},
|
||||||
|
"expectedBackground": "#52170d"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "counter-strike-2",
|
||||||
|
"swatches": {
|
||||||
|
"background": "#060404",
|
||||||
|
"average": "#786757",
|
||||||
|
"dominantFraction": 0.35693359375,
|
||||||
|
"darkFraction": 0.390625
|
||||||
|
},
|
||||||
|
"expectedBackground": "#251211"
|
||||||
|
}
|
||||||
|
]
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
const { test } = require("node:test")
|
||||||
|
const assert = require("node:assert/strict")
|
||||||
|
const fs = require("node:fs")
|
||||||
|
const ts = require("typescript")
|
||||||
|
function load(name) {
|
||||||
|
const exports = {}
|
||||||
|
new Function(
|
||||||
|
"exports",
|
||||||
|
"require",
|
||||||
|
ts.transpileModule(fs.readFileSync(`${__dirname}/${name}.ts`, "utf8"), {
|
||||||
|
compilerOptions: {
|
||||||
|
module: ts.ModuleKind.CommonJS,
|
||||||
|
target: ts.ScriptTarget.ES2022,
|
||||||
|
},
|
||||||
|
}).outputText
|
||||||
|
)(exports, (name) => load(name.replace("./", "")))
|
||||||
|
return exports
|
||||||
|
}
|
||||||
|
const { deriveCoverPalette } = load("cover-palette")
|
||||||
|
const { toOklab, fromOklab } = load("color-space")
|
||||||
|
|
||||||
|
test("sRGB and Oklab conversions round trip across the display gamut", () => {
|
||||||
|
for (const r of [0, 16, 64, 128, 192, 255])
|
||||||
|
for (const g of [0, 16, 64, 128, 192, 255])
|
||||||
|
for (const b of [0, 16, 64, 128, 192, 255])
|
||||||
|
assert.deepEqual(fromOklab(toOklab([r, g, b])), [r, g, b])
|
||||||
|
})
|
||||||
|
test("near-black neutral artwork does not amplify arbitrary channel noise", () => {
|
||||||
|
for (const background of ["#000000", "#030605", "#050303"]) {
|
||||||
|
const palette = deriveCoverPalette({ background, average: "#747474" })
|
||||||
|
assert.equal(palette.background, "#111111")
|
||||||
|
assert.equal(palette.foreground, "#FFFFFF")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
test("a conflicting shadow hue is muted while coherent dark blue retains its color", () => {
|
||||||
|
const shadow = deriveCoverPalette({
|
||||||
|
background: "#16101f",
|
||||||
|
average: "#584546",
|
||||||
|
dominantFraction: 0.59,
|
||||||
|
darkFraction: 0.59,
|
||||||
|
})
|
||||||
|
const blue = deriveCoverPalette({
|
||||||
|
background: "#0d131f",
|
||||||
|
average: "#404954",
|
||||||
|
dominantFraction: 0.32,
|
||||||
|
darkFraction: 0.39,
|
||||||
|
})
|
||||||
|
const rgb = (hex) => [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16))
|
||||||
|
const shadowRgb = rgb(shadow.background),
|
||||||
|
blueRgb = rgb(blue.background)
|
||||||
|
assert.ok(Math.max(...shadowRgb) - Math.min(...shadowRgb) <= 4)
|
||||||
|
assert.ok(blueRgb[2] - blueRgb[0] > 15)
|
||||||
|
assert.equal(deriveCoverPalette({ background: "invalid" }), null)
|
||||||
|
})
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { ThemeColors } from "@/lib/theme"
|
import type { ThemeColors } from "@/lib/theme"
|
||||||
|
import { toOklab, fromOklab } from "./color-space"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Colors for a screen tinted by its cover art, modeled on Apple Music's
|
* Colors for a screen tinted by its cover art, modeled on Apple Music's
|
||||||
@@ -17,33 +18,20 @@ export type CoverPalette = {
|
|||||||
isDark: boolean
|
isDark: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** Artwork measurements, cached before deriving the screen palette. */
|
||||||
* Raw colors sampled from the art. `background` is the color the art bleeds
|
|
||||||
* into; `text` is ordered by preference and `accent` holds candidates for the
|
|
||||||
* Play button.
|
|
||||||
*/
|
|
||||||
export type CoverSwatches = {
|
export type CoverSwatches = {
|
||||||
background: string
|
background: string
|
||||||
text: string[]
|
average?: string
|
||||||
accent: string[]
|
dominantFraction?: number
|
||||||
|
darkFraction?: number
|
||||||
}
|
}
|
||||||
|
|
||||||
// Best effort: `legibleBackground` only guarantees that white or black reaches
|
|
||||||
// 7:1, so on some backgrounds primary text settles for pure white or black.
|
|
||||||
const PRIMARY_MIN_CONTRAST = 10
|
|
||||||
const SECONDARY_MIN_CONTRAST = 4.5
|
|
||||||
const SECONDARY_TO_PRIMARY_CONTRAST = 0.62
|
|
||||||
const ACCENT_MIN_CONTRAST = 3
|
|
||||||
const ACCENT_MIN_CHROMA = 0.05
|
|
||||||
const ACCENT_MAX_LIGHTNESS_SHIFT = 0.25
|
|
||||||
// Backgrounds between these luminances can't reach 7:1 with white or black.
|
|
||||||
const DARK_BACKGROUND_MAX_LUMINANCE = 0.095
|
|
||||||
const LIGHT_BACKGROUND_MIN_LUMINANCE = 0.31
|
|
||||||
|
|
||||||
type Rgb = [number, number, number]
|
type Rgb = [number, number, number]
|
||||||
type Oklch = { l: number; c: number; h: number }
|
|
||||||
|
|
||||||
export function themeCoverPalette(theme: ThemeColors, isDark: boolean): CoverPalette {
|
export function themeCoverPalette(
|
||||||
|
theme: ThemeColors,
|
||||||
|
isDark: boolean
|
||||||
|
): CoverPalette {
|
||||||
return {
|
return {
|
||||||
background: theme.background,
|
background: theme.background,
|
||||||
foreground: theme.foreground,
|
foreground: theme.foreground,
|
||||||
@@ -57,240 +45,89 @@ export function themeCoverPalette(theme: ThemeColors, isDark: boolean): CoverPal
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Dark artwork canvas derived from region coverage and perceptual color. */
|
||||||
export function deriveCoverPalette(
|
export function deriveCoverPalette(
|
||||||
swatches: CoverSwatches,
|
swatches: CoverSwatches
|
||||||
schemeIsDark: boolean
|
|
||||||
): CoverPalette | null {
|
): CoverPalette | null {
|
||||||
const source = parseHex(swatches.background)
|
const source = parseHex(swatches.background)
|
||||||
if (!source) return null
|
if (!source) return null
|
||||||
|
const average = swatches.average
|
||||||
|
? (parseHex(swatches.average) ?? source)
|
||||||
|
: source
|
||||||
|
const [lightness, a, b] = toOklab(source)
|
||||||
|
const [, averageA, averageB] = toOklab(average)
|
||||||
|
const chroma = Math.hypot(a, b)
|
||||||
|
const averageChroma = Math.hypot(averageA, averageB)
|
||||||
|
const shadow = clamp((0.4 - lightness) / 0.3)
|
||||||
|
const coverage = clamp(swatches.dominantFraction ?? 1)
|
||||||
|
const darkCoverage = clamp(swatches.darkFraction ?? 0)
|
||||||
|
|
||||||
const background = legibleBackground(source, schemeIsDark)
|
// Luminance alone makes bright, muted artwork too light and dark blue art
|
||||||
const lightText = prefersLightText(background)
|
// almost black. Chroma and a bounded shadow lift retain both kinds of cover.
|
||||||
const parsedText = swatches.text
|
let canvasLightness = Math.max(
|
||||||
.map(parseHex)
|
0.17,
|
||||||
.filter((color): color is Rgb => color !== null)
|
Math.min(0.4, 0.11 + 0.21 * lightness + 0.58 * chroma + 0.08 * shadow)
|
||||||
const backgroundLuminance = luminance(background)
|
|
||||||
const sameSideText = parsedText.filter((color) =>
|
|
||||||
lightText
|
|
||||||
? luminance(color) > backgroundLuminance
|
|
||||||
: luminance(color) < backgroundLuminance
|
|
||||||
)
|
)
|
||||||
const textCandidates = sameSideText.length > 0 ? sameSideText : parsedText
|
let canvasChroma = Math.min(chroma * (1 + shadow), canvasLightness * 0.39)
|
||||||
const fallbackText: Rgb = lightText ? [255, 255, 255] : [0, 0, 0]
|
|
||||||
|
|
||||||
const foreground = withMinContrast(
|
// A dark region whose hue conflicts with the whole image is often a shadow,
|
||||||
textCandidates[0] ?? fallbackText,
|
// rather than a reliable saturated background. Do not amplify that tint.
|
||||||
background,
|
const disagreement = Math.max(
|
||||||
PRIMARY_MIN_CONTRAST
|
0,
|
||||||
|
1 -
|
||||||
|
(a * averageA + b * averageB) / Math.max(chroma * averageChroma, 1e-8) -
|
||||||
|
0.3
|
||||||
)
|
)
|
||||||
const primaryContrast = contrastRatio(foreground, background)
|
canvasChroma *= Math.exp(-20 * shadow * disagreement)
|
||||||
const secondaryTarget = Math.max(
|
canvasChroma *= Math.max(
|
||||||
SECONDARY_MIN_CONTRAST,
|
0,
|
||||||
primaryContrast * SECONDARY_TO_PRIMARY_CONTRAST
|
1 - 2.5 * darkCoverage * (1 - coverage) * (1 - shadow)
|
||||||
)
|
|
||||||
const secondaryForeground = softenTo(
|
|
||||||
withMinContrast(
|
|
||||||
textCandidates[1] ?? foreground,
|
|
||||||
background,
|
|
||||||
SECONDARY_MIN_CONTRAST
|
|
||||||
),
|
|
||||||
background,
|
|
||||||
secondaryTarget
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const accent = pickAccent(swatches.accent, background) ?? foreground
|
// Near-black RGB values carry unstable hue. Use the image's overall chroma
|
||||||
const accentForeground: Rgb = prefersLightText(accent)
|
// to distinguish neutral artwork from a dark region in a colorful image.
|
||||||
? [255, 255, 255]
|
const neutral = shadow * clamp((0.02 - chroma) / 0.02)
|
||||||
: [0, 0, 0]
|
canvasChroma =
|
||||||
|
canvasChroma * (1 - neutral) +
|
||||||
|
Math.max(0, averageChroma - 0.02) * 3.5 * neutral
|
||||||
|
canvasLightness =
|
||||||
|
canvasLightness * (1 - neutral) +
|
||||||
|
(0.177 + Math.max(0, averageChroma - 0.02) * 2) * neutral
|
||||||
|
if (chroma < 0.01 && averageChroma < 0.025) {
|
||||||
|
canvasLightness = toOklab([17, 17, 17])[0]
|
||||||
|
canvasChroma = 0
|
||||||
|
}
|
||||||
|
const direction = chroma > 0 ? canvasChroma / chroma : 0
|
||||||
|
const background = fromOklab([canvasLightness, a * direction, b * direction])
|
||||||
|
const mixWhite = (amount: number) =>
|
||||||
|
toHex(
|
||||||
|
background.map((channel) =>
|
||||||
|
Math.round(channel + (255 - channel) * amount)
|
||||||
|
) as Rgb
|
||||||
|
)
|
||||||
return {
|
return {
|
||||||
background: toHex(background),
|
background: toHex(background),
|
||||||
foreground: toHex(foreground),
|
foreground: "#FFFFFF",
|
||||||
secondaryForeground: toHex(secondaryForeground),
|
secondaryForeground: mixWhite(0.55),
|
||||||
accent: toHex(accent),
|
accent: "#FFFFFF",
|
||||||
accentForeground: toHex(accentForeground),
|
accentForeground: toHex(background),
|
||||||
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
|
accentText: "#FFFFFF",
|
||||||
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
|
surface: mixWhite(0.08),
|
||||||
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
|
divider: mixWhite(0.12),
|
||||||
isDark: lightText,
|
isDark: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
|
function clamp(value: number) {
|
||||||
const lch = toOklch(color)
|
return Math.max(0, Math.min(1, value))
|
||||||
// Keep the art's hue but avoid a glaring page in dark mode or a murky one in
|
|
||||||
// light mode.
|
|
||||||
const clamped = schemeIsDark
|
|
||||||
? withLightness(color, Math.min(lch.l, 0.86))
|
|
||||||
: withLightness(color, Math.max(lch.l, 0.2))
|
|
||||||
const y = luminance(clamped)
|
|
||||||
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
|
|
||||||
return clamped
|
|
||||||
}
|
|
||||||
|
|
||||||
const pivot = schemeIsDark ? 0.28 : 0.14
|
|
||||||
return y < pivot
|
|
||||||
? withLuminance(clamped, DARK_BACKGROUND_MAX_LUMINANCE)
|
|
||||||
: withLuminance(clamped, LIGHT_BACKGROUND_MIN_LUMINANCE)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function pickAccent(candidates: string[], background: Rgb): Rgb | null {
|
function parseHex(hex: string): Rgb | null {
|
||||||
let best: Rgb | null = null
|
if (!/^#[0-9a-f]{6}$/i.test(hex)) return null
|
||||||
let bestChroma = ACCENT_MIN_CHROMA
|
const value = parseInt(hex.slice(1), 16)
|
||||||
for (const hex of candidates) {
|
|
||||||
const color = parseHex(hex)
|
|
||||||
if (!color) continue
|
|
||||||
const adjusted = withMinContrast(color, background, ACCENT_MIN_CONTRAST)
|
|
||||||
const before = toOklch(color)
|
|
||||||
const after = toOklch(adjusted)
|
|
||||||
// A color pushed far from its own lightness (yellow turned olive) no
|
|
||||||
// longer reads as coming from the art.
|
|
||||||
if (Math.abs(after.l - before.l) > ACCENT_MAX_LIGHTNESS_SHIFT) continue
|
|
||||||
if (after.c > bestChroma) {
|
|
||||||
best = adjusted
|
|
||||||
bestChroma = after.c
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return best
|
|
||||||
}
|
|
||||||
|
|
||||||
function prefersLightText(background: Rgb) {
|
|
||||||
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
|
|
||||||
function withMinContrast(color: Rgb, background: Rgb, min: number): Rgb {
|
|
||||||
if (contrastRatio(color, background) >= min) return color
|
|
||||||
|
|
||||||
const lighten = prefersLightText(background)
|
|
||||||
const start = toOklch(color).l
|
|
||||||
const extreme = lighten ? 1 : 0
|
|
||||||
if (contrastRatio(withLightness(color, extreme), background) < min) {
|
|
||||||
return lighten ? [255, 255, 255] : [0, 0, 0]
|
|
||||||
}
|
|
||||||
|
|
||||||
let near = start
|
|
||||||
let far = extreme
|
|
||||||
for (let i = 0; i < 16; i++) {
|
|
||||||
const mid = (near + far) / 2
|
|
||||||
if (contrastRatio(withLightness(color, mid), background) >= min) {
|
|
||||||
far = mid
|
|
||||||
} else {
|
|
||||||
near = mid
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return withLightness(color, far)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Blends `color` toward `background` until its contrast drops to `max`. */
|
|
||||||
function softenTo(color: Rgb, background: Rgb, max: number): Rgb {
|
|
||||||
if (contrastRatio(color, background) <= max) return color
|
|
||||||
|
|
||||||
let keep = 0
|
|
||||||
let blend = 1
|
|
||||||
for (let i = 0; i < 16; i++) {
|
|
||||||
const mid = (keep + blend) / 2
|
|
||||||
if (contrastRatio(mix(color, background, mid), background) >= max) {
|
|
||||||
blend = mid
|
|
||||||
} else {
|
|
||||||
keep = mid
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return mix(color, background, blend)
|
|
||||||
}
|
|
||||||
|
|
||||||
function withLuminance(color: Rgb, target: number): Rgb {
|
|
||||||
let low = 0
|
|
||||||
let high = 1
|
|
||||||
for (let i = 0; i < 16; i++) {
|
|
||||||
const mid = (low + high) / 2
|
|
||||||
if (luminance(withLightness(color, mid)) < target) {
|
|
||||||
low = mid
|
|
||||||
} else {
|
|
||||||
high = mid
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** `amount` of `color` over `base`. */
|
|
||||||
function mix(color: Rgb, base: Rgb, amount: number): Rgb {
|
|
||||||
return [0, 1, 2].map((i) =>
|
|
||||||
Math.round(base[i] + (color[i] - base[i]) * amount)
|
|
||||||
) as Rgb
|
|
||||||
}
|
|
||||||
|
|
||||||
function contrastRatio(a: Rgb, b: Rgb) {
|
|
||||||
const la = luminance(a)
|
|
||||||
const lb = luminance(b)
|
|
||||||
return (Math.max(la, lb) + 0.05) / (Math.min(la, lb) + 0.05)
|
|
||||||
}
|
|
||||||
|
|
||||||
function luminance([r, g, b]: Rgb) {
|
|
||||||
return 0.2126 * toLinear(r) + 0.7152 * toLinear(g) + 0.0722 * toLinear(b)
|
|
||||||
}
|
|
||||||
|
|
||||||
function toLinear(channel: number) {
|
|
||||||
const c = channel / 255
|
|
||||||
return c <= 0.04045 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4
|
|
||||||
}
|
|
||||||
|
|
||||||
function fromLinear(value: number) {
|
|
||||||
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
|
||||||
return c * 255
|
|
||||||
}
|
|
||||||
|
|
||||||
function toOklch(color: Rgb): Oklch {
|
|
||||||
const [r, g, b] = color.map(toLinear)
|
|
||||||
const l = Math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
|
|
||||||
const m = Math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
|
|
||||||
const s = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
|
|
||||||
const L = 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s
|
|
||||||
const A = 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s
|
|
||||||
const B = 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s
|
|
||||||
return { l: L, c: Math.hypot(A, B), h: Math.atan2(B, A) }
|
|
||||||
}
|
|
||||||
|
|
||||||
function oklchToLinear({ l: L, c, h }: Oklch): Rgb {
|
|
||||||
const A = c * Math.cos(h)
|
|
||||||
const B = c * Math.sin(h)
|
|
||||||
const l = (L + 0.3963377774 * A + 0.2158037573 * B) ** 3
|
|
||||||
const m = (L - 0.1055613458 * A - 0.0638541728 * B) ** 3
|
|
||||||
const s = (L - 0.0894841775 * A - 1.291485548 * B) ** 3
|
|
||||||
return [
|
|
||||||
4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
|
|
||||||
-1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
|
|
||||||
-0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Sets OKLCH lightness, reducing chroma as needed to stay within sRGB. */
|
|
||||||
function withLightness(color: Rgb, lightness: number): Rgb {
|
|
||||||
const lch = toOklch(color)
|
|
||||||
const l = Math.min(1, Math.max(0, lightness))
|
|
||||||
let c = lch.c
|
|
||||||
let linear = oklchToLinear({ l, c, h: lch.h })
|
|
||||||
for (let i = 0; i < 12 && !inGamut(linear); i++) {
|
|
||||||
c *= 0.8
|
|
||||||
linear = oklchToLinear({ l, c, h: lch.h })
|
|
||||||
}
|
|
||||||
return linear.map((value) =>
|
|
||||||
Math.round(Math.min(255, Math.max(0, fromLinear(value))))
|
|
||||||
) as Rgb
|
|
||||||
}
|
|
||||||
|
|
||||||
function inGamut(linear: Rgb) {
|
|
||||||
return linear.every((value) => value >= -0.0005 && value <= 1.0005)
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseHex(hex: string | undefined): Rgb | null {
|
|
||||||
if (!hex) return null
|
|
||||||
const match = /^#?([0-9a-f]{6})/i.exec(hex.trim())
|
|
||||||
if (!match) return null
|
|
||||||
const value = parseInt(match[1], 16)
|
|
||||||
return [(value >> 16) & 255, (value >> 8) & 255, value & 255]
|
return [(value >> 16) & 255, (value >> 8) & 255, value & 255]
|
||||||
}
|
}
|
||||||
|
|
||||||
function toHex(color: Rgb) {
|
function toHex(color: Rgb) {
|
||||||
return `#${color.map((c) => c.toString(16).padStart(2, "0")).join("")}`
|
return `#${color.map((channel) => channel.toString(16).padStart(2, "0")).join("")}`
|
||||||
}
|
}
|
||||||
@@ -28,3 +28,8 @@ export function rememberIncomingMediaLink(path: string, serverOrigin: string) {
|
|||||||
pendingLink = { path, serverOrigin }
|
pendingLink = { path, serverOrigin }
|
||||||
for (const listener of listeners) listener()
|
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)
|
||||||
|
}
|
||||||
@@ -0,0 +1,266 @@
|
|||||||
|
// Palette algorithm used before the dominant-region artwork extraction.
|
||||||
|
import type { CoverPalette } from "@/lib/cover-palette"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Raw colors sampled from the art. `background` is the color the art bleeds
|
||||||
|
* into; `text` is ordered by preference and `accent` holds candidates for the
|
||||||
|
* Play button.
|
||||||
|
*/
|
||||||
|
export type LegacyCoverSwatches = {
|
||||||
|
background: string
|
||||||
|
text: string[]
|
||||||
|
accent: string[]
|
||||||
|
}
|
||||||
|
|
||||||
|
// Best effort: `legibleBackground` only guarantees that white or black reaches
|
||||||
|
// 7:1, so on some backgrounds primary text settles for pure white or black.
|
||||||
|
const PRIMARY_MIN_CONTRAST = 10
|
||||||
|
const SECONDARY_MIN_CONTRAST = 4.5
|
||||||
|
const SECONDARY_TO_PRIMARY_CONTRAST = 0.62
|
||||||
|
const ACCENT_MIN_CONTRAST = 3
|
||||||
|
const ACCENT_MIN_CHROMA = 0.05
|
||||||
|
const ACCENT_MAX_LIGHTNESS_SHIFT = 0.25
|
||||||
|
// Backgrounds between these luminances can't reach 7:1 with white or black.
|
||||||
|
const DARK_BACKGROUND_MAX_LUMINANCE = 0.095
|
||||||
|
const LIGHT_BACKGROUND_MIN_LUMINANCE = 0.31
|
||||||
|
|
||||||
|
type Rgb = [number, number, number]
|
||||||
|
type Oklch = { l: number; c: number; h: number }
|
||||||
|
|
||||||
|
export function deriveCoverPalette(
|
||||||
|
swatches: LegacyCoverSwatches,
|
||||||
|
schemeIsDark: boolean
|
||||||
|
): CoverPalette | null {
|
||||||
|
const source = parseHex(swatches.background)
|
||||||
|
if (!source) return null
|
||||||
|
|
||||||
|
const background = legibleBackground(source, schemeIsDark)
|
||||||
|
const lightText = prefersLightText(background)
|
||||||
|
const parsedText = swatches.text
|
||||||
|
.map(parseHex)
|
||||||
|
.filter((color): color is Rgb => color !== null)
|
||||||
|
const backgroundLuminance = luminance(background)
|
||||||
|
const sameSideText = parsedText.filter((color) =>
|
||||||
|
lightText
|
||||||
|
? luminance(color) > backgroundLuminance
|
||||||
|
: luminance(color) < backgroundLuminance
|
||||||
|
)
|
||||||
|
const textCandidates = sameSideText.length > 0 ? sameSideText : parsedText
|
||||||
|
const fallbackText: Rgb = lightText ? [255, 255, 255] : [0, 0, 0]
|
||||||
|
|
||||||
|
const foreground = withMinContrast(
|
||||||
|
textCandidates[0] ?? fallbackText,
|
||||||
|
background,
|
||||||
|
PRIMARY_MIN_CONTRAST
|
||||||
|
)
|
||||||
|
const primaryContrast = contrastRatio(foreground, background)
|
||||||
|
const secondaryTarget = Math.max(
|
||||||
|
SECONDARY_MIN_CONTRAST,
|
||||||
|
primaryContrast * SECONDARY_TO_PRIMARY_CONTRAST
|
||||||
|
)
|
||||||
|
const secondaryForeground = softenTo(
|
||||||
|
withMinContrast(
|
||||||
|
textCandidates[1] ?? foreground,
|
||||||
|
background,
|
||||||
|
SECONDARY_MIN_CONTRAST
|
||||||
|
),
|
||||||
|
background,
|
||||||
|
secondaryTarget
|
||||||
|
)
|
||||||
|
|
||||||
|
const accent = pickAccent(swatches.accent, background) ?? foreground
|
||||||
|
const accentForeground: Rgb = prefersLightText(accent)
|
||||||
|
? [255, 255, 255]
|
||||||
|
: [0, 0, 0]
|
||||||
|
|
||||||
|
return {
|
||||||
|
background: toHex(background),
|
||||||
|
foreground: toHex(foreground),
|
||||||
|
secondaryForeground: toHex(secondaryForeground),
|
||||||
|
accent: toHex(accent),
|
||||||
|
accentForeground: toHex(accentForeground),
|
||||||
|
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
|
||||||
|
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
|
||||||
|
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
|
||||||
|
isDark: lightText,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
|
||||||
|
const lch = toOklch(color)
|
||||||
|
// Keep the art's hue but avoid a glaring page in dark mode or a murky one in
|
||||||
|
// light mode.
|
||||||
|
const clamped = schemeIsDark
|
||||||
|
? withLightness(color, Math.min(lch.l, 0.86))
|
||||||
|
: withLightness(color, Math.max(lch.l, 0.2))
|
||||||
|
const y = luminance(clamped)
|
||||||
|
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
|
||||||
|
return clamped
|
||||||
|
}
|
||||||
|
|
||||||
|
const pivot = schemeIsDark ? 0.28 : 0.14
|
||||||
|
return y < pivot
|
||||||
|
? withLuminance(clamped, DARK_BACKGROUND_MAX_LUMINANCE)
|
||||||
|
: withLuminance(clamped, LIGHT_BACKGROUND_MIN_LUMINANCE)
|
||||||
|
}
|
||||||
|
|
||||||
|
function pickAccent(candidates: string[], background: Rgb): Rgb | null {
|
||||||
|
let best: Rgb | null = null
|
||||||
|
let bestChroma = ACCENT_MIN_CHROMA
|
||||||
|
for (const hex of candidates) {
|
||||||
|
const color = parseHex(hex)
|
||||||
|
if (!color) continue
|
||||||
|
const adjusted = withMinContrast(color, background, ACCENT_MIN_CONTRAST)
|
||||||
|
const before = toOklch(color)
|
||||||
|
const after = toOklch(adjusted)
|
||||||
|
// A color pushed far from its own lightness (yellow turned olive) no
|
||||||
|
// longer reads as coming from the art.
|
||||||
|
if (Math.abs(after.l - before.l) > ACCENT_MAX_LIGHTNESS_SHIFT) continue
|
||||||
|
if (after.c > bestChroma) {
|
||||||
|
best = adjusted
|
||||||
|
bestChroma = after.c
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return best
|
||||||
|
}
|
||||||
|
|
||||||
|
function prefersLightText(background: Rgb) {
|
||||||
|
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
|
||||||
|
function withMinContrast(color: Rgb, background: Rgb, min: number): Rgb {
|
||||||
|
if (contrastRatio(color, background) >= min) return color
|
||||||
|
|
||||||
|
const lighten = prefersLightText(background)
|
||||||
|
const start = toOklch(color).l
|
||||||
|
const extreme = lighten ? 1 : 0
|
||||||
|
if (contrastRatio(withLightness(color, extreme), background) < min) {
|
||||||
|
return lighten ? [255, 255, 255] : [0, 0, 0]
|
||||||
|
}
|
||||||
|
|
||||||
|
let near = start
|
||||||
|
let far = extreme
|
||||||
|
for (let i = 0; i < 16; i++) {
|
||||||
|
const mid = (near + far) / 2
|
||||||
|
if (contrastRatio(withLightness(color, mid), background) >= min) {
|
||||||
|
far = mid
|
||||||
|
} else {
|
||||||
|
near = mid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return withLightness(color, far)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Blends `color` toward `background` until its contrast drops to `max`. */
|
||||||
|
function softenTo(color: Rgb, background: Rgb, max: number): Rgb {
|
||||||
|
if (contrastRatio(color, background) <= max) return color
|
||||||
|
|
||||||
|
let keep = 0
|
||||||
|
let blend = 1
|
||||||
|
for (let i = 0; i < 16; i++) {
|
||||||
|
const mid = (keep + blend) / 2
|
||||||
|
if (contrastRatio(mix(color, background, mid), background) >= max) {
|
||||||
|
blend = mid
|
||||||
|
} else {
|
||||||
|
keep = mid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return mix(color, background, blend)
|
||||||
|
}
|
||||||
|
|
||||||
|
function withLuminance(color: Rgb, target: number): Rgb {
|
||||||
|
let low = 0
|
||||||
|
let high = 1
|
||||||
|
for (let i = 0; i < 16; i++) {
|
||||||
|
const mid = (low + high) / 2
|
||||||
|
if (luminance(withLightness(color, mid)) < target) {
|
||||||
|
low = mid
|
||||||
|
} else {
|
||||||
|
high = mid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** `amount` of `color` over `base`. */
|
||||||
|
function mix(color: Rgb, base: Rgb, amount: number): Rgb {
|
||||||
|
return [0, 1, 2].map((i) =>
|
||||||
|
Math.round(base[i] + (color[i] - base[i]) * amount)
|
||||||
|
) as Rgb
|
||||||
|
}
|
||||||
|
|
||||||
|
function contrastRatio(a: Rgb, b: Rgb) {
|
||||||
|
const la = luminance(a)
|
||||||
|
const lb = luminance(b)
|
||||||
|
return (Math.max(la, lb) + 0.05) / (Math.min(la, lb) + 0.05)
|
||||||
|
}
|
||||||
|
|
||||||
|
function luminance([r, g, b]: Rgb) {
|
||||||
|
return 0.2126 * toLinear(r) + 0.7152 * toLinear(g) + 0.0722 * toLinear(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
function toLinear(channel: number) {
|
||||||
|
const c = channel / 255
|
||||||
|
return c <= 0.04045 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4
|
||||||
|
}
|
||||||
|
|
||||||
|
function fromLinear(value: number) {
|
||||||
|
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
|
||||||
|
return c * 255
|
||||||
|
}
|
||||||
|
|
||||||
|
function toOklch(color: Rgb): Oklch {
|
||||||
|
const [r, g, b] = color.map(toLinear)
|
||||||
|
const l = Math.cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
|
||||||
|
const m = Math.cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
|
||||||
|
const s = Math.cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
|
||||||
|
const L = 0.2104542553 * l + 0.793617785 * m - 0.0040720468 * s
|
||||||
|
const A = 1.9779984951 * l - 2.428592205 * m + 0.4505937099 * s
|
||||||
|
const B = 0.0259040371 * l + 0.7827717662 * m - 0.808675766 * s
|
||||||
|
return { l: L, c: Math.hypot(A, B), h: Math.atan2(B, A) }
|
||||||
|
}
|
||||||
|
|
||||||
|
function oklchToLinear({ l: L, c, h }: Oklch): Rgb {
|
||||||
|
const A = c * Math.cos(h)
|
||||||
|
const B = c * Math.sin(h)
|
||||||
|
const l = (L + 0.3963377774 * A + 0.2158037573 * B) ** 3
|
||||||
|
const m = (L - 0.1055613458 * A - 0.0638541728 * B) ** 3
|
||||||
|
const s = (L - 0.0894841775 * A - 1.291485548 * B) ** 3
|
||||||
|
return [
|
||||||
|
4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
|
||||||
|
-1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
|
||||||
|
-0.0041960863 * l - 0.7034186147 * m + 1.707614701 * s,
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Sets OKLCH lightness, reducing chroma as needed to stay within sRGB. */
|
||||||
|
function withLightness(color: Rgb, lightness: number): Rgb {
|
||||||
|
const lch = toOklch(color)
|
||||||
|
const l = Math.min(1, Math.max(0, lightness))
|
||||||
|
let c = lch.c
|
||||||
|
let linear = oklchToLinear({ l, c, h: lch.h })
|
||||||
|
for (let i = 0; i < 12 && !inGamut(linear); i++) {
|
||||||
|
c *= 0.8
|
||||||
|
linear = oklchToLinear({ l, c, h: lch.h })
|
||||||
|
}
|
||||||
|
return linear.map((value) =>
|
||||||
|
Math.round(Math.min(255, Math.max(0, fromLinear(value))))
|
||||||
|
) as Rgb
|
||||||
|
}
|
||||||
|
|
||||||
|
function inGamut(linear: Rgb) {
|
||||||
|
return linear.every((value) => value >= -0.0005 && value <= 1.0005)
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseHex(hex: string | undefined): Rgb | null {
|
||||||
|
if (!hex) return null
|
||||||
|
const match = /^#?([0-9a-f]{6})/i.exec(hex.trim())
|
||||||
|
if (!match) return null
|
||||||
|
const value = parseInt(match[1], 16)
|
||||||
|
return [(value >> 16) & 255, (value >> 8) & 255, value & 255]
|
||||||
|
}
|
||||||
|
|
||||||
|
function toHex(color: Rgb) {
|
||||||
|
return `#${color.map((c) => c.toString(16).padStart(2, "0")).join("")}`
|
||||||
|
}
|
||||||
@@ -28,6 +28,7 @@ export function useStackScreenOptions(
|
|||||||
headerBackButtonDisplayMode: "minimal",
|
headerBackButtonDisplayMode: "minimal",
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
|
animation: "slide_from_right",
|
||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
headerTransparent: false,
|
headerTransparent: false,
|
||||||
headerStyle: { backgroundColor: theme.background },
|
headerStyle: { backgroundColor: theme.background },
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
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)
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
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,6 +84,7 @@ export const radius = {
|
|||||||
} as const
|
} as const
|
||||||
|
|
||||||
export const miniPlayerHeight = 56
|
export const miniPlayerHeight = 56
|
||||||
|
export const tabletMiniPlayerHeight = 68
|
||||||
export const tabBarHeight = Platform.OS === "ios" ? 49 : 80
|
export const tabBarHeight = Platform.OS === "ios" ? 49 : 80
|
||||||
export const playerBarHeight = miniPlayerHeight
|
export const playerBarHeight = miniPlayerHeight
|
||||||
export const carouselCardWidth = 160
|
export const carouselCardWidth = 160
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"platforms": ["apple"],
|
||||||
|
"apple": { "modules": ["ArtworkColorsModule"] }
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
Pod::Spec.new do |s|
|
||||||
|
s.name = 'ArtworkColors'
|
||||||
|
s.version = '1.0.0'
|
||||||
|
s.summary = 'Artwork color sampling for oTunes'
|
||||||
|
s.description = s.summary
|
||||||
|
s.license = { :type => 'MIT' }
|
||||||
|
s.author = 'oTunes'
|
||||||
|
s.homepage = 'https://otunes.abunchofknowitalls.com'
|
||||||
|
s.platforms = { :ios => '16.4' }
|
||||||
|
s.swift_version = '5.9'
|
||||||
|
s.source = { :git => '' }
|
||||||
|
s.static_framework = true
|
||||||
|
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
|
||||||
|
s.dependency 'ExpoModulesCore'
|
||||||
|
s.frameworks = 'ImageIO', 'CoreGraphics'
|
||||||
|
s.source_files = '**/*.swift'
|
||||||
|
end
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import ExpoModulesCore
|
||||||
|
import CoreGraphics
|
||||||
|
import ImageIO
|
||||||
|
|
||||||
|
public final class ArtworkColorsModule: Module {
|
||||||
|
public func definition() -> ModuleDefinition {
|
||||||
|
Name("ArtworkColors")
|
||||||
|
|
||||||
|
AsyncFunction("histogram") { (uri: URL) async throws -> [[Int]] in
|
||||||
|
let (data, response) = try await URLSession.shared.data(from: uri)
|
||||||
|
if let response = response as? HTTPURLResponse, !(200..<300).contains(response.statusCode) {
|
||||||
|
throw ArtworkColorError.invalidImage
|
||||||
|
}
|
||||||
|
return try Self.histogram(data: data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sample in sRGB so Display P3 artwork and ordinary JPEGs share one color space.
|
||||||
|
static func histogram(data: Data) throws -> [[Int]] {
|
||||||
|
guard let source = CGImageSourceCreateWithData(data as CFData, nil),
|
||||||
|
let image = CGImageSourceCreateThumbnailAtIndex(source, 0, [
|
||||||
|
kCGImageSourceCreateThumbnailFromImageAlways: true,
|
||||||
|
kCGImageSourceCreateThumbnailWithTransform: true,
|
||||||
|
kCGImageSourceThumbnailMaxPixelSize: 64,
|
||||||
|
] as CFDictionary),
|
||||||
|
let space = CGColorSpace(name: CGColorSpace.sRGB)
|
||||||
|
else { throw ArtworkColorError.invalidImage }
|
||||||
|
|
||||||
|
let width = image.width
|
||||||
|
let height = image.height
|
||||||
|
var pixels = [UInt8](repeating: 0, count: width * height * 4)
|
||||||
|
var bins = [[Int]](repeating: [0, 0, 0, 0], count: 512)
|
||||||
|
try pixels.withUnsafeMutableBytes { buffer in
|
||||||
|
guard let context = CGContext(
|
||||||
|
data: buffer.baseAddress, width: width, height: height,
|
||||||
|
bitsPerComponent: 8, bytesPerRow: width * 4, space: space,
|
||||||
|
bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue | CGBitmapInfo.byteOrder32Big.rawValue
|
||||||
|
) else { throw ArtworkColorError.invalidImage }
|
||||||
|
context.interpolationQuality = .high
|
||||||
|
context.draw(image, in: CGRect(x: 0, y: 0, width: width, height: height))
|
||||||
|
}
|
||||||
|
|
||||||
|
for offset in stride(from: 0, to: pixels.count, by: 4) {
|
||||||
|
let alpha = Int(pixels[offset + 3])
|
||||||
|
guard alpha >= 128 else { continue }
|
||||||
|
// Ignore transparent pixels and undo premultiplication for the rest.
|
||||||
|
let r = min(255, Int(pixels[offset]) * 255 / alpha)
|
||||||
|
let g = min(255, Int(pixels[offset + 1]) * 255 / alpha)
|
||||||
|
let b = min(255, Int(pixels[offset + 2]) * 255 / alpha)
|
||||||
|
let key = (r >> 5) * 64 + (g >> 5) * 8 + (b >> 5)
|
||||||
|
bins[key][0] += r
|
||||||
|
bins[key][1] += g
|
||||||
|
bins[key][2] += b
|
||||||
|
bins[key][3] += 1
|
||||||
|
}
|
||||||
|
// Keep each bin's actual mean rather than its quantized center.
|
||||||
|
return bins.filter { $0[3] > 0 }.map { bin in
|
||||||
|
[bin[0] / bin[3], bin[1] / bin[3], bin[2] / bin[3], bin[3]]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum ArtworkColorError: Error {
|
||||||
|
case invalidImage
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"platforms": ["apple"],
|
||||||
|
"apple": {
|
||||||
|
"modules": ["HandoffModule"],
|
||||||
|
"appDelegateSubscribers": ["HandoffAppDelegateSubscriber"]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
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
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "otunes-handoff",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"private": true
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import MediaPlayer
|
|||||||
import UIKit
|
import UIKit
|
||||||
internal import ExpoModulesCore
|
internal import ExpoModulesCore
|
||||||
|
|
||||||
|
#if !targetEnvironment(macCatalyst)
|
||||||
/// Bridges system volume without changing the playback audio session or player gain.
|
/// Bridges system volume without changing the playback audio session or player gain.
|
||||||
final class SystemVolume: Module {
|
final class SystemVolume: Module {
|
||||||
private var volumeView: MPVolumeView?
|
private var volumeView: MPVolumeView?
|
||||||
@@ -84,3 +85,18 @@ final class SystemVolume: Module {
|
|||||||
return ["volume": AVAudioSession.sharedInstance().outputVolume, "available": available]
|
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
|
||||||
@@ -0,0 +1,246 @@
|
|||||||
|
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,6 +30,7 @@
|
|||||||
"expo-constants": "~58.0.13",
|
"expo-constants": "~58.0.13",
|
||||||
"expo-dev-client": "~58.0.14",
|
"expo-dev-client": "~58.0.14",
|
||||||
"expo-font": "~58.0.9",
|
"expo-font": "~58.0.9",
|
||||||
|
"expo-glass-effect": "~58.0.5",
|
||||||
"expo-haptics": "~58.0.7",
|
"expo-haptics": "~58.0.7",
|
||||||
"expo-image": "~58.0.16",
|
"expo-image": "~58.0.16",
|
||||||
"expo-image-picker": "~58.0.10",
|
"expo-image-picker": "~58.0.10",
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
const {
|
||||||
|
withPodfile,
|
||||||
|
withPodfileProperties,
|
||||||
|
withXcodeProject,
|
||||||
|
} = require("expo/config-plugins")
|
||||||
|
|
||||||
|
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
|
||||||
|
module.exports = (config) => {
|
||||||
|
config = withPodfileProperties(config, (config) => {
|
||||||
|
config.modResults["ios.buildReactNativeFromSource"] = "true"
|
||||||
|
config.modResults.EXPO_USE_PRECOMPILED_MODULES = "false"
|
||||||
|
return config
|
||||||
|
})
|
||||||
|
|
||||||
|
config = withPodfile(config, (config) => {
|
||||||
|
const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
||||||
|
if (!pattern.test(config.modResults.contents)) {
|
||||||
|
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
|
||||||
|
}
|
||||||
|
config.modResults.contents = config.modResults.contents.replace(
|
||||||
|
pattern,
|
||||||
|
":mac_catalyst_enabled => true"
|
||||||
|
)
|
||||||
|
return config
|
||||||
|
})
|
||||||
|
|
||||||
|
return withXcodeProject(config, (config) => {
|
||||||
|
const project = config.modResults
|
||||||
|
const target = project.getFirstTarget().firstTarget
|
||||||
|
const lists = project.pbxXCConfigurationList()
|
||||||
|
const configurations = project.pbxXCBuildConfigurationSection()
|
||||||
|
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
|
||||||
|
const settings = configurations[value].buildSettings
|
||||||
|
settings.SUPPORTS_MACCATALYST = "YES"
|
||||||
|
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
|
||||||
|
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
||||||
|
}
|
||||||
|
return config
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -388,6 +388,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
|
|
||||||
const [queueOpen, setQueueOpen] = useState(false)
|
const [queueOpen, setQueueOpen] = useState(false)
|
||||||
const [isPlaying, setIsPlaying] = useState(false)
|
const [isPlaying, setIsPlaying] = useState(false)
|
||||||
|
const [playbackStartVersion, setPlaybackStartVersion] = useState(0)
|
||||||
const [currentTime, setCurrentTime] = useState(0)
|
const [currentTime, setCurrentTime] = useState(0)
|
||||||
const [measuredDuration, setMeasuredDuration] = useState<{
|
const [measuredDuration, setMeasuredDuration] = useState<{
|
||||||
songId: string
|
songId: string
|
||||||
@@ -890,7 +891,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
return () => {
|
return () => {
|
||||||
audio.removeEventListener("canplay", onCanPlay)
|
audio.removeEventListener("canplay", onCanPlay)
|
||||||
}
|
}
|
||||||
}, [isPlaying, currentSongId, attemptPlayback])
|
}, [isPlaying, currentSongId, playbackStartVersion, attemptPlayback])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const audio = audioRef.current
|
const audio = audioRef.current
|
||||||
@@ -1069,6 +1070,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
recorded.origin ??
|
recorded.origin ??
|
||||||
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
(recorded.playlistId ? `playlist:${recorded.playlistId}` : undefined)
|
||||||
const previousSongId = store.getState().queue[0]
|
const previousSongId = store.getState().queue[0]
|
||||||
|
store.update(playbackQueue.clearQueue)
|
||||||
store.update(recipe)
|
store.update(recipe)
|
||||||
const firstSongId = store.getState().queue[0]
|
const firstSongId = store.getState().queue[0]
|
||||||
if (!firstSongId) {
|
if (!firstSongId) {
|
||||||
@@ -1078,7 +1080,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
|
|||||||
if (firstSongId === previousSongId) {
|
if (firstSongId === previousSongId) {
|
||||||
seekTo(0)
|
seekTo(0)
|
||||||
}
|
}
|
||||||
|
// Repeated Play/Shuffle presses must request playback even when the
|
||||||
|
// first song and playing state have not changed.
|
||||||
|
isPlayingRef.current = true
|
||||||
setIsPlaying(true)
|
setIsPlaying(true)
|
||||||
|
setPlaybackStartVersion((version) => version + 1)
|
||||||
recordPlay(
|
recordPlay(
|
||||||
recorded.playlistId
|
recorded.playlistId
|
||||||
? { playlistId: recorded.playlistId }
|
? { playlistId: recorded.playlistId }
|
||||||
|
|||||||
+2
-1
@@ -21,7 +21,8 @@
|
|||||||
"packageManager": "pnpm@10.1.0",
|
"packageManager": "pnpm@10.1.0",
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"patchedDependencies": {
|
"patchedDependencies": {
|
||||||
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch"
|
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
|
||||||
|
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
diff --git a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
|
||||||
|
index cbe9b978ced6972a51bc5235b47a58dd55836351..b7063502332a7d1da5cb58ea8738670a9d3f5e87 100644
|
||||||
|
--- a/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
|
||||||
|
+++ b/android/src/main/java/com/swmansion/rnscreens/gamma/tabs/appearance/TabsAppearanceApplicator.kt
|
||||||
|
@@ -186,16 +186,24 @@ internal class TabsAppearanceApplicator(
|
||||||
|
val rippleColor =
|
||||||
|
tabBarAppearance?.tabBarItemRippleColor
|
||||||
|
?: resolveColorAttr(context, R.attr.itemRippleColor)
|
||||||
|
- bottomNavigationView.itemRippleColor = ColorStateList.valueOf(rippleColor)
|
||||||
|
+ // Material recreates the ripple drawable on these setters, even when
|
||||||
|
+ // values are unchanged. Preserve an in-flight press across tab updates.
|
||||||
|
+ if (bottomNavigationView.itemRippleColor?.defaultColor != rippleColor) {
|
||||||
|
+ bottomNavigationView.itemRippleColor = ColorStateList.valueOf(rippleColor)
|
||||||
|
+ }
|
||||||
|
|
||||||
|
// Active Indicator
|
||||||
|
val activeIndicatorColor =
|
||||||
|
tabBarAppearance?.tabBarItemActiveIndicatorColor
|
||||||
|
?: resolveColorAttr(context, R.attr.colorSecondaryContainer)
|
||||||
|
|
||||||
|
- bottomNavigationView.isItemActiveIndicatorEnabled =
|
||||||
|
- tabBarAppearance?.tabBarItemActiveIndicatorEnabled ?: true
|
||||||
|
- bottomNavigationView.itemActiveIndicatorColor = ColorStateList.valueOf(activeIndicatorColor)
|
||||||
|
+ val activeIndicatorEnabled = tabBarAppearance?.tabBarItemActiveIndicatorEnabled ?: true
|
||||||
|
+ if (bottomNavigationView.isItemActiveIndicatorEnabled != activeIndicatorEnabled) {
|
||||||
|
+ bottomNavigationView.isItemActiveIndicatorEnabled = activeIndicatorEnabled
|
||||||
|
+ }
|
||||||
|
+ if (bottomNavigationView.itemActiveIndicatorColor?.defaultColor != activeIndicatorColor) {
|
||||||
|
+ bottomNavigationView.itemActiveIndicatorColor = ColorStateList.valueOf(activeIndicatorColor)
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
fun updateFontStyles(
|
||||||
|
diff --git a/ios/tabs/host/RNSTabBarController.mm b/ios/tabs/host/RNSTabBarController.mm
|
||||||
|
index bc9c64436da76959ecdc22539b94ce459e1e4ed2..8fb814a2a8f9b669419d59620e8082c2e01943fa 100644
|
||||||
|
--- a/ios/tabs/host/RNSTabBarController.mm
|
||||||
|
+++ b/ios/tabs/host/RNSTabBarController.mm
|
||||||
|
@@ -354,6 +354,8 @@ static void rns_pushViewController(__unsafe_unretained id self,
|
||||||
|
[self updateTabBarA11yIfNeeded];
|
||||||
|
[self updateProminentIdentifierIfNeeded];
|
||||||
|
[self updateOrientationIfNeeded];
|
||||||
|
+ // Allow app-owned sidebar groups to be restored after router tab reconciliation.
|
||||||
|
+ [[NSNotificationCenter defaultCenter] postNotificationName:@"oTunesTabsDidUpdate" object:self];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -415,8 +417,9 @@ static void rns_pushViewController(__unsafe_unretained id self,
|
||||||
|
- (void)userDidSelectViewController:(nonnull UIViewController *)viewController
|
||||||
|
{
|
||||||
|
// At this moment the `UITabBarController` model is already updated.
|
||||||
|
- RCTAssert(self.selectedViewController == viewController,
|
||||||
|
- @"[RNScreens] Expected UIKit to update selectedViewController");
|
||||||
|
+ // A tab group exposes its root controller here, while selectedTab is the selected leaf.
|
||||||
|
+ RCTAssert([self effectiveSelectedViewController] == viewController,
|
||||||
|
+ @"[RNScreens] Expected UIKit to update the effective selection");
|
||||||
|
|
||||||
|
if (![self usesUITabAPI] && [self isSelectedViewControllerTheMoreNavigationController]) {
|
||||||
|
[self disableNavigationBarInMoreNavigationController];
|
||||||
Generated
+24
-14
@@ -8,6 +8,9 @@ patchedDependencies:
|
|||||||
expo-audio@58.0.10:
|
expo-audio@58.0.10:
|
||||||
hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
|
hash: f7f102c0f17b28e763d828acd4f138d62809f5be576e316a13008c27e84968c5
|
||||||
path: patches/expo-audio@58.0.10.patch
|
path: patches/expo-audio@58.0.10.patch
|
||||||
|
react-native-screens@4.30.0:
|
||||||
|
hash: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
|
||||||
|
path: patches/react-native-screens@4.30.0.patch
|
||||||
|
|
||||||
importers:
|
importers:
|
||||||
|
|
||||||
@@ -76,6 +79,9 @@ importers:
|
|||||||
expo-font:
|
expo-font:
|
||||||
specifier: ~58.0.9
|
specifier: ~58.0.9
|
||||||
version: 58.0.9(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 58.0.9(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
|
expo-glass-effect:
|
||||||
|
specifier: ~58.0.5
|
||||||
|
version: 58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-haptics:
|
expo-haptics:
|
||||||
specifier: ~58.0.7
|
specifier: ~58.0.7
|
||||||
version: 58.0.7(expo@58.0.17)
|
version: 58.0.7(expo@58.0.17)
|
||||||
@@ -93,7 +99,7 @@ importers:
|
|||||||
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-router:
|
expo-router:
|
||||||
specifier: ~58.0.25
|
specifier: ~58.0.25
|
||||||
version: 58.0.25(114ad080e17b889d99a70734d72d1fb4)
|
version: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
||||||
expo-secure-store:
|
expo-secure-store:
|
||||||
specifier: ~58.0.2
|
specifier: ~58.0.2
|
||||||
version: 58.0.2(expo@58.0.17)
|
version: 58.0.2(expo@58.0.17)
|
||||||
@@ -135,7 +141,7 @@ importers:
|
|||||||
version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-screens:
|
react-native-screens:
|
||||||
specifier: 4.30.0
|
specifier: 4.30.0
|
||||||
version: 4.30.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-svg:
|
react-native-svg:
|
||||||
specifier: 15.16.0
|
specifier: 15.16.0
|
||||||
version: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
@@ -144,7 +150,7 @@ importers:
|
|||||||
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
sonner-native:
|
sonner-native:
|
||||||
specifier: ^0.26.2
|
specifier: ^0.26.2
|
||||||
version: 0.26.4(6b7420e058a3b6d4e4d2699d79ac8702)
|
version: 0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^20
|
specifier: ^20
|
||||||
@@ -1731,12 +1737,15 @@ packages:
|
|||||||
|
|
||||||
'@oslojs/asn1@1.0.0':
|
'@oslojs/asn1@1.0.0':
|
||||||
resolution: {integrity: sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA==}
|
resolution: {integrity: sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA==}
|
||||||
|
deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
|
||||||
|
|
||||||
'@oslojs/binary@1.0.0':
|
'@oslojs/binary@1.0.0':
|
||||||
resolution: {integrity: sha512-9RCU6OwXU6p67H4NODbuxv2S3eenuQ4/WFLrsq+K/k682xrznH5EVWA7N4VFk9VYVcbFtKqur5YQQZc0ySGhsQ==}
|
resolution: {integrity: sha512-9RCU6OwXU6p67H4NODbuxv2S3eenuQ4/WFLrsq+K/k682xrznH5EVWA7N4VFk9VYVcbFtKqur5YQQZc0ySGhsQ==}
|
||||||
|
deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
|
||||||
|
|
||||||
'@oslojs/crypto@1.0.1':
|
'@oslojs/crypto@1.0.1':
|
||||||
resolution: {integrity: sha512-7n08G8nWjAr/Yu3vu9zzrd0L9XnrJfpMioQcvCMxBIiF5orECHe5/3J0jmXRVvgfqMm/+4oxlQ+Sq39COYLcNQ==}
|
resolution: {integrity: sha512-7n08G8nWjAr/Yu3vu9zzrd0L9XnrJfpMioQcvCMxBIiF5orECHe5/3J0jmXRVvgfqMm/+4oxlQ+Sq39COYLcNQ==}
|
||||||
|
deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
|
||||||
|
|
||||||
'@oslojs/encoding@1.1.0':
|
'@oslojs/encoding@1.1.0':
|
||||||
resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
|
resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==}
|
||||||
@@ -3908,6 +3917,7 @@ packages:
|
|||||||
eslint@9.39.4:
|
eslint@9.39.4:
|
||||||
resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
|
resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
|
||||||
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
|
||||||
|
deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
|
||||||
hasBin: true
|
hasBin: true
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
jiti: '*'
|
jiti: '*'
|
||||||
@@ -4045,8 +4055,8 @@ packages:
|
|||||||
react: '*'
|
react: '*'
|
||||||
react-native: '*'
|
react-native: '*'
|
||||||
|
|
||||||
expo-glass-effect@58.0.4:
|
expo-glass-effect@58.0.5:
|
||||||
resolution: {integrity: sha512-PrxU1FINOpqpnjtZMXHAC/APLq3T3fDforMqQ+JRqRtIrlQ8wntrX8IztLxJBKD9s8cJJ8V9MAoI89aYRK8j9Q==}
|
resolution: {integrity: sha512-PkL1X/r0cTs6NG47Xp3TxRvtqSeRmPYhPOHp3GDmZB2oOxpjXge6qLi/bSSv0asFWqf+MLOlXZ+hq2Imuh0Z1g==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
expo: '*'
|
expo: '*'
|
||||||
react: '*'
|
react: '*'
|
||||||
@@ -7528,7 +7538,7 @@ snapshots:
|
|||||||
ws: 8.21.0
|
ws: 8.21.0
|
||||||
zod: 3.25.76
|
zod: 3.25.76
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
expo-router: 58.0.25(114ad080e17b889d99a70734d72d1fb4)
|
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- '@expo/dom-webview'
|
- '@expo/dom-webview'
|
||||||
@@ -7829,7 +7839,7 @@ snapshots:
|
|||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-router: 58.0.25(114ad080e17b889d99a70734d72d1fb4)
|
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
||||||
react-dom: 19.3.0(react@19.3.0)
|
react-dom: 19.3.0(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
@@ -11136,7 +11146,7 @@ snapshots:
|
|||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
|
|
||||||
expo-glass-effect@58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
expo-glass-effect@58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
@@ -11230,7 +11240,7 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
expo-router@58.0.25(114ad080e17b889d99a70734d72d1fb4):
|
expo-router@58.0.25(88877fdcf2b70b064063b5f62591c4ab):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
@@ -11242,7 +11252,7 @@ snapshots:
|
|||||||
client-only: 0.0.1
|
client-only: 0.0.1
|
||||||
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
||||||
expo-constants: 58.0.13(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(typescript@6.0.3)
|
expo-constants: 58.0.13(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(typescript@6.0.3)
|
||||||
expo-glass-effect: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
expo-glass-effect: 58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-linking: 58.0.14(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
expo-linking: 58.0.14(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
|
||||||
expo-server: 58.0.5
|
expo-server: 58.0.5
|
||||||
nanoid: 3.3.20
|
nanoid: 3.3.20
|
||||||
@@ -11252,7 +11262,7 @@ snapshots:
|
|||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
react-native-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-screens: 4.30.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
server-only: 0.0.1
|
server-only: 0.0.1
|
||||||
sf-symbols-typescript: 2.2.0
|
sf-symbols-typescript: 2.2.0
|
||||||
standard-navigation: 0.0.5
|
standard-navigation: 0.0.5
|
||||||
@@ -12954,7 +12964,7 @@ snapshots:
|
|||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
|
|
||||||
react-native-screens@4.30.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
react-native-screens@4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-freeze: 1.0.4(react@19.3.0)
|
react-freeze: 1.0.4(react@19.3.0)
|
||||||
@@ -13503,14 +13513,14 @@ snapshots:
|
|||||||
|
|
||||||
slugify@1.6.9: {}
|
slugify@1.6.9: {}
|
||||||
|
|
||||||
sonner-native@0.26.4(6b7420e058a3b6d4e4d2699d79ac8702):
|
sonner-native@0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-screens: 4.30.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-screens: 4.30.0(patch_hash=f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-svg: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-svg: 15.16.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-worklets: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-worklets: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user