Compare commits
No files matched your search
@@ -73,15 +73,10 @@ 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.
|
||||||
|
|
||||||
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
|
The Catalyst plugin enables the Xcode target and React Native's CocoaPods
|
||||||
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
|
patches. It disables precompiled React Native and Expo modules so dependencies
|
||||||
raises pod deployment targets to the app's, and disables precompiled React
|
can compile for Catalyst. The Mac app derives a separate bundle identifier with
|
||||||
Native and Expo modules so dependencies can compile for Catalyst. System volume
|
Apple's `maccatalyst.` prefix. System volume stays under macOS control.
|
||||||
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,8 +26,6 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
production: "oTunes",
|
production: "oTunes",
|
||||||
}[variant]
|
}[variant]
|
||||||
|
|
||||||
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...config,
|
...config,
|
||||||
plugins: [
|
plugins: [
|
||||||
@@ -42,12 +40,11 @@ export default ({ config }: ConfigContext): ExpoConfig => {
|
|||||||
icon: `./assets/icon${iconSuffix}.png`,
|
icon: `./assets/icon${iconSuffix}.png`,
|
||||||
ios: {
|
ios: {
|
||||||
...config.ios,
|
...config.ios,
|
||||||
bundleIdentifier,
|
bundleIdentifier: `${config.ios!.bundleIdentifier}${suffix}`,
|
||||||
icon: `./assets/${composer}.icon`,
|
icon: `./assets/${composer}.icon`,
|
||||||
infoPlist: {
|
infoPlist: {
|
||||||
...config.ios?.infoPlist,
|
...config.ios?.infoPlist,
|
||||||
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
|
NSUserActivityTypes: [`com.abunchofknowitalls.otunes${suffix}.media`],
|
||||||
NSUserActivityTypes: [`${bundleIdentifier}.media`],
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
android: {
|
android: {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { Ionicons } from "@expo/vector-icons"
|
|
||||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||||
import {
|
import {
|
||||||
useSwipeRowGroup,
|
useSwipeRowGroup,
|
||||||
@@ -15,6 +14,7 @@ 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, Text, View } from "react-native"
|
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||||
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CollectionDivider,
|
CollectionDivider,
|
||||||
@@ -142,7 +142,7 @@ export default function AlbumScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton
|
<CollectionDetailSkeleton
|
||||||
variant="album"
|
zoomCoverSize={220}
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
style={backgroundStyle}
|
style={backgroundStyle}
|
||||||
backgroundColor={
|
backgroundColor={
|
||||||
@@ -211,7 +211,7 @@ export default function AlbumScreen() {
|
|||||||
<Ionicons
|
<Ionicons
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={colors.foreground}
|
color={palette.isDark ? "#fff" : "#000"}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</MediaActionMenu>
|
</MediaActionMenu>
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ export default function ArtistScreen() {
|
|||||||
headerLargeTitle: false,
|
headerLargeTitle: false,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton variant="artist" />
|
<CollectionDetailSkeleton round />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { Ionicons } from "@expo/vector-icons"
|
|
||||||
import {
|
import {
|
||||||
CollectionHero,
|
CollectionHero,
|
||||||
useCollectionHeroLayout,
|
useCollectionHeroLayout,
|
||||||
@@ -29,6 +28,7 @@ import {
|
|||||||
type ListRenderItemInfo,
|
type ListRenderItemInfo,
|
||||||
} from "react-native"
|
} from "react-native"
|
||||||
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
||||||
|
import { Ionicons } from "@expo/vector-icons"
|
||||||
|
|
||||||
import { CollectionDivider } from "@/components/collection-list"
|
import { CollectionDivider } from "@/components/collection-list"
|
||||||
import { CoverImage } from "@/components/cover-image"
|
import { CoverImage } from "@/components/cover-image"
|
||||||
@@ -112,7 +112,7 @@ export default function PlaylistScreen() {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<CollectionDetailSkeleton
|
<CollectionDetailSkeleton
|
||||||
variant="playlist"
|
zoomCoverSize={200}
|
||||||
onLayout={onLayout}
|
onLayout={onLayout}
|
||||||
style={backgroundStyle}
|
style={backgroundStyle}
|
||||||
backgroundColor={
|
backgroundColor={
|
||||||
@@ -170,7 +170,6 @@ 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()
|
||||||
@@ -293,7 +292,7 @@ function PlaylistContent({
|
|||||||
<Ionicons
|
<Ionicons
|
||||||
name="ellipsis-horizontal"
|
name="ellipsis-horizontal"
|
||||||
size={22}
|
size={22}
|
||||||
color={colors.foreground}
|
color={palette.isDark ? "#fff" : "#000"}
|
||||||
/>
|
/>
|
||||||
</Pressable>
|
</Pressable>
|
||||||
</MediaActionMenu>
|
</MediaActionMenu>
|
||||||
@@ -301,7 +300,6 @@ function PlaylistContent({
|
|||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
canEdit,
|
canEdit,
|
||||||
colors.foreground,
|
|
||||||
deletePlaylist,
|
deletePlaylist,
|
||||||
handlePlaylistDetailAction,
|
handlePlaylistDetailAction,
|
||||||
palette.foreground,
|
palette.foreground,
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ export default function FavoritesScreen() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||||
<CollectionDetailSkeleton variant="favorites" />
|
<CollectionDetailSkeleton />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,7 +118,12 @@ export default function LibraryScreen() {
|
|||||||
)
|
)
|
||||||
|
|
||||||
if (status === "LoadingFirstPage" && !isCached) {
|
if (status === "LoadingFirstPage" && !isCached) {
|
||||||
return <MediaGridSkeleton contentInset={false} header={listHeader} />
|
return (
|
||||||
|
<View style={{ flex: 1, backgroundColor: colors.background }}>
|
||||||
|
{listHeader}
|
||||||
|
<MediaGridSkeleton contentInset={false} />
|
||||||
|
</View>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -35,11 +35,7 @@ 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) {
|
if (!config || source.origin !== new URL(config.serverUrl).origin) {
|
||||||
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,20 +1,15 @@
|
|||||||
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 ComponentProps, type ReactNode } from "react"
|
import { type ReactNode, type ComponentProps } from "react"
|
||||||
import {
|
import {
|
||||||
Platform,
|
Platform,
|
||||||
|
ScrollView,
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
View,
|
View,
|
||||||
type DimensionValue,
|
type DimensionValue,
|
||||||
@@ -22,42 +17,34 @@ 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. */
|
||||||
* Loading screens never scroll, so they cannot rely on scroll-view inset
|
function SkeletonContent({
|
||||||
* adjustment. iOS headers are transparent and overlap the screen; Android
|
|
||||||
* headers are opaque and already sit above it.
|
|
||||||
*/
|
|
||||||
function SkeletonScreen({
|
|
||||||
children,
|
children,
|
||||||
style,
|
embedded = false,
|
||||||
backgroundColor,
|
|
||||||
onLayout,
|
|
||||||
}: {
|
}: {
|
||||||
children: ReactNode
|
children: ReactNode
|
||||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
embedded?: boolean
|
||||||
backgroundColor?: string
|
|
||||||
onLayout?: () => void
|
|
||||||
}) {
|
}) {
|
||||||
const colors = useThemeColors()
|
const colors = useThemeColors()
|
||||||
const headerHeight = useHeaderHeight()
|
const headerHeight = useHeaderHeight()
|
||||||
|
if (embedded) return <>{children}</>
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Reanimated.View
|
<ScrollView
|
||||||
onLayout={onLayout}
|
style={{ flex: 1, backgroundColor: colors.background }}
|
||||||
|
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}
|
||||||
</Reanimated.View>
|
</ScrollView>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,103 +61,56 @@ 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,
|
||||||
fontSize,
|
height = 14,
|
||||||
}: {
|
}: {
|
||||||
width: DimensionValue
|
width: DimensionValue
|
||||||
fontSize: number
|
height?: number
|
||||||
}) {
|
}) {
|
||||||
return (
|
return <Skeleton style={{ width, height, borderRadius: 4 }} />
|
||||||
<View
|
|
||||||
style={{
|
|
||||||
width,
|
|
||||||
height: Math.round(fontSize * 1.2),
|
|
||||||
justifyContent: "center",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Skeleton
|
|
||||||
style={{ height: Math.round(fontSize * 0.8), borderRadius: 4 }}
|
|
||||||
/>
|
|
||||||
</View>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Mirrors `SongRow`, including its `inset` album/playlist layout. */
|
export function SongRowSkeleton() {
|
||||||
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} />
|
||||||
{meta}
|
<View style={styles.songMeta}>
|
||||||
</View>
|
<TextLine width="60%" height={16} />
|
||||||
)
|
<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>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function SongRows({ rows, inset }: { rows: number; inset?: boolean }) {
|
export function SongListSkeleton({
|
||||||
return Array.from({ length: rows }, (_, index) => (
|
rows = 10,
|
||||||
<SongRowSkeleton key={index} inset={inset} />
|
embedded = false,
|
||||||
))
|
}: {
|
||||||
}
|
rows?: number
|
||||||
|
embedded?: boolean
|
||||||
export function SongListSkeleton({ rows = 10 }: { rows?: number }) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<SkeletonScreen>
|
<SkeletonContent embedded={embedded}>
|
||||||
<SongRows rows={rows} />
|
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||||
</SkeletonScreen>
|
{Array.from({ length: rows }, (_, index) => (
|
||||||
|
<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, minHeight }]}>
|
<View style={[styles.card, { width }]}>
|
||||||
<Skeleton
|
<Skeleton
|
||||||
style={{
|
style={{
|
||||||
width,
|
width,
|
||||||
@@ -178,37 +118,35 @@ function CardSkeleton({
|
|||||||
borderRadius: round ? width / 2 : radius.md,
|
borderRadius: round ? width / 2 : radius.md,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<TextLine width="80%" fontSize={14} />
|
<TextLine width="80%" />
|
||||||
{round ? null : <TextLine width="50%" fontSize={12} />}
|
{round ? null : <TextLine width="50%" height={12} />}
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Mirrors `MediaGridList`: a `FlatList` on phones, `TabletMediaGrid` on iPad. */
|
export function MediaGridSkeleton({
|
||||||
function MediaGridContent({
|
items = 6,
|
||||||
items,
|
contentInset = true,
|
||||||
contentInset,
|
embedded = false,
|
||||||
header,
|
|
||||||
}: {
|
}: {
|
||||||
items: number
|
items?: number
|
||||||
contentInset: boolean
|
contentInset?: boolean
|
||||||
header?: ReactNode
|
embedded?: boolean
|
||||||
}) {
|
}) {
|
||||||
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,
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
@@ -216,47 +154,20 @@ function MediaGridContent({
|
|||||||
{Array.from(
|
{Array.from(
|
||||||
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
{ length: ready ? Math.max(items, columns * 3) : 0 },
|
||||||
(_, index) => (
|
(_, index) => (
|
||||||
<CardSkeleton
|
<CardSkeleton key={index} width={cardWidth} />
|
||||||
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} fontSize={22} />
|
<TextLine width={160} height={22} />
|
||||||
<View style={styles.carouselRow}>
|
<View style={styles.carouselRow}>
|
||||||
{Array.from({ length: 8 }, (_, index) => (
|
{Array.from({ length: 3 }, (_, index) => (
|
||||||
<CardSkeleton key={index} width={carouselCardWidth} />
|
<CardSkeleton key={index} width={carouselCardWidth} />
|
||||||
))}
|
))}
|
||||||
</View>
|
</View>
|
||||||
@@ -265,148 +176,140 @@ export function CarouselSkeleton() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function HomeSkeleton() {
|
export function HomeSkeleton() {
|
||||||
|
const headerHeight = useHeaderHeight()
|
||||||
|
const colors = useThemeColors()
|
||||||
return (
|
return (
|
||||||
<SkeletonScreen>
|
<ScrollView
|
||||||
<View style={styles.home}>
|
style={{ flex: 1, backgroundColor: colors.background }}
|
||||||
<CarouselSkeleton />
|
contentContainerStyle={[
|
||||||
<CarouselSkeleton />
|
styles.home,
|
||||||
</View>
|
{ paddingTop: (Platform.OS === "ios" ? headerHeight : 0) + spacing.lg },
|
||||||
</SkeletonScreen>
|
]}
|
||||||
)
|
contentInsetAdjustmentBehavior="never"
|
||||||
}
|
scrollEnabled={false}
|
||||||
|
accessibilityLabel="Loading"
|
||||||
function HeroActions({
|
>
|
||||||
favorite = true,
|
<CarouselSkeleton />
|
||||||
reverse = false,
|
<CarouselSkeleton />
|
||||||
}: {
|
</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({
|
||||||
variant,
|
zoomCoverSize,
|
||||||
style,
|
style,
|
||||||
|
round = false,
|
||||||
backgroundColor,
|
backgroundColor,
|
||||||
onLayout,
|
onLayout,
|
||||||
}: {
|
}: {
|
||||||
variant: "album" | "playlist" | "favorites" | "artist"
|
zoomCoverSize?: number
|
||||||
style?: ComponentProps<typeof Reanimated.View>["style"]
|
style?: ComponentProps<typeof Reanimated.ScrollView>["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 =
|
||||||
if (variant === "artist" || variant === "favorites") {
|
!round && landscape
|
||||||
const artist = variant === "artist"
|
? tabletCoverSize!
|
||||||
const coverSize = artist ? 180 : 200
|
: (zoomCoverSize ?? (round ? 180 : 210))
|
||||||
const hero = (
|
const actions = (
|
||||||
<View style={styles.centeredHero}>
|
<View style={styles.actions}>
|
||||||
<Skeleton
|
<Skeleton style={styles.iconAction} />
|
||||||
style={{
|
<Skeleton style={styles.playButton} />
|
||||||
width: coverSize,
|
<Skeleton style={styles.iconAction} />
|
||||||
height: coverSize,
|
</View>
|
||||||
borderRadius: artist ? coverSize / 2 : radius.lg,
|
)
|
||||||
}}
|
const artwork = (
|
||||||
/>
|
<Skeleton
|
||||||
<TextLine width={200} fontSize={artist ? 28 : 24} />
|
style={{
|
||||||
<HeroActions favorite={artist} />
|
width: coverSize,
|
||||||
</View>
|
height: coverSize,
|
||||||
)
|
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 (
|
||||||
<SkeletonScreen
|
<Reanimated.ScrollView
|
||||||
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"
|
||||||
>
|
>
|
||||||
<CollectionHero
|
{round ? (
|
||||||
artwork={
|
<View style={styles.artistHero}>
|
||||||
<Link.AppleZoomTarget>
|
{zoomCoverSize ? (
|
||||||
<View collapsable={false}>
|
<Link.AppleZoomTarget>
|
||||||
<Skeleton
|
<View collapsable={false}>{artwork}</View>
|
||||||
style={{
|
</Link.AppleZoomTarget>
|
||||||
width: coverSize,
|
) : (
|
||||||
height: coverSize,
|
artwork
|
||||||
borderRadius: radius.lg,
|
)}
|
||||||
}}
|
<TextLine width={200} height={24} />
|
||||||
/>
|
<TextLine width={120} height={16} />
|
||||||
</View>
|
{actions}
|
||||||
</Link.AppleZoomTarget>
|
</View>
|
||||||
}
|
|
||||||
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} />
|
|
||||||
))
|
|
||||||
) : (
|
) : (
|
||||||
<SongRows rows={8} inset />
|
<CollectionHero
|
||||||
|
artwork={
|
||||||
|
zoomCoverSize ? (
|
||||||
|
<Link.AppleZoomTarget>
|
||||||
|
<View collapsable={false}>{artwork}</View>
|
||||||
|
</Link.AppleZoomTarget>
|
||||||
|
) : (
|
||||||
|
artwork
|
||||||
|
)
|
||||||
|
}
|
||||||
|
actions={actions}
|
||||||
|
>
|
||||||
|
<TextLine width={landscape && !round ? "85%" : 200} height={24} />
|
||||||
|
<TextLine
|
||||||
|
width={landscape && !round ? "60%" : 120}
|
||||||
|
height={landscape && !round ? 22 : 16}
|
||||||
|
/>
|
||||||
|
<TextLine width={landscape && !round ? "70%" : 150} height={14} />
|
||||||
|
</CollectionHero>
|
||||||
)}
|
)}
|
||||||
</SkeletonScreen>
|
{round ? (
|
||||||
|
<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 (
|
||||||
<SkeletonScreen>
|
<SkeletonContent>
|
||||||
{Array.from({ length: rows }, (_, index) => (
|
<View accessibilityLabel="Loading" accessibilityRole="progressbar">
|
||||||
<View
|
{Array.from({ length: rows }, (_, index) => (
|
||||||
key={index}
|
<View
|
||||||
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
key={index}
|
||||||
>
|
style={[styles.artistRow, { borderBottomColor: colors.border }]}
|
||||||
<Skeleton style={styles.artistAvatar} />
|
>
|
||||||
<TextLine width="50%" fontSize={16} />
|
<Skeleton style={styles.artistAvatar} />
|
||||||
</View>
|
<TextLine width="50%" height={16} />
|
||||||
))}
|
</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",
|
||||||
@@ -416,55 +319,22 @@ 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 },
|
songMeta: { flex: 1, gap: 6 },
|
||||||
songSubtitle: { marginTop: 3 },
|
|
||||||
trackRow: {
|
|
||||||
flexDirection: "row",
|
|
||||||
alignItems: "center",
|
|
||||||
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 },
|
card: { gap: spacing.xs },
|
||||||
grid: { flexDirection: "row", flexWrap: "wrap" },
|
grid: { flexDirection: "row", flexWrap: "wrap", gap: spacing.md },
|
||||||
|
gridInset: { padding: spacing.lg },
|
||||||
|
gridRowInset: { paddingHorizontal: spacing.lg },
|
||||||
carousel: { gap: spacing.md, overflow: "hidden" },
|
carousel: { gap: spacing.md, overflow: "hidden" },
|
||||||
carouselRow: { flexDirection: "row", gap: spacing.md },
|
carouselRow: { flexDirection: "row", gap: spacing.md },
|
||||||
home: { padding: spacing.lg, gap: spacing.xl },
|
home: { padding: spacing.lg, gap: spacing.xl },
|
||||||
centeredHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
artistHero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||||
actions: {
|
actions: {
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
justifyContent: "center",
|
|
||||||
gap: spacing.sm,
|
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: {
|
||||||
|
|||||||
@@ -19,9 +19,6 @@ 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
|
||||||
@@ -51,7 +48,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 + tabletCardTextHeight + gap
|
const rowHeight = cardWidth + 48 + gap
|
||||||
const firstRow = Math.max(
|
const firstRow = Math.max(
|
||||||
0,
|
0,
|
||||||
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
Math.floor((scrollY - headerHeight) / rowHeight) - 2
|
||||||
|
|||||||
@@ -7,15 +7,11 @@ private enum HandoffState {
|
|||||||
static var pending: [String: String]?
|
static var pending: [String: String]?
|
||||||
static var notify: (() -> Void)?
|
static var notify: (() -> Void)?
|
||||||
|
|
||||||
// app.config.ts declares the one `.media` type per build profile; iOS and
|
static var activityType: String {
|
||||||
// Catalyst must publish the same string for Handoff to pair them. Other
|
"\(Bundle.main.bundleIdentifier!).media"
|
||||||
// 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,
|
||||||
|
|||||||
@@ -4,20 +4,6 @@ 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) => {
|
||||||
@@ -27,15 +13,14 @@ module.exports = (config) => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
config = withPodfile(config, (config) => {
|
config = withPodfile(config, (config) => {
|
||||||
const flag = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
const pattern = /:mac_catalyst_enabled\s*=>\s*(?:false|true)/
|
||||||
const postInstall = /(react_native_post_install\([\s\S]*?\n {4}\)\n)/
|
if (!pattern.test(config.modResults.contents)) {
|
||||||
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")
|
||||||
}
|
}
|
||||||
contents = contents.replace(flag, ":mac_catalyst_enabled => true")
|
config.modResults.contents = config.modResults.contents.replace(
|
||||||
contents = contents.replace(postInstall, `$1${raisePodDeploymentTargets}`)
|
pattern,
|
||||||
config.modResults.contents = contents
|
":mac_catalyst_enabled => true"
|
||||||
|
)
|
||||||
return config
|
return config
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -47,8 +32,7 @@ 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"
|
||||||
// Share the iOS bundle ID so Handoff and the App ID match across devices.
|
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "YES"
|
||||||
settings.DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = "NO"
|
|
||||||
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
settings.TARGETED_DEVICE_FAMILY = '"1,2"'
|
||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
|
|||||||
+1
-5
@@ -22,11 +22,7 @@
|
|||||||
"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"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
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)
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
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
+19
-31
@@ -5,21 +5,9 @@ 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
|
||||||
@@ -60,7 +48,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(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)
|
version: 5.2.1
|
||||||
'@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)
|
||||||
@@ -111,7 +99,7 @@ importers:
|
|||||||
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
expo-router:
|
expo-router:
|
||||||
specifier: ~58.0.25
|
specifier: ~58.0.25
|
||||||
version: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585)
|
version: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
||||||
expo-secure-store:
|
expo-secure-store:
|
||||||
specifier: ~58.0.2
|
specifier: ~58.0.2
|
||||||
version: 58.0.2(expo@58.0.17)
|
version: 58.0.2(expo@58.0.17)
|
||||||
@@ -147,7 +135,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(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)
|
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)
|
||||||
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)
|
||||||
@@ -162,7 +150,7 @@ importers:
|
|||||||
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
version: 0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
sonner-native:
|
sonner-native:
|
||||||
specifier: ^0.26.2
|
specifier: ^0.26.2
|
||||||
version: 0.26.4(9d30290a128c046b3db5fe7a9d46b005)
|
version: 0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@types/node':
|
'@types/node':
|
||||||
specifier: ^20
|
specifier: ^20
|
||||||
@@ -7562,7 +7550,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(8aefb264c8a29c1f36eeb4f71100c585)
|
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- '@expo/dom-webview'
|
- '@expo/dom-webview'
|
||||||
@@ -7863,7 +7851,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(8aefb264c8a29c1f36eeb4f71100c585)
|
expo-router: 58.0.25(88877fdcf2b70b064063b5f62591c4ab)
|
||||||
react-dom: 19.3.0(react@19.3.0)
|
react-dom: 19.3.0(react@19.3.0)
|
||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
@@ -9247,7 +9235,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(patch_hash=73deacaea9aae000a42050d343517da9e16e736e92a4fff3f61f81dba093a1c4)': {}
|
'@react-native-community/slider@5.2.1': {}
|
||||||
|
|
||||||
'@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:
|
||||||
@@ -11167,7 +11155,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(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-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)):
|
||||||
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)
|
||||||
@@ -11242,7 +11230,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
arg: 5.0.2
|
arg: 5.0.2
|
||||||
|
|
||||||
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):
|
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):
|
||||||
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
|
||||||
@@ -11272,7 +11260,7 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
expo-router@58.0.25(8aefb264c8a29c1f36eeb4f71100c585):
|
expo-router@58.0.25(88877fdcf2b70b064063b5f62591c4ab):
|
||||||
dependencies:
|
dependencies:
|
||||||
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
'@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
@@ -11292,7 +11280,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(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-drawer-layout: 4.2.12(react-native-gesture-handler@3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native-reanimated@4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-screens: 4.30.0(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
|
||||||
@@ -11303,7 +11291,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(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-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-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'
|
||||||
@@ -11382,12 +11370,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(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-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-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(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)
|
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)
|
||||||
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)
|
||||||
@@ -12953,13 +12941,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(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-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):
|
||||||
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(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-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)
|
||||||
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):
|
||||||
@@ -12983,7 +12971,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(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-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):
|
||||||
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)
|
||||||
@@ -13545,12 +13533,12 @@ snapshots:
|
|||||||
|
|
||||||
slugify@1.6.9: {}
|
slugify@1.6.9: {}
|
||||||
|
|
||||||
sonner-native@0.26.4(9d30290a128c046b3db5fe7a9d46b005):
|
sonner-native@0.26.4(5bf7f10fae9db32d21c97f8e81e5bd9a):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.3.0
|
react: 19.3.0
|
||||||
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
|
||||||
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-gesture-handler: 3.3.0(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-reanimated: 4.7.1(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-reanimated: 4.7.1(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
react-native-safe-area-context: 5.10.1(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)
|
||||||
react-native-screens: 4.30.0(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