Add an Apple Music integration on iOS

This commit is contained in:
James Babcock committed 2026-10-23 23:05:49 -07:00
1 parent 1780057f3c
commit e36fb14a34
21 files changed
+1323 -129

No files matched your search

+4 -4
View File
@@ -57,9 +57,9 @@ export function musicSettingsMenuItems(): MenuItem[] {
/**
* Now playing: album art (unless turned off), title/artist/album and a
* progress bar for the active Android media session, the Music app's header
* at card size. The media bridge runs for the whole session; the widget
* subscribes and ticks once a second only while something is playing.
* progress bar for the active media session (Apple Music on iOS), the Music
* app's header at card size. The media bridge runs for the whole session; the
* widget subscribes and ticks once a second only while something is playing.
*/
export class MusicWidget implements GlanceWidget {
private media: MediaControllerState = mediaControllerBridge.snapshot();
@@ -105,7 +105,7 @@ export class MusicWidget implements GlanceWidget {
if (!media.accessEnabled) {
// Actionable, so it stays as text.
image.drawText(small, PAD, PAD, "Music", 150);
image.drawText(small, PAD, PAD + small.lineHeight + 6, "Notification access needed", 140);
image.drawText(small, PAD, PAD + small.lineHeight + 6, mediaControllerBridge.accessLabel, 140);
return;
}
// Nothing playing: a dim note, centred, and nothing else.
-1
View File
@@ -1,6 +1,5 @@
/** Native services still outside the current iOS app-screen milestone. */
const unavailable: Record<string, string> = {
music: 'Media-player integration is not available on iOS yet.',
microphones: 'Glasses microphone capture is not available on iOS yet.',
}
export function iosAppUnavailableReason(appId: string): string | null {
+18 -18
View File
@@ -46,10 +46,11 @@ type FocusColumn = "actions" | "playlist";
/**
* Music controller app: metadata + album art + transport controls for the
* active Android media session (any player that publishes one), plus the
* player's queue when it exposes one (scroll to a track, click to jump).
* With no session, the front page lists the apps whose library can be
* browsed (click one to open its MediaBrowseLayer).
* active Android media session (any player that publishes one) or, on iOS,
* the Apple Music system player, plus the player's queue when it exposes one
* (scroll to a track, click to jump). With no session, the front page lists
* the apps whose library can be browsed (click one to open its
* MediaBrowseLayer).
*/
class MusicAppLayer implements Layer {
// Watch swipes skip tracks: right = next, left = previous.
@@ -97,15 +98,11 @@ class MusicAppLayer implements Layer {
const media = mediaControllerBridge.snapshot();
if (!media.accessEnabled) {
const lines = wrapText(
font,
"Notification access is required to control Android media sessions. Tap to open settings.",
width - 48,
);
const lines = wrapText(font, mediaControllerBridge.accessPrompt, width - 48);
for (let index = 0; index < lines.length; index++) {
image.drawText(font, 24, 16 + index * lineStep(font), lines[index]!, 180);
}
image.drawText(font, 20, height - 16, `${GESTURE_CLICK} open settings`, 110);
image.drawText(font, 20, height - 16, `${GESTURE_CLICK} ${mediaControllerBridge.accessAction}`, 110);
return image;
}
@@ -113,10 +110,12 @@ class MusicAppLayer implements Layer {
const apps = mediaBrowserBridge.listBrowsableApps(!this.libraryAppsFresh);
this.libraryAppsFresh = true;
this.libraryMenu.setItems(apps);
image.drawText(font, 24, 16, "No active media session.", 180);
const prompt = apps.length
? "Browse a music app's library, or start playback on the phone."
: "Start playback in another app on the phone.";
image.drawText(font, 24, 16, global.isIOS ? "Nothing is playing in Apple Music." : "No active media session.", 180);
const prompt = global.isIOS
? "Browse your library, or start playback on the phone."
: apps.length
? "Browse a music app's library, or start playback on the phone."
: "Start playback in another app on the phone.";
let y = 22 + lineStep(font);
for (const line of wrapText(font, prompt, width - 48)) {
image.drawText(font, 24, y, line, 150);
@@ -229,7 +228,7 @@ class MusicAppLayer implements Layer {
}
if (!media.accessEnabled) {
if (event.type === "click") {
mediaControllerBridge.openNotificationAccessSettings();
void mediaControllerBridge.requestAccess();
} else if (event.type === "double-click") {
ctx.stack.pop();
}
@@ -268,8 +267,8 @@ class MusicAppLayer implements Layer {
const item = this.queueMenu.selectedItem;
if (item) {
await mediaControllerBridge.skipToQueueItem(item.id);
// The player rebuilds the queue with the chosen track at index 0.
this.queueMenu.select(0);
// Android players rebuild the queue with the chosen track at index 0.
if (mediaControllerBridge.skipRebuildsQueue) this.queueMenu.select(0);
}
return;
}
@@ -497,7 +496,8 @@ export function createMusicAppWindow(options: InProcessAppOptions): InProcessWin
iconLetter: "M",
icon: "music",
closeable: true,
menuItems: () => [{
// Music settings choose among Android media apps; iOS has only Apple Music.
menuItems: () => global.isIOS ? [] : [{
label: "Music settings",
onSelect: (ctx) => {
ctx.stack.pop();