diff --git a/apps/mobile/.gitignore b/apps/mobile/.gitignore
index 4359542..7e0c02a 100644
--- a/apps/mobile/.gitignore
+++ b/apps/mobile/.gitignore
@@ -1,7 +1,7 @@
-ios/
-android/
+/ios/
+/android/
# @generated expo-cli sync-2b81b286409207a5da26e14c78851eb30d8ccbdb
# The following patterns were generated by expo-cli
expo-env.d.ts
-# @end expo-cli
\ No newline at end of file
+# @end expo-cli
diff --git a/apps/mobile/app.json b/apps/mobile/app.json
index 9e61032..03cbba5 100644
--- a/apps/mobile/app.json
+++ b/apps/mobile/app.json
@@ -27,7 +27,9 @@
"monochromeImage": "./assets/android-icon-monochrome.png",
"foregroundImage": "./assets/android-icon-foreground.png",
"backgroundColor": "#C60322"
- }
+ },
+ "userInterfaceStyle": "dark",
+ "softwareKeyboardLayoutMode": "resize"
},
"plugins": [
"expo-router",
@@ -49,12 +51,23 @@
],
"expo-image",
"expo-status-bar",
- "expo-app-intents"
+ "expo-app-intents",
+ "./plugins/with-android-colors",
+ [
+ "expo-navigation-bar",
+ {
+ "enforceContrast": false,
+ "style": "light"
+ }
+ ]
],
"experiments": {
"typedRoutes": true,
"inlineModules": {
- "watchedDirectories": ["app-intents", "native"]
+ "watchedDirectories": [
+ "app-intents",
+ "native"
+ ]
}
},
"extra": {
diff --git a/apps/mobile/app/(app)/(tabs)/_layout.tsx b/apps/mobile/app/(app)/(tabs)/_layout.tsx
index 6f7f58a..051a11c 100644
--- a/apps/mobile/app/(app)/(tabs)/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/_layout.tsx
@@ -1,37 +1,50 @@
+import { NavigationBar } from "expo-navigation-bar"
+import {
+ AndroidTabThemeProvider,
+ useAndroidTabPalette,
+ useAndroidTabSelectedColor,
+} from "@/contexts/android-tab-theme"
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
import { NativeTabs } from "expo-router/native-tabs"
-import { DynamicColorIOS, Platform, View, useColorScheme } from "react-native"
+import { DynamicColorIOS, Platform, View } from "react-native"
import { useMemo } from "react"
import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player"
+import { useAndroidKeyboardVisible } from "@/hooks/use-android-keyboard-visible"
import { usePlaybackQueue } from "@/contexts/playback"
-import { appleMusic, colors } from "@/lib/theme"
+import { appleMusic, colors, miniPlayerHeight, useIsDark } from "@/lib/theme"
export const unstable_settings = { anchor: "library" }
function useRouterTheme() {
- const isDark = useColorScheme() === "dark"
+ const themeIsDark = useIsDark()
+ const androidPalette = useAndroidTabPalette()
+ const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
return useMemo(() => {
const palette = isDark ? colors.dark : colors.light
+ const android = Platform.OS === "android" ? androidPalette : null
const base = isDark ? DarkTheme : DefaultTheme
return {
...base,
colors: {
...base.colors,
- background: palette.background,
- card: palette.card,
- text: palette.foreground,
- border: palette.border,
- primary: palette.primary,
+ background: android?.background ?? palette.background,
+ card: android?.surface ?? palette.card,
+ text: android?.foreground ?? palette.foreground,
+ border: android?.divider ?? palette.border,
+ primary: android?.accentText ?? palette.primary,
},
}
- }, [isDark])
+ }, [isDark, androidPalette])
}
function useNativeTabColors() {
- const isDark = useColorScheme() === "dark"
+ const selectedColor = useAndroidTabSelectedColor()
+ const themeIsDark = useIsDark()
+ const androidPalette = useAndroidTabPalette()
+ const isDark = Platform.OS === "android" ? androidPalette.isDark : themeIsDark
const inactive = appleMusic.tabInactive
const iconColor =
@@ -41,24 +54,23 @@ function useNativeTabColors() {
selected: appleMusic.pink,
}
: {
- default: isDark ? inactive : "#636366",
- selected: appleMusic.pink,
+ default: androidPalette.secondaryForeground,
+ selected: selectedColor,
}
const labelColor =
Platform.OS === "ios"
? DynamicColorIOS({ dark: inactive, light: "#636366" })
- : isDark
- ? inactive
- : "#636366"
+ : androidPalette.secondaryForeground
return {
isDark,
+ tintColor: Platform.OS === "android" ? selectedColor : appleMusic.pink,
iconColor,
labelStyle: {
default: { color: labelColor, fontSize: 10 },
selected: {
- color: appleMusic.pink,
+ color: Platform.OS === "android" ? selectedColor : appleMusic.pink,
fontSize: 10,
fontWeight: "600" as const,
},
@@ -67,23 +79,32 @@ function useNativeTabColors() {
? "systemChromeMaterialDark"
: "systemChromeMaterialLight",
backgroundColor:
- Platform.OS === "ios"
- ? undefined
- : isDark
- ? appleMusic.background
- : colors.light.background,
+ Platform.OS === "ios" ? undefined : androidPalette.background,
}
}
-export default function TabsLayout() {
+function TabsContent() {
+ const keyboardVisible = useAndroidKeyboardVisible()
const routerTheme = useRouterTheme()
const tabColors = useNativeTabColors()
const { currentSong, queueSongIds } = usePlaybackQueue()
const showBottomAccessory = Boolean(currentSong && queueSongIds.length > 0)
+ // NativeTabs already owns the tab bar and system navigation insets.
+ const androidContentStyle =
+ Platform.OS === "android"
+ ? {
+ paddingBottom:
+ showBottomAccessory && !keyboardVisible ? miniPlayerHeight : 0,
+ }
+ : undefined
+
return (
+ {Platform.OS === "android" ? (
+
+ ) : null}
{Platform.OS === "ios" && showBottomAccessory ? (
@@ -101,12 +125,20 @@ export default function TabsLayout() {
) : null}
-
+
Home
-
+
Library
-
+
Search
-
+ {!keyboardVisible ? : null}
)
}
+
+export default function TabsLayout() {
+ if (Platform.OS !== "android") return
+ return (
+
+
+
+ )
+}
diff --git a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
index 87b926d..195b95a 100644
--- a/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/_layout.tsx
@@ -1,4 +1,5 @@
import { Stack } from "expo-router"
+import { Platform } from "react-native"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
@@ -14,6 +15,10 @@ export default function HomeLayout() {
({
...baseOptions,
+ ...(Platform.OS === "android" &&
+ (route.name === "album/[id]" || route.name === "playlist/[id]")
+ ? { animation: "none" as const }
+ : {}),
title: tabStackScreenTitles[route.name] ?? "Home",
headerRight:
route.name === "index" ? () => : undefined,
diff --git a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
index 8c7c878..9a71030 100644
--- a/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
+++ b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx
@@ -1,8 +1,16 @@
+import { useAndroidScreenPalette } from "@/contexts/android-tab-theme"
import { MusicEntityView } from "@/components/music-entity-view"
import { Stack, useIsFocused, useLocalSearchParams } from "expo-router"
import { StatusBar } from "expo-status-bar"
import { memo, useCallback, useEffect, useMemo } from "react"
-import { FlatList, Pressable, StyleSheet, Text, View } from "react-native"
+import {
+ FlatList,
+ Platform,
+ Pressable,
+ StyleSheet,
+ Text,
+ View,
+} from "react-native"
import { Ionicons } from "@expo/vector-icons"
import {
@@ -57,10 +65,11 @@ export default function AlbumScreen() {
const isFocused = useIsFocused()
const coverUri =
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
- const { palette, settled } = useCoverPalette(
+ const { palette: artworkPalette, settled } = useCoverPalette(
coverUri,
album ? album.cover != null : album === null ? false : undefined
)
+ const { palette, onLayout } = useAndroidScreenPalette(artworkPalette)
const songIds = useMemo(
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
[album]
@@ -147,6 +156,14 @@ export default function AlbumScreen() {
title: "",
headerLargeTitle: false,
headerTintColor: palette.foreground,
+ ...(Platform.OS === "android"
+ ? {
+ headerStyle: { backgroundColor: palette.background },
+ statusBarStyle: palette.isDark
+ ? ("light" as const)
+ : ("dark" as const),
+ }
+ : {}),
headerRight: () => (
{
rememberSongs(songs)
@@ -146,6 +148,7 @@ export default function PlaylistScreen() {
return (
void
playlist: BrowsePlaylistDetail
songs: BrowseSong[]
allSongIds: Id<"songs">[] | undefined
@@ -269,6 +274,14 @@ function PlaylistContent({
title: "",
headerLargeTitle: false,
headerTintColor: palette.foreground,
+ ...(Platform.OS === "android"
+ ? {
+ headerStyle: { backgroundColor: palette.background },
+ statusBarStyle: palette.isDark
+ ? ("light" as const)
+ : ("dark" as const),
+ }
+ : {}),
headerRight: () => (
{user.isAdmin ? (
{subtitle}
) : null}
-
+
)
}
diff --git a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
index e3d9b68..1620b26 100644
--- a/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/library/_layout.tsx
@@ -1,4 +1,5 @@
import { Stack } from "expo-router"
+import { Platform } from "react-native"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
@@ -14,6 +15,10 @@ export default function LibraryLayout() {
({
...baseOptions,
+ ...(Platform.OS === "android" &&
+ (route.name === "album/[id]" || route.name === "playlist/[id]")
+ ? { animation: "none" as const }
+ : {}),
title: tabStackScreenTitles[route.name] ?? "Library",
headerRight:
route.name === "index" ? () => : undefined,
diff --git a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
index 288328a..dcea4b1 100644
--- a/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
+++ b/apps/mobile/app/(app)/(tabs)/search/_layout.tsx
@@ -1,4 +1,5 @@
import { Stack } from "expo-router"
+import { Platform } from "react-native"
import { ProfileHeaderButton } from "@/components/profile-header-button"
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
@@ -14,6 +15,10 @@ export default function SearchLayout() {
({
...baseOptions,
+ ...(Platform.OS === "android" &&
+ (route.name === "album/[id]" || route.name === "playlist/[id]")
+ ? { animation: "none" as const }
+ : {}),
title: tabStackScreenTitles[route.name] ?? "Search",
headerRight:
route.name === "index" ? () => : undefined,
diff --git a/apps/mobile/app/(app)/(tabs)/search/index.tsx b/apps/mobile/app/(app)/(tabs)/search/index.tsx
index 7cb6756..1dc5e39 100644
--- a/apps/mobile/app/(app)/(tabs)/search/index.tsx
+++ b/apps/mobile/app/(app)/(tabs)/search/index.tsx
@@ -1,3 +1,5 @@
+import { Platform } from "react-native"
+import { useThemeColors } from "@/lib/theme"
import { Stack } from "expo-router"
import { useCallback } from "react"
@@ -5,6 +7,7 @@ import { SearchResults } from "@/components/search-results"
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
export default function SearchScreen() {
+ const colors = useThemeColors()
const { searchQuery, onQueryChange, onSearchSubmit } = useDebouncedSearch()
const handleChangeText = useCallback(
@@ -21,6 +24,15 @@ export default function SearchScreen() {
onChangeText={handleChangeText}
onSearchButtonPress={onSearchSubmit}
autoCapitalize="none"
+ {...(Platform.OS === "android"
+ ? {
+ barTintColor: colors.background,
+ textColor: colors.foreground,
+ tintColor: colors.primary,
+ hintTextColor: colors.mutedForeground,
+ headerIconColor: colors.foreground,
+ }
+ : {})}
/>
diff --git a/apps/mobile/app/(app)/_layout.tsx b/apps/mobile/app/(app)/_layout.tsx
index 186accd..5efd2ff 100644
--- a/apps/mobile/app/(app)/_layout.tsx
+++ b/apps/mobile/app/(app)/_layout.tsx
@@ -66,7 +66,8 @@ export default function AppLayout() {
+ {Platform.OS === "android" ? (
+ <>
+
+
+ >
+ ) : null}
-
-
-
+
+ return (
+
+
+
+ )
+}
diff --git a/apps/mobile/app/_layout.tsx b/apps/mobile/app/_layout.tsx
index 51c5f71..40c8ce4 100644
--- a/apps/mobile/app/_layout.tsx
+++ b/apps/mobile/app/_layout.tsx
@@ -1,7 +1,7 @@
import { useConvexAuth } from "@convex-dev/auth/react"
import { DarkTheme, Stack, ThemeProvider } from "expo-router"
import { StatusBar } from "expo-status-bar"
-import { useColorScheme } from "react-native"
+import { useIsDark } from "@/lib/theme"
import { GestureHandlerRootView } from "react-native-gesture-handler"
import { SafeAreaProvider } from "react-native-safe-area-context"
@@ -47,14 +47,14 @@ function RootNavigator() {
}
export default function RootLayout() {
- const colorScheme = useColorScheme()
+ const isDark = useIsDark()
return (
-
+
diff --git a/apps/mobile/app/server.tsx b/apps/mobile/app/server.tsx
index 036c79b..6433fc3 100644
--- a/apps/mobile/app/server.tsx
+++ b/apps/mobile/app/server.tsx
@@ -1,13 +1,9 @@
import { useState } from "react"
-import {
- KeyboardAvoidingView,
- Platform,
- StyleSheet,
- Text,
- View,
-} from "react-native"
+import { StyleSheet, Text, View } from "react-native"
import { SafeAreaView } from "react-native-safe-area-context"
+import { KeyboardForm } from "@/components/keyboard-form"
+
import { Button, Card, Input } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config"
import { spacing, useThemeColors } from "@/lib/theme"
@@ -41,10 +37,7 @@ export default function ServerScreen() {
return (
-
+
oTunes
@@ -82,7 +75,7 @@ export default function ServerScreen() {
onPress={() => void handleContinue()}
/>
-
+
)
}
diff --git a/apps/mobile/components/android-sheet.tsx b/apps/mobile/components/android-sheet.tsx
new file mode 100644
index 0000000..840bc8e
--- /dev/null
+++ b/apps/mobile/components/android-sheet.tsx
@@ -0,0 +1,15 @@
+import type { PropsWithChildren } from "react"
+import { KeyboardAvoidingView, Platform } from "react-native"
+import { SafeAreaView } from "react-native-safe-area-context"
+
+/** RN modals have their own window; protect their actions from navigation and IME. */
+export function AndroidSheet({ children }: PropsWithChildren) {
+ if (Platform.OS !== "android") return children
+ return (
+
+
+ {children}
+
+
+ )
+}
diff --git a/apps/mobile/components/audio-output-button.tsx b/apps/mobile/components/audio-output-button.tsx
new file mode 100644
index 0000000..d0952ad
--- /dev/null
+++ b/apps/mobile/components/audio-output-button.tsx
@@ -0,0 +1,71 @@
+import {
+ requireNativeView,
+ requireOptionalNativeModule,
+ type NativeModule,
+} from "expo"
+import {
+ Platform,
+ Pressable,
+ type StyleProp,
+ type ViewProps,
+ type ViewStyle,
+} from "react-native"
+
+import { PlayerSymbol } from "@/components/player-symbol"
+import { showError } from "@/lib/toast"
+
+type AudioOutputModule = NativeModule & {
+ showPicker: () => Promise
+}
+
+const audioOutput =
+ requireOptionalNativeModule("AudioOutput")
+const AirPlayPicker =
+ Platform.OS === "ios" && audioOutput
+ ? requireNativeView("AudioOutput")
+ : null
+
+export function AudioOutputButton({
+ color,
+ style,
+}: {
+ color: string
+ style: StyleProp
+}) {
+ if (AirPlayPicker) {
+ return
+ }
+
+ const available =
+ Platform.OS === "android" && Platform.Version >= 33 && audioOutput !== null
+
+ async function showPicker() {
+ try {
+ if (!(await audioOutput?.showPicker())) {
+ showError("Audio output selection is unavailable on this device.")
+ }
+ } catch {
+ showError("Audio output selection could not be opened.")
+ }
+ }
+
+ return (
+
+
+
+ )
+}
diff --git a/apps/mobile/components/auth-form.tsx b/apps/mobile/components/auth-form.tsx
index 407acfd..42b0792 100644
--- a/apps/mobile/components/auth-form.tsx
+++ b/apps/mobile/components/auth-form.tsx
@@ -2,16 +2,11 @@ import { useAuthActions } from "@convex-dev/auth/react"
import { Link } from "expo-router"
import { useQuery } from "convex/react"
import { useState } from "react"
-import {
- KeyboardAvoidingView,
- Platform,
- Pressable,
- StyleSheet,
- Text,
- View,
-} from "react-native"
+import { Pressable, StyleSheet, Text, View } from "react-native"
import { SafeAreaView } from "react-native-safe-area-context"
+import { KeyboardForm } from "@/components/keyboard-form"
+
import { Button, Card, Input } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config"
import { api } from "@otunes/convex/_generated/api"
@@ -92,14 +87,15 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
return (
-
+
- {text.title}
-
+
+ {text.title}
+
+
{text.description}
{config ? (
@@ -111,8 +107,8 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
{signupsDisabled ? (
- New account registration is currently disabled. Contact an administrator if you need
- access.
+ New account registration is currently disabled. Contact an
+ administrator if you need access.
) : (
@@ -137,16 +133,28 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
onChangeText={setPassword}
placeholder="Password"
secureTextEntry
- autoComplete={flow === "signIn" ? "current-password" : "new-password"}
+ autoComplete={
+ flow === "signIn" ? "current-password" : "new-password"
+ }
+ />
+ {error ? (
+ {error}
+ ) : null}
+
+
)
}
diff --git a/apps/mobile/components/keyboard-form.tsx b/apps/mobile/components/keyboard-form.tsx
new file mode 100644
index 0000000..64fa77a
--- /dev/null
+++ b/apps/mobile/components/keyboard-form.tsx
@@ -0,0 +1,32 @@
+import type { PropsWithChildren } from "react"
+import {
+ KeyboardAvoidingView,
+ Platform,
+ ScrollView,
+ type StyleProp,
+ type ViewStyle,
+} from "react-native"
+
+/** Android resizes for the IME; scrolling keeps tall forms and actions reachable. */
+export function KeyboardForm({
+ children,
+ style,
+}: PropsWithChildren<{ style?: StyleProp }>) {
+ if (Platform.OS === "android") {
+ return (
+
+ {children}
+
+ )
+ }
+ return (
+
+ {children}
+
+ )
+}
diff --git a/apps/mobile/components/media-cards.tsx b/apps/mobile/components/media-cards.tsx
index 473774b..6535b8d 100644
--- a/apps/mobile/components/media-cards.tsx
+++ b/apps/mobile/components/media-cards.tsx
@@ -3,7 +3,9 @@ import { Ionicons } from "@expo/vector-icons"
import { memo, useCallback, type ReactElement } from "react"
import {
FlatList,
+ Platform,
Pressable,
+ ScrollView,
StyleSheet,
Text,
View,
@@ -33,6 +35,7 @@ import {
export type MediaItem = BrowseAlbum | BrowseArtist | PlaylistSummary
const GRID_INITIAL_ROWS = 5
+const MAX_NON_VIRTUAL_CAROUSEL_ITEMS = 10
export const AlbumCard = memo(function AlbumCard({
album,
@@ -306,14 +309,30 @@ function ContentCarouselBody({
/>
) : null}
-
+ {Platform.OS === "android" &&
+ content.length <= MAX_NON_VIRTUAL_CAROUSEL_ITEMS ? (
+
+ {content.map((item) => (
+
+
+
+ ))}
+
+ ) : (
+
+ )}
)
}
@@ -343,6 +362,10 @@ const styles = StyleSheet.create({
fontSize: 22,
fontWeight: "700",
},
+ androidCarousel: {
+ // Horizontal lists should measure their cards, not stretch the Home sections.
+ flexGrow: 0,
+ },
carouselContent: {
gap: spacing.md,
},
diff --git a/apps/mobile/components/media-context-menu.tsx b/apps/mobile/components/media-context-menu.tsx
index eb19a47..202a05f 100644
--- a/apps/mobile/components/media-context-menu.tsx
+++ b/apps/mobile/components/media-context-menu.tsx
@@ -1,4 +1,5 @@
-import { MenuView, type MenuAction } from "@expo/ui/community/menu"
+import type { MenuAction } from "@expo/ui/community/menu"
+import { MenuView } from "@/components/media-menu"
import { requireNativeView } from "expo"
import type { ComponentType, ReactNode } from "react"
import {
@@ -171,8 +172,7 @@ export function buildMediaMenuActions(
actions.push({
id: item.action,
title: item.label(countSuffix, favorited, playlistLabel),
- image:
- item.action === "favorite" && favorited ? "star.fill" : item.image,
+ image: item.action === "favorite" && favorited ? "star.fill" : item.image,
})
}
diff --git a/apps/mobile/components/media-menu.android.tsx b/apps/mobile/components/media-menu.android.tsx
new file mode 100644
index 0000000..ed6b4b9
--- /dev/null
+++ b/apps/mobile/components/media-menu.android.tsx
@@ -0,0 +1,137 @@
+import { Ionicons } from "@expo/vector-icons"
+import type { ComponentProps } from "react"
+import type { MediaAction } from "@/components/media-context-menu"
+import type { MenuComponentProps } from "@expo/ui/community/menu"
+import {
+ DropdownMenu,
+ DropdownMenuItem,
+ Host,
+ RNHostView,
+ Text,
+} from "@expo/ui/jetpack-compose"
+import { useState } from "react"
+import { Pressable, View } from "react-native"
+import { Gesture, GestureDetector } from "react-native-gesture-handler"
+
+import { appleMusic } from "@/lib/theme"
+
+const actionIcons = {
+ share: "share-outline",
+ playlist: "list-outline",
+ "play-next": "play-forward-outline",
+ "play-last": "list",
+ shuffle: "shuffle",
+ "create-station": "radio-outline",
+ favorite: "star-outline",
+ "go-artist": "person-outline",
+ "go-album": "disc-outline",
+ "delete-playlist": "trash-outline",
+} satisfies Record["name"]>
+
+// The community MenuView creates a dynamic-color Host internally. Own this
+// Android host so menus use the same fixed palette as the rest of the app.
+export function MenuView({
+ actions,
+ children,
+ style,
+ shouldOpenOnLongPress,
+ onPressAction,
+}: MenuComponentProps) {
+ const [expanded, setExpanded] = useState(false)
+ const longPress = Gesture.LongPress()
+ .runOnJS(true)
+ .onStart(() => setExpanded(true))
+ return (
+
+
+ setExpanded(false)}
+ color={appleMusic.elevated}
+ cornerRadius={4}
+ shadowElevation={0}
+ properties={{ clippingEnabled: false }}
+ >
+
+
+ {shouldOpenOnLongPress ? (
+
+ {children}
+
+ ) : (
+ setExpanded(true)}
+ accessible={false}
+ focusable={false}
+ android_disableSound
+ >
+ {children}
+
+ )}
+
+
+
+ {actions
+ .filter((action) => !action.attributes?.hidden)
+ .map((action) => (
+ {
+ setExpanded(false)
+ onPressAction?.({
+ nativeEvent: { event: action.id ?? action.title },
+ })
+ }}
+ >
+
+
+
+
+
+
+ {action.title}
+
+
+ ))}
+
+
+
+
+ )
+}
diff --git a/apps/mobile/components/media-menu.tsx b/apps/mobile/components/media-menu.tsx
new file mode 100644
index 0000000..f239c95
--- /dev/null
+++ b/apps/mobile/components/media-menu.tsx
@@ -0,0 +1 @@
+export { MenuView } from "@expo/ui/community/menu"
diff --git a/apps/mobile/components/mini-player.tsx b/apps/mobile/components/mini-player.tsx
index 35a8927..8923c2c 100644
--- a/apps/mobile/components/mini-player.tsx
+++ b/apps/mobile/components/mini-player.tsx
@@ -1,3 +1,7 @@
+import {
+ useAndroidTabPalette,
+ useAndroidTabHasArtworkPalette,
+} from "@/contexts/android-tab-theme"
import { Ionicons } from "@expo/vector-icons"
import { NativeTabs } from "expo-router/native-tabs"
import { useRouter } from "expo-router"
@@ -10,13 +14,7 @@ import { CoverImage } from "@/components/cover-image"
import { usePlaybackActions, usePlaybackQueue } from "@/contexts/playback"
import { useServerConfig } from "@/contexts/server-config"
import { albumCoverUrl } from "@/lib/urls"
-import {
- miniPlayerHeight,
- tabBarHeight,
- useBlurTint,
- useMiniPlayerBackground,
- useThemeColors,
-} from "@/lib/theme"
+import { miniPlayerHeight, tabBarHeight, useThemeColors } from "@/lib/theme"
function MiniPlayerContent({
placement,
@@ -27,10 +25,19 @@ function MiniPlayerContent({
variant: "bar" | "accessory"
onOpenPlayer: () => void
}) {
- const colors = useThemeColors()
+ const theme = useThemeColors()
+ const palette = useAndroidTabPalette()
+ const colors =
+ Platform.OS === "android"
+ ? {
+ ...theme,
+ foreground: palette.foreground,
+ mutedForeground: palette.secondaryForeground,
+ }
+ : theme
const { config } = useServerConfig()
const { currentSong, isPlaying } = usePlaybackQueue()
- const { setIsPlaying, skipNext } = usePlaybackActions()
+ const { setIsPlaying, skipNext, skipPrevious } = usePlaybackActions()
if (!currentSong || !config) {
return null
@@ -114,6 +121,20 @@ function MiniPlayerContent({
+ {Platform.OS === "android" && !isAccessory ? (
+ {
+ event.stopPropagation()
+ void skipPrevious()
+ }}
+ hitSlop={6}
+ >
+
+
+ ) : null}
{
@@ -144,13 +165,28 @@ function MiniPlayerContent({
}
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
- const colors = useThemeColors()
- const backgroundColor = useMiniPlayerBackground()
+ const palette = useAndroidTabPalette()
+ const hasArtworkPalette = useAndroidTabHasArtworkPalette()
return (
-
-
+
{children}
+ {hasArtworkPalette ? (
+
+ ) : null}
+
)
}
@@ -224,9 +260,15 @@ const styles = StyleSheet.create({
androidBar: {
overflow: "hidden",
},
- topBorder: {
- height: StyleSheet.hairlineWidth,
+ separator: {
+ position: "absolute",
+ left: 0,
+ right: 0,
+ height: 1,
+ zIndex: 1,
},
+ topBorder: { top: 0 },
+ bottomBorder: { bottom: 0 },
content: {
flexDirection: "row",
alignItems: "center",
diff --git a/apps/mobile/components/player.tsx b/apps/mobile/components/player.tsx
index ced7f43..25dc922 100644
--- a/apps/mobile/components/player.tsx
+++ b/apps/mobile/components/player.tsx
@@ -8,7 +8,7 @@ import { formatDuration } from "@/lib/format"
import { albumCoverUrl } from "@/lib/urls"
import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
import { memo, useCallback } from "react"
-import { Pressable, StyleSheet, Text, View } from "react-native"
+import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
import {
MediaContextMenu,
@@ -155,7 +155,8 @@ export const SongListRow = memo(function SongListRow({
})
export const tabContentBottomInset = spacing.lg
-export const contentBottomInset = miniPlayerHeight + spacing.lg
+export const contentBottomInset =
+ Platform.OS === "android" ? spacing.lg : miniPlayerHeight + spacing.lg
const styles = StyleSheet.create({
row: {
diff --git a/apps/mobile/components/ui/primitives.tsx b/apps/mobile/components/ui/primitives.tsx
index 459bd85..2ab15f4 100644
--- a/apps/mobile/components/ui/primitives.tsx
+++ b/apps/mobile/components/ui/primitives.tsx
@@ -1,5 +1,6 @@
import {
ActivityIndicator,
+ Platform,
Pressable,
PressableProps,
StyleProp,
@@ -85,6 +86,13 @@ export function Input({ style, ...props }: TextInputProps) {
return (
+
{children}
)
diff --git a/apps/mobile/components/ui/toaster.tsx b/apps/mobile/components/ui/toaster.tsx
index faea2e4..a280ead 100644
--- a/apps/mobile/components/ui/toaster.tsx
+++ b/apps/mobile/components/ui/toaster.tsx
@@ -1,16 +1,15 @@
import { Toaster as SonnerToaster } from "sonner-native"
-import { useColorScheme } from "react-native"
-import { colors, radius } from "@/lib/theme"
+import { radius, useIsDark, useThemeColors } from "@/lib/theme"
export function Toaster() {
- const scheme = useColorScheme()
- const themeColors = scheme === "dark" ? colors.dark : colors.light
+ const isDark = useIsDark()
+ const themeColors = useThemeColors()
return (
-
- event.stopPropagation()}
- >
-
- Add to Playlist
-
- playlist.id}
- renderItem={({
- item: playlist,
- }: {
- item: OwnedPlaylistForAdd
- }) => (
-
- void handleAddToPlaylist(playlist.id, playlist.songIds)
- }
- >
-
- {playlist.title}
-
-
- )}
- />
- {
- selectionRequestIdRef.current += 1
- setOpen(false)
- setNewPlaylistName("")
- setCreateOpen(true)
- }}
- />
+
+
+ event.stopPropagation()}
+ >
+
+ Add to Playlist
+
+ playlist.id}
+ renderItem={({
+ item: playlist,
+ }: {
+ item: OwnedPlaylistForAdd
+ }) => (
+
+ void handleAddToPlaylist(playlist.id, playlist.songIds)
+ }
+ >
+
+ {playlist.title}
+
+
+ )}
+ />
+ {
+ selectionRequestIdRef.current += 1
+ setOpen(false)
+ setNewPlaylistName("")
+ setCreateOpen(true)
+ }}
+ />
+
-
+
setCreateOpen(false)}
>
- setCreateOpen(false)}>
+
event.stopPropagation()}
+ style={styles.overlay}
+ onPress={() => setCreateOpen(false)}
>
-
- New Playlist
-
-
-
- setCreateOpen(false)}
+ event.stopPropagation()}
+ >
+
+ New Playlist
+
+
- void handleCreatePlaylist()}
- />
-
+
+ setCreateOpen(false)}
+ />
+ void handleCreatePlaylist()}
+ />
+
+
-
+
)
diff --git a/apps/mobile/contexts/android-tab-theme.tsx b/apps/mobile/contexts/android-tab-theme.tsx
new file mode 100644
index 0000000..791de27
--- /dev/null
+++ b/apps/mobile/contexts/android-tab-theme.tsx
@@ -0,0 +1,137 @@
+import {
+ useIsFocused,
+ useNavigation,
+ usePreventRemove,
+ useRoute,
+ type NativeStackNavigationProp,
+} from "expo-router"
+import {
+ createContext,
+ useCallback,
+ useContext,
+ useLayoutEffect,
+ useMemo,
+ useState,
+ type PropsWithChildren,
+} from "react"
+import { Platform } from "react-native"
+
+import { themeCoverPalette, type CoverPalette } from "@/lib/cover-palette"
+import { useIsDark, useThemeColors } from "@/lib/theme"
+
+type TabTheme = {
+ palette: CoverPalette
+ selectedColor: string
+ hasArtworkPalette: boolean
+ setPalette: (palette: CoverPalette | null, owner: string) => void
+}
+const AndroidTabTheme = createContext(null)
+
+function useDefaultPalette() {
+ const theme = useThemeColors()
+ const isDark = useIsDark()
+ return useMemo(() => themeCoverPalette(theme, isDark), [theme, isDark])
+}
+
+export function AndroidTabThemeProvider({ children }: PropsWithChildren) {
+ const defaultPalette = useDefaultPalette()
+ const [screen, setScreen] = useState<{
+ palette: CoverPalette
+ owner: string
+ } | null>(null)
+ const palette = screen?.palette ?? null
+ const setPalette = useCallback(
+ (palette: CoverPalette | null, owner: string) => {
+ setScreen((current) =>
+ palette ? { palette, owner } : current?.owner === owner ? null : current
+ )
+ },
+ []
+ )
+ const artworkPalette =
+ palette &&
+ (palette.background !== defaultPalette.background ||
+ palette.foreground !== defaultPalette.foreground ||
+ palette.secondaryForeground !== defaultPalette.secondaryForeground ||
+ palette.accent !== defaultPalette.accent)
+ ? palette
+ : null
+ const value = useMemo(
+ () => ({
+ palette: artworkPalette ?? defaultPalette,
+ selectedColor: artworkPalette?.foreground ?? defaultPalette.accentText,
+ hasArtworkPalette: artworkPalette !== null,
+ setPalette,
+ }),
+ [defaultPalette, artworkPalette, setPalette]
+ )
+ return (
+
+ {children}
+
+ )
+}
+
+export function useAndroidTabPalette() {
+ const theme = useContext(AndroidTabTheme)
+ const defaultPalette = useDefaultPalette()
+ return theme?.palette ?? defaultPalette
+}
+
+export function useAndroidTabHasArtworkPalette() {
+ return useContext(AndroidTabTheme)?.hasArtworkPalette ?? false
+}
+
+export function useAndroidTabSelectedColor() {
+ const theme = useContext(AndroidTabTheme)
+ const defaultPalette = useDefaultPalette()
+ return theme?.selectedColor ?? defaultPalette.accentText
+}
+
+/** Keep Android artwork screens and shared bars on the same displayed palette. */
+export function useAndroidScreenPalette(palette: CoverPalette) {
+ const isFocused = useIsFocused()
+ const owner = useRoute().key
+ const navigation =
+ useNavigation>>()
+ const [appeared, setAppeared] = useState(false)
+ const [leaving, setLeaving] = useState(false)
+ const [laidOut, setLaidOut] = useState(false)
+ const onLayout = useCallback(() => setLaidOut(true), [])
+ const theme = useContext(AndroidTabTheme)
+ const setPalette = theme?.setPalette
+
+ useLayoutEffect(() => {
+ if (Platform.OS !== "android") return
+ return navigation.addListener("transitionEnd", ({ data }) => {
+ setAppeared(!data.closing)
+ })
+ }, [navigation])
+
+ usePreventRemove(Platform.OS === "android" && !leaving, ({ repeat }) => {
+ setLeaving(true)
+ setPalette?.(null, owner)
+ // Let the page and bars paint their shared destination colors before the
+ // native stack removes the page. React blur happens too early for this.
+ requestAnimationFrame(() => requestAnimationFrame(repeat))
+ })
+
+ useLayoutEffect(() => {
+ if (
+ Platform.OS !== "android" ||
+ !setPalette ||
+ !isFocused ||
+ !laidOut ||
+ !appeared ||
+ leaving
+ )
+ return
+ setPalette(palette, owner)
+ return () => setPalette(null, owner)
+ }, [appeared, isFocused, laidOut, leaving, owner, palette, setPalette])
+
+ return {
+ palette: Platform.OS === "android" && theme ? theme.palette : palette,
+ onLayout: Platform.OS === "android" ? onLayout : undefined,
+ }
+}
diff --git a/apps/mobile/hooks/use-android-keyboard-visible.ts b/apps/mobile/hooks/use-android-keyboard-visible.ts
new file mode 100644
index 0000000..0d6984d
--- /dev/null
+++ b/apps/mobile/hooks/use-android-keyboard-visible.ts
@@ -0,0 +1,19 @@
+import { useEffect, useState } from "react"
+import { Keyboard, Platform } from "react-native"
+
+export function useAndroidKeyboardVisible() {
+ const [visible, setVisible] = useState(false)
+ useEffect(() => {
+ if (Platform.OS !== "android") return
+ setVisible(Keyboard.isVisible())
+ const show = Keyboard.addListener("keyboardDidShow", () => setVisible(true))
+ const hide = Keyboard.addListener("keyboardDidHide", () =>
+ setVisible(false)
+ )
+ return () => {
+ show.remove()
+ hide.remove()
+ }
+ }, [])
+ return visible
+}
diff --git a/apps/mobile/lib/navigation.ts b/apps/mobile/lib/navigation.ts
index cb107d9..63f6e0c 100644
--- a/apps/mobile/lib/navigation.ts
+++ b/apps/mobile/lib/navigation.ts
@@ -1,7 +1,7 @@
import type { NativeStackNavigationOptions } from "expo-router"
-import { useColorScheme } from "react-native"
+import { Platform } from "react-native"
-import { colors } from "@/lib/theme"
+import { useThemeColors } from "@/lib/theme"
type StackScreenOptions = NativeStackNavigationOptions
@@ -18,8 +18,7 @@ export const tabStackScreenTitles: Record = {
export function useStackScreenOptions(
overrides?: StackScreenOptions
): StackScreenOptions {
- const scheme = useColorScheme()
- const theme = scheme === "dark" ? colors.dark : colors.light
+ const theme = useThemeColors()
return {
headerLargeTitle: true,
@@ -27,6 +26,16 @@ export function useStackScreenOptions(
headerTintColor: theme.foreground,
headerLargeTitleStyle: { color: theme.foreground },
headerBackButtonDisplayMode: "minimal",
+ ...(Platform.OS === "android"
+ ? {
+ headerLargeTitle: false,
+ headerTransparent: false,
+ headerStyle: { backgroundColor: theme.background },
+ headerShadowVisible: false,
+ statusBarStyle: "light" as const,
+ contentStyle: { backgroundColor: theme.background },
+ }
+ : {}),
...overrides,
}
}
diff --git a/apps/mobile/lib/theme.ts b/apps/mobile/lib/theme.ts
index 6b7145f..4708ada 100644
--- a/apps/mobile/lib/theme.ts
+++ b/apps/mobile/lib/theme.ts
@@ -50,12 +50,12 @@ export const colors = {
export type ThemeColors = (typeof colors)[keyof typeof colors]
export function useThemeColors(): ThemeColors {
- const scheme = useColorScheme()
- return scheme === "dark" ? colors.dark : colors.light
+ return useIsDark() ? colors.dark : colors.light
}
export function useIsDark(): boolean {
- return useColorScheme() === "dark"
+ const scheme = useColorScheme()
+ return Platform.OS === "android" || scheme === "dark"
}
export function useBlurTint(): "light" | "dark" {
diff --git a/apps/mobile/modules/audio-output/.gitignore b/apps/mobile/modules/audio-output/.gitignore
new file mode 100644
index 0000000..7d78d75
--- /dev/null
+++ b/apps/mobile/modules/audio-output/.gitignore
@@ -0,0 +1 @@
+/android/build/
diff --git a/apps/mobile/modules/audio-output/android/build.gradle b/apps/mobile/modules/audio-output/android/build.gradle
new file mode 100644
index 0000000..4419560
--- /dev/null
+++ b/apps/mobile/modules/audio-output/android/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+ id 'com.android.library'
+ id 'expo-module-gradle-plugin'
+}
+
+group = 'expo.modules.audiooutput'
+version = '1.0.0'
+
+android {
+ namespace 'expo.modules.audiooutput'
+}
+
+dependencies {
+ implementation 'androidx.mediarouter:mediarouter:1.8.1'
+}
diff --git a/apps/mobile/modules/audio-output/android/src/main/AndroidManifest.xml b/apps/mobile/modules/audio-output/android/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..90b837a
--- /dev/null
+++ b/apps/mobile/modules/audio-output/android/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt b/apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt
new file mode 100644
index 0000000..155ed54
--- /dev/null
+++ b/apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt
@@ -0,0 +1,23 @@
+package expo.modules.audiooutput
+
+import android.os.Build
+import androidx.mediarouter.app.SystemOutputSwitcherDialogController
+import expo.modules.kotlin.functions.Queues
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class AudioOutputModule : Module() {
+ override fun definition() = ModuleDefinition {
+ Name("AudioOutput")
+
+ AsyncFunction("showPicker") {
+ val activity = appContext.currentActivity
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || activity == null) {
+ false
+ } else {
+ // AndroidX handles Android 13's system intent and Android 14+'s public API.
+ SystemOutputSwitcherDialogController.showDialog(activity)
+ }
+ }.runOnQueue(Queues.MAIN)
+ }
+}
diff --git a/apps/mobile/modules/audio-output/expo-module.config.json b/apps/mobile/modules/audio-output/expo-module.config.json
new file mode 100644
index 0000000..a13f0f6
--- /dev/null
+++ b/apps/mobile/modules/audio-output/expo-module.config.json
@@ -0,0 +1,9 @@
+{
+ "platforms": ["apple", "android"],
+ "apple": {
+ "modules": ["AudioOutputModule"]
+ },
+ "android": {
+ "modules": ["expo.modules.audiooutput.AudioOutputModule"]
+ }
+}
diff --git a/apps/mobile/modules/audio-output/ios/AudioOutput.podspec b/apps/mobile/modules/audio-output/ios/AudioOutput.podspec
new file mode 100644
index 0000000..d0a06ef
--- /dev/null
+++ b/apps/mobile/modules/audio-output/ios/AudioOutput.podspec
@@ -0,0 +1,17 @@
+Pod::Spec.new do |s|
+ s.name = 'AudioOutput'
+ s.version = '1.0.0'
+ s.summary = 'Native audio output selection for oTunes'
+ s.description = s.summary
+ s.license = { :type => 'MIT' }
+ s.author = 'oTunes'
+ s.homepage = 'https://otunes.abunchofknowitalls.com'
+ s.platforms = { :ios => '16.4' }
+ s.swift_version = '5.9'
+ s.source = { :git => '' }
+ s.static_framework = true
+ s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+ s.dependency 'ExpoModulesCore'
+ s.frameworks = 'AVKit'
+ s.source_files = '**/*.swift'
+end
diff --git a/apps/mobile/modules/audio-output/ios/AudioOutputModule.swift b/apps/mobile/modules/audio-output/ios/AudioOutputModule.swift
new file mode 100644
index 0000000..6fbcde6
--- /dev/null
+++ b/apps/mobile/modules/audio-output/ios/AudioOutputModule.swift
@@ -0,0 +1,30 @@
+import AVKit
+import ExpoModulesCore
+
+public class AudioOutputModule: Module {
+ public func definition() -> ModuleDefinition {
+ Name("AudioOutput")
+
+ View(AudioOutputView.self) {
+ Prop("tint") { (view: AudioOutputView, color: UIColor) in
+ view.picker.tintColor = color
+ }
+ }
+ }
+}
+
+final class AudioOutputView: ExpoView {
+ let picker = AVRoutePickerView()
+
+ required init(appContext: AppContext? = nil) {
+ super.init(appContext: appContext)
+ picker.prioritizesVideoDevices = false
+ picker.backgroundColor = .clear
+ addSubview(picker)
+ }
+
+ override func layoutSubviews() {
+ super.layoutSubviews()
+ picker.frame = bounds
+ }
+}
diff --git a/apps/mobile/modules/audio-output/package.json b/apps/mobile/modules/audio-output/package.json
new file mode 100644
index 0000000..15927d5
--- /dev/null
+++ b/apps/mobile/modules/audio-output/package.json
@@ -0,0 +1,5 @@
+{
+ "name": "otunes-audio-output",
+ "version": "1.0.0",
+ "private": true
+}
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index d2c0724..dc6eeed 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -34,12 +34,14 @@
"expo-image": "~58.0.16",
"expo-image-picker": "~58.0.10",
"expo-linking": "~58.0.14",
+ "expo-navigation-bar": "~58.0.4",
"expo-router": "~58.0.25",
"expo-secure-store": "~58.0.2",
"expo-sharing": "~58.0.20",
"expo-splash-screen": "~58.0.11",
"expo-status-bar": "~58.0.4",
"expo-symbols": "~58.0.4",
+ "expo-system-ui": "~58.0.6",
"react": "19.3.0",
"react-dom": "19.3.0",
"react-native": "0.88.0",
diff --git a/apps/mobile/plugins/with-android-colors.js b/apps/mobile/plugins/with-android-colors.js
new file mode 100644
index 0000000..68f37e7
--- /dev/null
+++ b/apps/mobile/plugins/with-android-colors.js
@@ -0,0 +1,26 @@
+const { withAndroidStyles } = require("expo/config-plugins")
+
+// Native controls and system bars must never fall back to device theme colors.
+module.exports = (config) =>
+ withAndroidStyles(config, (config) => {
+ const theme = config.modResults.resources.style.find(
+ (style) => style.$.name === "AppTheme"
+ )
+ const colors = {
+ colorPrimary: "#FA2D48",
+ colorPrimaryDark: "#000000",
+ colorAccent: "#FA2D48",
+ "android:windowBackground": "#000000",
+ "android:statusBarColor": "#000000",
+ "android:navigationBarColor": "#000000",
+ "android:windowLightStatusBar": "false",
+ "android:windowLightNavigationBar": "false",
+ "android:enforceStatusBarContrast": "false",
+ "android:enforceNavigationBarContrast": "false",
+ }
+ for (const [name, value] of Object.entries(colors)) {
+ theme.item = theme.item.filter((item) => item.$.name !== name)
+ theme.item.push({ $: { name }, _: value })
+ }
+ return config
+ })
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1160d88..6a1b044 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -88,6 +88,9 @@ importers:
expo-linking:
specifier: ~58.0.14
version: 58.0.14(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
+ expo-navigation-bar:
+ specifier: ~58.0.4
+ 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:
specifier: ~58.0.25
version: 58.0.25(114ad080e17b889d99a70734d72d1fb4)
@@ -106,6 +109,9 @@ importers:
expo-symbols:
specifier: ~58.0.4
version: 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-system-ui:
+ specifier: ~58.0.6
+ version: 58.0.6(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:
specifier: 19.3.0
version: 19.3.0
@@ -4120,6 +4126,13 @@ packages:
expo-modules-macros@0.22.0:
resolution: {integrity: sha512-IHY+FkILfG19qsyf9G/z7dcWVgsyqdkWsvvob3n5nWKa2meCCAGeEjp42N68fG8Ta6dn/bsceuma7uh2i6ho9g==}
+ expo-navigation-bar@58.0.4:
+ resolution: {integrity: sha512-XO1Ljy9MlmVLYlmIGUNHxTCcHN8TjlbYQnf+jqjoxpbPxDCXDCSaX0+F7rKh0G4CUehKsfoebbMO/VIy87qSqg==}
+ peerDependencies:
+ expo: '*'
+ react: '*'
+ react-native: '*'
+
expo-router@58.0.25:
resolution: {integrity: sha512-sFumF6yUbxcSfiYcd+5vJjjIbVN0wo5X0F9SEnoNlmmvzoI9jD6k9dcSMnoe5ywquWonUEAdcHcpfsa087/8sQ==}
peerDependencies:
@@ -4197,6 +4210,16 @@ packages:
react: '*'
react-native: '*'
+ expo-system-ui@58.0.6:
+ resolution: {integrity: sha512-K1+GIYhNDc4J0lJAL0m8giesP1dgfavhN+joA6FQ45r1FXAWwS1PaueCiCJaq5hB6z5iAYT7b9XqYp76UU65yw==}
+ peerDependencies:
+ expo: '*'
+ react-native: '*'
+ react-native-web: '*'
+ peerDependenciesMeta:
+ react-native-web:
+ optional: true
+
expo-updates-interface@58.0.1:
resolution: {integrity: sha512-OF+3BtMXtUsXWDfpHVNus9yHpx7WjMwjxDfeeN9LQBYSq/UtYmNNHBSfzChYTuqljWFSOAHRfsDykV9EB73Wlg==}
peerDependencies:
@@ -11198,6 +11221,15 @@ snapshots:
'@expo/modules-macros-win32-arm64': 0.22.0
'@expo/modules-macros-win32-x64': 0.22.0
+ expo-navigation-bar@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):
+ dependencies:
+ debug: 4.4.3
+ expo: 58.0.17(@babel/core@7.29.7)(@expo/dom-webview@58.0.2)(@expo/metro-runtime@58.0.15)(expo-router@58.0.25)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)(typescript@6.0.3)
+ react: 19.3.0
+ react-native: 0.88.0(@babel/core@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:
+ - supports-color
+
expo-router@58.0.25(114ad080e17b889d99a70734d72d1fb4):
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)
@@ -11278,6 +11310,15 @@ snapshots:
react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0)
sf-symbols-typescript: 2.2.0
+ expo-system-ui@58.0.6(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:
+ '@react-native/normalize-colors': 0.88.0
+ debug: 4.4.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)
+ transitivePeerDependencies:
+ - supports-color
+
expo-updates-interface@58.0.1(expo@58.0.17):
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)