From de1b34d8d711728c3fe68a0adba84185633ae7bf Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Sat, 24 Oct 2026 16:14:14 -0400 Subject: [PATCH] feat(mobile): add native AirPlay and Cast output picker --- apps/mobile/.gitignore | 6 +- apps/mobile/app/(app)/player.tsx | 20 ++---- .../mobile/components/audio-output-button.tsx | 71 +++++++++++++++++++ apps/mobile/modules/audio-output/.gitignore | 1 + .../modules/audio-output/android/build.gradle | 15 ++++ .../android/src/main/AndroidManifest.xml | 9 +++ .../modules/audiooutput/AudioOutputModule.kt | 23 ++++++ .../audio-output/expo-module.config.json | 9 +++ .../audio-output/ios/AudioOutput.podspec | 17 +++++ .../audio-output/ios/AudioOutputModule.swift | 30 ++++++++ apps/mobile/modules/audio-output/package.json | 5 ++ 11 files changed, 188 insertions(+), 18 deletions(-) create mode 100644 apps/mobile/components/audio-output-button.tsx create mode 100644 apps/mobile/modules/audio-output/.gitignore create mode 100644 apps/mobile/modules/audio-output/android/build.gradle create mode 100644 apps/mobile/modules/audio-output/android/src/main/AndroidManifest.xml create mode 100644 apps/mobile/modules/audio-output/android/src/main/java/expo/modules/audiooutput/AudioOutputModule.kt create mode 100644 apps/mobile/modules/audio-output/expo-module.config.json create mode 100644 apps/mobile/modules/audio-output/ios/AudioOutput.podspec create mode 100644 apps/mobile/modules/audio-output/ios/AudioOutputModule.swift create mode 100644 apps/mobile/modules/audio-output/package.json 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/(app)/player.tsx b/apps/mobile/app/(app)/player.tsx index feb8bf1..fac62e7 100644 --- a/apps/mobile/app/(app)/player.tsx +++ b/apps/mobile/app/(app)/player.tsx @@ -30,6 +30,7 @@ import { api } from "@otunes/convex/_generated/api" import { playbackFormat } from "@otunes/convex/playback-stream" import { AudioFormatBadge } from "@/components/audio-format-badge" +import { AudioOutputButton } from "@/components/audio-output-button" import { CoverImage } from "@/components/cover-image" import { MarqueeText } from "@/components/marquee-text" import { @@ -431,21 +432,10 @@ export default function PlayerScreen() { color={colors.foreground} /> - - - + 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/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 +}