Compare commits
5
Commits
No files matched your search
@@ -73,10 +73,15 @@ 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
|
Archive action with the Catalyst destination. EAS's existing iOS profiles still
|
||||||
build iPhone/iPad apps.
|
build iPhone/iPad apps.
|
||||||
|
|
||||||
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
|
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
|
||||||
patches. It disables precompiled React Native and Expo modules so dependencies
|
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
|
||||||
can compile for Catalyst. The Mac app derives a separate bundle identifier with
|
raises pod deployment targets to the app's, and disables precompiled React
|
||||||
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
|
Native and Expo modules so dependencies can compile for Catalyst. System volume
|
||||||
|
stays under macOS control.
|
||||||
|
|
||||||
|
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
|
||||||
|
same team. Handoff only pairs apps with a matching team and activity type, which
|
||||||
|
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
|
||||||
|
|
||||||
To return a checkout to ordinary iOS builds, rerun prebuild without
|
To return a checkout to ordinary iOS builds, rerun prebuild without
|
||||||
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
|
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
|
||||||
@@ -26,6 +26,8 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
production: "oTunes",
|
production: "oTunes",
|
||||||
}[variant]
|
}[variant]
|
||||||
|
|
||||||
|
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...config,
|
...config,
|
||||||
plugins: [
|
plugins: [
|
||||||
@@ -40,11 +42,12 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
icon: `./assets/icon${iconSuffix}.png`,
|
icon: `./assets/icon${iconSuffix}.png`,
|
||||||
ios: {
|
ios: {
|
||||||
...config.ios,
|
...config.ios,
|
||||||
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
bundleIdentifier,
|
||||||
icon: `./assets/${composer}.icon`,
|
icon: `./assets/${composer}.icon`,
|
||||||
infoPlist: {
|
infoPlist: {
|
||||||
...config.ios?.infoPlist,
|
...config.ios?.infoPlist,
|
||||||
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
|
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
|
||||||
|
NSUserActivityTypes: [`${bundleIdentifier}.media`],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
android: {
|
android: {
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
"expo-status-bar",
|
"expo-status-bar",
|
||||||
"expo-app-intents",
|
"expo-app-intents",
|
||||||
"./plugins/with-android-colors",
|
"./plugins/with-android-colors",
|
||||||
|
"./plugins/with-android-fast-fade",
|
||||||
[
|
[
|
||||||
"expo-navigation-bar",
|
"expo-navigation-bar",
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import { NavigationBar } from "expo-navigation-bar"
|
|||||||
import {
|
import {
|
||||||
ScreenPaletteProvider,
|
ScreenPaletteProvider,
|
||||||
useAndroidTabPalette,
|
useAndroidTabPalette,
|
||||||
useAndroidTabBackgroundStyle,
|
useAndroidTabHasArtworkPalette,
|
||||||
useAndroidNativeTabColors,
|
useTabletBackgroundStyle,
|
||||||
} 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"
|
||||||
@@ -46,12 +46,13 @@ function useRouterTheme() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function useNativeTabColors() {
|
function useNativeTabColors() {
|
||||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
|
||||||
const selectedColor = colors.dark.primary
|
|
||||||
const themeIsDark = useIsDark()
|
const themeIsDark = useIsDark()
|
||||||
const androidPalette = colors.dark
|
const androidPalette = useAndroidTabPalette()
|
||||||
const artworkPalette = useAndroidTabPalette()
|
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
const selectedColor = hasArtworkPalette
|
||||||
|
? androidPalette.foreground
|
||||||
|
: androidPalette.accentText
|
||||||
|
const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
|
||||||
const inactive = appleMusic.tabInactive
|
const inactive = appleMusic.tabInactive
|
||||||
|
|
||||||
const iconColor =
|
const iconColor =
|
||||||
@@ -61,14 +62,14 @@ function useNativeTabColors() {
|
|||||||
selected: appleMusic.pink,
|
selected: appleMusic.pink,
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
default: androidPalette.mutedForeground,
|
default: androidPalette.secondaryForeground,
|
||||||
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.mutedForeground
|
: androidPalette.secondaryForeground
|
||||||
|
|
||||||
return {
|
return {
|
||||||
isDark,
|
isDark,
|
||||||
@@ -85,20 +86,17 @@ function useNativeTabColors() {
|
|||||||
blurEffect: isDark
|
blurEffect: isDark
|
||||||
? "systemChromeMaterialDark"
|
? "systemChromeMaterialDark"
|
||||||
: "systemChromeMaterialLight",
|
: "systemChromeMaterialLight",
|
||||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
backgroundColor:
|
||||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
Platform.OS === "ios" ? undefined : androidPalette.background,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function TabsContent() {
|
function TabsContent() {
|
||||||
const tabletLayout = useTabletLayout()
|
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 backgroundStyle = useTabletBackgroundStyle()
|
||||||
const { currentSong, queueSongIds } = usePlaybackQueue()
|
const { currentSong, queueSongIds } = usePlaybackQueue()
|
||||||
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
|
||||||
|
|
||||||
@@ -140,9 +138,6 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="home"
|
name="home"
|
||||||
unstable_nativeProps={
|
|
||||||
Platform.OS === "android" ? homeColors : undefined
|
|
||||||
}
|
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
@@ -152,9 +147,6 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="library"
|
name="library"
|
||||||
unstable_nativeProps={
|
|
||||||
Platform.OS === "android" ? libraryColors : undefined
|
|
||||||
}
|
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
@@ -169,9 +161,6 @@ function TabsContent() {
|
|||||||
|
|
||||||
<NativeTabs.Trigger
|
<NativeTabs.Trigger
|
||||||
name="search"
|
name="search"
|
||||||
unstable_nativeProps={
|
|
||||||
Platform.OS === "android" ? searchColors : undefined
|
|
||||||
}
|
|
||||||
disableTransparentOnScrollEdge
|
disableTransparentOnScrollEdge
|
||||||
contentStyle={androidContentStyle}
|
contentStyle={androidContentStyle}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||||
import {
|
import {
|
||||||
useSwipeRowGroup,
|
useSwipeRowGroup,
|
||||||
@@ -7,21 +8,13 @@ import {
|
|||||||
CollectionHero,
|
CollectionHero,
|
||||||
useCollectionHeroLayout,
|
useCollectionHeroLayout,
|
||||||
} from "@/components/collection-hero"
|
} from "@/components/collection-hero"
|
||||||
import {
|
|
||||||
PaletteText,
|
|
||||||
PaletteIcon,
|
|
||||||
renderArtworkBackButton,
|
|
||||||
} from "@/components/palette-text"
|
|
||||||
import Animated from "react-native-reanimated"
|
import Animated from "react-native-reanimated"
|
||||||
import {
|
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||||
renderAndroidArtworkBackground,
|
|
||||||
useScreenPalette,
|
|
||||||
} from "@/contexts/android-tab-theme"
|
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
import { Link, Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
import { 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 { Platform, Pressable, StyleSheet, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CollectionDivider,
|
CollectionDivider,
|
||||||
@@ -142,17 +135,14 @@ export default function AlbumScreen() {
|
|||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton
|
<CollectionDetailSkeleton
|
||||||
zoomCoverSize={220}
|
variant="album"
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
style={backgroundStyle}
|
style={backgroundStyle}
|
||||||
backgroundColor={
|
backgroundColor={
|
||||||
@@ -173,9 +163,9 @@ export default function AlbumScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
<Text style={{ color: colors.mutedForeground }}>
|
||||||
Album not found.
|
Album not found.
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -196,10 +186,7 @@ export default function AlbumScreen() {
|
|||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
statusBarStyle: palette.isDark
|
statusBarStyle: palette.isDark
|
||||||
? ("light" as const)
|
? ("light" as const)
|
||||||
: ("dark" as const),
|
: ("dark" as const),
|
||||||
@@ -221,11 +208,10 @@ export default function AlbumScreen() {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<Pressable hitSlop={8}>
|
<Pressable hitSlop={8}>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={palette.isDark ? "#fff" : "#000"}
|
color={colors.foreground}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</MediaActionMenu>
|
</MediaActionMenu>
|
||||||
@@ -283,8 +269,7 @@ export default function AlbumScreen() {
|
|||||||
{ backgroundColor: palette.surface },
|
{ backgroundColor: palette.surface },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone={favorited ? "accent" : "foreground"}
|
|
||||||
name={favorited ? "star" : "star-outline"}
|
name={favorited ? "star" : "star-outline"}
|
||||||
size={24}
|
size={24}
|
||||||
color={favorited ? palette.accent : palette.foreground}
|
color={favorited ? palette.accent : palette.foreground}
|
||||||
@@ -310,8 +295,7 @@ export default function AlbumScreen() {
|
|||||||
{ backgroundColor: palette.surface },
|
{ backgroundColor: palette.surface },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name="shuffle"
|
name="shuffle"
|
||||||
size={24}
|
size={24}
|
||||||
color={palette.foreground}
|
color={palette.foreground}
|
||||||
@@ -320,8 +304,7 @@ export default function AlbumScreen() {
|
|||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
styles.title,
|
styles.title,
|
||||||
heroLayout.landscape && styles.titleLandscape,
|
heroLayout.landscape && styles.titleLandscape,
|
||||||
@@ -329,13 +312,12 @@ export default function AlbumScreen() {
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{album.title}
|
{album.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<Pressable
|
<Pressable
|
||||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||||
style={styles.artistPressable}
|
style={styles.artistPressable}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="accentText"
|
|
||||||
style={[
|
style={[
|
||||||
styles.artist,
|
styles.artist,
|
||||||
heroLayout.landscape && styles.artistLandscape,
|
heroLayout.landscape && styles.artistLandscape,
|
||||||
@@ -343,7 +325,7 @@ export default function AlbumScreen() {
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{album.artist.name}
|
{album.artist.name}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
<View
|
<View
|
||||||
style={{
|
style={{
|
||||||
@@ -357,25 +339,18 @@ export default function AlbumScreen() {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{metadata ? (
|
{metadata ? (
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
{metadata}
|
{metadata}
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
{album.hasLossless ? (
|
{album.hasLossless ? (
|
||||||
<>
|
<>
|
||||||
{metadata ? (
|
{metadata ? (
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
·
|
·
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
<AudioFormatBadge
|
<AudioFormatBadge
|
||||||
artwork
|
|
||||||
format="lossless"
|
format="lossless"
|
||||||
color={palette.secondaryForeground}
|
color={palette.secondaryForeground}
|
||||||
backgroundColor={palette.background}
|
backgroundColor={palette.background}
|
||||||
@@ -385,15 +360,11 @@ export default function AlbumScreen() {
|
|||||||
{album.hasAtmos ? (
|
{album.hasAtmos ? (
|
||||||
<>
|
<>
|
||||||
{metadata || album.hasLossless ? (
|
{metadata || album.hasLossless ? (
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
·
|
·
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
<AudioFormatBadge
|
<AudioFormatBadge
|
||||||
artwork
|
|
||||||
format="atmos"
|
format="atmos"
|
||||||
color={palette.secondaryForeground}
|
color={palette.secondaryForeground}
|
||||||
backgroundColor={palette.background}
|
backgroundColor={palette.background}
|
||||||
@@ -517,12 +488,11 @@ 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)}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="secondaryForeground"
|
|
||||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||||
>
|
>
|
||||||
{number}
|
{number}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.trackContent,
|
styles.trackContent,
|
||||||
@@ -530,29 +500,24 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<View style={styles.trackMeta}>
|
<View style={styles.trackMeta}>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{track.title}
|
{track.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
{track.artists ? (
|
{track.artists ? (
|
||||||
<PaletteText
|
<Text
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
style={{ color: palette.secondaryForeground }}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{track.artists.join(", ")}
|
{track.artists.join(", ")}
|
||||||
</PaletteText>
|
</Text>
|
||||||
) : null}
|
) : null}
|
||||||
</View>
|
</View>
|
||||||
<PaletteText
|
<Text style={{ color: palette.secondaryForeground }}>
|
||||||
tone="secondaryForeground"
|
|
||||||
style={{ color: palette.secondaryForeground }}
|
|
||||||
>
|
|
||||||
{formatDuration(track.durationSeconds)}
|
{formatDuration(track.durationSeconds)}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</Row>
|
</Row>
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
|
|||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton round />
|
<CollectionDetailSkeleton variant="artist" />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,14 @@
|
|||||||
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
import {
|
import {
|
||||||
CollectionHero,
|
CollectionHero,
|
||||||
useCollectionHeroLayout,
|
useCollectionHeroLayout,
|
||||||
} from "@/components/collection-hero"
|
} from "@/components/collection-hero"
|
||||||
import {
|
|
||||||
PaletteText,
|
|
||||||
PaletteIcon,
|
|
||||||
renderArtworkBackButton,
|
|
||||||
} from "@/components/palette-text"
|
|
||||||
import Animated from "react-native-reanimated"
|
import Animated from "react-native-reanimated"
|
||||||
import {
|
import {
|
||||||
PlaylistSearchBar,
|
PlaylistSearchBar,
|
||||||
usePlaylistSearch,
|
usePlaylistSearch,
|
||||||
} from "@/components/playlist-search-bar"
|
} from "@/components/playlist-search-bar"
|
||||||
import {
|
import { useScreenPalette } from "@/contexts/android-tab-theme"
|
||||||
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"
|
||||||
@@ -31,6 +24,7 @@ import {
|
|||||||
Platform,
|
Platform,
|
||||||
Pressable,
|
Pressable,
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
|
Text,
|
||||||
View,
|
View,
|
||||||
type ListRenderItemInfo,
|
type ListRenderItemInfo,
|
||||||
} from "react-native"
|
} from "react-native"
|
||||||
@@ -111,17 +105,14 @@ export default function PlaylistScreen() {
|
|||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
}
|
}
|
||||||
: {}),
|
: {}),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton
|
<CollectionDetailSkeleton
|
||||||
zoomCoverSize={200}
|
variant="playlist"
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
style={backgroundStyle}
|
style={backgroundStyle}
|
||||||
backgroundColor={
|
backgroundColor={
|
||||||
@@ -142,9 +133,9 @@ export default function PlaylistScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
<Text style={{ color: colors.mutedForeground }}>
|
||||||
Playlist not found.
|
Playlist not found.
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
@@ -179,6 +170,7 @@ function PlaylistContent({
|
|||||||
}) {
|
}) {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const isFocused = useIsFocused()
|
const isFocused = useIsFocused()
|
||||||
|
const colors = useThemeColors()
|
||||||
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
const { playPlaylist, playPlaylistShuffled, playFromSong } =
|
||||||
usePlaybackActions()
|
usePlaybackActions()
|
||||||
const { isSongFavorite } = useFavorites()
|
const { isSongFavorite } = useFavorites()
|
||||||
@@ -279,10 +271,7 @@ function PlaylistContent({
|
|||||||
headerTintColor: palette.foreground,
|
headerTintColor: palette.foreground,
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
headerStyle: { backgroundColor: "transparent" },
|
headerStyle: { backgroundColor: palette.background },
|
||||||
headerBackground: renderAndroidArtworkBackground,
|
|
||||||
headerBackVisible: false,
|
|
||||||
headerLeft: renderArtworkBackButton,
|
|
||||||
statusBarStyle: palette.isDark
|
statusBarStyle: palette.isDark
|
||||||
? ("light" as const)
|
? ("light" as const)
|
||||||
: ("dark" as const),
|
: ("dark" as const),
|
||||||
@@ -301,11 +290,10 @@ function PlaylistContent({
|
|||||||
onAction={handlePlaylistMenuAction}
|
onAction={handlePlaylistMenuAction}
|
||||||
>
|
>
|
||||||
<Pressable hitSlop={8}>
|
<Pressable hitSlop={8}>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={palette.isDark ? "#fff" : "#000"}
|
color={colors.foreground}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</MediaActionMenu>
|
</MediaActionMenu>
|
||||||
@@ -313,6 +301,7 @@ function PlaylistContent({
|
|||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
canEdit,
|
canEdit,
|
||||||
|
colors.foreground,
|
||||||
deletePlaylist,
|
deletePlaylist,
|
||||||
handlePlaylistDetailAction,
|
handlePlaylistDetailAction,
|
||||||
palette.foreground,
|
palette.foreground,
|
||||||
@@ -372,15 +361,14 @@ function PlaylistContent({
|
|||||||
contentInsetAdjustmentBehavior="automatic"
|
contentInsetAdjustmentBehavior="automatic"
|
||||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||||
ListEmptyComponent={
|
ListEmptyComponent={
|
||||||
<PaletteText
|
<Text
|
||||||
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."}
|
||||||
</PaletteText>
|
</Text>
|
||||||
}
|
}
|
||||||
ListHeaderComponent={
|
ListHeaderComponent={
|
||||||
<PlaylistHero
|
<PlaylistHero
|
||||||
@@ -473,19 +461,15 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
|||||||
}}
|
}}
|
||||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||||
name="trash"
|
<Text
|
||||||
size={22}
|
|
||||||
color={colors.primaryForeground}
|
|
||||||
/>
|
|
||||||
<PaletteText
|
|
||||||
style={[
|
style={[
|
||||||
styles.removeActionText,
|
styles.removeActionText,
|
||||||
{ color: colors.primaryForeground },
|
{ color: colors.primaryForeground },
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
Remove
|
Remove
|
||||||
</PaletteText>
|
</Text>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
@@ -565,8 +549,7 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
|
||||||
name={isSubscribed ? "checkmark" : "add"}
|
name={isSubscribed ? "checkmark" : "add"}
|
||||||
size={24}
|
size={24}
|
||||||
color={
|
color={
|
||||||
@@ -592,18 +575,12 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
onPress={onShuffle}
|
onPress={onShuffle}
|
||||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||||
tone="foreground"
|
|
||||||
name="shuffle"
|
|
||||||
size={24}
|
|
||||||
color={palette.foreground}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
styles.title,
|
styles.title,
|
||||||
heroLayout.landscape && styles.titleLandscape,
|
heroLayout.landscape && styles.titleLandscape,
|
||||||
@@ -611,16 +588,15 @@ const PlaylistHero = memo(function PlaylistHero({
|
|||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
{title}
|
{title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={{
|
style={{
|
||||||
color: palette.foreground,
|
color: palette.foreground,
|
||||||
fontSize: heroLayout.landscape ? 22 : 16,
|
fontSize: heroLayout.landscape ? 22 : 16,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{ownerName}
|
{ownerName}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</CollectionHero>
|
</CollectionHero>
|
||||||
<CollectionDivider color={palette.divider} />
|
<CollectionDivider color={palette.divider} />
|
||||||
</MusicEntityView>
|
</MusicEntityView>
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||||
<CollectionDetailSkeleton />
|
<CollectionDetailSkeleton variant="favorites" />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import {
|
|||||||
} from "@/lib/artwork-color-preference"
|
} 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 { clearCoverPaletteCache } from "@/hooks/use-cover-palette"
|
||||||
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
|
||||||
import { changeServer, signOut } from "@/lib/session"
|
import { changeServer, signOut } from "@/lib/session"
|
||||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||||
@@ -185,6 +186,7 @@ function AppearanceSection() {
|
|||||||
setSaving(true)
|
setSaving(true)
|
||||||
try {
|
try {
|
||||||
await setArtworkColorsEnabled(checked)
|
await setArtworkColorsEnabled(checked)
|
||||||
|
clearCoverPaletteCache()
|
||||||
} catch {
|
} catch {
|
||||||
showError("Could not save artwork colors preference.")
|
showError("Could not save artwork colors preference.")
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -118,12 +118,7 @@ export default function LibraryScreen() {
|
|||||||
)
|
)
|
||||||
|
|
||||||
if (status === "LoadingFirstPage" && !isCached) {
|
if (status === "LoadingFirstPage" && !isCached) {
|
||||||
return (
|
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
||||||
<View style={{ flex: 1, backgroundColor: colors.background }}>
|
|
||||||
{listHeader}
|
|
||||||
<MediaGridSkeleton contentInset={false} />
|
|
||||||
</View>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { PaletteText } from "@/components/palette-text"
|
import { StyleSheet, Text, View } from "react-native"
|
||||||
import { StyleSheet, View } from "react-native"
|
|
||||||
import Svg, { G, Path } from "react-native-svg"
|
import Svg, { G, Path } from "react-native-svg"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -69,12 +68,10 @@ function LosslessMark({
|
|||||||
|
|
||||||
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
||||||
export function AudioFormatBadge({
|
export function AudioFormatBadge({
|
||||||
artwork = false,
|
|
||||||
format,
|
format,
|
||||||
color,
|
color,
|
||||||
backgroundColor,
|
backgroundColor,
|
||||||
}: {
|
}: {
|
||||||
artwork?: boolean
|
|
||||||
format: PlaybackFormat
|
format: PlaybackFormat
|
||||||
color: string
|
color: string
|
||||||
backgroundColor: string
|
backgroundColor: string
|
||||||
@@ -87,12 +84,7 @@ export function AudioFormatBadge({
|
|||||||
) : (
|
) : (
|
||||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||||
)}
|
)}
|
||||||
<PaletteText
|
<Text style={[styles.label, { color }]}>{label}</Text>
|
||||||
tone={artwork ? "secondaryForeground" : undefined}
|
|
||||||
style={[styles.label, { color }]}
|
|
||||||
>
|
|
||||||
{label}
|
|
||||||
</PaletteText>
|
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { PaletteText } from "@/components/palette-text"
|
|
||||||
import { memo } from "react"
|
import { memo } from "react"
|
||||||
import { StyleSheet, View } from "react-native"
|
import { StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import { useThemeColors } from "@/lib/theme"
|
import { useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
@@ -26,12 +25,9 @@ export const DiscHeader = memo(function DiscHeader({
|
|||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
return (
|
return (
|
||||||
<PaletteText
|
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||||
tone={color ? "foreground" : undefined}
|
|
||||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
|
||||||
>
|
|
||||||
{label}
|
{label}
|
||||||
</PaletteText>
|
</Text>
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,11 @@ export function HandoffBridge() {
|
|||||||
if (!active || !activity) return
|
if (!active || !activity) return
|
||||||
try {
|
try {
|
||||||
const source = new URL(activity.server)
|
const source = new URL(activity.server)
|
||||||
if (!config || source.origin !== new URL(config.serverUrl).origin) {
|
if (!config) {
|
||||||
|
showError("Connect to an oTunes server to continue this activity.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (source.origin !== new URL(config.serverUrl).origin) {
|
||||||
showError("This activity belongs to a different oTunes server.")
|
showError("This activity belongs to a different oTunes server.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
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, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||||
|
|
||||||
@@ -67,8 +65,7 @@ function MiniPlayerContent({
|
|||||||
<View
|
<View
|
||||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||||
>
|
>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryTitle : styles.title,
|
isAccessory ? styles.accessoryTitle : styles.title,
|
||||||
{ color: colors.foreground },
|
{ color: colors.foreground },
|
||||||
@@ -76,7 +73,7 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.title}
|
{currentSong.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
<Pressable
|
<Pressable
|
||||||
style={styles.controlButton}
|
style={styles.controlButton}
|
||||||
@@ -86,8 +83,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name={isPlaying ? "pause" : "play"}
|
name={isPlaying ? "pause" : "play"}
|
||||||
size={20}
|
size={20}
|
||||||
color={colors.foreground}
|
color={colors.foreground}
|
||||||
@@ -105,8 +101,7 @@ function MiniPlayerContent({
|
|||||||
style={artworkStyle}
|
style={artworkStyle}
|
||||||
/>
|
/>
|
||||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="foreground"
|
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryTitle : styles.title,
|
isAccessory ? styles.accessoryTitle : styles.title,
|
||||||
{ color: colors.foreground },
|
{ color: colors.foreground },
|
||||||
@@ -114,9 +109,8 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.title}
|
{currentSong.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<PaletteText
|
<Text
|
||||||
tone="secondaryForeground"
|
|
||||||
style={[
|
style={[
|
||||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||||
{ color: colors.mutedForeground },
|
{ color: colors.mutedForeground },
|
||||||
@@ -124,7 +118,7 @@ function MiniPlayerContent({
|
|||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{currentSong.artist.name}
|
{currentSong.artist.name}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.controls}>
|
<View style={styles.controls}>
|
||||||
{Platform.OS === "android" && !isAccessory ? (
|
{Platform.OS === "android" && !isAccessory ? (
|
||||||
@@ -138,12 +132,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="play-back" size={24} color={colors.foreground} />
|
||||||
tone="foreground"
|
|
||||||
name="play-back"
|
|
||||||
size={24}
|
|
||||||
color={colors.foreground}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
</Pressable>
|
||||||
) : null}
|
) : null}
|
||||||
<Pressable
|
<Pressable
|
||||||
@@ -154,8 +143,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons
|
||||||
tone="foreground"
|
|
||||||
name={isPlaying ? "pause" : "play"}
|
name={isPlaying ? "pause" : "play"}
|
||||||
size={24}
|
size={24}
|
||||||
color={colors.foreground}
|
color={colors.foreground}
|
||||||
@@ -169,12 +157,7 @@ function MiniPlayerContent({
|
|||||||
}}
|
}}
|
||||||
hitSlop={6}
|
hitSlop={6}
|
||||||
>
|
>
|
||||||
<PaletteIcon
|
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||||
tone="foreground"
|
|
||||||
name="play-forward"
|
|
||||||
size={24}
|
|
||||||
color={colors.foreground}
|
|
||||||
/>
|
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</View>
|
</View>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
@@ -184,10 +167,9 @@ 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 (
|
||||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
<View style={[styles.androidBar, { backgroundColor: palette.background }]}>
|
||||||
{children}
|
{children}
|
||||||
{hasArtworkPalette ? (
|
{hasArtworkPalette ? (
|
||||||
<View
|
<View
|
||||||
@@ -205,7 +187,7 @@ function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
|||||||
{ backgroundColor: palette.secondaryForeground },
|
{ backgroundColor: palette.secondaryForeground },
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
</Animated.View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
import { Ionicons } from "@expo/vector-icons"
|
|
||||||
import type { ComponentProps } from "react"
|
|
||||||
import { Pressable, type TextProps } from "react-native"
|
|
||||||
import { useRouter } from "expo-router"
|
|
||||||
import Animated from "react-native-reanimated"
|
|
||||||
|
|
||||||
import {
|
|
||||||
useAnimatedPaletteColor,
|
|
||||||
type PaletteColor,
|
|
||||||
} from "@/contexts/android-tab-theme"
|
|
||||||
|
|
||||||
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
|
|
||||||
|
|
||||||
/** Keep artwork text colors on the same UI-thread animation as the background. */
|
|
||||||
export function PaletteText({
|
|
||||||
tone,
|
|
||||||
style,
|
|
||||||
...props
|
|
||||||
}: TextProps & { tone?: PaletteColor }) {
|
|
||||||
const colorStyle = useAnimatedPaletteColor(tone)
|
|
||||||
return <Animated.Text {...props} style={[style, colorStyle]} />
|
|
||||||
}
|
|
||||||
|
|
||||||
export function PaletteIcon({
|
|
||||||
tone,
|
|
||||||
style,
|
|
||||||
...props
|
|
||||||
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
|
|
||||||
const colorStyle = useAnimatedPaletteColor(tone)
|
|
||||||
return <AnimatedIcon {...props} style={[style, colorStyle]} />
|
|
||||||
}
|
|
||||||
|
|
||||||
function ArtworkBackButton() {
|
|
||||||
const router = useRouter()
|
|
||||||
return (
|
|
||||||
<Pressable
|
|
||||||
accessibilityRole="button"
|
|
||||||
accessibilityLabel="Navigate up"
|
|
||||||
hitSlop={8}
|
|
||||||
onPress={() => router.back()}
|
|
||||||
>
|
|
||||||
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
|
|
||||||
</Pressable>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export function renderArtworkBackButton() {
|
|
||||||
return <ArtworkBackButton />
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||||
import { PaletteText } from "@/components/palette-text"
|
|
||||||
import { MusicEntityView } from "@/components/music-entity-view"
|
import { MusicEntityView } from "@/components/music-entity-view"
|
||||||
import { collectionInset } from "@/components/collection-list"
|
import { collectionInset } from "@/components/collection-list"
|
||||||
import { CoverImage } from "@/components/cover-image"
|
import { CoverImage } from "@/components/cover-image"
|
||||||
@@ -16,7 +15,7 @@ import {
|
|||||||
useThemeColors,
|
useThemeColors,
|
||||||
} from "@/lib/theme"
|
} from "@/lib/theme"
|
||||||
import { memo, useCallback } from "react"
|
import { memo, useCallback } from "react"
|
||||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
MediaContextMenu,
|
MediaContextMenu,
|
||||||
@@ -64,27 +63,22 @@ export const SongRow = memo(function SongRow({
|
|||||||
const content = (
|
const content = (
|
||||||
<>
|
<>
|
||||||
<View style={styles.rowMeta}>
|
<View style={styles.rowMeta}>
|
||||||
<PaletteText
|
<Text
|
||||||
tone={palette ? "foreground" : undefined}
|
|
||||||
style={[styles.rowTitle, { color: foreground }]}
|
style={[styles.rowTitle, { color: foreground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{song.title}
|
{song.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
<PaletteText
|
<Text
|
||||||
tone={palette ? "secondaryForeground" : undefined}
|
|
||||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||||
numberOfLines={1}
|
numberOfLines={1}
|
||||||
>
|
>
|
||||||
{song.artist.name} · {song.album.title}
|
{song.artist.name} · {song.album.title}
|
||||||
</PaletteText>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
<PaletteText
|
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||||
tone={palette ? "secondaryForeground" : undefined}
|
|
||||||
style={[styles.duration, { color: secondaryForeground }]}
|
|
||||||
>
|
|
||||||
{formatDuration(song.durationSeconds)}
|
{formatDuration(song.durationSeconds)}
|
||||||
</PaletteText>
|
</Text>
|
||||||
{trailing}
|
{trailing}
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,15 +1,20 @@
|
|||||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||||
|
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||||
import {
|
import {
|
||||||
CollectionHero,
|
CollectionHero,
|
||||||
useCollectionHeroLayout,
|
useCollectionHeroLayout,
|
||||||
} from "@/components/collection-hero"
|
} from "@/components/collection-hero"
|
||||||
|
import {
|
||||||
|
CollectionDivider,
|
||||||
|
collectionInset,
|
||||||
|
} from "@/components/collection-list"
|
||||||
|
import { tabletCardTextHeight } from "@/components/tablet-media-grid"
|
||||||
import { Link } from "expo-router"
|
import { Link } from "expo-router"
|
||||||
import { useHeaderHeight } from "expo-router/react-navigation"
|
import { useHeaderHeight } from "expo-router/react-navigation"
|
||||||
import Reanimated from "react-native-reanimated"
|
import Reanimated from "react-native-reanimated"
|
||||||
import { type ReactNode, type ComponentProps } from "react"
|
import { type ComponentProps, type ReactNode } from "react"
|
||||||
import {
|
import {
|
||||||
Platform,
|
Platform,
|
||||||
ScrollView,
|
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
View,
|
View,
|
||||||
type DimensionValue,
|
type DimensionValue,
|
||||||
@@ -17,34 +22,42 @@ import {
|
|||||||
type ViewStyle,
|
type ViewStyle,
|
||||||
} from "react-native"
|
} from "react-native"
|
||||||
|
|
||||||
import { contentBottomInset } from "@/components/player"
|
|
||||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
/** Reserve the transparent native header explicitly while skeletons cannot scroll. */
|
/**
|
||||||
function SkeletonContent({
|
* Loading screens never scroll, so they cannot rely on scroll-view inset
|
||||||
|
* adjustment. iOS headers are transparent and overlap the screen; Android
|
||||||
|
* headers are opaque and already sit above it.
|
||||||
|
*/
|
||||||
|
function SkeletonScreen({
|
||||||
children,
|
children,
|
||||||
embedded = false,
|
style,
|
||||||
|
backgroundColor,
|
||||||
|
onLayout,
|
||||||
}: {
|
}: {
|
||||||
children: ReactNode
|
children: ReactNode
|
||||||
embedded?: boolean
|
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||||
|
backgroundColor?: string
|
||||||
|
onLayout?: () => void
|
||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const headerHeight = useHeaderHeight()
|
const headerHeight = useHeaderHeight()
|
||||||
if (embedded) return <>{children}</>
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollView
|
<Reanimated.View
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
onLayout={onLayout}
|
||||||
contentContainerStyle={{
|
|
||||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
|
||||||
paddingBottom: contentBottomInset,
|
|
||||||
}}
|
|
||||||
contentInsetAdjustmentBehavior="never"
|
|
||||||
scrollEnabled={false}
|
|
||||||
accessibilityLabel="Loading"
|
accessibilityLabel="Loading"
|
||||||
|
accessibilityRole="progressbar"
|
||||||
|
style={[
|
||||||
|
styles.screen,
|
||||||
|
{
|
||||||
|
backgroundColor: backgroundColor ?? colors.background,
|
||||||
|
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
||||||
|
},
|
||||||
|
style,
|
||||||
|
]}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
</ScrollView>
|
</Reanimated.View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,56 +74,103 @@ export function Skeleton({ style }: { style?: StyleProp<ViewStyle> }) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Occupies the line box of text at `fontSize`, so loaded text lands in place. */
|
||||||
function TextLine({
|
function TextLine({
|
||||||
width,
|
width,
|
||||||
height = 14,
|
fontSize,
|
||||||
}: {
|
}: {
|
||||||
width: DimensionValue
|
width: DimensionValue
|
||||||
height?: number
|
fontSize: number
|
||||||
}) {
|
}) {
|
||||||
return <Skeleton style={{ width, height, borderRadius: 4 }} />
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
width,
|
||||||
|
height: Math.round(fontSize * 1.2),
|
||||||
|
justifyContent: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Skeleton
|
||||||
|
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SongRowSkeleton() {
|
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
|
||||||
|
export function SongRowSkeleton({ inset = false }: { inset?: boolean }) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
|
const meta = (
|
||||||
|
<View style={styles.songMeta}>
|
||||||
|
<TextLine width="60%" fontSize={16} />
|
||||||
|
<View style={styles.songSubtitle}>
|
||||||
|
<TextLine width="40%" fontSize={14} />
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
if (inset) {
|
||||||
|
return (
|
||||||
|
<View style={styles.insetRow}>
|
||||||
|
<Skeleton style={styles.songArtwork} />
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.insetSongContent,
|
||||||
|
{ borderBottomColor: colors.border },
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
{meta}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<View style={[styles.songRow, { borderBottomColor: colors.border }]}>
|
<View style={[styles.songRow, { borderBottomColor: colors.border }]}>
|
||||||
<Skeleton style={styles.songArtwork} />
|
<Skeleton style={styles.songArtwork} />
|
||||||
<View style={styles.songMeta}>
|
{meta}
|
||||||
<TextLine width="60%" height={16} />
|
</View>
|
||||||
<TextLine width="40%" />
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function TrackRowSkeleton() {
|
||||||
|
const colors = useThemeColors()
|
||||||
|
return (
|
||||||
|
<View style={styles.trackRow}>
|
||||||
|
<View style={styles.trackNumber}>
|
||||||
|
<TextLine width={12} fontSize={16} />
|
||||||
|
</View>
|
||||||
|
<View style={[styles.trackContent, { borderBottomColor: colors.border }]}>
|
||||||
|
<TextLine width="55%" fontSize={16} />
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SongListSkeleton({
|
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
||||||
rows = 10,
|
return Array.from({ length: rows }, (_, index) => (
|
||||||
embedded = false,
|
<SongRowSkeleton key={index} inset={inset} />
|
||||||
}: {
|
))
|
||||||
rows?: number
|
}
|
||||||
embedded?: boolean
|
|
||||||
}) {
|
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
||||||
return (
|
return (
|
||||||
<SkeletonContent embedded={embedded}>
|
<SkeletonScreen>
|
||||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
<SongRows rows={rows} />
|
||||||
{Array.from({ length: rows }, (_, index) => (
|
</SkeletonScreen>
|
||||||
<SongRowSkeleton key={index} />
|
|
||||||
))}
|
|
||||||
</View>
|
|
||||||
</SkeletonContent>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Mirrors the album, playlist, and artist cards in `media-cards`. */
|
||||||
function CardSkeleton({
|
function CardSkeleton({
|
||||||
width,
|
width,
|
||||||
|
minHeight,
|
||||||
round = false,
|
round = false,
|
||||||
}: {
|
}: {
|
||||||
width: number
|
width: number
|
||||||
|
minHeight?: number
|
||||||
round?: boolean
|
round?: boolean
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<View style={[styles.card, { width }]}>
|
<View style={[styles.card, { width, minHeight }]}>
|
||||||
<Skeleton
|
<Skeleton
|
||||||
style={{
|
style={{
|
||||||
width,
|
width,
|
||||||
@@ -118,35 +178,37 @@ function CardSkeleton({
|
|||||||
borderRadius: round ? width / 2 : radius.md,
|
borderRadius: round ? width / 2 : radius.md,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<TextLine width="80%" />
|
<TextLine width="80%" fontSize={14} />
|
||||||
{round ? null : <TextLine width="50%" height={12} />}
|
{round ? null : <TextLine width="50%" fontSize={12} />}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function MediaGridSkeleton({
|
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
|
||||||
items = 6,
|
function MediaGridContent({
|
||||||
contentInset = true,
|
items,
|
||||||
embedded = false,
|
contentInset,
|
||||||
|
header,
|
||||||
}: {
|
}: {
|
||||||
items?: number
|
items: number
|
||||||
contentInset?: boolean
|
contentInset: boolean
|
||||||
embedded?: boolean
|
header?: ReactNode
|
||||||
}) {
|
}) {
|
||||||
|
const tabletLayout = useTabletLayout()
|
||||||
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
const { cardWidth, columns, onLayout, horizontalPadding, gap, ready } =
|
||||||
useMediaGridLayout()
|
useMediaGridLayout()
|
||||||
return (
|
return (
|
||||||
<SkeletonContent embedded={embedded}>
|
<>
|
||||||
|
{header}
|
||||||
<View
|
<View
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
accessibilityLabel="Loading"
|
|
||||||
accessibilityRole="progressbar"
|
|
||||||
style={[
|
style={[
|
||||||
styles.grid,
|
styles.grid,
|
||||||
contentInset ? styles.gridInset : styles.gridRowInset,
|
|
||||||
{
|
{
|
||||||
paddingHorizontal: horizontalPadding,
|
paddingHorizontal: horizontalPadding,
|
||||||
paddingTop: contentInset ? horizontalPadding : 0,
|
paddingTop: contentInset ? horizontalPadding : 0,
|
||||||
|
// FlatList applies its content gap after the list header as well.
|
||||||
|
marginTop: header && !tabletLayout ? gap : 0,
|
||||||
gap,
|
gap,
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
@@ -154,20 +216,47 @@ export function MediaGridSkeleton({
|
|||||||
{Array.from(
|
{Array.from(
|
||||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||||
(_, index) => (
|
(_, index) => (
|
||||||
<CardSkeleton key={index} width={cardWidth} />
|
<CardSkeleton
|
||||||
|
key={index}
|
||||||
|
width={cardWidth}
|
||||||
|
minHeight={
|
||||||
|
tabletLayout ? cardWidth + tabletCardTextHeight : undefined
|
||||||
|
}
|
||||||
|
/>
|
||||||
)
|
)
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
</SkeletonContent>
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export function MediaGridSkeleton({
|
||||||
|
items = 6,
|
||||||
|
contentInset = true,
|
||||||
|
header,
|
||||||
|
}: {
|
||||||
|
items?: number
|
||||||
|
contentInset?: boolean
|
||||||
|
/** The loaded list's `ListHeaderComponent`, so it keeps its position. */
|
||||||
|
header?: ReactNode
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<SkeletonScreen>
|
||||||
|
<MediaGridContent
|
||||||
|
items={items}
|
||||||
|
contentInset={contentInset}
|
||||||
|
header={header}
|
||||||
|
/>
|
||||||
|
</SkeletonScreen>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function CarouselSkeleton() {
|
export function CarouselSkeleton() {
|
||||||
return (
|
return (
|
||||||
<View style={styles.carousel}>
|
<View style={styles.carousel}>
|
||||||
<TextLine width={160} height={22} />
|
<TextLine width={160} fontSize={22} />
|
||||||
<View style={styles.carouselRow}>
|
<View style={styles.carouselRow}>
|
||||||
{Array.from({ length: 3 }, (_, index) => (
|
{Array.from({ length: 8 }, (_, index) => (
|
||||||
<CardSkeleton key={index} width={carouselCardWidth} />
|
<CardSkeleton key={index} width={carouselCardWidth} />
|
||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
@@ -176,140 +265,148 @@ export function CarouselSkeleton() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function HomeSkeleton() {
|
export function HomeSkeleton() {
|
||||||
const headerHeight = useHeaderHeight()
|
|
||||||
const colors = useThemeColors()
|
|
||||||
return (
|
return (
|
||||||
<ScrollView
|
<SkeletonScreen>
|
||||||
style={{ flex: 1, backgroundColor: colors.background }}
|
<View style={styles.home}>
|
||||||
contentContainerStyle={[
|
<CarouselSkeleton />
|
||||||
styles.home,
|
<CarouselSkeleton />
|
||||||
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
</View>
|
||||||
]}
|
</SkeletonScreen>
|
||||||
contentInsetAdjustmentBehavior="never"
|
)
|
||||||
scrollEnabled={false}
|
}
|
||||||
accessibilityLabel="Loading"
|
|
||||||
>
|
function HeroActions({
|
||||||
<CarouselSkeleton />
|
favorite = true,
|
||||||
<CarouselSkeleton />
|
reverse = false,
|
||||||
</ScrollView>
|
}: {
|
||||||
|
favorite?: boolean
|
||||||
|
reverse?: boolean
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<View style={[styles.actions, reverse && styles.actionsReverse]}>
|
||||||
|
{favorite ? <Skeleton style={styles.iconAction} /> : null}
|
||||||
|
<Skeleton style={styles.playButton} />
|
||||||
|
<Skeleton style={styles.iconAction} />
|
||||||
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 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,
|
variant,
|
||||||
style,
|
style,
|
||||||
round = false,
|
|
||||||
backgroundColor,
|
backgroundColor,
|
||||||
onLayout,
|
onLayout,
|
||||||
}: {
|
}: {
|
||||||
zoomCoverSize?: number
|
variant: "album" | "playlist" | "favorites" | "artist"
|
||||||
style?: ComponentProps<typeof Reanimated.ScrollView>["style"]
|
style?: ComponentProps<typeof Reanimated.View>["style"]
|
||||||
round?: boolean
|
|
||||||
backgroundColor?: string
|
backgroundColor?: string
|
||||||
onLayout?: () => void
|
onLayout?: () => void
|
||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
|
||||||
const headerHeight = useHeaderHeight()
|
|
||||||
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
const { landscape, coverSize: tabletCoverSize } = useCollectionHeroLayout()
|
||||||
const coverSize =
|
|
||||||
!round && landscape
|
if (variant === "artist" || variant === "favorites") {
|
||||||
? tabletCoverSize!
|
const artist = variant === "artist"
|
||||||
: (zoomCoverSize ?? (round ? 180 : 210))
|
const coverSize = artist ? 180 : 200
|
||||||
const actions = (
|
const hero = (
|
||||||
<View style={styles.actions}>
|
<View style={styles.centeredHero}>
|
||||||
<Skeleton style={styles.iconAction} />
|
<Skeleton
|
||||||
<Skeleton style={styles.playButton} />
|
style={{
|
||||||
<Skeleton style={styles.iconAction} />
|
width: coverSize,
|
||||||
</View>
|
height: coverSize,
|
||||||
)
|
borderRadius: artist ? coverSize / 2 : radius.lg,
|
||||||
const artwork = (
|
}}
|
||||||
<Skeleton
|
/>
|
||||||
style={{
|
<TextLine width={200} fontSize={artist ? 28 : 24} />
|
||||||
width: coverSize,
|
<HeroActions favorite={artist} />
|
||||||
height: coverSize,
|
</View>
|
||||||
borderRadius: round ? coverSize / 2 : radius.lg,
|
)
|
||||||
}}
|
return (
|
||||||
/>
|
<SkeletonScreen
|
||||||
)
|
style={style}
|
||||||
|
backgroundColor={backgroundColor}
|
||||||
|
onLayout={onLayout}
|
||||||
|
>
|
||||||
|
{artist ? (
|
||||||
|
<MediaGridContent items={4} contentInset={false} header={hero} />
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
{hero}
|
||||||
|
<CollectionDivider />
|
||||||
|
<SongRows rows={8} inset />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</SkeletonScreen>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const album = variant === "album"
|
||||||
|
const coverSize = tabletCoverSize ?? (album ? 220 : 200)
|
||||||
return (
|
return (
|
||||||
<Reanimated.ScrollView
|
<SkeletonScreen
|
||||||
|
style={style}
|
||||||
|
backgroundColor={backgroundColor}
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
style={[
|
|
||||||
{ flex: 1, backgroundColor: backgroundColor ?? colors.background },
|
|
||||||
style,
|
|
||||||
]}
|
|
||||||
contentContainerStyle={{
|
|
||||||
paddingTop: Platform.OS === "ios" ? headerHeight : 0,
|
|
||||||
paddingBottom: contentBottomInset,
|
|
||||||
}}
|
|
||||||
contentInsetAdjustmentBehavior="never"
|
|
||||||
scrollEnabled={false}
|
|
||||||
accessibilityLabel="Loading"
|
|
||||||
>
|
>
|
||||||
{round ? (
|
<CollectionHero
|
||||||
<View style={styles.artistHero}>
|
artwork={
|
||||||
{zoomCoverSize ? (
|
<Link.AppleZoomTarget>
|
||||||
<Link.AppleZoomTarget>
|
<View collapsable={false}>
|
||||||
<View collapsable={false}>{artwork}</View>
|
<Skeleton
|
||||||
</Link.AppleZoomTarget>
|
style={{
|
||||||
) : (
|
width: coverSize,
|
||||||
artwork
|
height: coverSize,
|
||||||
)}
|
borderRadius: radius.lg,
|
||||||
<TextLine width={200} height={24} />
|
}}
|
||||||
<TextLine width={120} height={16} />
|
/>
|
||||||
{actions}
|
</View>
|
||||||
</View>
|
</Link.AppleZoomTarget>
|
||||||
|
}
|
||||||
|
actions={<HeroActions favorite={album} reverse={landscape} />}
|
||||||
|
>
|
||||||
|
<TextLine
|
||||||
|
width={landscape ? "85%" : 200}
|
||||||
|
fontSize={landscape ? 22 : 24}
|
||||||
|
/>
|
||||||
|
<TextLine
|
||||||
|
width={landscape ? "60%" : 120}
|
||||||
|
fontSize={landscape ? 22 : 16}
|
||||||
|
/>
|
||||||
|
{album ? (
|
||||||
|
<TextLine width={landscape ? "40%" : 150} fontSize={14} />
|
||||||
|
) : null}
|
||||||
|
</CollectionHero>
|
||||||
|
<CollectionDivider />
|
||||||
|
{album ? (
|
||||||
|
Array.from({ length: 10 }, (_, index) => (
|
||||||
|
<TrackRowSkeleton key={index} />
|
||||||
|
))
|
||||||
) : (
|
) : (
|
||||||
<CollectionHero
|
<SongRows rows={8} inset />
|
||||||
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 ? (
|
</SkeletonScreen>
|
||||||
<MediaGridSkeleton items={4} contentInset={false} embedded />
|
|
||||||
) : (
|
|
||||||
<SongListSkeleton rows={8} embedded />
|
|
||||||
)}
|
|
||||||
</Reanimated.ScrollView>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
export function ArtistListSkeleton({ rows = 12 }: { rows?: number }) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
return (
|
return (
|
||||||
<SkeletonContent>
|
<SkeletonScreen>
|
||||||
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
{Array.from({ length: rows }, (_, index) => (
|
||||||
{Array.from({ length: rows }, (_, index) => (
|
<View
|
||||||
<View
|
key={index}
|
||||||
key={index}
|
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
>
|
||||||
>
|
<Skeleton style={styles.artistAvatar} />
|
||||||
<Skeleton style={styles.artistAvatar} />
|
<TextLine width="50%" fontSize={16} />
|
||||||
<TextLine width="50%" height={16} />
|
</View>
|
||||||
</View>
|
))}
|
||||||
))}
|
</SkeletonScreen>
|
||||||
</View>
|
|
||||||
</SkeletonContent>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
|
screen: { flex: 1, overflow: "hidden" },
|
||||||
songRow: {
|
songRow: {
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
@@ -319,22 +416,55 @@ const styles = StyleSheet.create({
|
|||||||
paddingHorizontal: spacing.lg,
|
paddingHorizontal: spacing.lg,
|
||||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||||
},
|
},
|
||||||
|
insetRow: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
gap: spacing.md,
|
||||||
|
paddingLeft: collectionInset,
|
||||||
|
},
|
||||||
|
insetSongContent: {
|
||||||
|
flex: 1,
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
alignSelf: "stretch",
|
||||||
|
minHeight: 64,
|
||||||
|
paddingVertical: 10,
|
||||||
|
marginRight: collectionInset,
|
||||||
|
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||||
|
},
|
||||||
songArtwork: { width: 44, height: 44, borderRadius: 6 },
|
songArtwork: { width: 44, height: 44, borderRadius: 6 },
|
||||||
songMeta: { flex: 1, gap: 6 },
|
songMeta: { flex: 1 },
|
||||||
card: { gap: spacing.xs },
|
songSubtitle: { marginTop: 3 },
|
||||||
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
trackRow: {
|
||||||
gridInset: { padding: spacing.lg },
|
|
||||||
gridRowInset: { paddingHorizontal: spacing.lg },
|
|
||||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
|
||||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
|
||||||
home: { padding: spacing.lg, gap: spacing.xl },
|
|
||||||
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
|
||||||
actions: {
|
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
gap: spacing.sm,
|
gap: spacing.sm,
|
||||||
|
paddingLeft: collectionInset,
|
||||||
|
},
|
||||||
|
trackNumber: { width: 24, alignItems: "center" },
|
||||||
|
trackContent: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: "center",
|
||||||
|
alignSelf: "stretch",
|
||||||
|
minHeight: 52,
|
||||||
|
paddingVertical: 12,
|
||||||
|
marginRight: collectionInset,
|
||||||
|
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||||
|
},
|
||||||
|
card: { gap: spacing.xs },
|
||||||
|
grid: { flexDirection: "row", flexWrap: "wrap" },
|
||||||
|
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||||
|
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||||
|
home: { padding: spacing.lg, gap: spacing.xl },
|
||||||
|
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||||
|
actions: {
|
||||||
|
flexDirection: "row",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
gap: spacing.sm,
|
||||||
marginTop: spacing.sm,
|
marginTop: spacing.sm,
|
||||||
},
|
},
|
||||||
|
actionsReverse: { flexDirection: "row-reverse" },
|
||||||
iconAction: { width: 44, height: 44, borderRadius: 22 },
|
iconAction: { width: 44, height: 44, borderRadius: 22 },
|
||||||
playButton: { width: 160, height: 44, borderRadius: 999 },
|
playButton: { width: 160, height: 44, borderRadius: 999 },
|
||||||
artistRow: {
|
artistRow: {
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ import { SafeAreaView } from "react-native-safe-area-context"
|
|||||||
import { Platform } from "react-native"
|
import { Platform } from "react-native"
|
||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
|
|
||||||
import { useAndroidTabBackgroundStyle } from "@/contexts/android-tab-theme"
|
import { useTabletBackgroundStyle } from "@/contexts/android-tab-theme"
|
||||||
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
import { TabletPlayerLayoutSync } from "@/contexts/tablet-player-layout"
|
||||||
import { TabletSidebar } from "@/components/tablet-sidebar"
|
import { TabletSidebar } from "@/components/tablet-sidebar"
|
||||||
|
|
||||||
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
/** Apply sidebar insets natively, before Yoga measures the content pane. */
|
||||||
export function TabScreenContent({ children }: { children: ReactNode }) {
|
export function TabScreenContent({ children }: { children: ReactNode }) {
|
||||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
const backgroundStyle = useTabletBackgroundStyle()
|
||||||
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
if (Platform.OS !== "ios" || !Platform.isPad) return <>{children}</>
|
||||||
return (
|
return (
|
||||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
|||||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||||
import { useThemeColors } from "@/lib/theme"
|
import { useThemeColors } from "@/lib/theme"
|
||||||
|
|
||||||
|
/** Height reserved under each tablet card's artwork for its title and subtitle. */
|
||||||
|
export const tabletCardTextHeight = 48
|
||||||
|
|
||||||
type GridProps = {
|
type GridProps = {
|
||||||
content: MediaItem[]
|
content: MediaItem[]
|
||||||
paddingBottom: number
|
paddingBottom: number
|
||||||
@@ -48,7 +51,7 @@ export function TabletMediaGrid({
|
|||||||
const [headerHeight, setHeaderHeight] = useState(0)
|
const [headerHeight, setHeaderHeight] = useState(0)
|
||||||
const [scrollY, setScrollY] = useState(0)
|
const [scrollY, setScrollY] = useState(0)
|
||||||
const lastRequestedLength = useRef(-1)
|
const lastRequestedLength = useRef(-1)
|
||||||
const rowHeight = cardWidth + 48 + gap
|
const rowHeight = cardWidth + tabletCardTextHeight + gap
|
||||||
const firstRow = Math.max(
|
const firstRow = Math.max(
|
||||||
0,
|
0,
|
||||||
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
|
||||||
import {
|
import {
|
||||||
ActivityIndicator,
|
ActivityIndicator,
|
||||||
Platform,
|
Platform,
|
||||||
@@ -74,20 +73,8 @@ export function Button({
|
|||||||
<ActivityIndicator color={textColor} />
|
<ActivityIndicator color={textColor} />
|
||||||
) : (
|
) : (
|
||||||
<View style={styles.buttonContent}>
|
<View style={styles.buttonContent}>
|
||||||
{icon ? (
|
{icon ? <Ionicons name={icon} size={18} color={textColor} /> : null}
|
||||||
<PaletteIcon
|
<Text style={[styles.buttonText, { color: textColor }]}>{title}</Text>
|
||||||
tone={tint ? "accentForeground" : undefined}
|
|
||||||
name={icon}
|
|
||||||
size={18}
|
|
||||||
color={textColor}
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
<PaletteText
|
|
||||||
tone={tint ? "accentForeground" : undefined}
|
|
||||||
style={[styles.buttonText, { color: textColor }]}
|
|
||||||
>
|
|
||||||
{title}
|
|
||||||
</PaletteText>
|
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
</Pressable>
|
</Pressable>
|
||||||
|
|||||||
@@ -14,14 +14,10 @@ import {
|
|||||||
useState,
|
useState,
|
||||||
type PropsWithChildren,
|
type PropsWithChildren,
|
||||||
} from "react"
|
} from "react"
|
||||||
import { Platform, StyleSheet, type HostInstance } from "react-native"
|
import { Platform } from "react-native"
|
||||||
import Reanimated, {
|
import {
|
||||||
useSharedValue,
|
useSharedValue,
|
||||||
useAnimatedStyle,
|
useAnimatedStyle,
|
||||||
useAnimatedReaction,
|
|
||||||
useAnimatedRef,
|
|
||||||
setNativeProps,
|
|
||||||
processColor,
|
|
||||||
withTiming,
|
withTiming,
|
||||||
type SharedValue,
|
type SharedValue,
|
||||||
} from "react-native-reanimated"
|
} from "react-native-reanimated"
|
||||||
@@ -29,19 +25,17 @@ import 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
|
||||||
colors: SharedValue<PaletteColors>
|
|
||||||
hasArtworkPalette: boolean
|
hasArtworkPalette: boolean
|
||||||
|
tabletBackground: SharedValue<string>
|
||||||
setPalette: (palette: CoverPalette | null, owner: string) => void
|
setPalette: (palette: CoverPalette | null, owner: string) => void
|
||||||
}
|
}
|
||||||
const AndroidTabTheme = createContext<TabTheme | null>(null)
|
const AndroidTabTheme = createContext<TabTheme | null>(null)
|
||||||
|
|
||||||
|
const isTablet = Platform.OS === "ios" && Platform.isPad
|
||||||
|
const sharesPalette = Platform.OS === "android" || isTablet
|
||||||
|
|
||||||
function useDefaultPalette() {
|
function useDefaultPalette() {
|
||||||
const theme = useThemeColors()
|
const theme = useThemeColors()
|
||||||
const isDark = useIsDark()
|
const isDark = useIsDark()
|
||||||
@@ -60,52 +54,37 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
|||||||
palette.foreground !== defaultPalette.foreground ||
|
palette.foreground !== defaultPalette.foreground ||
|
||||||
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
palette.secondaryForeground !== defaultPalette.secondaryForeground ||
|
||||||
palette.accent !== defaultPalette.accent
|
palette.accent !== defaultPalette.accent
|
||||||
const { isDark: _defaultIsDark, ...defaultColors } = defaultPalette
|
const tabletBackground = useSharedValue(defaultPalette.background)
|
||||||
const animatedColors = useSharedValue<PaletteColors>({
|
|
||||||
...defaultColors,
|
|
||||||
selectedColor: defaultPalette.accentText,
|
|
||||||
})
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
const { isDark: _isDark, ...colors } = palette
|
if (!isTablet) return
|
||||||
animatedColors.value = withTiming(
|
tabletBackground.value = withTiming(palette.background, {
|
||||||
{
|
duration: TABLET_FADE_MS,
|
||||||
...colors,
|
})
|
||||||
selectedColor: hasArtwork
|
}, [tabletBackground, palette.background])
|
||||||
? palette.foreground
|
|
||||||
: defaultPalette.accentText,
|
|
||||||
},
|
|
||||||
{ duration: PALETTE_FADE_MS }
|
|
||||||
)
|
|
||||||
}, [animatedColors, palette, defaultPalette, hasArtwork])
|
|
||||||
const paletteOwner = useRef<string | null>(null)
|
const paletteOwner = useRef<string | null>(null)
|
||||||
const setPalette = useCallback(
|
const setPalette = useCallback(
|
||||||
(palette: CoverPalette | null, owner: string) => {
|
(palette: CoverPalette | null, owner: string) => {
|
||||||
if (!palette && paletteOwner.current !== owner) return
|
if (!palette && paletteOwner.current !== owner) return
|
||||||
paletteOwner.current = palette ? owner : null
|
paletteOwner.current = palette ? owner : null
|
||||||
// Start on the UI thread immediately. React may defer commits while
|
if (isTablet) {
|
||||||
// the native stack is animating, including transitionStart state updates.
|
// React may defer commits while the iPad stack is animating.
|
||||||
const target = palette ?? defaultPalette
|
tabletBackground.value = withTiming(
|
||||||
const { isDark: _isDark, ...colors } = target
|
(palette ?? defaultPalette).background,
|
||||||
animatedColors.value = withTiming(
|
{ duration: TABLET_FADE_MS }
|
||||||
{
|
)
|
||||||
...colors,
|
}
|
||||||
selectedColor: palette ? target.foreground : target.accentText,
|
|
||||||
},
|
|
||||||
{ duration: PALETTE_FADE_MS }
|
|
||||||
)
|
|
||||||
setScreen(palette ? { palette, owner } : null)
|
setScreen(palette ? { palette, owner } : null)
|
||||||
},
|
},
|
||||||
[animatedColors, defaultPalette]
|
[tabletBackground, defaultPalette]
|
||||||
)
|
)
|
||||||
const artworkPalette = hasArtwork ? palette : null
|
|
||||||
const value = useMemo(
|
const value = useMemo(
|
||||||
() => ({
|
() => ({
|
||||||
palette: artworkPalette ?? defaultPalette,
|
palette: hasArtwork ? palette : defaultPalette,
|
||||||
colors: animatedColors,
|
hasArtworkPalette: hasArtwork,
|
||||||
hasArtworkPalette: artworkPalette !== null,
|
tabletBackground,
|
||||||
setPalette,
|
setPalette,
|
||||||
}),
|
}),
|
||||||
[defaultPalette, artworkPalette, setPalette, animatedColors]
|
[defaultPalette, hasArtwork, palette, setPalette, tabletBackground]
|
||||||
)
|
)
|
||||||
return (
|
return (
|
||||||
<AndroidTabTheme.Provider value={value}>
|
<AndroidTabTheme.Provider value={value}>
|
||||||
@@ -114,50 +93,6 @@ export function ScreenPaletteProvider({ children }: PropsWithChildren) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* NativeTabs forwards raw screen props to its Fabric screen. Bind that host
|
|
||||||
* directly so appearance updates stay on the UI thread with the page colors.
|
|
||||||
*/
|
|
||||||
export function useAndroidNativeTabColors() {
|
|
||||||
const colors = useContext(AndroidTabTheme)?.colors
|
|
||||||
const ref = useAnimatedRef<HostInstance>()
|
|
||||||
const mounted = useSharedValue(false)
|
|
||||||
const attach = useCallback(
|
|
||||||
(host: HostInstance | null) => {
|
|
||||||
if (host) ref(host)
|
|
||||||
mounted.value = host !== null
|
|
||||||
},
|
|
||||||
[ref, mounted]
|
|
||||||
)
|
|
||||||
|
|
||||||
useAnimatedReaction(
|
|
||||||
() => ({ colors: colors?.value, mounted: mounted.value }),
|
|
||||||
({ colors: palette, mounted: ready }) => {
|
|
||||||
if (Platform.OS !== "android" || !ready || !palette) return
|
|
||||||
const normal = processColor(palette.secondaryForeground)
|
|
||||||
const selected = processColor(palette.selectedColor)
|
|
||||||
setNativeProps(ref, {
|
|
||||||
standardAppearance: {
|
|
||||||
tabBarBackgroundColor: processColor("transparent"),
|
|
||||||
tabBarItemRippleColor: selected,
|
|
||||||
tabBarItemActiveIndicatorEnabled: false,
|
|
||||||
tabBarItemTitleSmallLabelFontSize: 10,
|
|
||||||
tabBarItemTitleLargeLabelFontSize: 10,
|
|
||||||
normal: {
|
|
||||||
tabBarItemTitleFontColor: normal,
|
|
||||||
tabBarItemIconColor: normal,
|
|
||||||
},
|
|
||||||
selected: {
|
|
||||||
tabBarItemTitleFontColor: selected,
|
|
||||||
tabBarItemIconColor: selected,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
}
|
|
||||||
)
|
|
||||||
return { ref: attach, style: { backgroundColor: "transparent" } }
|
|
||||||
}
|
|
||||||
|
|
||||||
export function useAndroidTabPalette() {
|
export function useAndroidTabPalette() {
|
||||||
const theme = useContext(AndroidTabTheme)
|
const theme = useContext(AndroidTabTheme)
|
||||||
const defaultPalette = useDefaultPalette()
|
const defaultPalette = useDefaultPalette()
|
||||||
@@ -168,53 +103,29 @@ export function useAndroidTabHasArtworkPalette() {
|
|||||||
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useAndroidTabBackgroundStyle() {
|
/** iPad fades the sidebar and content pane together; other layouts skip it. */
|
||||||
const theme = useContext(AndroidTabTheme)
|
export function useTabletBackgroundStyle() {
|
||||||
const fallback = useDefaultPalette().background
|
const background = useContext(AndroidTabTheme)?.tabletBackground
|
||||||
const colors = theme?.colors
|
|
||||||
return useAnimatedStyle(() =>
|
return useAnimatedStyle(() =>
|
||||||
Platform.OS === "android" || (Platform.OS === "ios" && Platform.isPad)
|
isTablet && background ? { backgroundColor: background.value } : {}
|
||||||
? { backgroundColor: colors?.value.background ?? fallback }
|
|
||||||
: {}
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Color tokens share the background's UI-thread timing. */
|
const TABLET_FADE_MS = 400
|
||||||
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() {
|
* Artwork screens always paint their own palette so it slides with the page.
|
||||||
const style = useAndroidTabBackgroundStyle()
|
* Shared chrome (tab bar, mini player) switches when the transition starts.
|
||||||
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) {
|
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 [laidOut, setLaidOut] = useState(false)
|
const [laidOut, setLaidOut] = useState(false)
|
||||||
const [closing, setClosing] = useState(false)
|
const [closing, setClosing] = useState(false)
|
||||||
const onLayout = useCallback(() => setLaidOut(true), [])
|
const onLayout = useCallback(() => setLaidOut(true), [])
|
||||||
const theme = useContext(AndroidTabTheme)
|
const setPalette = useContext(AndroidTabTheme)?.setPalette
|
||||||
const setPalette = theme?.setPalette
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
if (!sharesPalette) return
|
if (!sharesPalette) return
|
||||||
const start = navigation.addListener("transitionStart", ({ data }) => {
|
const start = navigation.addListener("transitionStart", ({ data }) => {
|
||||||
@@ -230,20 +141,18 @@ export function useScreenPalette(palette: CoverPalette) {
|
|||||||
start()
|
start()
|
||||||
cancel()
|
cancel()
|
||||||
}
|
}
|
||||||
}, [navigation, sharesPalette, setPalette, owner, palette])
|
}, [navigation, setPalette, owner, palette])
|
||||||
const defaultPalette = useDefaultPalette()
|
|
||||||
const ready = laidOut || isTablet
|
const ready = laidOut || isTablet
|
||||||
const target = isFocused && ready && !closing ? palette : defaultPalette
|
const backgroundStyle = useTabletBackgroundStyle()
|
||||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
|
||||||
|
|
||||||
useLayoutEffect(() => {
|
useLayoutEffect(() => {
|
||||||
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
if (!sharesPalette || !setPalette || !isFocused || !ready || closing) return
|
||||||
setPalette(palette, owner)
|
setPalette(palette, owner)
|
||||||
return () => setPalette(null, owner)
|
return () => setPalette(null, owner)
|
||||||
}, [closing, ready, isFocused, owner, palette, setPalette, sharesPalette])
|
}, [closing, ready, isFocused, owner, palette, setPalette])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
palette: Platform.OS === "android" ? target : palette,
|
palette,
|
||||||
backgroundStyle,
|
backgroundStyle,
|
||||||
onLayout: sharesPalette ? onLayout : undefined,
|
onLayout: sharesPalette ? onLayout : undefined,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -134,7 +134,13 @@ export function createCoverPaletteSource<Swatches>({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return { prefetch, usePalette }
|
/** Forget in-memory swatches so covers are re-extracted. */
|
||||||
|
function clear() {
|
||||||
|
swatchesByKey.clear()
|
||||||
|
pending.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
return { prefetch, usePalette, clear }
|
||||||
}
|
}
|
||||||
|
|
||||||
function sameSwatches(a: unknown, b: unknown) {
|
function sameSwatches(a: unknown, b: unknown) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import {
|
|||||||
type CoverPaletteResult,
|
type CoverPaletteResult,
|
||||||
} from "@/hooks/cover-palette-source"
|
} from "@/hooks/cover-palette-source"
|
||||||
import {
|
import {
|
||||||
|
clearLegacyCoverPaletteCache,
|
||||||
prefetchLegacyCoverPalette,
|
prefetchLegacyCoverPalette,
|
||||||
useLegacyCoverPalette,
|
useLegacyCoverPalette,
|
||||||
} from "@/hooks/use-legacy-cover-palette"
|
} from "@/hooks/use-legacy-cover-palette"
|
||||||
@@ -12,6 +13,7 @@ import {
|
|||||||
} from "@/lib/artwork-color-preference"
|
} from "@/lib/artwork-color-preference"
|
||||||
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
import { extractCoverSwatches } from "@/lib/artwork-colors"
|
||||||
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
|
import { deriveCoverPalette, type CoverSwatches } from "@/lib/cover-palette"
|
||||||
|
import { clearCachePrefix } from "@/lib/persistent-cache"
|
||||||
|
|
||||||
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
|
export { COVER_PALETTE_WAIT_MS } from "@/hooks/cover-palette-source"
|
||||||
|
|
||||||
@@ -21,6 +23,16 @@ const region = createCoverPaletteSource<CoverSwatches>({
|
|||||||
derive: (swatches) => deriveCoverPalette(swatches),
|
derive: (swatches) => deriveCoverPalette(swatches),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Forget every extracted palette, in memory and on device, so covers are
|
||||||
|
* re-extracted. Both pipelines share the `palette:` cache prefix.
|
||||||
|
*/
|
||||||
|
export function clearCoverPaletteCache() {
|
||||||
|
region.clear()
|
||||||
|
clearLegacyCoverPaletteCache()
|
||||||
|
clearCachePrefix("palette")
|
||||||
|
}
|
||||||
|
|
||||||
/** Warm visible artwork colors before a detail page is pushed. */
|
/** Warm visible artwork colors before a detail page is pushed. */
|
||||||
export function prefetchCoverPalette(uri: string) {
|
export function prefetchCoverPalette(uri: string) {
|
||||||
void loadArtworkColorsEnabled().then((enabled) =>
|
void loadArtworkColorsEnabled().then((enabled) =>
|
||||||
|
|||||||
@@ -65,3 +65,5 @@ export const prefetchLegacyCoverPalette = legacy.prefetch
|
|||||||
|
|
||||||
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
|
/** `react-native-image-colors` pipeline used when new artwork colors are off. */
|
||||||
export const useLegacyCoverPalette = legacy.usePalette
|
export const useLegacyCoverPalette = legacy.usePalette
|
||||||
|
|
||||||
|
export const clearLegacyCoverPaletteCache = legacy.clear
|
||||||
@@ -28,7 +28,7 @@ export function useStackScreenOptions(
|
|||||||
headerBackButtonDisplayMode: "minimal",
|
headerBackButtonDisplayMode: "minimal",
|
||||||
...(Platform.OS === "android"
|
...(Platform.OS === "android"
|
||||||
? {
|
? {
|
||||||
animation: "slide_from_right",
|
animation: "fade",
|
||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
headerTransparent: false,
|
headerTransparent: false,
|
||||||
headerStyle: { backgroundColor: theme.background },
|
headerStyle: { backgroundColor: theme.background },
|
||||||
|
|||||||
@@ -7,11 +7,15 @@ private enum HandoffState {
|
|||||||
static var pending: [String: String]?
|
static var pending: [String: String]?
|
||||||
static var notify: (() -> Void)?
|
static var notify: (() -> Void)?
|
||||||
|
|
||||||
static var activityType: String {
|
// app.config.ts declares the one `.media` type per build profile; iOS and
|
||||||
"\(Bundle.main.bundleIdentifier!).media"
|
// Catalyst must publish the same string for Handoff to pair them. Other
|
||||||
}
|
// plugins (expo-router) append their own types, so match by suffix.
|
||||||
|
static let activityType =
|
||||||
|
(Bundle.main.object(forInfoDictionaryKey: "NSUserActivityTypes") as! [String])
|
||||||
|
.first { $0.hasSuffix(".media") }!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ExpoAppSceneDelegate forwards scene(_:continue:) and cold-start activities here.
|
||||||
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
|
public final class HandoffAppDelegateSubscriber: ExpoAppDelegateSubscriber {
|
||||||
public func application(
|
public func application(
|
||||||
_ application: UIApplication,
|
_ application: UIApplication,
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
const fs = require("fs")
|
||||||
|
const path = require("path")
|
||||||
|
const { withDangerousMod } = require("expo/config-plugins")
|
||||||
|
|
||||||
|
// Overrides react-native-screens' 150ms crossfade for `animation: "fade"`.
|
||||||
|
// App resources win over library resources with the same name, so the stack
|
||||||
|
// fades through black in 100ms: the old page out, then the new page in.
|
||||||
|
const anims = {
|
||||||
|
"rns_fade_out.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:fromAlpha="1.0"
|
||||||
|
android:toAlpha="0.0"
|
||||||
|
android:duration="50" />
|
||||||
|
`,
|
||||||
|
"rns_fade_in.xml": `<alpha xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:fromAlpha="0.0"
|
||||||
|
android:toAlpha="1.0"
|
||||||
|
android:startOffset="50"
|
||||||
|
android:duration="50" />
|
||||||
|
`,
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = (config) =>
|
||||||
|
withDangerousMod(config, [
|
||||||
|
"android",
|
||||||
|
(config) => {
|
||||||
|
const dir = path.join(
|
||||||
|
config.modRequest.platformProjectRoot,
|
||||||
|
"app/src/main/res/anim"
|
||||||
|
)
|
||||||
|
fs.mkdirSync(dir, { recursive: true })
|
||||||
|
for (const [name, xml] of Object.entries(anims)) {
|
||||||
|
fs.writeFileSync(path.join(dir, name), `<?xml version="1.0" encoding="utf-8"?>\n${xml}`)
|
||||||
|
}
|
||||||
|
return config
|
||||||
|
},
|
||||||
|
])
|
||||||
@@ -4,6 +4,20 @@ const {
|
|||||||
withXcodeProject,
|
withXcodeProject,
|
||||||
} = require("expo/config-plugins")
|
} = require("expo/config-plugins")
|
||||||
|
|
||||||
|
// Pods left at React Native's iOS 15.1 minimum map to a macOS target below what
|
||||||
|
// current Xcode accepts for Catalyst, so raise them to the app's own target.
|
||||||
|
const raisePodDeploymentTargets = `
|
||||||
|
app_target = installer.aggregate_targets.first.platform.deployment_target
|
||||||
|
installer.pods_project.targets.each do |target|
|
||||||
|
target.build_configurations.each do |build|
|
||||||
|
current = build.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
|
||||||
|
if current.nil? || Pod::Version.new(current) < app_target
|
||||||
|
build.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = app_target.to_s
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
`
|
||||||
|
|
||||||
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
|
// Opt in during prebuild so normal iOS builds keep their precompiled dependencies.
|
||||||
module.exports = (config) => {
|
module.exports = (config) => {
|
||||||
config = withPodfileProperties(config, (config) => {
|
config = withPodfileProperties(config, (config) => {
|
||||||
@@ -13,14 +27,15 @@ module.exports = (config) => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
config = withPodfile(config, (config) => {
|
config = withPodfile(config, (config) => {
|
||||||
const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
||||||
if (!pattern.test(config.modResults.contents)) {
|
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/
|
||||||
|
let contents = config.modResults.contents
|
||||||
|
if (!flag.test(contents) || !postInstall.test(contents)) {
|
||||||
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
|
throw new Error("Cannot enable Catalyst: Expo's Podfile template has changed")
|
||||||
}
|
}
|
||||||
config.modResults.contents = config.modResults.contents.replace(
|
contents = contents.replace(flag, ":mac_catalyst_enabled => true")
|
||||||
pattern,
|
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`)
|
||||||
":mac_catalyst_enabled => true"
|
config.modResults.contents = contents
|
||||||
)
|
|
||||||
return config
|
return config
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -32,7 +47,8 @@ module.exports = (config) => {
|
|||||||
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
|
for (const { value } of lists[target.buildConfigurationList].buildConfigurations) {
|
||||||
const settings = configurations[value].buildSettings
|
const settings = configurations[value].buildSettings
|
||||||
settings.SUPPORTS_MACCATALYST = "YES"
|
settings.SUPPORTS_MACCATALYST = "YES"
|
||||||
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
|
// Share the iOS bundle ID so Handoff and the App ID match across devices.
|
||||||
|
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
|
||||||
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
|
|||||||
+5
-1
@@ -22,7 +22,11 @@
|
|||||||
"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"
|
"react-native-screens@4.30.0": "patches/react-native-screens@4.30.0.patch",
|
||||||
|
"react-native-reanimated@4.7.1": "patches/react-native-reanimated@4.7.1.patch",
|
||||||
|
"expo-modules-core@58.0.24": "patches/expo-modules-core@58.0.24.patch",
|
||||||
|
"expo-file-system@58.0.10": "patches/expo-file-system@58.0.10.patch",
|
||||||
|
"@react-native-community/slider@5.2.1": "patches/@react-native-community__slider@5.2.1.patch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -198,6 +198,15 @@ export async function clearPersistentCache() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Deletes every entry whose key starts with `<prefix>:`. */
|
||||||
|
export function clearCachePrefix(prefix: string) {
|
||||||
|
for (const key of [...memory.keys()]) {
|
||||||
|
if (entryPrefix(key) !== prefix) continue
|
||||||
|
removeFromMemory(key)
|
||||||
|
scheduleWrite(key, null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export function subscribeCache(key: string, listener: () => void) {
|
export function subscribeCache(key: string, listener: () => void) {
|
||||||
let keyListeners = listeners.get(key)
|
let keyListeners = listeners.get(key)
|
||||||
if (!keyListeners) {
|
if (!keyListeners) {
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/ios/RNCSliderComponentView.mm b/ios/RNCSliderComponentView.mm
|
||||||
|
index aa9eb66a486a53762490ed720c5dd2f3a618a166..feb786dce183fff6ee326aa949ee90820cf80c96 100644
|
||||||
|
--- a/ios/RNCSliderComponentView.mm
|
||||||
|
+++ b/ios/RNCSliderComponentView.mm
|
||||||
|
@@ -24,7 +24,8 @@ using namespace facebook::react;
|
||||||
|
{
|
||||||
|
RNCSlider *slider;
|
||||||
|
UIImage *_image;
|
||||||
|
- BOOL _isSliding;
|
||||||
|
+ // Match the protocol's C++ bool; BOOL is signed char on x86_64 Catalyst.
|
||||||
|
+ bool _isSliding;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (ComponentDescriptorProvider)componentDescriptorProvider
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
diff --git a/ios/FileSystemModule.swift b/ios/FileSystemModule.swift
|
||||||
|
index 3bc078d127da36062b3df214ca92db981793cf12..dd1c89213260e21b3b3e4021cb8b8b7a5562f758 100644
|
||||||
|
--- a/ios/FileSystemModule.swift
|
||||||
|
+++ b/ios/FileSystemModule.swift
|
||||||
|
@@ -61,12 +61,21 @@ public final class FileSystemModule: Module {
|
||||||
|
}
|
||||||
|
|
||||||
|
#if os(iOS)
|
||||||
|
+ // canPreview is unavailable on Mac Catalyst; Quick Look reports unsupported files itself.
|
||||||
|
+ private func isPreviewable(_ item: QLPreviewItem) -> Bool {
|
||||||
|
+ #if targetEnvironment(macCatalyst)
|
||||||
|
+ return true
|
||||||
|
+ #else
|
||||||
|
+ return QLPreviewController.canPreview(item)
|
||||||
|
+ #endif
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
private func canPreview(file: FileSystemFile) throws -> Bool {
|
||||||
|
return try file.withCorrectTypeAndScopedAccess(permission: .read) {
|
||||||
|
guard file.exists else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
- return QLPreviewController.canPreview(FileSystemPreviewItem(url: file.url, title: nil))
|
||||||
|
+ return isPreviewable(FileSystemPreviewItem(url: file.url, title: nil))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -98,7 +107,7 @@ public final class FileSystemModule: Module {
|
||||||
|
throw FilePreviewFileNotFoundException(file.url)
|
||||||
|
}
|
||||||
|
let item = FileSystemPreviewItem(url: file.url, title: options?.title)
|
||||||
|
- guard QLPreviewController.canPreview(item) else {
|
||||||
|
+ guard isPreviewable(item) else {
|
||||||
|
throw FilePreviewUnsupportedException(file.url)
|
||||||
|
}
|
||||||
|
items.append(item)
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/ios/Core/Functions/AsyncFunctionDefinition.swift b/ios/Core/Functions/AsyncFunctionDefinition.swift
|
||||||
|
index 48ee585ff3c7c5f71eceda36a3384619834e6e6e..81ca378035663da2db30ab6007daa2546189507b 100644
|
||||||
|
--- a/ios/Core/Functions/AsyncFunctionDefinition.swift
|
||||||
|
+++ b/ios/Core/Functions/AsyncFunctionDefinition.swift
|
||||||
|
@@ -197,7 +197,8 @@ public class AsyncFunctionDefinition<Args, FirstArgType, ReturnType>: AnyAsyncFu
|
||||||
|
switch consume result {
|
||||||
|
case .success(let value):
|
||||||
|
promise.resolve(value)
|
||||||
|
- case .failure(let error as any Error):
|
||||||
|
+ // Swift 6.4.2 crashes lowering `let error as any Error` when compiled from source.
|
||||||
|
+ case .failure(let error):
|
||||||
|
promise.reject(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/apple/reanimated/apple/REAReducedMotion.h b/apple/reanimated/apple/REAReducedMotion.h
|
||||||
|
index 5e22e18c7abe91f6ca6b1a58a5ff14a0f4e97647..7eabe9952af372982eb24595f999321b966996f7 100644
|
||||||
|
--- a/apple/reanimated/apple/REAReducedMotion.h
|
||||||
|
+++ b/apple/reanimated/apple/REAReducedMotion.h
|
||||||
|
@@ -1,10 +1,9 @@
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
|
||||||
|
+// Mac Catalyst can see AppKit too, but its Quickdraw types clash with React's.
|
||||||
|
#if __has_include(<UIKit/UIAccessibility.h>)
|
||||||
|
#import <UIKit/UIAccessibility.h>
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-#if __has_include(<AppKit/AppKit.h>)
|
||||||
|
+#elif __has_include(<AppKit/AppKit.h>)
|
||||||
|
#import <AppKit/AppKit.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
Generated
+31
-19
@@ -5,9 +5,21 @@ settings:
|
|||||||
excludeLinksFromLockfile: false
|
excludeLinksFromLockfile: false
|
||||||
|
|
||||||
patchedDependencies:
|
patchedDependencies:
|
||||||
|
'@react-native-community/slider@5.2.1':
|
||||||
|
hash: 73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4
|
||||||
|
path: patches/@react-native-community__slider@5.2.1.patch
|
||||||
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
|
||||||
|
expo-file-system@58.0.10:
|
||||||
|
hash: 8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c
|
||||||
|
path: patches/expo-file-system@58.0.10.patch
|
||||||
|
expo-modules-core@58.0.24:
|
||||||
|
hash: c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed
|
||||||
|
path: patches/expo-modules-core@58.0.24.patch
|
||||||
|
react-native-reanimated@4.7.1:
|
||||||
|
hash: badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3
|
||||||
|
path: patches/react-native-reanimated@4.7.1.patch
|
||||||
react-native-screens@4.30.0:
|
react-native-screens@4.30.0:
|
||||||
hash: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
|
hash: f79520899c22be4c5109cdeacfecb373c9116181b7be338d898899bfcf0b262d
|
||||||
path: patches/react-native-screens@4.30.0.patch
|
path: patches/react-native-screens@4.30.0.patch
|
||||||
@@ -48,7 +60,7 @@ importers:
|
|||||||
version: 2.2.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))
|
version: 2.2.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-community/slider':
|
'@react-native-community/slider':
|
||||||
specifier: 5.2.1
|
specifier: 5.2.1
|
||||||
version: 5.2.1
|
version: 5.2.1(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)
|
||||||
'@react-native/metro-config':
|
'@react-native/metro-config':
|
||||||
specifier: 0.88.0
|
specifier: 0.88.0
|
||||||
version: 0.88.0(@babel/core@7.29.7)
|
version: 0.88.0(@babel/core@7.29.7)
|
||||||
@@ -99,7 +111,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(88877fdcf2b70b064063b5f62591c4ab)
|
version: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
|
||||||
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 +147,7 @@ importers:
|
|||||||
version: 2.6.0(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: 2.6.0(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)
|
||||||
react-native-reanimated:
|
react-native-reanimated:
|
||||||
specifier: 4.7.1
|
specifier: 4.7.1
|
||||||
version: 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)
|
version: 4.7.1(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(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:
|
react-native-safe-area-context:
|
||||||
specifier: ~5.10.1
|
specifier: ~5.10.1
|
||||||
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)
|
||||||
@@ -150,7 +162,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(5bf7f10fae9db32d21c97f8e81e5bd9a)
|
version: 0.26.4(9d30290a128c046b3db5fe7a9d46b005)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^20
|
specifier: ^20
|
||||||
@@ -7550,7 +7562,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(88877fdcf2b70b064063b5f62591c4ab)
|
expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
|
||||||
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'
|
||||||
@@ -7851,7 +7863,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(88877fdcf2b70b064063b5f62591c4ab)
|
expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
|
||||||
react-dom: 19.3.0(react@19.3.0)
|
react-dom: 19.3.0(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
@@ -9235,7 +9247,7 @@ snapshots:
|
|||||||
merge-options: 3.0.4
|
merge-options: 3.0.4
|
||||||
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-community/slider@5.2.1': {}
|
'@react-native-community/slider@5.2.1(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)': {}
|
||||||
|
|
||||||
'@react-native-masked-view/masked-view@0.3.2(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-masked-view/masked-view@0.3.2(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:
|
||||||
@@ -11155,7 +11167,7 @@ snapshots:
|
|||||||
expo-dev-menu-interface: 58.0.1(expo@58.0.17)
|
expo-dev-menu-interface: 58.0.1(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-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-file-system@58.0.10(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)):
|
expo-file-system@58.0.10(patch_hash=8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c)(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)):
|
||||||
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-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)
|
||||||
@@ -11230,7 +11242,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
arg: 5.0.2
|
arg: 5.0.2
|
||||||
|
|
||||||
expo-modules-core@58.0.24(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):
|
expo-modules-core@58.0.24(patch_hash=c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed)(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):
|
||||||
dependencies:
|
dependencies:
|
||||||
expo-modules-jsi: 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))
|
expo-modules-jsi: 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))
|
||||||
expo-modules-macros: 0.22.0
|
expo-modules-macros: 0.22.0
|
||||||
@@ -11260,7 +11272,7 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
expo-router@58.0.25(88877fdcf2b70b064063b5f62591c4ab):
|
expo-router@58.0.25(8aefb264c8a29c1f36eeb4f71100c585):
|
||||||
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)
|
||||||
@@ -11280,7 +11292,7 @@ snapshots:
|
|||||||
react-fast-compare: 3.2.2
|
react-fast-compare: 3.2.2
|
||||||
react-is: 19.2.7
|
react-is: 19.2.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-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(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(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(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-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
|
||||||
@@ -11291,7 +11303,7 @@ snapshots:
|
|||||||
expo-symbols: 58.0.4(expo-font@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-symbols: 58.0.4(expo-font@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)
|
||||||
react-dom: 19.3.0(react@19.3.0)
|
react-dom: 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(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(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-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)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- '@types/react'
|
- '@types/react'
|
||||||
@@ -11370,12 +11382,12 @@ snapshots:
|
|||||||
babel-preset-expo: 58.0.19(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@58.0.17)(react-refresh@0.14.2)
|
babel-preset-expo: 58.0.19(@babel/core@7.29.7)(@babel/runtime@7.29.7)(expo@58.0.17)(react-refresh@0.14.2)
|
||||||
expo-asset: 58.0.18(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-asset: 58.0.18(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-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-file-system: 58.0.10(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))
|
expo-file-system: 58.0.10(patch_hash=8e68fafb653077a9ba74fe6c33a742af88e3299ce9470723f8c2ec97fe86073c)(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))
|
||||||
expo-font: 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-font: 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-keep-awake: 58.0.3(expo@58.0.17)(react@19.3.0)
|
expo-keep-awake: 58.0.3(expo@58.0.17)(react@19.3.0)
|
||||||
expo-modules-autolinking: 58.0.14(typescript@6.0.3)
|
expo-modules-autolinking: 58.0.14(typescript@6.0.3)
|
||||||
expo-modules-cli: 0.3.1
|
expo-modules-cli: 0.3.1
|
||||||
expo-modules-core: 58.0.24(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)
|
expo-modules-core: 58.0.24(patch_hash=c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed)(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)
|
||||||
pretty-format: 29.7.0
|
pretty-format: 29.7.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-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)
|
||||||
@@ -12941,13 +12953,13 @@ snapshots:
|
|||||||
|
|
||||||
react-is@19.2.7: {}
|
react-is@19.2.7: {}
|
||||||
|
|
||||||
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(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(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):
|
||||||
dependencies:
|
dependencies:
|
||||||
color: 4.2.3
|
color: 4.2.3
|
||||||
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(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(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)
|
||||||
use-latest-callback: 0.2.6(react@19.3.0)
|
use-latest-callback: 0.2.6(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):
|
||||||
@@ -12971,7 +12983,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-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(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(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):
|
||||||
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)
|
||||||
@@ -13533,12 +13545,12 @@ snapshots:
|
|||||||
|
|
||||||
slugify@1.6.9: {}
|
slugify@1.6.9: {}
|
||||||
|
|
||||||
sonner-native@0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a):
|
sonner-native@0.26.4(9d30290a128c046b3db5fe7a9d46b005):
|
||||||
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(patch_hash=badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3)(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(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-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)
|
||||||
|
|||||||
Reference in new issue
Block a user