From 59888544da50dfcf52add88ea2ce8cdb80ea1852 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Fri, 23 Oct 2026 14:21:22 -0400 Subject: [PATCH 1/5] fix(mobile): sync player volume with system audio --- apps/mobile/app.json | 2 +- apps/mobile/app/(app)/(tabs)/_layout.tsx | 71 ++++++++-------- apps/mobile/app/(app)/player.tsx | 57 +++++++------ apps/mobile/components/mini-player.tsx | 64 ++++++-------- apps/mobile/components/player-slider.tsx | 19 ++++- apps/mobile/contexts/playback.tsx | 67 +-------------- apps/mobile/hooks/use-system-volume.ts | 60 +++++++++++++ apps/mobile/lib/theme.ts | 4 +- apps/mobile/lib/urls.ts | 9 +- apps/mobile/native/SystemVolume.kt | 77 +++++++++++++++++ apps/mobile/native/SystemVolume.swift | 79 +++++++++++++++++ apps/mobile/package.json | 7 ++ patches/expo-audio@58.0.10.patch | 104 ++++++++++++++++++++++- pnpm-lock.yaml | 6 +- 14 files changed, 450 insertions(+), 176 deletions(-) create mode 100644 apps/mobile/hooks/use-system-volume.ts create mode 100644 apps/mobile/native/SystemVolume.kt create mode 100644 apps/mobile/native/SystemVolume.swift diff --git a/apps/mobile/app.json b/apps/mobile/app.json index 54025c2..9e61032 100644 --- a/apps/mobile/app.json +++ b/apps/mobile/app.json @@ -54,7 +54,7 @@ "experiments": { "typedRoutes": true, "inlineModules": { - "watchedDirectories": ["app-intents"] + "watchedDirectories": ["app-intents", "native"] } }, "extra": { diff --git a/apps/mobile/app/(app)/(tabs)/_layout.tsx b/apps/mobile/app/(app)/(tabs)/_layout.tsx index 352876f..6f7f58a 100644 --- a/apps/mobile/app/(app)/(tabs)/_layout.tsx +++ b/apps/mobile/app/(app)/(tabs)/_layout.tsx @@ -1,9 +1,9 @@ import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router" import { NativeTabs } from "expo-router/native-tabs" -import { DynamicColorIOS, Platform, useColorScheme } from "react-native" +import { DynamicColorIOS, Platform, View, useColorScheme } from "react-native" import { useMemo } from "react" -import { TabBottomAccessory } from "@/components/mini-player" +import { AndroidMiniPlayer, TabBottomAccessory } from "@/components/mini-player" import { usePlaybackQueue } from "@/contexts/playback" import { appleMusic, colors } from "@/lib/theme" @@ -83,41 +83,44 @@ export default function TabsLayout() { return ( - - {showBottomAccessory ? ( - - - - ) : null} + + + {Platform.OS === "ios" && showBottomAccessory ? ( + + + + ) : null} - - - Home - + + + Home + - - - Library - + + + Library + - - - Search - - + + + Search + + + + ) } diff --git a/apps/mobile/app/(app)/player.tsx b/apps/mobile/app/(app)/player.tsx index d73c1dc..79cd6e6 100644 --- a/apps/mobile/app/(app)/player.tsx +++ b/apps/mobile/app/(app)/player.tsx @@ -47,6 +47,7 @@ import { useServerConfig } from "@/contexts/server-config" import { useCachedQuery } from "@/hooks/use-cached-query" import { useCoverPalette } from "@/hooks/use-cover-palette" import { useMediaMenuActions } from "@/hooks/use-media-menu-actions" +import { useSystemVolume } from "@/hooks/use-system-volume" import { formatDuration, formatRemainingDuration } from "@/lib/format" import { nowPlayingColors, @@ -80,14 +81,13 @@ export default function PlayerScreen() { repeatEnabled, currentTime, duration, - volume, queueSongIds, setIsPlaying, - setVolume, seekTo, skipNext, skipPrevious, } = usePlayback() + const { volume, setVolume, available: volumeAvailable } = useSystemVolume() const [showQueue, setShowQueue] = useState(false) const [stageHeight, setStageHeight] = useState(0) const [scrubTime, setScrubTime] = useState(null) @@ -377,31 +377,34 @@ export default function PlayerScreen() { - - } - trailing={ - - } - /> + {volumeAvailable ? ( + + } + trailing={ + + } + /> + ) : null} -// ) -// } +/** NativeTabs.BottomAccessory only renders on iOS. */ +export function AndroidMiniPlayer() { + const router = useRouter() + const insets = useSafeAreaInsets() + const { currentSong, queueSongIds } = usePlaybackQueue() + if (Platform.OS !== "android" || !currentSong || queueSongIds.length === 0) { + return null + } + return ( + + + router.push("/player")} + /> + + + ) +} const styles = StyleSheet.create({ floatingContainer: { diff --git a/apps/mobile/components/player-slider.tsx b/apps/mobile/components/player-slider.tsx index 348f4cc..36ec2b6 100644 --- a/apps/mobile/components/player-slider.tsx +++ b/apps/mobile/components/player-slider.tsx @@ -34,6 +34,7 @@ export function PlayerSlider({ leading, trailing, accessibilityLabel, + commitHoldMs = COMMIT_HOLD_MS, }: { value: number maximumValue: number @@ -46,6 +47,8 @@ export function PlayerSlider({ leading?: ReactNode trailing?: ReactNode accessibilityLabel: string + /** Seeking needs a hold while playback catches up; system volume does not. */ + commitHoldMs?: number }) { const max = maximumValue > 0 ? maximumValue : 1 const fraction = useSharedValue(clamp(value / max)) @@ -64,16 +67,28 @@ export function PlayerSlider({ onValueChange, onSlidingStart, onSlidingComplete, + value, + commitHoldMs, max, }) - callbacks.current = { onValueChange, onSlidingStart, onSlidingComplete, max } + callbacks.current = { + onValueChange, + onSlidingStart, + onSlidingComplete, + value, + commitHoldMs, + max, + } const gesture = useMemo(() => { const start = () => callbacks.current.onSlidingStart?.() const change = (next: number) => callbacks.current.onValueChange?.(next * callbacks.current.max) const complete = (next: number) => { - holdUntil.current = Date.now() + COMMIT_HOLD_MS + holdUntil.current = Date.now() + callbacks.current.commitHoldMs + if (callbacks.current.commitHoldMs === 0) { + fraction.value = clamp(callbacks.current.value / callbacks.current.max) + } callbacks.current.onSlidingComplete?.(next * callbacks.current.max) } diff --git a/apps/mobile/contexts/playback.tsx b/apps/mobile/contexts/playback.tsx index 1f963dc..6ee733c 100644 --- a/apps/mobile/contexts/playback.tsx +++ b/apps/mobile/contexts/playback.tsx @@ -19,7 +19,6 @@ import { type ReactNode, } from "react" import { AppState } from "react-native" -import AsyncStorage from "@react-native-async-storage/async-storage" import { ANONYMOUS_CACHE_SCOPE, @@ -57,8 +56,6 @@ import { const PREVIOUS_TRACK_RESTART_THRESHOLD_SECONDS = 5 const PROGRESS_SAVE_INTERVAL_MS = 5000 const PREFETCH_UPCOMING_SONGS = 5 -const VOLUME_STORAGE_KEY = "otunes:volume" -const DEFAULT_VOLUME = 0.8 function lockScreenMetadata( song: BrowseSong, @@ -79,13 +76,11 @@ type PlaybackContextValue = { shuffleEnabled: boolean repeatEnabled: RepeatMode isPlaying: boolean - volume: number currentTime: number duration: number seekTo: (seconds: number) => void waitForPlaybackReady: (playing?: boolean) => Promise setIsPlaying: (playing: boolean) => void - setVolume: (volume: number) => void playInOrder: (songIds: Id<"songs">[]) => Promise playShuffled: (songIds: Id<"songs">[]) => Promise addToQueueNext: (songIds: Id<"songs">[]) => Promise @@ -268,9 +263,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { const seekInFlightRef = useRef(false) const loadRequestIdRef = useRef(0) const playRequestRef = useRef(0) - const volumeRef = useRef(DEFAULT_VOLUME) - const volumeChangedRef = useRef(false) - const volumeSaveTimerRef = useRef | null>(null) const ignoreTrackChangeTimerRef = useRef | null>(null) @@ -278,7 +270,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { const [isPlaying, setIsPlayingState] = useState(false) const [currentTime, setCurrentTime] = useState(0) const [measuredDuration, setDuration] = useState(0) - const [volume, setVolumeState] = useState(DEFAULT_VOLUME) const [progressToRestore, setProgressToRestore] = useState( null ) @@ -466,7 +457,8 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { updateInterval: 500, loop: repeatToPlaylistLoop(storeRef.current.getState().repeatEnabled), }) - playlist.volume = volumeRef.current + // System volume controls loudness; keep the player gain at full scale. + playlist.volume = 1 statusSubscriptionRef.current = playlist.addListener( "playlistStatusUpdate", handlePlaylistStatusUpdate @@ -498,42 +490,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { } }) - void AsyncStorage.getItem(VOLUME_STORAGE_KEY) - .then((stored) => { - if (!cancelled && !volumeChangedRef.current && stored) { - const parsed = Number(stored) - if (Number.isFinite(parsed)) { - const restoredVolume = Math.min(1, Math.max(0, parsed)) - volumeRef.current = restoredVolume - setVolumeState(restoredVolume) - } - } - }) - .catch(() => {}) - return () => { cancelled = true - if (volumeSaveTimerRef.current) { - clearTimeout(volumeSaveTimerRef.current) - volumeSaveTimerRef.current = null - } - if (volumeChangedRef.current) { - void AsyncStorage.setItem( - VOLUME_STORAGE_KEY, - String(volumeRef.current) - ).catch(() => {}) - } destroyPlaylist() } }, [destroyPlaylist]) - useEffect(() => { - volumeRef.current = volume - if (playlistRef.current) { - playlistRef.current.volume = volume - } - }, [volume]) - useEffect(() => { const playlist = playlistRef.current if (playlist) { @@ -553,25 +515,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { } }, []) - const setVolume = useCallback((nextVolume: number) => { - const clamped = Math.min(1, Math.max(0, nextVolume)) - volumeChangedRef.current = true - volumeRef.current = clamped - setVolumeState(clamped) - if (volumeSaveTimerRef.current) { - clearTimeout(volumeSaveTimerRef.current) - } - volumeSaveTimerRef.current = setTimeout(() => { - volumeSaveTimerRef.current = null - void AsyncStorage.setItem(VOLUME_STORAGE_KEY, String(clamped)).catch( - () => {} - ) - }, 250) - if (playlistRef.current) { - playlistRef.current.volume = clamped - } - }, []) - const seekTo = useCallback( async (seconds: number) => { const playlist = playlistRef.current @@ -704,7 +647,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { playlist.skipTo(currentIndex) } playlist.loop = repeatToPlaylistLoop(repeatEnabled) - playlist.volume = volumeRef.current if (metadata) { updatePlaylistLockScreenMetadata(playlist, metadata) } @@ -818,7 +760,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { } loadedSongIdsRef.current = windowSongIds loadedLoadKeyRef.current = loadKey - playlist.volume = volumeRef.current playlist.loop = repeatToPlaylistLoop(repeatEnabled) activatePlaylistLockScreen( playlist, @@ -1345,11 +1286,9 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { shuffleEnabled: playback.shuffleEnabled, repeatEnabled, isPlaying: isPlaybackActive, - volume, currentTime, duration, seekTo, - setVolume, }), [ actionsValue, @@ -1363,8 +1302,6 @@ export function PlaybackProvider({ children }: { children: ReactNode }) { queueSongIds, repeatEnabled, seekTo, - setVolume, - volume, ] ) diff --git a/apps/mobile/hooks/use-system-volume.ts b/apps/mobile/hooks/use-system-volume.ts new file mode 100644 index 0000000..c887719 --- /dev/null +++ b/apps/mobile/hooks/use-system-volume.ts @@ -0,0 +1,60 @@ +import { requireOptionalNativeModule, type EventEmitter } from "expo" +import { useCallback, useEffect, useState } from "react" +import { AppState } from "react-native" + +type VolumeState = { volume: number; available: boolean } +type VolumeEvents = { onVolumeChange: (state: VolumeState) => void } +interface SystemVolumeModule extends EventEmitter { + getState(): Promise + setVolume(volume: number): Promise +} + +const native = requireOptionalNativeModule("SystemVolume") + +/** The device owns volume. Never restore an app-specific level on launch. */ +export function useSystemVolume() { + const [state, setState] = useState({ + volume: 0, + available: false, + }) + + useEffect(() => { + if (!native) return + let active = true + let revision = 0 + const listener = native.addListener("onVolumeChange", (next) => { + revision++ + if (active) setState(next) + }) + const refresh = async () => { + const requestedRevision = ++revision + try { + const next = await native.getState() + if (active && requestedRevision === revision) setState(next) + } catch { + if (active && requestedRevision === revision) { + setState((value) => ({ ...value, available: false })) + } + } + } + void refresh() + const foreground = AppState.addEventListener("change", (next) => { + if (next === "active") void refresh() + }) + return () => { + active = false + listener.remove() + foreground.remove() + } + }, []) + + const setVolume = useCallback((value: number) => { + if (!native || !Number.isFinite(value)) return + const volume = Math.min(1, Math.max(0, value)) + void native.setVolume(volume).catch(() => { + setState((current) => ({ ...current, available: false })) + }) + }, []) + + return { ...state, setVolume } +} diff --git a/apps/mobile/lib/theme.ts b/apps/mobile/lib/theme.ts index c38947f..6b7145f 100644 --- a/apps/mobile/lib/theme.ts +++ b/apps/mobile/lib/theme.ts @@ -84,13 +84,13 @@ export const radius = { } as const export const miniPlayerHeight = 56 -export const tabBarHeight = Platform.OS === "ios" ? 49 : 56 +export const tabBarHeight = Platform.OS === "ios" ? 49 : 80 export const playerBarHeight = miniPlayerHeight export const carouselCardWidth = 160 export function useTwoColumnCardWidth( horizontalPadding = spacing.lg, - gap = spacing.md, + gap = spacing.md ) { const { width } = useWindowDimensions() return Math.floor((width - horizontalPadding * 2 - gap) / 2) diff --git a/apps/mobile/lib/urls.ts b/apps/mobile/lib/urls.ts index 62ae507..50da4ed 100644 --- a/apps/mobile/lib/urls.ts +++ b/apps/mobile/lib/urls.ts @@ -86,8 +86,13 @@ export function songAudioSource( : undefined const name = options?.songTitle - if (headers || name) { - return { uri, ...(name ? { name } : {}), ...(headers ? { headers } : {}) } + if (headers || name || useHls) { + return { + uri, + ...(useHls ? { mimeType: "application/x-mpegURL" } : {}), + ...(name ? { name } : {}), + ...(headers ? { headers } : {}), + } } return uri diff --git a/apps/mobile/native/SystemVolume.kt b/apps/mobile/native/SystemVolume.kt new file mode 100644 index 0000000..c8b3e51 --- /dev/null +++ b/apps/mobile/native/SystemVolume.kt @@ -0,0 +1,77 @@ +package com.abunchofknowitalls.otunes + +import android.content.Context +import android.database.ContentObserver +import android.media.AudioManager +import android.os.Build +import android.os.Handler +import android.os.Looper +import android.provider.Settings +import expo.modules.kotlin.functions.Queues +import expo.modules.kotlin.modules.Module +import expo.modules.kotlin.modules.ModuleDefinition +import kotlin.math.roundToInt + +class SystemVolume : Module() { + private val context get() = requireNotNull(appContext.reactContext) + private val audio get() = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager + private var observer: ContentObserver? = null + private var lastState: Map? = null + + override fun definition() = ModuleDefinition { + Name("SystemVolume") + Events("onVolumeChange") + + AsyncFunction("getState") { state() }.runOnQueue(Queues.MAIN) + + AsyncFunction("setVolume") { value: Double -> + if (value.isFinite() && available()) { + val maximum = audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC) + val minimum = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + audio.getStreamMinVolume(AudioManager.STREAM_MUSIC) + } else { + 0 + } + val index = (value.coerceIn(0.0, 1.0) * maximum).roundToInt().coerceIn(minimum, maximum) + audio.setStreamVolume(AudioManager.STREAM_MUSIC, index, 0) + publishState() + } + }.runOnQueue(Queues.MAIN) + + OnStartObserving { + lastState = null + observer = object : ContentObserver(Handler(Looper.getMainLooper())) { + override fun onChange(selfChange: Boolean) = publishState() + }.also { + context.contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, it) + } + } + + OnStopObserving { stopObserving() } + OnDestroy { stopObserving() } + } + + private fun available(): Boolean = + !audio.isVolumeFixed && audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC) > 0 + + private fun state(): Map { + val maximum = audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC) + return mapOf( + "volume" to if (maximum > 0) audio.getStreamVolume(AudioManager.STREAM_MUSIC).toDouble() / maximum else 0.0, + "available" to available() + ) + } + + private fun publishState() { + val next = state() + if (next != lastState) { + lastState = next + sendEvent("onVolumeChange", next) + } + } + + private fun stopObserving() { + observer?.let { context.contentResolver.unregisterContentObserver(it) } + observer = null + } +} diff --git a/apps/mobile/native/SystemVolume.swift b/apps/mobile/native/SystemVolume.swift new file mode 100644 index 0000000..f5a7746 --- /dev/null +++ b/apps/mobile/native/SystemVolume.swift @@ -0,0 +1,79 @@ +import AVFAudio +import MediaPlayer +import UIKit +internal import ExpoModulesCore + +/// Bridges system volume without changing the playback audio session or player gain. +final class SystemVolume: Module { + private var volumeView: MPVolumeView? + private var observation: NSKeyValueObservation? + + public func definition() -> ExpoModulesCore.ModuleDefinition { + Name("SystemVolume") + Events("onVolumeChange") + + AsyncFunction("getState") { () -> [String: Any] in + self.prepareVolumeView() + return self.state() + }.runOnQueue(.main) + + AsyncFunction("setVolume") { (value: Double) in + self.prepareVolumeView() + guard value.isFinite, + let slider = self.volumeView?.subviews.compactMap({ $0 as? UISlider }).first + else { return } + slider.setValue(Float(min(1, max(0, value))), animated: false) + slider.sendActions(for: .valueChanged) + slider.sendActions(for: .touchUpInside) + }.runOnQueue(.main) + + OnStartObserving { + self.observation = AVAudioSession.sharedInstance().observe( + \.outputVolume, options: [.new] + ) { [weak self] _, _ in + guard let self else { return } + self.sendEvent("onVolumeChange", self.state()) + } + } + + OnStopObserving { + self.observation = nil + } + + OnDestroy { + self.observation = nil + let view = self.volumeView + self.volumeView = nil + DispatchQueue.main.async { view?.removeFromSuperview() } + } + } + + private func prepareVolumeView() { + #if !targetEnvironment(simulator) + if volumeView == nil { + // MPVolumeView must belong to a window to control the device's volume. + let view = MPVolumeView(frame: CGRect(x: -200, y: -200, width: 120, height: 30)) + view.showsRouteButton = false + volumeView = view + } + if volumeView?.window == nil { + let window = UIApplication.shared.connectedScenes + .compactMap { $0 as? UIWindowScene } + .flatMap { $0.windows } + .first { $0.isKeyWindow } + if let volumeView { window?.addSubview(volumeView) } + } + #endif + } + + private func state() -> [String: Any] { + #if targetEnvironment(simulator) + // Simulator's host audio controls do not update AVAudioSession.outputVolume. + let available = false + #else + // The control remains visible on physical iPhones, including during route changes. + let available = true + #endif + return ["volume": AVAudioSession.sharedInstance().outputVolume, "available": available] + } +} diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 5e53518..d2c0724 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -57,5 +57,12 @@ "@types/react": "~19.3.0", "babel-preset-expo": "^58.0.18", "typescript": "~6.0.3" + }, + "expo": { + "autolinking": { + "buildFromSource": [ + "expo-audio" + ] + } } } diff --git a/patches/expo-audio@58.0.10.patch b/patches/expo-audio@58.0.10.patch index 1a0c1e8..6f1c55b 100644 --- a/patches/expo-audio@58.0.10.patch +++ b/patches/expo-audio@58.0.10.patch @@ -4,7 +4,7 @@ diff --git a/ios/AudioPlaylist.swift b/ios/AudioPlaylist.swift @@ -179,20 +179,31 @@ return } - + - let wasPlaying = isPlaying - let resumeIndex: Int - if ref.currentItem != nil { @@ -13,7 +13,7 @@ diff --git a/ios/AudioPlaylist.swift b/ios/AudioPlaylist.swift - resumeIndex = index - } sources.insert(source, at: index) - + - previousTrackIndex = resumeIndex - rebuildPlaylist(startingAt: resumeIndex) - if wasPlaying { @@ -43,7 +43,7 @@ diff --git a/ios/AudioPlaylist.swift b/ios/AudioPlaylist.swift + updateStatus(with: ["trackCount": trackCount]) } - + @@ -213,12 +224,11 @@ play(at: currentRate) } @@ -61,3 +61,101 @@ diff --git a/ios/AudioPlaylist.swift b/ios/AudioPlaylist.swift } else if index < playerItems.count { if let item = playerItems[index] { ref.remove(item) +diff --git a/android/src/main/java/expo/modules/audio/AudioPlaylist.kt b/android/src/main/java/expo/modules/audio/AudioPlaylist.kt +--- a/android/src/main/java/expo/modules/audio/AudioPlaylist.kt ++++ b/android/src/main/java/expo/modules/audio/AudioPlaylist.kt +@@ -9,2 +9,3 @@ + import androidx.media3.exoplayer.ExoPlayer ++import androidx.media3.exoplayer.source.MediaSource + import androidx.media3.exoplayer.source.DefaultMediaSourceFactory +@@ -53,3 +54,3 @@ + +- private var createMediaItemForSource: ((AudioSource) -> MediaItem?)? = null ++ private var createMediaSourceForSource: ((AudioSource) -> MediaSource?)? = null + +@@ -60,4 +61,4 @@ + +- fun setMediaItemCreator(creator: (AudioSource) -> MediaItem?) { +- this.createMediaItemForSource = creator ++ fun setMediaSourceCreator(creator: (AudioSource) -> MediaSource?) { ++ this.createMediaSourceForSource = creator + } +@@ -67,5 +68,5 @@ + sources.forEach { source -> +- createMediaItemForSource?.invoke(source)?.let { mediaItem -> ++ createMediaSourceForSource?.invoke(source)?.let { mediaItem -> + validSources.add(source) +- ref.addMediaItem(mediaItem) ++ ref.addMediaSource(mediaItem) + } +@@ -151,5 +152,5 @@ + fun add(source: AudioSource) { +- val mediaItem = createMediaItemForSource?.invoke(source) ?: return ++ val mediaItem = createMediaSourceForSource?.invoke(source) ?: return + sources.add(source) +- ref.addMediaItem(mediaItem) ++ ref.addMediaSource(mediaItem) + sendStatusUpdate(mapOf("trackCount" to trackCount)) +@@ -161,5 +162,5 @@ + } +- val mediaItem = createMediaItemForSource?.invoke(source) ?: return ++ val mediaItem = createMediaSourceForSource?.invoke(source) ?: return + sources.add(index, source) +- ref.addMediaItem(index, mediaItem) ++ ref.addMediaSource(index, mediaItem) + sendStatusUpdate(mapOf("trackCount" to trackCount)) +diff --git a/android/src/main/java/expo/modules/audio/AudioModule.kt b/android/src/main/java/expo/modules/audio/AudioModule.kt +--- a/android/src/main/java/expo/modules/audio/AudioModule.kt ++++ b/android/src/main/java/expo/modules/audio/AudioModule.kt +@@ -909,14 +909,4 @@ + playlist.loopMode = loop +- playlist.setMediaItemCreator { source -> +- source.uri?.let { uriString -> +- val uri = uriString.toUri() +- when { +- isRawResource(uri) -> { +- val file = getResourceName(uri, uriString) +- MediaItem.fromUri(getRawResourceURI(file)) +- } +- else -> MediaItem.fromUri(uri) +- } +- } +- } ++ // Use the same per-source headers and stream type as standalone players. ++ playlist.setMediaSourceCreator { source -> createMediaItem(source) } + playlist.loadInitialPlaylist() +@@ -1130,3 +1120,3 @@ + } +- else -> MediaItem.fromUri(uri) ++ else -> MediaItem.Builder().setUri(uri).setMimeType(source.mimeType).build() + } +@@ -1196,3 +1186,3 @@ + val uri = mediaItem.localConfiguration?.uri +- return when (val type = uri?.let { retrieveStreamType(it) }) { ++ return when (val type = uri?.let { Util.inferContentTypeForUriAndMimeType(it, mediaItem.localConfiguration?.mimeType) }) { + CONTENT_TYPE_SS -> SsMediaSource.Factory(factory) +diff --git a/android/src/main/java/expo/modules/audio/AudioRecords.kt b/android/src/main/java/expo/modules/audio/AudioRecords.kt +--- a/android/src/main/java/expo/modules/audio/AudioRecords.kt ++++ b/android/src/main/java/expo/modules/audio/AudioRecords.kt +@@ -15,3 +15,4 @@ + @Field val headers: Map?, +- @Field val name: String? = null ++ @Field val name: String? = null, ++ @Field val mimeType: String? = null + ) : Record +diff --git a/src/Audio.types.ts b/src/Audio.types.ts +--- a/src/Audio.types.ts ++++ b/src/Audio.types.ts +@@ -38,2 +38,4 @@ + headers?: Record; ++ /** MIME type for streams whose URL has no file extension, such as HLS. */ ++ mimeType?: string; + /** +diff --git a/build/Audio.types.d.ts b/build/Audio.types.d.ts +--- a/build/Audio.types.d.ts ++++ b/build/Audio.types.d.ts +@@ -31,2 +31,4 @@ + headers?: Record; ++ /** MIME type for streams whose URL has no file extension, such as HLS. */ ++ mimeType?: string; + /** diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4179936..1160d88 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: patchedDependencies: expo-audio@58.0.10: - hash: 316b70cb0213ecf24723e4074c1bde7ef15a627e8bf5d8f938c0be9965f1b4e8 + hash: e01ad6e484db76d810c2df5bf9c376eccf8d4c5359736b626868ea8bd8dac566 path: patches/expo-audio@58.0.10.patch importers: @@ -63,7 +63,7 @@ importers: version: 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-audio: specifier: ~58.0.10 - version: 58.0.10(patch_hash=316b70cb0213ecf24723e4074c1bde7ef15a627e8bf5d8f938c0be9965f1b4e8)(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@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.10(patch_hash=e01ad6e484db76d810c2df5bf9c376eccf8d4c5359736b626868ea8bd8dac566)(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@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-blur: specifier: ~58.0.5 version: 58.0.5(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0) @@ -11050,7 +11050,7 @@ snapshots: - supports-color - typescript - expo-audio@58.0.10(patch_hash=316b70cb0213ecf24723e4074c1bde7ef15a627e8bf5d8f938c0be9965f1b4e8)(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@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-audio@58.0.10(patch_hash=e01ad6e484db76d810c2df5bf9c376eccf8d4c5359736b626868ea8bd8dac566)(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@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: 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-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) -- 2.54.1 From a447c44384d99b9921392db515916321628dec39 Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Fri, 23 Oct 2026 19:36:36 -0400 Subject: [PATCH 2/5] fix(mobile): align Android padding and screen colors --- apps/mobile/app.json | 19 ++- apps/mobile/app/(app)/(tabs)/_layout.tsx | 99 ++++++++---- .../app/(app)/(tabs)/home/album/[id].tsx | 19 ++- .../app/(app)/(tabs)/home/playlist/[id].tsx | 12 ++ .../mobile/app/(app)/(tabs)/home/settings.tsx | 17 +- apps/mobile/app/(app)/(tabs)/search/index.tsx | 12 ++ apps/mobile/app/(app)/_layout.tsx | 3 +- apps/mobile/app/(app)/player.tsx | 11 +- apps/mobile/app/(app)/settings.tsx | 17 +- apps/mobile/app/_layout.tsx | 6 +- apps/mobile/app/server.tsx | 17 +- apps/mobile/components/android-sheet.tsx | 15 ++ apps/mobile/components/auth-form.tsx | 52 +++--- apps/mobile/components/keyboard-form.tsx | 32 ++++ apps/mobile/components/media-context-menu.tsx | 6 +- apps/mobile/components/media-menu.android.tsx | 137 ++++++++++++++++ apps/mobile/components/media-menu.tsx | 1 + apps/mobile/components/mini-player.tsx | 57 +++++-- apps/mobile/components/player.tsx | 5 +- apps/mobile/components/ui/primitives.tsx | 15 +- apps/mobile/components/ui/toaster.tsx | 9 +- apps/mobile/contexts/add-to-playlist.tsx | 152 +++++++++--------- apps/mobile/contexts/android-tab-theme.tsx | 68 ++++++++ .../hooks/use-android-keyboard-visible.ts | 19 +++ apps/mobile/lib/navigation.ts | 17 +- apps/mobile/lib/theme.ts | 6 +- apps/mobile/package.json | 2 + apps/mobile/plugins/with-android-colors.js | 26 +++ pnpm-lock.yaml | 41 +++++ 29 files changed, 714 insertions(+), 178 deletions(-) create mode 100644 apps/mobile/components/android-sheet.tsx create mode 100644 apps/mobile/components/keyboard-form.tsx create mode 100644 apps/mobile/components/media-menu.android.tsx create mode 100644 apps/mobile/components/media-menu.tsx create mode 100644 apps/mobile/contexts/android-tab-theme.tsx create mode 100644 apps/mobile/hooks/use-android-keyboard-visible.ts create mode 100644 apps/mobile/plugins/with-android-colors.js 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/album/[id].tsx b/apps/mobile/app/(app)/(tabs)/home/album/[id].tsx index 8c7c878..7fb9ae0 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 { @@ -61,6 +69,7 @@ export default function AlbumScreen() { coverUri, album ? album.cover != null : album === null ? false : undefined ) + useAndroidScreenPalette(palette) 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) @@ -269,6 +271,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)/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/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} +