Compare commits
No files matched your search
@@ -11,7 +11,7 @@ ARG NODE_VERSION=24.13.0-slim
|
||||
|
||||
# The Convex backend runs inside the oTunes image. Pin to a commit tag from
|
||||
# https://github.com/get-convex/convex-backend/pkgs/container/convex-backend
|
||||
ARG CONVEX_BACKEND_IMAGE=ghcr.io/get-convex/convex-backend:5c7cb5bc7db457290f1769f95f1d1340912f7fd7
|
||||
ARG CONVEX_BACKEND_IMAGE=ghcr.io/convex/convex-backend:5c7cb5bc7db457290f1769f95f1d1340912f7fd7
|
||||
|
||||
# Audio-only static ffmpeg. The distro package links video filters that pull
|
||||
# in LLVM and Mesa (~420MB) for codecs this app never uses.
|
||||
@@ -27,6 +27,8 @@ WORKDIR /app
|
||||
# Only manifests needed for @otunes/web and its workspace dependency (@otunes/convex).
|
||||
# Mobile is intentionally omitted so its deps are never installed.
|
||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
||||
# pnpm validates patches even when their packages are outside the install filter.
|
||||
COPY patches ./patches
|
||||
COPY apps/web/package.json ./apps/web/
|
||||
COPY packages/convex/package.json ./packages/convex/
|
||||
|
||||
@@ -81,6 +83,7 @@ FROM node:${NODE_VERSION} AS convex-functions
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json pnpm-lock.yaml .npmrc ./
|
||||
COPY patches ./patches
|
||||
COPY packages/convex/package.json ./packages/convex/
|
||||
|
||||
RUN printf '%s\n' \
|
||||
|
||||
@@ -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
|
||||
# @end expo-cli
|
||||
@@ -0,0 +1,87 @@
|
||||
# Mobile build variants
|
||||
|
||||
EAS profiles set `APP_VARIANT` to select the app identity in `app.config.ts`.
|
||||
Both iOS bundle identifiers and Android package names use these values:
|
||||
|
||||
| Profile | App name | Identifier |
|
||||
| --- | --- | --- |
|
||||
| development | oTunes (Development) | com.abunchofknowitalls.otunes.development |
|
||||
| preview | oTunes (Preview) | com.abunchofknowitalls.otunes.preview |
|
||||
| production | oTunes | com.abunchofknowitalls.otunes |
|
||||
|
||||
Build with `eas build --profile development`, `--profile preview`, or
|
||||
`--profile production` from this directory.
|
||||
|
||||
For local builds and Metro, select the same variant explicitly:
|
||||
|
||||
```sh
|
||||
APP_VARIANT=development pnpm ios
|
||||
APP_VARIANT=development pnpm android
|
||||
APP_VARIANT=development pnpm start
|
||||
```
|
||||
|
||||
An unset `APP_VARIANT` keeps the production identity. Unknown variants fail
|
||||
configuration. URL schemes are `otunes-development`, `otunes-preview`, and
|
||||
`otunes` respectively, allowing the apps to be installed together.
|
||||
|
||||
### Shared links and artwork
|
||||
|
||||
Shared URLs stay as ordinary HTTPS links. The web page's "Open App" action
|
||||
opens `otunes://open?url=<encoded HTTPS URL>`, including the server address and
|
||||
album, artist, or playlist destination. No domain association files, signing
|
||||
settings, or per-server mobile builds are needed.
|
||||
|
||||
The app checks the link's server against its configured server before opening
|
||||
media. Links for another server do not switch the current server. On a fresh
|
||||
installation, the server address is prefilled in setup. The destination is kept
|
||||
in memory through setup and sign-in, and is opened after authentication.
|
||||
The browser may ask before opening the app. If the app is absent, the web page
|
||||
remains available. Native changes still require a new mobile build.
|
||||
|
||||
Native sharing supplies media titles and artwork through iOS link metadata and Android's chooser
|
||||
thumbnail, while sharing the original HTTPS URL. Receiving apps control whether
|
||||
they display previews. If artwork cannot load, the URL is still shared. Existing
|
||||
builds without the native sharing module fall back to URL-only sharing.
|
||||
|
||||
### iPad sidebar
|
||||
|
||||
Expo Router owns navigation through `NativeTabs sidebarAdaptable`.
|
||||
`native/TabletSidebar.swift` adds UIKit Library and Playlists groups and the pinned
|
||||
account footer, which the current Expo Router API does not expose. The bridge
|
||||
reuses the router's tab instances so each destination retains its navigation stack.
|
||||
|
||||
The `react-native-screens` patch checks the selected leaf controller rather than
|
||||
the group's root controller. It also notifies the sidebar bridge after each native
|
||||
tab reconciliation, so startup updates cannot replace the Library and Playlists
|
||||
sections with a flat tab list. Keep both behaviors when updating the dependency.
|
||||
After changing native modules or dependency patches, run `pod install` in `ios`
|
||||
and rebuild the development app.
|
||||
|
||||
### Mac Catalyst
|
||||
|
||||
On a Mac with Xcode and CocoaPods installed, generate the iOS project with
|
||||
Catalyst enabled. Use a separate checkout for Catalyst builds, since prebuild
|
||||
changes the generated iOS project and its dependency configuration.
|
||||
|
||||
```sh
|
||||
MAC_CATALYST=1 APP_VARIANT=development pnpm exec expo prebuild --platform ios --clean
|
||||
open ios/*.xcworkspace
|
||||
```
|
||||
|
||||
In Xcode, select the app scheme and the **My Mac (Mac Catalyst)** destination,
|
||||
select your signing team, then build and run. For a Release build, use Xcode's
|
||||
Archive action with the Catalyst destination. EAS's existing iOS profiles still
|
||||
build iPhone/iPad apps.
|
||||
|
||||
Don't enable Catalyst by hand in Xcode; the plugin configures everything during
|
||||
prebuild. It enables the Xcode target and React Native's CocoaPods patches,
|
||||
raises pod deployment targets to the app's, and disables precompiled React
|
||||
Native and Expo modules so dependencies can compile for Catalyst. System volume
|
||||
stays under macOS control.
|
||||
|
||||
The Mac app uses the same bundle identifier as the iOS app, so sign both with the
|
||||
same team. Handoff only pairs apps with a matching team and activity type, which
|
||||
`app.config.ts` declares once per build profile in `NSUserActivityTypes`.
|
||||
|
||||
To return a checkout to ordinary iOS builds, rerun prebuild without
|
||||
`MAC_CATALYST=1`. Keep `APP_VARIANT` consistent when starting Metro.
|
||||
@@ -0,0 +1,42 @@
|
||||
import Foundation
|
||||
import AppIntents
|
||||
internal import ExpoAppIntents
|
||||
internal import ExpoModulesCore
|
||||
|
||||
/// Registers the app-owned intent types and their system integrations.
|
||||
enum MusicAppIntents {
|
||||
static func register() {
|
||||
Task {
|
||||
await AppIntentDispatcher.shared.setShortcutsRefreshHandler {
|
||||
AppShortcuts.updateAppShortcutParameters()
|
||||
}
|
||||
AppShortcuts.updateAppShortcutParameters()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Registered Expo inline module that wires app-target App Intents code to expo-app-intents.
|
||||
/// Do not change the name of this class.
|
||||
final class AppIntentsSetup: Module {
|
||||
public func definition() -> ExpoModulesCore.ModuleDefinition {
|
||||
Name("AppIntentsSetup")
|
||||
|
||||
AsyncFunction("replaceCatalog") { (kind: String, json: String) in
|
||||
try await MusicCatalogStorage.shared.replace(kind: kind, json: json)
|
||||
}
|
||||
|
||||
AsyncFunction("catalogJSON") { (kind: String) in
|
||||
let records = try await MusicCatalogStorage.shared.records(kind: kind)
|
||||
return String(decoding: try JSONEncoder().encode(records), as: UTF8.self)
|
||||
}
|
||||
|
||||
AsyncFunction("completeInvocation") { (token: String, error: String?) in
|
||||
await MusicIntentExecution.shared.complete(token: token, error: error)
|
||||
}
|
||||
|
||||
OnCreate {
|
||||
MusicAppIntents.register()
|
||||
MusicEntityRegistration.register()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
import AppIntents
|
||||
|
||||
/// Phrases compiled into the app. Each one includes the app name, and each
|
||||
/// phrase fills at most one parameter. Siri asks for anything a phrase leaves out.
|
||||
struct AppShortcuts: AppShortcutsProvider {
|
||||
static var appShortcuts: [AppShortcut] {
|
||||
AppShortcut(
|
||||
intent: PlayMusicIntent(),
|
||||
phrases: [
|
||||
"Play music in \(.applicationName)",
|
||||
"Play \(\.$song) in \(.applicationName)",
|
||||
"Play the album \(\.$album) in \(.applicationName)",
|
||||
"Play \(\.$artist) in \(.applicationName)",
|
||||
"Play the playlist \(\.$playlist) in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Play Music",
|
||||
systemImageName: "play.fill"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: AddToPlaylistIntent(),
|
||||
phrases: [
|
||||
"Add to a playlist in \(.applicationName)",
|
||||
"Add \(\.$song) to a playlist in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Add to Playlist",
|
||||
systemImageName: "text.badge.plus"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: AddToUpNextIntent(),
|
||||
phrases: [
|
||||
"Play \(\.$song) next in \(.applicationName)",
|
||||
"Add to Up Next in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Add to Up Next",
|
||||
systemImageName: "text.line.first.and.arrowtriangle.forward"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: ClearUpNextIntent(),
|
||||
phrases: [
|
||||
"Clear Up Next in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Clear Up Next",
|
||||
systemImageName: "clear"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: CreatePlaylistIntent(),
|
||||
phrases: [
|
||||
"Create a playlist in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Create Playlist",
|
||||
systemImageName: "music.note.list"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: GetCurrentSongIntent(),
|
||||
phrases: [
|
||||
"What's playing in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Get Current Song",
|
||||
systemImageName: "music.note"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: LoveSongIntent(),
|
||||
phrases: [
|
||||
"Love this song in \(.applicationName)",
|
||||
"Favorite this song in \(.applicationName)",
|
||||
"Favorite song in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Love Song",
|
||||
systemImageName: "heart.fill"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: PauseMusicIntent(),
|
||||
phrases: [
|
||||
"Pause \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Pause",
|
||||
systemImageName: "pause.fill"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: ResumeMusicIntent(),
|
||||
phrases: [
|
||||
"Resume \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Resume",
|
||||
systemImageName: "play.fill"
|
||||
)
|
||||
AppShortcut(
|
||||
intent: SkipMusicIntent(),
|
||||
phrases: [
|
||||
"Skip this song in \(.applicationName)",
|
||||
],
|
||||
shortTitle: "Skip",
|
||||
systemImageName: "forward.fill"
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,625 @@
|
||||
#if compiler(>=6.4)
|
||||
import AppIntents
|
||||
internal import ExpoAppIntents
|
||||
import Foundation
|
||||
import MediaIntents
|
||||
|
||||
/// Apple's audio schemas are what Siri and Shortcuts use for Music.app actions
|
||||
/// such as play, add to library, add to playlist, love, and create station.
|
||||
/// They require the iOS 27 SDK. Older compilers keep the custom intents in
|
||||
/// `MusicIntents.swift`.
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEnum(schema: .audio.playbackAttributes)
|
||||
enum PlaybackAttributes: String {
|
||||
case shuffle
|
||||
case `repeat`
|
||||
|
||||
static let caseDisplayRepresentations: [PlaybackAttributes: DisplayRepresentation] = [
|
||||
.shuffle: "Shuffle",
|
||||
.`repeat`: "Repeat",
|
||||
]
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEnum(schema: .audio.queueInsertionLocation)
|
||||
enum QueueInsertionLocation: String {
|
||||
case next
|
||||
case tail
|
||||
|
||||
static let caseDisplayRepresentations: [QueueInsertionLocation: DisplayRepresentation] = [
|
||||
.next: "Play Next",
|
||||
.tail: "Play Last",
|
||||
]
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEnum(schema: .audio.affinityState)
|
||||
enum AffinityState: String {
|
||||
case like
|
||||
case dislike
|
||||
case unset
|
||||
|
||||
static let caseDisplayRepresentations: [AffinityState: DisplayRepresentation] = [
|
||||
.like: "Like",
|
||||
.dislike: "Dislike",
|
||||
.unset: "Unset",
|
||||
]
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@UnionValue
|
||||
enum PlaylistOwner {
|
||||
case name(String)
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEntity(schema: .audio.artist)
|
||||
struct AudioArtistEntity {
|
||||
static let defaultQuery = AudioArtistQuery()
|
||||
|
||||
var id: String
|
||||
var name: String
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(name)")
|
||||
}
|
||||
|
||||
init(record: AppIntentEntityRecord) {
|
||||
id = record.id
|
||||
name = record.title
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
struct AudioArtistQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [AudioArtistEntity.ID]) async throws -> [AudioArtistEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.artistKind, matching: identifiers)
|
||||
.map(AudioArtistEntity.init(record:))
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [AudioArtistEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.artistKind)
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(AudioArtistEntity.init(record:))
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [AudioArtistEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.artistKind)
|
||||
if string.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(AudioArtistEntity.init(record:))
|
||||
}
|
||||
return MusicCatalog.rank(records, query: string, limit: 50, score: MusicCatalog.nameScore)
|
||||
.map(AudioArtistEntity.init(record:))
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
extension AudioArtistQuery: IntentValueQuery {
|
||||
func values(for audioSearch: AudioSearch) async throws -> [AudioArtistEntity] {
|
||||
switch audioSearch.criteria {
|
||||
case .searchQuery(let query):
|
||||
return try await entities(matching: query)
|
||||
case .unspecified:
|
||||
return try await suggestedEntities()
|
||||
case .url(let urls):
|
||||
return try await artists(for: urls)
|
||||
@unknown default:
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
private func artists(for urls: [URL]) async throws -> [AudioArtistEntity] {
|
||||
let identifiers = urls.compactMap { url -> String? in
|
||||
guard case .artist(let id) = MusicCatalog.linkTarget(from: url) else {
|
||||
return nil
|
||||
}
|
||||
return id
|
||||
}
|
||||
return try await entities(for: identifiers)
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEntity(schema: .audio.album)
|
||||
struct AudioAlbumEntity {
|
||||
static let defaultQuery = AudioAlbumQuery()
|
||||
|
||||
var id: String
|
||||
var title: String
|
||||
var artistName: String
|
||||
var artists: [AudioArtistEntity]
|
||||
var universalProductCode: String?
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(title)", subtitle: "\(artistName)")
|
||||
}
|
||||
|
||||
init(record: AppIntentEntityRecord, artistsById: [String: AudioArtistEntity]) {
|
||||
id = record.id
|
||||
title = record.title
|
||||
artistName = record.metadata["artistName"] ?? ""
|
||||
universalProductCode = nil
|
||||
if let artist = artistsById[record.metadata["artistId"] ?? ""] {
|
||||
artists = [artist]
|
||||
} else {
|
||||
artists = []
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
struct AudioAlbumQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [AudioAlbumEntity.ID]) async throws -> [AudioAlbumEntity] {
|
||||
let artistsById = try await Self.artistsById()
|
||||
return try await MusicCatalog.records(ofKind: MusicCatalog.albumKind, matching: identifiers)
|
||||
.map { AudioAlbumEntity(record: $0, artistsById: artistsById) }
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [AudioAlbumEntity] {
|
||||
let artistsById = try await Self.artistsById()
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.albumKind)
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map { AudioAlbumEntity(record: $0, artistsById: artistsById) }
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [AudioAlbumEntity] {
|
||||
let artistsById = try await Self.artistsById()
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.albumKind)
|
||||
let matches = string.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
|
||||
? MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
: MusicCatalog.rank(records, query: string, limit: 50, score: MusicCatalog.albumScore)
|
||||
return matches.map { AudioAlbumEntity(record: $0, artistsById: artistsById) }
|
||||
}
|
||||
|
||||
fileprivate static func artistsById() async throws -> [String: AudioArtistEntity] {
|
||||
let artists = try await MusicCatalog.records(ofKind: MusicCatalog.artistKind)
|
||||
.map(AudioArtistEntity.init(record:))
|
||||
return Dictionary(uniqueKeysWithValues: artists.map { ($0.id, $0) })
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
extension AudioAlbumQuery: IntentValueQuery {
|
||||
func values(for audioSearch: AudioSearch) async throws -> [AudioAlbumEntity] {
|
||||
switch audioSearch.criteria {
|
||||
case .searchQuery(let query):
|
||||
return try await entities(matching: query)
|
||||
case .unspecified:
|
||||
return try await suggestedEntities()
|
||||
case .url(let urls):
|
||||
let identifiers = urls.compactMap { url -> String? in
|
||||
guard case .album(let id) = MusicCatalog.linkTarget(from: url) else {
|
||||
return nil
|
||||
}
|
||||
return id
|
||||
}
|
||||
return try await entities(for: identifiers)
|
||||
@unknown default:
|
||||
return []
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEntity(schema: .audio.song)
|
||||
struct AudioSongEntity {
|
||||
static let defaultQuery = AudioSongQuery()
|
||||
|
||||
var id: String
|
||||
var title: String
|
||||
var artistName: String
|
||||
var composerName: String?
|
||||
var albumTitle: String?
|
||||
var artists: [AudioArtistEntity]
|
||||
var album: AudioAlbumEntity?
|
||||
var composers: [AudioArtistEntity]
|
||||
var internationalStandardRecordingCode: String?
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(title)", subtitle: "\(artistName)")
|
||||
}
|
||||
|
||||
init(
|
||||
record: AppIntentEntityRecord,
|
||||
artistsById: [String: AudioArtistEntity],
|
||||
albumsById: [String: AudioAlbumEntity]
|
||||
) {
|
||||
id = record.id
|
||||
title = record.title
|
||||
artistName = record.metadata["artistName"] ?? ""
|
||||
composerName = nil
|
||||
albumTitle = record.metadata["albumTitle"]
|
||||
composers = []
|
||||
internationalStandardRecordingCode = nil
|
||||
if let artist = artistsById[record.metadata["artistId"] ?? ""] {
|
||||
artists = [artist]
|
||||
} else {
|
||||
artists = []
|
||||
}
|
||||
album = albumsById[record.metadata["albumId"] ?? ""]
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
struct AudioSongQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [AudioSongEntity.ID]) async throws -> [AudioSongEntity] {
|
||||
let context = try await AudioLibraryContext.load()
|
||||
return try await MusicCatalog.records(ofKind: MusicCatalog.songKind, matching: identifiers)
|
||||
.map { context.song(from: $0) }
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [AudioSongEntity] {
|
||||
let context = try await AudioLibraryContext.load()
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.songKind)
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true).map {
|
||||
context.song(from: $0)
|
||||
}
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [AudioSongEntity] {
|
||||
let context = try await AudioLibraryContext.load()
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.songKind)
|
||||
let matches = string.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
|
||||
? MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
: MusicCatalog.rank(records, query: string, limit: 50, score: MusicCatalog.songScore)
|
||||
return matches.map { context.song(from: $0) }
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
extension AudioSongQuery: IntentValueQuery {
|
||||
func values(for audioSearch: AudioSearch) async throws -> [AudioSongEntity] {
|
||||
switch audioSearch.criteria {
|
||||
case .searchQuery(let query):
|
||||
return try await entities(matching: query)
|
||||
case .unspecified:
|
||||
return try await suggestedEntities()
|
||||
case .url(let urls):
|
||||
let context = try await AudioLibraryContext.load()
|
||||
var matches: [AppIntentEntityRecord] = []
|
||||
for url in urls {
|
||||
guard let target = MusicCatalog.linkTarget(from: url) else {
|
||||
continue
|
||||
}
|
||||
matches.append(contentsOf: try await MusicCatalog.songs(for: target))
|
||||
}
|
||||
return matches.map { context.song(from: $0) }
|
||||
@unknown default:
|
||||
return []
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEntity(schema: .audio.playlist)
|
||||
struct AudioPlaylistEntity {
|
||||
static let defaultQuery = AudioPlaylistQuery()
|
||||
|
||||
var id: String
|
||||
var title: String
|
||||
var owner: PlaylistOwner?
|
||||
var createdByMe: Bool?
|
||||
var curatedForMe: Bool?
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(title)")
|
||||
}
|
||||
|
||||
init(record: AppIntentEntityRecord) {
|
||||
id = record.id
|
||||
title = record.title
|
||||
let ownerName = record.metadata["ownerName"] ?? ""
|
||||
owner = ownerName.isEmpty ? nil : .name(ownerName)
|
||||
createdByMe = record.metadata["createdByMe"] == "1"
|
||||
curatedForMe = nil
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
struct AudioPlaylistQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [AudioPlaylistEntity.ID]) async throws -> [AudioPlaylistEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.playlistKind, matching: identifiers)
|
||||
.map(AudioPlaylistEntity.init(record:))
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [AudioPlaylistEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.playlistKind)
|
||||
.map(AudioPlaylistEntity.init(record:))
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [AudioPlaylistEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.playlistKind)
|
||||
if string.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
||||
return records.map(AudioPlaylistEntity.init(record:))
|
||||
}
|
||||
return MusicCatalog.rank(records, query: string, limit: 50, score: MusicCatalog.nameScore)
|
||||
.map(AudioPlaylistEntity.init(record:))
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
extension AudioPlaylistQuery: IntentValueQuery {
|
||||
func values(for audioSearch: AudioSearch) async throws -> [AudioPlaylistEntity] {
|
||||
switch audioSearch.criteria {
|
||||
case .searchQuery(let query):
|
||||
return try await entities(matching: query)
|
||||
case .unspecified:
|
||||
return try await suggestedEntities()
|
||||
case .url(let urls):
|
||||
let identifiers = urls.compactMap { url -> String? in
|
||||
guard case .playlist(let id) = MusicCatalog.linkTarget(from: url) else {
|
||||
return nil
|
||||
}
|
||||
return id
|
||||
}
|
||||
return try await entities(for: identifiers)
|
||||
@unknown default:
|
||||
return []
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppEntity(schema: .audio.warmupAudioQueueResult)
|
||||
struct WarmupAudioQueueResultEntity {
|
||||
static let defaultQuery = WarmupAudioQueueResultQuery()
|
||||
|
||||
var id: String
|
||||
var title: String
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(title)")
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
struct WarmupAudioQueueResultQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [WarmupAudioQueueResultEntity.ID]) async throws -> [WarmupAudioQueueResultEntity] {
|
||||
identifiers.compactMap { id in
|
||||
guard let entry = WarmupAudioStore.entry(id: id) else {
|
||||
return nil
|
||||
}
|
||||
return WarmupAudioQueueResultEntity(id: entry.id, title: entry.title)
|
||||
}
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [WarmupAudioQueueResultEntity] {
|
||||
WarmupAudioStore.all().map { WarmupAudioQueueResultEntity(id: $0.id, title: $0.title) }
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [WarmupAudioQueueResultEntity] {
|
||||
let query = MusicCatalog.normalized(string)
|
||||
return WarmupAudioStore.all().compactMap { entry in
|
||||
if query.isEmpty || MusicCatalog.normalized(entry.title).contains(query) {
|
||||
return WarmupAudioQueueResultEntity(id: entry.id, title: entry.title)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
enum WarmupAudioStore {
|
||||
private static let defaultsKey = "otunes.warmupAudioQueue"
|
||||
|
||||
struct Entry: Codable {
|
||||
var id: String
|
||||
var title: String
|
||||
}
|
||||
|
||||
static func remember(id: String, title: String) {
|
||||
var entries = all()
|
||||
entries.removeAll { $0.id == id }
|
||||
entries.append(Entry(id: id, title: title))
|
||||
if entries.count > 20 {
|
||||
entries = Array(entries.suffix(20))
|
||||
}
|
||||
if let data = try? JSONEncoder().encode(entries) {
|
||||
UserDefaults.standard.set(data, forKey: defaultsKey)
|
||||
}
|
||||
}
|
||||
|
||||
static func entry(id: String) -> Entry? {
|
||||
all().first { $0.id == id }
|
||||
}
|
||||
|
||||
static func all() -> [Entry] {
|
||||
guard let data = UserDefaults.standard.data(forKey: defaultsKey),
|
||||
let entries = try? JSONDecoder().decode([Entry].self, from: data)
|
||||
else {
|
||||
return []
|
||||
}
|
||||
return entries
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@UnionValue
|
||||
enum AudioItem {
|
||||
case song(AudioSongEntity)
|
||||
case album(AudioAlbumEntity)
|
||||
case artist(AudioArtistEntity)
|
||||
case playlist(AudioPlaylistEntity)
|
||||
|
||||
var kind: String {
|
||||
switch self {
|
||||
case .song:
|
||||
return "song"
|
||||
case .album:
|
||||
return "album"
|
||||
case .artist:
|
||||
return "artist"
|
||||
case .playlist:
|
||||
return "playlist"
|
||||
}
|
||||
}
|
||||
|
||||
var itemId: String {
|
||||
switch self {
|
||||
case .song(let song):
|
||||
return song.id
|
||||
case .album(let album):
|
||||
return album.id
|
||||
case .artist(let artist):
|
||||
return artist.id
|
||||
case .playlist(let playlist):
|
||||
return playlist.id
|
||||
}
|
||||
}
|
||||
|
||||
var itemTitle: String {
|
||||
switch self {
|
||||
case .song(let song):
|
||||
return song.title
|
||||
case .album(let album):
|
||||
return album.title
|
||||
case .artist(let artist):
|
||||
return artist.name
|
||||
case .playlist(let playlist):
|
||||
return playlist.title
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
private struct AudioLibraryContext {
|
||||
var artistsById: [String: AudioArtistEntity]
|
||||
var albumsById: [String: AudioAlbumEntity]
|
||||
|
||||
static func load() async throws -> AudioLibraryContext {
|
||||
let artistsById = try await AudioAlbumQuery.artistsById()
|
||||
let albums = try await MusicCatalog.records(ofKind: MusicCatalog.albumKind).map {
|
||||
AudioAlbumEntity(record: $0, artistsById: artistsById)
|
||||
}
|
||||
return AudioLibraryContext(
|
||||
artistsById: artistsById,
|
||||
albumsById: Dictionary(uniqueKeysWithValues: albums.map { ($0.id, $0) })
|
||||
)
|
||||
}
|
||||
|
||||
func song(from record: AppIntentEntityRecord) -> AudioSongEntity {
|
||||
AudioSongEntity(record: record, artistsById: artistsById, albumsById: albumsById)
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppIntent(schema: .audio.playAudio)
|
||||
struct PlayAudioIntent: AudioStartingIntent {
|
||||
static let openAppWhenRun = true
|
||||
|
||||
var audioEntity: AudioItem
|
||||
var playbackAttributes: Set<PlaybackAttributes>
|
||||
var warmupAudioQueueResult: WarmupAudioQueueResultEntity?
|
||||
var queueLocation: QueueInsertionLocation?
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
let queue: String
|
||||
switch queueLocation {
|
||||
case .next:
|
||||
queue = "next"
|
||||
case .tail:
|
||||
queue = "tail"
|
||||
case nil:
|
||||
queue = "now"
|
||||
}
|
||||
try await MusicCommands.play(
|
||||
kind: audioEntity.kind,
|
||||
id: audioEntity.itemId,
|
||||
title: audioEntity.itemTitle,
|
||||
shuffle: playbackAttributes.contains(.shuffle),
|
||||
repeatMode: playbackAttributes.contains(.`repeat`) ? "all" : "none",
|
||||
queue: queue,
|
||||
warmupId: warmupAudioQueueResult?.id
|
||||
)
|
||||
return .result(dialog: "Playing \(audioEntity.itemTitle).")
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppIntent(schema: .audio.warmupAudioQueue)
|
||||
struct WarmupAudioQueueIntent {
|
||||
static let openAppWhenRun = true
|
||||
|
||||
var audioEntity: AudioItem
|
||||
var playbackAttributes: Set<PlaybackAttributes>
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ReturnsValue<WarmupAudioQueueResultEntity> {
|
||||
let id = try await MusicCommands.warmup(
|
||||
kind: audioEntity.kind,
|
||||
id: audioEntity.itemId,
|
||||
title: audioEntity.itemTitle,
|
||||
shuffle: playbackAttributes.contains(.shuffle)
|
||||
)
|
||||
WarmupAudioStore.remember(id: id, title: audioEntity.itemTitle)
|
||||
let result = WarmupAudioQueueResultEntity(id: id, title: audioEntity.itemTitle)
|
||||
return .result(value: result)
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppIntent(schema: .audio.addToPlaylist)
|
||||
struct AddAudioToPlaylistIntent {
|
||||
static let openAppWhenRun = true
|
||||
|
||||
var audioEntity: AudioItem
|
||||
var playlist: AudioPlaylistEntity
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
if audioEntity.kind == "playlist" && audioEntity.itemId == playlist.id {
|
||||
throw MusicIntentFailure("Choose a different playlist.")
|
||||
}
|
||||
try await MusicCommands.addToPlaylist(
|
||||
playlistId: playlist.id,
|
||||
sources: [(kind: audioEntity.kind, id: audioEntity.itemId)]
|
||||
)
|
||||
return .result(dialog: "Adding to \(playlist.title).")
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppIntent(schema: .audio.updateAudioAffinity)
|
||||
struct UpdateAudioAffinityIntent {
|
||||
static let openAppWhenRun = true
|
||||
|
||||
var affinityState: AffinityState
|
||||
var target: AudioItem
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
if affinityState == .dislike {
|
||||
throw MusicIntentFailure("oTunes doesn't keep dislikes. You can unlike it instead.")
|
||||
}
|
||||
if target.kind == "playlist" {
|
||||
throw MusicIntentFailure("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
let state = affinityState == .like ? "like" : "unset"
|
||||
try await MusicCommands.updateAffinity(kind: target.kind, id: target.itemId, state: state)
|
||||
let verb = affinityState == .like ? "Loving" : "Unliking"
|
||||
return .result(dialog: "\(verb) \(target.itemTitle).")
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
@AppIntent(schema: .audio.createStation)
|
||||
struct CreateAudioStationIntent {
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
guard let song = try await MusicCatalog.currentSong() else {
|
||||
throw MusicIntentFailure("Nothing is playing in oTunes.")
|
||||
}
|
||||
if song.artistId.isEmpty {
|
||||
throw MusicIntentFailure("oTunes can't find an artist for this song.")
|
||||
}
|
||||
try await MusicCommands.createStation(artistId: song.artistId, artistName: song.artistName)
|
||||
let artist = song.artistName.isEmpty ? "this artist" : song.artistName
|
||||
return .result(dialog: "Playing more by \(artist).")
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,332 @@
|
||||
import AppIntents
|
||||
internal import ExpoAppIntents
|
||||
import Foundation
|
||||
|
||||
struct MusicIntentFailure: Error, CustomLocalizedStringResourceConvertible {
|
||||
let localizedStringResource: LocalizedStringResource
|
||||
|
||||
init(_ message: String) {
|
||||
localizedStringResource = LocalizedStringResource(stringLiteral: message)
|
||||
}
|
||||
}
|
||||
|
||||
enum MusicLinkTarget {
|
||||
case song(String)
|
||||
case album(String)
|
||||
case artist(String)
|
||||
case playlist(String)
|
||||
}
|
||||
|
||||
/// Reads the full disk-backed catalogs JavaScript publishes and turns
|
||||
/// spoken requests into those records. The same kinds back Shortcuts pickers and,
|
||||
/// on iOS 27, the audio schemas Siri uses for Apple Music-style requests.
|
||||
enum MusicCatalog {
|
||||
static let songKind = "song"
|
||||
static let albumKind = "album"
|
||||
static let artistKind = "artist"
|
||||
static let playlistKind = "playlist"
|
||||
static let nowPlayingKind = "nowPlaying"
|
||||
/// Kept in sync with the catalog query and the JavaScript bridge.
|
||||
static let favoritesPlaylistId = "otunes:favorites"
|
||||
|
||||
static func records(ofKind kind: String) async throws -> [AppIntentEntityRecord] {
|
||||
try await MusicCatalogStorage.shared.records(kind: kind)
|
||||
}
|
||||
|
||||
static func records(ofKind kind: String, matching identifiers: [String]) async throws -> [AppIntentEntityRecord] {
|
||||
try await records(ofKind: kind).filter { identifiers.contains($0.id) }
|
||||
}
|
||||
|
||||
static func currentSong() async throws -> SongEntity? {
|
||||
guard let current = try await records(ofKind: nowPlayingKind).first else {
|
||||
return nil
|
||||
}
|
||||
if let song = try await SongQuery().entities(for: [current.id]).first {
|
||||
return song
|
||||
}
|
||||
return SongEntity(record: current)
|
||||
}
|
||||
|
||||
static func normalized(_ value: String) -> String {
|
||||
value
|
||||
.folding(options: [.caseInsensitive, .diacriticInsensitive], locale: .current)
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
}
|
||||
|
||||
static func cleanedQuery(_ query: String) -> String {
|
||||
var text = normalized(query)
|
||||
let prefixes = [
|
||||
"the song ", "the album ", "the artist ", "the playlist ",
|
||||
"songs by ", "music by ", "song ", "album ", "artist ", "playlist ", "some ",
|
||||
]
|
||||
var didStrip = true
|
||||
while didStrip {
|
||||
didStrip = false
|
||||
for prefix in prefixes where text.hasPrefix(prefix) {
|
||||
text = String(text.dropFirst(prefix.count))
|
||||
.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
didStrip = true
|
||||
}
|
||||
}
|
||||
return text
|
||||
}
|
||||
|
||||
static func rank(
|
||||
_ records: [AppIntentEntityRecord],
|
||||
query: String,
|
||||
limit: Int,
|
||||
score: (AppIntentEntityRecord, String) -> Int
|
||||
) -> [AppIntentEntityRecord] {
|
||||
let cleaned = cleanedQuery(query)
|
||||
guard !cleaned.isEmpty else {
|
||||
return []
|
||||
}
|
||||
return records
|
||||
.compactMap { record -> (AppIntentEntityRecord, Int)? in
|
||||
let value = score(record, cleaned)
|
||||
return value > 0 ? (record, value) : nil
|
||||
}
|
||||
.sorted { lhs, rhs in
|
||||
if lhs.1 != rhs.1 {
|
||||
return lhs.1 > rhs.1
|
||||
}
|
||||
return lhs.0.title.localizedCaseInsensitiveCompare(rhs.0.title) == .orderedAscending
|
||||
}
|
||||
.prefix(limit)
|
||||
.map(\.0)
|
||||
}
|
||||
|
||||
static func songScore(_ record: AppIntentEntityRecord, _ query: String) -> Int {
|
||||
let title = normalized(record.title)
|
||||
let artist = normalized(record.metadata["artistName"] ?? "")
|
||||
if title == query {
|
||||
return 100
|
||||
}
|
||||
if let range = query.range(of: " by ") {
|
||||
let titlePart = normalized(String(query[..<range.lowerBound]))
|
||||
let artistPart = normalized(String(query[range.upperBound...]))
|
||||
var score = 0
|
||||
if !titlePart.isEmpty && (title == titlePart || title.contains(titlePart)) {
|
||||
score += title == titlePart ? 70 : 50
|
||||
}
|
||||
if !artistPart.isEmpty && (artist == artistPart || artist.contains(artistPart)) {
|
||||
score += artist == artistPart ? 30 : 20
|
||||
}
|
||||
return score >= 50 ? score : 0
|
||||
}
|
||||
if title.contains(query) || (query.contains(title) && title.count > 2) {
|
||||
return title.contains(query) ? 80 : 60
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
static func albumScore(_ record: AppIntentEntityRecord, _ query: String) -> Int {
|
||||
let title = normalized(record.title)
|
||||
let artist = normalized(record.metadata["artistName"] ?? "")
|
||||
if title == query {
|
||||
return 100
|
||||
}
|
||||
if title.contains(query) || (query.contains(title) && title.count > 2) {
|
||||
return 80
|
||||
}
|
||||
if artist == query {
|
||||
return 45
|
||||
}
|
||||
if artist.contains(query) && query.count > 2 {
|
||||
return 30
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
static func nameScore(_ record: AppIntentEntityRecord, _ query: String) -> Int {
|
||||
let name = normalized(record.title)
|
||||
let synonyms = record.synonyms.map(normalized)
|
||||
if name == query || synonyms.contains(query) {
|
||||
return 100
|
||||
}
|
||||
if name.contains(query) || synonyms.contains(where: { $0.contains(query) }) {
|
||||
return 80
|
||||
}
|
||||
if query.contains(name) && name.count > 2 {
|
||||
return 60
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
static func suggested(
|
||||
_ records: [AppIntentEntityRecord],
|
||||
limit: Int,
|
||||
favoritesFirst: Bool
|
||||
) -> [AppIntentEntityRecord] {
|
||||
let pool: [AppIntentEntityRecord]
|
||||
if favoritesFirst {
|
||||
let favorites = records.filter { $0.metadata["favorite"] == "1" }
|
||||
pool = favorites.isEmpty ? records : favorites
|
||||
} else {
|
||||
pool = records
|
||||
}
|
||||
return Array(pool.prefix(limit))
|
||||
}
|
||||
|
||||
static func linkTarget(from url: URL) -> MusicLinkTarget? {
|
||||
let parts = url.path.split(separator: "/").map(String.init).filter { !$0.isEmpty }
|
||||
guard let kind = parts.first, parts.count >= 2 else {
|
||||
return nil
|
||||
}
|
||||
let id = parts[1]
|
||||
switch kind {
|
||||
case "album":
|
||||
if let songId = URLComponents(url: url, resolvingAgainstBaseURL: false)?
|
||||
.queryItems?
|
||||
.first(where: { $0.name == "s" })?
|
||||
.value,
|
||||
!songId.isEmpty
|
||||
{
|
||||
return .song(songId)
|
||||
}
|
||||
return .album(id)
|
||||
case "artist":
|
||||
return .artist(id)
|
||||
case "playlist":
|
||||
return .playlist(id == "favorites" ? favoritesPlaylistId : id)
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
static func songs(for target: MusicLinkTarget) async throws -> [AppIntentEntityRecord] {
|
||||
let songs = try await records(ofKind: songKind)
|
||||
switch target {
|
||||
case .song(let id):
|
||||
return songs.filter { $0.id == id }
|
||||
case .album(let id):
|
||||
return Array(songs.filter { $0.metadata["albumId"] == id }.prefix(25))
|
||||
case .artist(let id):
|
||||
return Array(songs.filter { $0.metadata["artistId"] == id }.prefix(25))
|
||||
case .playlist:
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
static func formatDuration(_ seconds: Int) -> String {
|
||||
guard seconds > 0 else {
|
||||
return ""
|
||||
}
|
||||
return String(format: "%d:%02d", seconds / 60, seconds % 60)
|
||||
}
|
||||
}
|
||||
|
||||
enum MusicCommands {
|
||||
static func play(
|
||||
kind: String,
|
||||
id: String,
|
||||
title: String,
|
||||
shuffle: Bool?,
|
||||
repeatMode: String?,
|
||||
queue: String,
|
||||
warmupId: String?
|
||||
) async throws -> String {
|
||||
let params: AppIntentParams = [
|
||||
"kind": .string(kind),
|
||||
"id": .string(id),
|
||||
"title": .string(title),
|
||||
"queue": .string(queue),
|
||||
"shuffle": shuffle.map { .string($0 ? "songs" : "off") } ?? .null,
|
||||
"repeat": repeatMode.map(AppIntentValue.string) ?? .null,
|
||||
"warmupId": warmupId.map(AppIntentValue.string) ?? .null,
|
||||
]
|
||||
return try await MusicIntentExecution.shared.run(name: "playMusic", params: params)
|
||||
}
|
||||
|
||||
static func warmup(kind: String, id: String, title: String, shuffle: Bool) async throws -> String {
|
||||
try await MusicIntentExecution.shared.run(
|
||||
name: "warmupAudio",
|
||||
params: [
|
||||
"kind": .string(kind),
|
||||
"id": .string(id),
|
||||
"title": .string(title),
|
||||
"shuffle": .string(shuffle ? "songs" : "off"),
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
static func addToPlaylist(playlistId: String, sources: [(kind: String, id: String)]) async throws {
|
||||
try await MusicIntentExecution.shared.run(
|
||||
name: "addToPlaylist",
|
||||
params: [
|
||||
"playlistId": .string(playlistId),
|
||||
"sources": .array(sources.map { source in
|
||||
.object([
|
||||
"kind": .string(source.kind),
|
||||
"id": .string(source.id),
|
||||
])
|
||||
}),
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
static func addToUpNext(
|
||||
position: String,
|
||||
sources: [(kind: String, id: String)]
|
||||
) async throws {
|
||||
try await MusicIntentExecution.shared.run(
|
||||
name: "addToUpNext",
|
||||
params: [
|
||||
"position": .string(position),
|
||||
"sources": .array(sources.map { source in
|
||||
.object([
|
||||
"kind": .string(source.kind),
|
||||
"id": .string(source.id),
|
||||
])
|
||||
}),
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
static func createPlaylist(name: String, sources: [(kind: String, id: String)]) async throws {
|
||||
try await MusicIntentExecution.shared.run(
|
||||
name: "createPlaylist",
|
||||
params: [
|
||||
"name": .string(name),
|
||||
"sources": .array(sources.map { source in
|
||||
.object([
|
||||
"kind": .string(source.kind),
|
||||
"id": .string(source.id),
|
||||
])
|
||||
}),
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
static func clearUpNext() async throws {
|
||||
try await MusicIntentExecution.shared.run(name: "clearUpNext")
|
||||
}
|
||||
|
||||
static func createStation(artistId: String, artistName: String) async throws {
|
||||
try await MusicIntentExecution.shared.run(
|
||||
name: "createStation",
|
||||
params: [
|
||||
"artistId": .string(artistId),
|
||||
"title": .string(artistName),
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
static func updateAffinity(kind: String, id: String, state: String) async throws {
|
||||
try await MusicIntentExecution.shared.run(
|
||||
name: "updateAffinity",
|
||||
params: [
|
||||
"kind": .string(kind),
|
||||
"id": .string(id),
|
||||
"state": .string(state),
|
||||
]
|
||||
)
|
||||
}
|
||||
|
||||
static func transport(_ command: String) async throws {
|
||||
try await MusicIntentExecution.shared.run(
|
||||
name: "transport",
|
||||
params: ["command": .string(command)]
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
import AppIntents
|
||||
@preconcurrency import CoreSpotlight
|
||||
internal import ExpoAppIntents
|
||||
internal import ExpoModulesCore
|
||||
import UniformTypeIdentifiers
|
||||
|
||||
enum MusicEntityRegistration {
|
||||
static func register() {
|
||||
AppIntentDonationRegistry.shared.register("playMusic", as: PlayMusicIntent.self)
|
||||
if #available(iOS 18.0, *) {
|
||||
AppEntityIdentifierRegistry.shared.registerIndexed("song", as: SongEntity.self)
|
||||
} else {
|
||||
AppEntityIdentifierRegistry.shared.register("song", as: SongEntity.self)
|
||||
}
|
||||
if #available(iOS 18.0, *) {
|
||||
AppEntityIdentifierRegistry.shared.registerIndexed("album", as: AlbumEntity.self)
|
||||
} else {
|
||||
AppEntityIdentifierRegistry.shared.register("album", as: AlbumEntity.self)
|
||||
}
|
||||
if #available(iOS 18.0, *) {
|
||||
AppEntityIdentifierRegistry.shared.registerIndexed("artist", as: ArtistEntity.self)
|
||||
} else {
|
||||
AppEntityIdentifierRegistry.shared.register("artist", as: ArtistEntity.self)
|
||||
}
|
||||
if #available(iOS 18.0, *) {
|
||||
AppEntityIdentifierRegistry.shared.registerIndexed("playlist", as: PlaylistEntity.self)
|
||||
} else {
|
||||
AppEntityIdentifierRegistry.shared.register("playlist", as: PlaylistEntity.self)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension SongEntity: AppIntentEntityRecordConvertible {}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
extension SongEntity: IndexedEntity {
|
||||
var attributeSet: CSSearchableItemAttributeSet {
|
||||
let attributes = CSSearchableItemAttributeSet(contentType: .text)
|
||||
attributes.title = title
|
||||
attributes.displayName = title
|
||||
attributes.contentDescription = "\(artistName) · \(albumTitle)"
|
||||
attributes.keywords = [title, artistName, albumTitle, "music", "song"]
|
||||
return attributes
|
||||
}
|
||||
}
|
||||
|
||||
struct OpenSongIntent: OpenIntent {
|
||||
static let title: LocalizedStringResource = "Open Song"
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Song")
|
||||
var target: SongEntity
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult {
|
||||
_ = try await MusicIntentExecution.shared.run(
|
||||
name: "openMusic", params: ["kind": .string("song"), "id": .string(target.id)]
|
||||
)
|
||||
return .result()
|
||||
}
|
||||
}
|
||||
|
||||
extension AlbumEntity: AppIntentEntityRecordConvertible {}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
extension AlbumEntity: IndexedEntity {
|
||||
var attributeSet: CSSearchableItemAttributeSet {
|
||||
let attributes = CSSearchableItemAttributeSet(contentType: .text)
|
||||
attributes.title = title
|
||||
attributes.displayName = title
|
||||
attributes.contentDescription = artistName
|
||||
attributes.keywords = [title, artistName, "music", "album"]
|
||||
return attributes
|
||||
}
|
||||
}
|
||||
|
||||
struct OpenAlbumIntent: OpenIntent {
|
||||
static let title: LocalizedStringResource = "Open Album"
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Album")
|
||||
var target: AlbumEntity
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult {
|
||||
_ = try await MusicIntentExecution.shared.run(
|
||||
name: "openMusic", params: ["kind": .string("album"), "id": .string(target.id)]
|
||||
)
|
||||
return .result()
|
||||
}
|
||||
}
|
||||
|
||||
extension ArtistEntity: AppIntentEntityRecordConvertible {}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
extension ArtistEntity: IndexedEntity {
|
||||
var attributeSet: CSSearchableItemAttributeSet {
|
||||
let attributes = CSSearchableItemAttributeSet(contentType: .text)
|
||||
attributes.title = name
|
||||
attributes.displayName = name
|
||||
attributes.contentDescription = "oTunes artist"
|
||||
attributes.keywords = [name, "music", "artist"]
|
||||
return attributes
|
||||
}
|
||||
}
|
||||
|
||||
struct OpenArtistIntent: OpenIntent {
|
||||
static let title: LocalizedStringResource = "Open Artist"
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Artist")
|
||||
var target: ArtistEntity
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult {
|
||||
_ = try await MusicIntentExecution.shared.run(
|
||||
name: "openMusic", params: ["kind": .string("artist"), "id": .string(target.id)]
|
||||
)
|
||||
return .result()
|
||||
}
|
||||
}
|
||||
|
||||
extension PlaylistEntity: AppIntentEntityRecordConvertible {}
|
||||
|
||||
@available(iOS 18.0, *)
|
||||
extension PlaylistEntity: IndexedEntity {
|
||||
var attributeSet: CSSearchableItemAttributeSet {
|
||||
let attributes = CSSearchableItemAttributeSet(contentType: .text)
|
||||
attributes.title = title
|
||||
attributes.displayName = title
|
||||
attributes.contentDescription = "oTunes playlist"
|
||||
attributes.keywords = [title, "music", "playlist"]
|
||||
return attributes
|
||||
}
|
||||
}
|
||||
|
||||
struct OpenPlaylistIntent: OpenIntent {
|
||||
static let title: LocalizedStringResource = "Open Playlist"
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Playlist")
|
||||
var target: PlaylistEntity
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult {
|
||||
_ = try await MusicIntentExecution.shared.run(
|
||||
name: "openMusic", params: ["kind": .string("playlist"), "id": .string(target.id)]
|
||||
)
|
||||
return .result()
|
||||
}
|
||||
}
|
||||
|
||||
extension PlayMusicIntent: DonatableAppIntent {
|
||||
struct DonationParams: Record {
|
||||
@Field(.required) var kind: String = ""
|
||||
@Field(.required) var id: String = ""
|
||||
@Field var shuffle: Bool = false
|
||||
}
|
||||
|
||||
init(donationParams: DonationParams) async throws {
|
||||
self.init()
|
||||
shuffle = donationParams.shuffle ? .songs : .off
|
||||
switch donationParams.kind {
|
||||
case "song":
|
||||
guard let value = try await SongQuery().entities(for: [donationParams.id]).first else {
|
||||
throw MusicIntentFailure("This song is no longer available.")
|
||||
}
|
||||
song = value
|
||||
case "album":
|
||||
guard let value = try await AlbumQuery().entities(for: [donationParams.id]).first else {
|
||||
throw MusicIntentFailure("This album is no longer available.")
|
||||
}
|
||||
album = value
|
||||
case "artist":
|
||||
guard let value = try await ArtistQuery().entities(for: [donationParams.id]).first else {
|
||||
throw MusicIntentFailure("This artist is no longer available.")
|
||||
}
|
||||
artist = value
|
||||
case "playlist":
|
||||
guard let value = try await PlaylistQuery().entities(for: [donationParams.id]).first else {
|
||||
throw MusicIntentFailure("This playlist is no longer available.")
|
||||
}
|
||||
playlist = value
|
||||
default:
|
||||
throw MusicIntentFailure("Unknown music type.")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The system can recover an evicted Spotlight index without waiting for the next
|
||||
// catalog refresh. Rebuild only the compact catalog published to expo-app-intents.
|
||||
#if compiler(>=6.4)
|
||||
@available(iOS 27.0, *)
|
||||
extension SongQuery: IndexedEntityQuery {
|
||||
func reindexEntities(
|
||||
for identifiers: [SongEntity.ID], indexDescription: CSSearchableIndexDescription
|
||||
) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.updateIndexFromCatalog(kind: "song", matching: identifiers)
|
||||
}
|
||||
|
||||
func reindexAllEntities(indexDescription: CSSearchableIndexDescription) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.replaceIndexFromCatalog(kind: "song")
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
extension AlbumQuery: IndexedEntityQuery {
|
||||
func reindexEntities(
|
||||
for identifiers: [AlbumEntity.ID], indexDescription: CSSearchableIndexDescription
|
||||
) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.updateIndexFromCatalog(kind: "album", matching: identifiers)
|
||||
}
|
||||
|
||||
func reindexAllEntities(indexDescription: CSSearchableIndexDescription) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.replaceIndexFromCatalog(kind: "album")
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
extension ArtistQuery: IndexedEntityQuery {
|
||||
func reindexEntities(
|
||||
for identifiers: [ArtistEntity.ID], indexDescription: CSSearchableIndexDescription
|
||||
) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.updateIndexFromCatalog(kind: "artist", matching: identifiers)
|
||||
}
|
||||
|
||||
func reindexAllEntities(indexDescription: CSSearchableIndexDescription) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.replaceIndexFromCatalog(kind: "artist")
|
||||
}
|
||||
}
|
||||
|
||||
@available(iOS 27.0, *)
|
||||
extension PlaylistQuery: IndexedEntityQuery {
|
||||
func reindexEntities(
|
||||
for identifiers: [PlaylistEntity.ID], indexDescription: CSSearchableIndexDescription
|
||||
) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.updateIndexFromCatalog(kind: "playlist", matching: identifiers)
|
||||
}
|
||||
|
||||
func reindexAllEntities(indexDescription: CSSearchableIndexDescription) async throws {
|
||||
try await AppEntityIdentifierRegistry.shared.replaceIndexFromCatalog(kind: "playlist")
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,301 @@
|
||||
import AppIntents
|
||||
internal import ExpoAppIntents
|
||||
import Foundation
|
||||
|
||||
struct SongEntity: AppEntity {
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Song")
|
||||
static let defaultQuery = SongQuery()
|
||||
|
||||
var id: String
|
||||
var title: String
|
||||
var artistName: String
|
||||
var artistId: String
|
||||
var albumTitle: String
|
||||
var albumId: String
|
||||
var durationSeconds: Int
|
||||
var genres: String
|
||||
var year: String
|
||||
var trackNumber: String
|
||||
var discNumber: String
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(title)", subtitle: "\(artistName)")
|
||||
}
|
||||
|
||||
init(record: AppIntentEntityRecord) {
|
||||
id = record.id
|
||||
title = record.title
|
||||
artistName = record.metadata["artistName"] ?? record.subtitle ?? ""
|
||||
artistId = record.metadata["artistId"] ?? ""
|
||||
albumTitle = record.metadata["albumTitle"] ?? ""
|
||||
albumId = record.metadata["albumId"] ?? ""
|
||||
durationSeconds = Int(record.metadata["duration"] ?? "") ?? 0
|
||||
genres = record.metadata["genres"] ?? ""
|
||||
year = record.metadata["year"] ?? ""
|
||||
trackNumber = record.metadata["track"] ?? ""
|
||||
discNumber = record.metadata["disk"] ?? ""
|
||||
}
|
||||
}
|
||||
|
||||
struct SongQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [String]) async throws -> [SongEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.songKind, matching: identifiers)
|
||||
.map(SongEntity.init(record:))
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [SongEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.songKind)
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(SongEntity.init(record:))
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [SongEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.songKind)
|
||||
let query = string.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if query.isEmpty {
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(SongEntity.init(record:))
|
||||
}
|
||||
return MusicCatalog.rank(records, query: query, limit: 50, score: MusicCatalog.songScore)
|
||||
.map(SongEntity.init(record:))
|
||||
}
|
||||
}
|
||||
|
||||
struct AlbumEntity: AppEntity {
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Album")
|
||||
static let defaultQuery = AlbumQuery()
|
||||
|
||||
var id: String
|
||||
var title: String
|
||||
var artistName: String
|
||||
var artistId: String
|
||||
var year: String
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(title)", subtitle: "\(artistName)")
|
||||
}
|
||||
|
||||
init(record: AppIntentEntityRecord) {
|
||||
id = record.id
|
||||
title = record.title
|
||||
artistName = record.metadata["artistName"] ?? record.subtitle ?? ""
|
||||
artistId = record.metadata["artistId"] ?? ""
|
||||
year = record.metadata["year"] ?? ""
|
||||
}
|
||||
}
|
||||
|
||||
struct AlbumQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [String]) async throws -> [AlbumEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.albumKind, matching: identifiers)
|
||||
.map(AlbumEntity.init(record:))
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [AlbumEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.albumKind)
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(AlbumEntity.init(record:))
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [AlbumEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.albumKind)
|
||||
let query = string.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if query.isEmpty {
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(AlbumEntity.init(record:))
|
||||
}
|
||||
return MusicCatalog.rank(records, query: query, limit: 50, score: MusicCatalog.albumScore)
|
||||
.map(AlbumEntity.init(record:))
|
||||
}
|
||||
}
|
||||
|
||||
struct ArtistEntity: AppEntity {
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Artist")
|
||||
static let defaultQuery = ArtistQuery()
|
||||
|
||||
var id: String
|
||||
var name: String
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
DisplayRepresentation(title: "\(name)")
|
||||
}
|
||||
|
||||
init(record: AppIntentEntityRecord) {
|
||||
id = record.id
|
||||
name = record.title
|
||||
}
|
||||
}
|
||||
|
||||
struct ArtistQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [String]) async throws -> [ArtistEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.artistKind, matching: identifiers)
|
||||
.map(ArtistEntity.init(record:))
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [ArtistEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.artistKind)
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(ArtistEntity.init(record:))
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [ArtistEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.artistKind)
|
||||
let query = string.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if query.isEmpty {
|
||||
return MusicCatalog.suggested(records, limit: 25, favoritesFirst: true)
|
||||
.map(ArtistEntity.init(record:))
|
||||
}
|
||||
return MusicCatalog.rank(records, query: query, limit: 50, score: MusicCatalog.nameScore)
|
||||
.map(ArtistEntity.init(record:))
|
||||
}
|
||||
}
|
||||
|
||||
struct PlaylistEntity: AppEntity {
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Playlist")
|
||||
static let defaultQuery = PlaylistQuery()
|
||||
|
||||
var id: String
|
||||
var title: String
|
||||
var ownerName: String
|
||||
var createdByMe: Bool
|
||||
|
||||
var displayRepresentation: DisplayRepresentation {
|
||||
if ownerName.isEmpty {
|
||||
return DisplayRepresentation(title: "\(title)")
|
||||
}
|
||||
return DisplayRepresentation(title: "\(title)", subtitle: "\(ownerName)")
|
||||
}
|
||||
|
||||
init(record: AppIntentEntityRecord) {
|
||||
id = record.id
|
||||
title = record.title
|
||||
ownerName = record.metadata["ownerName"] ?? record.subtitle ?? ""
|
||||
createdByMe = record.metadata["createdByMe"] == "1"
|
||||
}
|
||||
}
|
||||
|
||||
struct PlaylistQuery: EntityStringQuery {
|
||||
func entities(for identifiers: [String]) async throws -> [PlaylistEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.playlistKind, matching: identifiers)
|
||||
.map(PlaylistEntity.init(record:))
|
||||
}
|
||||
|
||||
func suggestedEntities() async throws -> [PlaylistEntity] {
|
||||
try await MusicCatalog.records(ofKind: MusicCatalog.playlistKind)
|
||||
.map(PlaylistEntity.init(record:))
|
||||
}
|
||||
|
||||
func entities(matching string: String) async throws -> [PlaylistEntity] {
|
||||
let records = try await MusicCatalog.records(ofKind: MusicCatalog.playlistKind)
|
||||
let query = string.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if query.isEmpty {
|
||||
return records.map(PlaylistEntity.init(record:))
|
||||
}
|
||||
return MusicCatalog.rank(records, query: query, limit: 50, score: MusicCatalog.nameScore)
|
||||
.map(PlaylistEntity.init(record:))
|
||||
}
|
||||
}
|
||||
|
||||
enum MusicShuffle: String, AppEnum {
|
||||
case off
|
||||
case songs
|
||||
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Shuffle")
|
||||
static let caseDisplayRepresentations: [MusicShuffle: DisplayRepresentation] = [
|
||||
.off: "Off",
|
||||
.songs: "Songs",
|
||||
]
|
||||
}
|
||||
|
||||
enum MusicRepeat: String, AppEnum {
|
||||
case none
|
||||
case one
|
||||
case all
|
||||
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Repeat")
|
||||
static let caseDisplayRepresentations: [MusicRepeat: DisplayRepresentation] = [
|
||||
.none: "None",
|
||||
.one: "One",
|
||||
.all: "All",
|
||||
]
|
||||
}
|
||||
|
||||
enum UpNextPosition: String, AppEnum {
|
||||
case next
|
||||
case last
|
||||
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Position")
|
||||
static let caseDisplayRepresentations: [UpNextPosition: DisplayRepresentation] = [
|
||||
.next: "Play Next",
|
||||
.last: "Play Last",
|
||||
]
|
||||
}
|
||||
|
||||
enum MusicDetail: String, AppEnum {
|
||||
case title
|
||||
case artist
|
||||
case album
|
||||
case albumArtist
|
||||
case genre
|
||||
case duration
|
||||
case year
|
||||
case trackNumber
|
||||
case discNumber
|
||||
|
||||
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "Detail")
|
||||
static let caseDisplayRepresentations: [MusicDetail: DisplayRepresentation] = [
|
||||
.title: "Title",
|
||||
.artist: "Artist",
|
||||
.album: "Album",
|
||||
.albumArtist: "Album Artist",
|
||||
.genre: "Genre",
|
||||
.duration: "Duration",
|
||||
.year: "Year",
|
||||
.trackNumber: "Track Number",
|
||||
.discNumber: "Disc Number",
|
||||
]
|
||||
}
|
||||
|
||||
enum MusicSelection {
|
||||
static func sources(
|
||||
song: SongEntity?,
|
||||
album: AlbumEntity?,
|
||||
artist: ArtistEntity?,
|
||||
playlist: PlaylistEntity?
|
||||
) throws -> [(kind: String, id: String, title: String)] {
|
||||
var sources: [(kind: String, id: String, title: String)] = []
|
||||
if let song {
|
||||
sources.append(("song", song.id, song.title))
|
||||
}
|
||||
if let album {
|
||||
sources.append(("album", album.id, album.title))
|
||||
}
|
||||
if let artist {
|
||||
sources.append(("artist", artist.id, artist.name))
|
||||
}
|
||||
if let playlist {
|
||||
sources.append(("playlist", playlist.id, playlist.title))
|
||||
}
|
||||
if sources.isEmpty {
|
||||
throw MusicIntentFailure("Choose a song, album, artist, or playlist.")
|
||||
}
|
||||
return sources
|
||||
}
|
||||
|
||||
static func singleTarget(
|
||||
song: SongEntity?,
|
||||
album: AlbumEntity?,
|
||||
artist: ArtistEntity?,
|
||||
playlist: PlaylistEntity?
|
||||
) throws -> (kind: String, id: String, title: String)? {
|
||||
let sources = [
|
||||
song.map { (kind: "song", id: $0.id, title: $0.title) },
|
||||
album.map { (kind: "album", id: $0.id, title: $0.title) },
|
||||
artist.map { (kind: "artist", id: $0.id, title: $0.name) },
|
||||
playlist.map { (kind: "playlist", id: $0.id, title: $0.title) },
|
||||
].compactMap { $0 }
|
||||
if sources.count > 1 {
|
||||
throw MusicIntentFailure("Choose one song, album, artist, or playlist.")
|
||||
}
|
||||
return sources.first
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,425 @@
|
||||
import AppIntents
|
||||
import Foundation
|
||||
|
||||
// Actions that use the React player or authenticated mutations open the app and
|
||||
// wait for its acknowledgment. Native catalog reads can run without opening it.
|
||||
|
||||
struct PlayMusicIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Play Music"
|
||||
static let description = IntentDescription("Plays music using oTunes.")
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Song")
|
||||
var song: SongEntity?
|
||||
|
||||
@Parameter(title: "Album")
|
||||
var album: AlbumEntity?
|
||||
|
||||
@Parameter(title: "Artist")
|
||||
var artist: ArtistEntity?
|
||||
|
||||
@Parameter(title: "Playlist")
|
||||
var playlist: PlaylistEntity?
|
||||
|
||||
@Parameter(title: "Shuffle")
|
||||
var shuffle: MusicShuffle?
|
||||
|
||||
@Parameter(title: "Repeat")
|
||||
var repeatMode: MusicRepeat?
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
let target = try MusicSelection.singleTarget(
|
||||
song: song,
|
||||
album: album,
|
||||
artist: artist,
|
||||
playlist: playlist
|
||||
)
|
||||
let kind = target?.0 ?? "resume"
|
||||
let id = target?.1 ?? ""
|
||||
let name = target?.2 ?? "your music"
|
||||
try await MusicCommands.play(
|
||||
kind: kind,
|
||||
id: id,
|
||||
title: name,
|
||||
shuffle: shuffle.map { $0 == .songs },
|
||||
repeatMode: repeatMode?.rawValue,
|
||||
queue: "now",
|
||||
warmupId: nil
|
||||
)
|
||||
return .result(dialog: "Playing \(name).")
|
||||
}
|
||||
}
|
||||
|
||||
struct AddToPlaylistIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Add to Playlist"
|
||||
static let description = IntentDescription(
|
||||
"Adds the items passed as input to the specified playlist."
|
||||
)
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Song")
|
||||
var song: SongEntity?
|
||||
|
||||
@Parameter(title: "Album")
|
||||
var album: AlbumEntity?
|
||||
|
||||
@Parameter(title: "Artist")
|
||||
var artist: ArtistEntity?
|
||||
|
||||
@Parameter(title: "Music")
|
||||
var sourcePlaylist: PlaylistEntity?
|
||||
|
||||
@Parameter(title: "Playlist")
|
||||
var playlist: PlaylistEntity
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
let sources = try MusicSelection.sources(
|
||||
song: song,
|
||||
album: album,
|
||||
artist: artist,
|
||||
playlist: sourcePlaylist
|
||||
)
|
||||
if sources.contains(where: { $0.id == playlist.id && $0.kind == "playlist" }) {
|
||||
throw MusicIntentFailure("Choose a different playlist.")
|
||||
}
|
||||
try await MusicCommands.addToPlaylist(
|
||||
playlistId: playlist.id,
|
||||
sources: sources.map { (kind: $0.kind, id: $0.id) }
|
||||
)
|
||||
return .result(dialog: "Adding to \(playlist.title).")
|
||||
}
|
||||
}
|
||||
|
||||
struct AddToUpNextIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Add to Up Next"
|
||||
static let description = IntentDescription(
|
||||
"Adds the music passed as input to your Up Next queue."
|
||||
)
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Song")
|
||||
var song: SongEntity?
|
||||
|
||||
@Parameter(title: "Album")
|
||||
var album: AlbumEntity?
|
||||
|
||||
@Parameter(title: "Artist")
|
||||
var artist: ArtistEntity?
|
||||
|
||||
@Parameter(title: "Playlist")
|
||||
var playlist: PlaylistEntity?
|
||||
|
||||
@Parameter(title: "Position", default: .next)
|
||||
var position: UpNextPosition
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
let sources = try MusicSelection.sources(
|
||||
song: song,
|
||||
album: album,
|
||||
artist: artist,
|
||||
playlist: playlist
|
||||
)
|
||||
try await MusicCommands.addToUpNext(
|
||||
position: position.rawValue,
|
||||
sources: sources.map { (kind: $0.kind, id: $0.id) }
|
||||
)
|
||||
let placement = position == .next ? "Playing this next." : "Adding this to the end of Up Next."
|
||||
return .result(dialog: "\(placement)")
|
||||
}
|
||||
}
|
||||
|
||||
struct ClearUpNextIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Clear Up Next"
|
||||
static let description = IntentDescription("Clears the Up Next queue.")
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
try await MusicCommands.clearUpNext()
|
||||
return .result(dialog: "Clearing Up Next.")
|
||||
}
|
||||
}
|
||||
|
||||
struct CreatePlaylistIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Create Playlist"
|
||||
static let description = IntentDescription(
|
||||
"Creates a new playlist, adding any items passed as input."
|
||||
)
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@Parameter(title: "Name")
|
||||
var name: String
|
||||
|
||||
@Parameter(title: "Song")
|
||||
var song: SongEntity?
|
||||
|
||||
@Parameter(title: "Album")
|
||||
var album: AlbumEntity?
|
||||
|
||||
@Parameter(title: "Artist")
|
||||
var artist: ArtistEntity?
|
||||
|
||||
@Parameter(title: "Playlist")
|
||||
var playlist: PlaylistEntity?
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
if trimmed.isEmpty {
|
||||
throw MusicIntentFailure("A playlist needs a name.")
|
||||
}
|
||||
let sources = [
|
||||
song.map { (kind: "song", id: $0.id) },
|
||||
album.map { (kind: "album", id: $0.id) },
|
||||
artist.map { (kind: "artist", id: $0.id) },
|
||||
playlist.map { (kind: "playlist", id: $0.id) },
|
||||
].compactMap { $0 }
|
||||
try await MusicCommands.createPlaylist(name: trimmed, sources: sources)
|
||||
return .result(dialog: "Creating \(trimmed).")
|
||||
}
|
||||
}
|
||||
|
||||
struct GetCurrentSongIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Get Current Song"
|
||||
static let description = IntentDescription(
|
||||
"Returns the song that is currently playing in oTunes, if any."
|
||||
)
|
||||
static let openAppWhenRun = false
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ReturnsValue<SongEntity> & ProvidesDialog {
|
||||
guard let song = try await MusicCatalog.currentSong() else {
|
||||
throw MusicIntentFailure("Nothing is playing in oTunes.")
|
||||
}
|
||||
return .result(value: song, dialog: "\(song.title)")
|
||||
}
|
||||
}
|
||||
|
||||
struct GetDetailsOfMusicIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Get Details of Music"
|
||||
static let description = IntentDescription(
|
||||
"Gets a specific piece of information from the music passed into the action."
|
||||
)
|
||||
static let openAppWhenRun = false
|
||||
|
||||
@Parameter(title: "Song")
|
||||
var song: SongEntity?
|
||||
|
||||
@Parameter(title: "Album")
|
||||
var album: AlbumEntity?
|
||||
|
||||
@Parameter(title: "Artist")
|
||||
var artist: ArtistEntity?
|
||||
|
||||
@Parameter(title: "Playlist")
|
||||
var playlist: PlaylistEntity?
|
||||
|
||||
@Parameter(title: "Detail")
|
||||
var detail: MusicDetail
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ReturnsValue<String> & ProvidesDialog {
|
||||
let value = try await detailValue()
|
||||
return .result(value: value, dialog: value.isEmpty ? "Not available." : "\(value)")
|
||||
}
|
||||
|
||||
private func detailValue() async throws -> String {
|
||||
if let target = try MusicSelection.singleTarget(
|
||||
song: song,
|
||||
album: album,
|
||||
artist: artist,
|
||||
playlist: playlist
|
||||
) {
|
||||
return try value(for: target)
|
||||
}
|
||||
guard let current = try await MusicCatalog.currentSong() else {
|
||||
throw MusicIntentFailure("Choose music, or play a song in oTunes first.")
|
||||
}
|
||||
return Self.value(detail, song: current)
|
||||
}
|
||||
|
||||
private func value(for target: (kind: String, id: String, title: String)) throws -> String {
|
||||
switch target.kind {
|
||||
case "song":
|
||||
guard let song else {
|
||||
throw MusicIntentFailure("That song is no longer in your library.")
|
||||
}
|
||||
return Self.value(detail, song: song)
|
||||
case "album":
|
||||
guard let album else {
|
||||
throw MusicIntentFailure("That album is no longer in your library.")
|
||||
}
|
||||
return Self.value(detail, album: album)
|
||||
case "artist":
|
||||
guard let artist else {
|
||||
throw MusicIntentFailure("That artist is no longer in your library.")
|
||||
}
|
||||
return Self.value(detail, artist: artist)
|
||||
case "playlist":
|
||||
guard let playlist else {
|
||||
throw MusicIntentFailure("That playlist is no longer in your library.")
|
||||
}
|
||||
return Self.value(detail, playlist: playlist)
|
||||
default:
|
||||
throw MusicIntentFailure("oTunes can't read that.")
|
||||
}
|
||||
}
|
||||
|
||||
private static func value(_ detail: MusicDetail, song: SongEntity) -> String {
|
||||
switch detail {
|
||||
case .title:
|
||||
return song.title
|
||||
case .artist, .albumArtist:
|
||||
return song.artistName
|
||||
case .album:
|
||||
return song.albumTitle
|
||||
case .genre:
|
||||
return song.genres
|
||||
case .duration:
|
||||
return MusicCatalog.formatDuration(song.durationSeconds)
|
||||
case .year:
|
||||
return song.year == "0" ? "" : song.year
|
||||
case .trackNumber:
|
||||
return song.trackNumber
|
||||
case .discNumber:
|
||||
return song.discNumber
|
||||
}
|
||||
}
|
||||
|
||||
private static func value(_ detail: MusicDetail, album: AlbumEntity) -> String {
|
||||
switch detail {
|
||||
case .title, .album:
|
||||
return album.title
|
||||
case .artist, .albumArtist:
|
||||
return album.artistName
|
||||
case .year:
|
||||
return album.year == "0" ? "" : album.year
|
||||
case .genre, .duration, .trackNumber, .discNumber:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
private static func value(_ detail: MusicDetail, artist: ArtistEntity) -> String {
|
||||
switch detail {
|
||||
case .title, .artist, .albumArtist:
|
||||
return artist.name
|
||||
case .album, .genre, .duration, .year, .trackNumber, .discNumber:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
private static func value(_ detail: MusicDetail, playlist: PlaylistEntity) -> String {
|
||||
switch detail {
|
||||
case .title:
|
||||
return playlist.title
|
||||
case .artist, .albumArtist:
|
||||
return playlist.ownerName
|
||||
case .album, .genre, .duration, .year, .trackNumber, .discNumber:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct LoveSongIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Love Song"
|
||||
static let description = IntentDescription(
|
||||
"Loves the song that is playing in oTunes. Also used for Favorite Song."
|
||||
)
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
guard let song = try await MusicCatalog.currentSong() else {
|
||||
throw MusicIntentFailure("Nothing is playing in oTunes.")
|
||||
}
|
||||
try await MusicCommands.updateAffinity(kind: "song", id: song.id, state: "like")
|
||||
return .result(dialog: "Loving \(song.title).")
|
||||
}
|
||||
}
|
||||
|
||||
struct UnlikeSongIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Unlike Song"
|
||||
static let description = IntentDescription("Removes the love from the song that is playing.")
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
guard let song = try await MusicCatalog.currentSong() else {
|
||||
throw MusicIntentFailure("Nothing is playing in oTunes.")
|
||||
}
|
||||
try await MusicCommands.updateAffinity(kind: "song", id: song.id, state: "unset")
|
||||
return .result(dialog: "Unliking \(song.title).")
|
||||
}
|
||||
}
|
||||
|
||||
struct CreateStationIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Create Station"
|
||||
static let description = IntentDescription(
|
||||
"Plays more music by the artist of the song that is playing."
|
||||
)
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
guard let song = try await MusicCatalog.currentSong() else {
|
||||
throw MusicIntentFailure("Nothing is playing in oTunes.")
|
||||
}
|
||||
if song.artistId.isEmpty {
|
||||
throw MusicIntentFailure("oTunes can't find an artist for this song.")
|
||||
}
|
||||
try await MusicCommands.createStation(artistId: song.artistId, artistName: song.artistName)
|
||||
let artist = song.artistName.isEmpty ? "this artist" : song.artistName
|
||||
return .result(dialog: "Playing more by \(artist).")
|
||||
}
|
||||
}
|
||||
|
||||
struct PauseMusicIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Pause Music"
|
||||
static let description = IntentDescription("Pauses playback in oTunes.")
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
try await MusicCommands.transport("pause")
|
||||
return .result(dialog: "Pausing.")
|
||||
}
|
||||
}
|
||||
|
||||
struct ResumeMusicIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Resume Music"
|
||||
static let description = IntentDescription("Resumes playback in oTunes.")
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
try await MusicCommands.transport("resume")
|
||||
return .result(dialog: "Resuming.")
|
||||
}
|
||||
}
|
||||
|
||||
struct SkipMusicIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Skip Song"
|
||||
static let description = IntentDescription("Skips to the next song in oTunes.")
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
try await MusicCommands.transport("next")
|
||||
return .result(dialog: "Skipping.")
|
||||
}
|
||||
}
|
||||
|
||||
struct PreviousTrackIntent: AppIntent {
|
||||
static let title: LocalizedStringResource = "Previous Song"
|
||||
static let description = IntentDescription("Goes back to the previous song in oTunes.")
|
||||
static let openAppWhenRun = true
|
||||
|
||||
@MainActor
|
||||
func perform() async throws -> some IntentResult & ProvidesDialog {
|
||||
try await MusicCommands.transport("previous")
|
||||
return .result(dialog: "Going back.")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
import Foundation
|
||||
internal import ExpoAppIntents
|
||||
|
||||
/// Full catalogs live in Application Support, never in UserDefaults. The package
|
||||
/// catalog contains only a bounded selection for shortcut suggestions and Spotlight.
|
||||
actor MusicCatalogStorage {
|
||||
static let shared = MusicCatalogStorage()
|
||||
|
||||
private func location(_ kind: String) throws -> URL {
|
||||
guard ["song", "album", "artist", "playlist", "nowPlaying"].contains(kind) else {
|
||||
throw MusicIntentFailure("Unknown music catalog.")
|
||||
}
|
||||
let directory = try FileManager.default.url(
|
||||
for: .applicationSupportDirectory, in: .userDomainMask,
|
||||
appropriateFor: nil, create: true
|
||||
).appendingPathComponent("MusicIntents", isDirectory: true)
|
||||
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
|
||||
return directory.appendingPathComponent("\(kind).json")
|
||||
}
|
||||
|
||||
func replace(kind: String, json: String) throws {
|
||||
let data = Data(json.utf8)
|
||||
let records = try JSONDecoder().decode([AppIntentEntityRecord].self, from: data)
|
||||
guard Set(records.map(\.id)).count == records.count,
|
||||
records.allSatisfy({ !$0.id.isEmpty && !$0.title.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty })
|
||||
else { throw MusicIntentFailure("Invalid music catalog.") }
|
||||
try data.write(to: location(kind), options: [.atomic, .completeFileProtectionUntilFirstUserAuthentication])
|
||||
}
|
||||
|
||||
func records(kind: String) throws -> [AppIntentEntityRecord] {
|
||||
let url = try location(kind)
|
||||
guard FileManager.default.fileExists(atPath: url.path) else { return [] }
|
||||
return try JSONDecoder().decode([AppIntentEntityRecord].self, from: Data(contentsOf: url))
|
||||
}
|
||||
}
|
||||
|
||||
/// App-owned completion channel. Expo's dispatcher itself remains one-way.
|
||||
actor MusicIntentExecution {
|
||||
static let shared = MusicIntentExecution()
|
||||
private var waiting = Set<String>()
|
||||
private var results: [String: String] = [:]
|
||||
|
||||
func complete(token: String, error: String?) {
|
||||
guard waiting.contains(token) else { return }
|
||||
results[token] = error ?? ""
|
||||
}
|
||||
|
||||
func run(name: String, params: AppIntentParams = [:]) async throws -> String {
|
||||
let token = UUID().uuidString
|
||||
let deadline = Date().addingTimeInterval(25)
|
||||
waiting.insert(token)
|
||||
defer {
|
||||
waiting.remove(token)
|
||||
results.removeValue(forKey: token)
|
||||
}
|
||||
var payload = params
|
||||
payload["completionToken"] = .string(token)
|
||||
payload["deadline"] = .double(deadline.timeIntervalSince1970 * 1000)
|
||||
let id = await AppIntentDispatcher.shared.dispatch(name: name, params: payload)
|
||||
while Date() < deadline {
|
||||
try Task.checkCancellation()
|
||||
if let error = results.removeValue(forKey: token) {
|
||||
if !error.isEmpty { throw MusicIntentFailure(error) }
|
||||
return id
|
||||
}
|
||||
try await Task.sleep(for: .milliseconds(100))
|
||||
}
|
||||
throw MusicIntentFailure("oTunes did not finish in time. Open the app, check your connection, and try again.")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
# Siri and Shortcuts
|
||||
|
||||
This integration uses Expo 58 inline modules and `expo-app-intents`. Rebuild the native app after changing Swift declarations or registrations. An OTA JavaScript update cannot add these capabilities.
|
||||
|
||||
Playback and library changes open oTunes because they need its authenticated React runtime. Swift dispatches a request and waits for an app-owned completion acknowledgment. Playback waits for the native audio player to load the requested track; warmup waits for it to load while paused. Errors reach Siri, and requests that have expired are discarded before starting a side effect. Native catalog reads do not open the app.
|
||||
|
||||
The full entity catalog lives in Application Support. The backend supplies pages of 200 records. Expo's UserDefaults catalog holds at most 100 suggestions per kind, with favorites first, and mirrors those suggestions into Spotlight. Siri's native queries search the full disk catalog. Catalogs refresh on launch, foreground entry, favorite changes, and every five minutes while foregrounded.
|
||||
|
||||
Songs, albums, artists, and playlists have Spotlight open intents and on-screen entity associations. Associations require iOS 18.4 and Xcode 27; Spotlight indexing requires iOS 18. Playback donations are made after the player starts, preserve shuffle, and resolve real catalog entities. Removed records trigger donation cleanup. Sign-out clears catalogs, Spotlight entries, donations, and pending invocations. On iOS 27, the query types also handle system requests to rebuild Spotlight indexes.
|
||||
|
||||
Audio schema intents require Xcode 27 and iOS 27. Custom intents remain available on earlier supported versions and remain visible on iOS 27 because intent discovery metadata must be a compile-time constant.
|
||||
|
||||
## Backend rollout
|
||||
|
||||
Deploy the companion Convex changes before installing the new mobile build:
|
||||
|
||||
- `library.intentCatalogPage` supplies authenticated, paginated entity records.
|
||||
- `appIntentPlaylists` records playlist-creation request IDs in the same transaction as creation. Replaying a request returns the original playlist ID.
|
||||
- `playlists.createPlaylist` accepts an optional `invocationId`; existing callers can omit it.
|
||||
|
||||
## Verification
|
||||
|
||||
Run from the repository root:
|
||||
|
||||
```sh
|
||||
pnpm --filter @otunes/mobile typecheck
|
||||
pnpm --filter @otunes/convex typecheck
|
||||
node --test apps/mobile/lib/app-intents.test.cjs packages/convex/convex/app-intent-playlists.test.cjs
|
||||
```
|
||||
|
||||
Build iOS with Xcode and verify the app target's `ExtractAppIntentsMetadata` phase. TypeScript checks alone do not validate Swift declarations or Apple's schema contracts.
|
||||
|
||||
On a suitable device, verify cold and warm playback, paused warmup followed by playback, offline errors, request expiry, playlist replay, and a saved shortcut after upgrading. Check entity resolution after rename/delete and sign-out. Verify Spotlight opening, on-screen requests, and donations separately; metadata extraction does not establish system discovery or successful runtime execution.
|
||||
@@ -0,0 +1,64 @@
|
||||
import type { ConfigContext, ExpoConfig } from "expo/config"
|
||||
|
||||
export default ({ config }: ConfigContext): ExpoConfig => {
|
||||
const variant: string =
|
||||
process.env.APP_VARIANT ?? process.env.EAS_BUILD_PROFILE ?? "production"
|
||||
if (
|
||||
variant !== "development" &&
|
||||
variant !== "preview" &&
|
||||
variant !== "production"
|
||||
) {
|
||||
throw new Error(`Unsupported APP_VARIANT: ${variant}`)
|
||||
}
|
||||
|
||||
const suffix = variant === "production" ? "" : `.${variant}`
|
||||
const iconSuffix = variant === "production" ? "" : `-${variant}`
|
||||
const nameSuffix =
|
||||
variant === "development"
|
||||
? " (Development)"
|
||||
: variant === "preview"
|
||||
? " (Preview)"
|
||||
: ""
|
||||
// Expo writes this filename into Xcode build settings without quoting it.
|
||||
const composer = {
|
||||
development: "oTunesDev",
|
||||
preview: "oTunesPreview",
|
||||
production: "oTunes",
|
||||
}[variant]
|
||||
|
||||
const bundleIdentifier = `${config.ios!.bundleIdentifier}${suffix}`
|
||||
|
||||
return {
|
||||
...config,
|
||||
plugins: [
|
||||
...(config.plugins ?? []),
|
||||
...(process.env.MAC_CATALYST === "1"
|
||||
? ["./plugins/with-mac-catalyst"]
|
||||
: []),
|
||||
],
|
||||
name: `${config.name}${nameSuffix}`,
|
||||
slug: config.slug!,
|
||||
scheme: variant === "production" ? "otunes" : `otunes-${variant}`,
|
||||
icon: `./assets/icon${iconSuffix}.png`,
|
||||
ios: {
|
||||
...config.ios,
|
||||
bundleIdentifier,
|
||||
icon: `./assets/${composer}.icon`,
|
||||
infoPlist: {
|
||||
...config.ios?.infoPlist,
|
||||
// HandoffModule publishes this `.media` type; Catalyst shares this bundle ID.
|
||||
NSUserActivityTypes: [`${bundleIdentifier}.media`],
|
||||
},
|
||||
},
|
||||
android: {
|
||||
...config.android,
|
||||
package: `${config.android!.package}${suffix}`,
|
||||
icon: `./assets/android-icon${iconSuffix}.png`,
|
||||
adaptiveIcon: {
|
||||
monochromeImage: "./assets/android-icon-monochrome.png",
|
||||
foregroundImage: `./assets/android-icon-foreground${iconSuffix}.png`,
|
||||
backgroundImage: `./assets/android-icon-background${iconSuffix}.png`,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -26,8 +26,11 @@
|
||||
"adaptiveIcon": {
|
||||
"monochromeImage": "./assets/android-icon-monochrome.png",
|
||||
"foregroundImage": "./assets/android-icon-foreground.png",
|
||||
"backgroundColor": "#C60322"
|
||||
}
|
||||
"backgroundImage": "./assets/android-icon-background.png"
|
||||
},
|
||||
"userInterfaceStyle": "dark",
|
||||
"softwareKeyboardLayoutMode": "resize",
|
||||
"icon": "./assets/android-icon.png"
|
||||
},
|
||||
"plugins": [
|
||||
"expo-router",
|
||||
@@ -44,33 +47,29 @@
|
||||
[
|
||||
"expo-splash-screen",
|
||||
{
|
||||
"ios": {
|
||||
"backgroundColor": "#ffffff",
|
||||
"image": "./assets/ios-icon.png",
|
||||
"dark": {
|
||||
"image": "./assets/ios-icon-dark.png",
|
||||
"backgroundColor": "#000000"
|
||||
},
|
||||
"imageWidth": 200
|
||||
},
|
||||
"android": {
|
||||
"backgroundColor": "#ffffff",
|
||||
"image": "./assets/icon.png",
|
||||
"dark": {
|
||||
"image": "./assets/icon-dark.png",
|
||||
"backgroundColor": "#000000"
|
||||
},
|
||||
"imageWidth": 200
|
||||
}
|
||||
"backgroundColor": "#000000"
|
||||
}
|
||||
],
|
||||
"expo-image",
|
||||
"expo-status-bar",
|
||||
"./plugins/with-ios-pod-deployment-target.js",
|
||||
"./plugins/with-ios-scene-lifecycle.js"
|
||||
"expo-app-intents",
|
||||
"./plugins/with-android-colors",
|
||||
[
|
||||
"expo-navigation-bar",
|
||||
{
|
||||
"enforceContrast": false,
|
||||
"style": "light"
|
||||
}
|
||||
]
|
||||
],
|
||||
"experiments": {
|
||||
"typedRoutes": true
|
||||
"typedRoutes": true,
|
||||
"inlineModules": {
|
||||
"watchedDirectories": [
|
||||
"app-intents",
|
||||
"native"
|
||||
]
|
||||
}
|
||||
},
|
||||
"extra": {
|
||||
"router": {},
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { useStackScreenOptions, tabStackScreenTitles } from "@/lib/navigation"
|
||||
import { tabletSections, TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
|
||||
export default function TabletSectionLayout({ segment }: { segment: string }) {
|
||||
const section = tabletSections.find((item) => item.group === segment)
|
||||
const options = useStackScreenOptions()
|
||||
|
||||
return (
|
||||
<TabletSectionContext value={section}>
|
||||
<Stack
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...options,
|
||||
title:
|
||||
route.name === "index"
|
||||
? section?.title
|
||||
: tabStackScreenTitles[route.name],
|
||||
})}
|
||||
/>
|
||||
</TabletSectionContext>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/album/[id]"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/artist/[id]"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/browse/albums"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/browse/artists"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/browse/playlists"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/browse/songs"
|
||||
@@ -0,0 +1,23 @@
|
||||
import { useContext } from "react"
|
||||
import Albums from "../home/browse/albums"
|
||||
import Artists from "../home/browse/artists"
|
||||
import Songs from "../home/browse/songs"
|
||||
import Playlists from "../home/browse/playlists"
|
||||
import Favorites from "../home/playlist/favorites"
|
||||
import RecentlyPlayed from "../home/recently-played"
|
||||
import { TabletSectionContext } from "@/lib/tablet-navigation"
|
||||
|
||||
const screens = {
|
||||
albums: Albums,
|
||||
artists: Artists,
|
||||
songs: Songs,
|
||||
playlists: Playlists,
|
||||
favorites: Favorites,
|
||||
recent: RecentlyPlayed,
|
||||
}
|
||||
|
||||
export default function TabletSectionScreen() {
|
||||
const section = useContext(TabletSectionContext)
|
||||
const Screen = screens[section?.name ?? "albums"]
|
||||
return <Screen />
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/playlist/[id]"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../../library/playlist/favorites"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../library/queue"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../library/recently-added"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../library/recently-played"
|
||||
@@ -0,0 +1 @@
|
||||
export { default } from "../library/settings"
|
||||
@@ -1,35 +1,57 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { TabletMiniPlayer } from "@/components/tablet-mini-player"
|
||||
import { TabletPlayerLayoutProvider } from "@/contexts/tablet-player-layout"
|
||||
import Animated from "react-native-reanimated"
|
||||
import { NavigationBar } from "expo-navigation-bar"
|
||||
import {
|
||||
ScreenPaletteProvider,
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidNativeTabColors,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { DarkTheme, DefaultTheme, ThemeProvider } from "expo-router"
|
||||
import { NativeTabs } from "expo-router/unstable-native-tabs"
|
||||
import { DynamicColorIOS, Platform, useColorScheme } from "react-native"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { DynamicColorIOS, Platform } from "react-native"
|
||||
import { useMemo } from "react"
|
||||
|
||||
import { TabBottomAccessory } from "@/components/mini-player"
|
||||
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"
|
||||
// These props initialize native tabs; the worklet owns subsequent colors.
|
||||
const selectedColor = colors.dark.primary
|
||||
const themeIsDark = useIsDark()
|
||||
const androidPalette = colors.dark
|
||||
const artworkPalette = useAndroidTabPalette()
|
||||
const isDark = Platform.OS === "android" ? artworkPalette.isDark : themeIsDark
|
||||
const inactive = appleMusic.tabInactive
|
||||
|
||||
const iconColor =
|
||||
@@ -39,24 +61,23 @@ function useNativeTabColors() {
|
||||
selected: appleMusic.pink,
|
||||
}
|
||||
: {
|
||||
default: isDark ? inactive : "#636366",
|
||||
selected: appleMusic.pink,
|
||||
default: androidPalette.mutedForeground,
|
||||
selected: selectedColor,
|
||||
}
|
||||
|
||||
const labelColor =
|
||||
Platform.OS === "ios"
|
||||
? DynamicColorIOS({ dark: inactive, light: "#636366" })
|
||||
: isDark
|
||||
? inactive
|
||||
: "#636366"
|
||||
: androidPalette.mutedForeground
|
||||
|
||||
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,
|
||||
},
|
||||
@@ -64,58 +85,161 @@ function useNativeTabColors() {
|
||||
blurEffect: isDark
|
||||
? "systemChromeMaterialDark"
|
||||
: "systemChromeMaterialLight",
|
||||
backgroundColor:
|
||||
Platform.OS === "ios"
|
||||
? undefined
|
||||
: isDark
|
||||
? appleMusic.background
|
||||
: colors.light.background,
|
||||
// Reveal the shared UI-thread background beneath the native tab bar.
|
||||
backgroundColor: Platform.OS === "ios" ? undefined : "transparent",
|
||||
}
|
||||
}
|
||||
|
||||
export default function TabsLayout() {
|
||||
function TabsContent() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const homeColors = useAndroidNativeTabColors()
|
||||
const libraryColors = useAndroidNativeTabColors()
|
||||
const searchColors = useAndroidNativeTabColors()
|
||||
const keyboardVisible = useAndroidKeyboardVisible()
|
||||
const routerTheme = useRouterTheme()
|
||||
const tabColors = useNativeTabColors()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
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 (
|
||||
<ThemeProvider value={routerTheme}>
|
||||
<NativeTabs
|
||||
blurEffect={
|
||||
tabColors.blurEffect as
|
||||
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
||||
}
|
||||
backgroundColor={tabColors.backgroundColor}
|
||||
iconColor={tabColors.iconColor}
|
||||
labelStyle={tabColors.labelStyle}
|
||||
tintColor={appleMusic.pink}
|
||||
minimizeBehavior="onScrollDown"
|
||||
>
|
||||
{showBottomAccessory ? (
|
||||
<NativeTabs.BottomAccessory>
|
||||
<TabBottomAccessory />
|
||||
</NativeTabs.BottomAccessory>
|
||||
<Animated.View style={[{ flex: 1 }, backgroundStyle]}>
|
||||
{Platform.OS === "android" ? (
|
||||
<NavigationBar style={tabColors.isDark ? "light" : "dark"} />
|
||||
) : null}
|
||||
<NativeTabs
|
||||
sidebarAdaptable
|
||||
blurEffect={
|
||||
tabColors.blurEffect as
|
||||
"systemChromeMaterialDark" | "systemChromeMaterialLight"
|
||||
}
|
||||
backgroundColor={tabColors.backgroundColor}
|
||||
iconColor={tabColors.iconColor}
|
||||
labelStyle={tabColors.labelStyle}
|
||||
tintColor={tabColors.tintColor}
|
||||
minimizeBehavior="onScrollDown"
|
||||
{...(Platform.OS === "android"
|
||||
? { disableIndicator: true, rippleColor: tabColors.tintColor }
|
||||
: {})}
|
||||
>
|
||||
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
|
||||
<NativeTabs.BottomAccessory>
|
||||
<TabBottomAccessory />
|
||||
</NativeTabs.BottomAccessory>
|
||||
) : null}
|
||||
|
||||
<NativeTabs.Trigger name="home" disableTransparentOnScrollEdge>
|
||||
<NativeTabs.Trigger.Icon sf="house.fill" md="home" />
|
||||
<NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="home"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? homeColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="house.fill" md="home" />
|
||||
<NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
|
||||
<NativeTabs.Trigger name="library" disableTransparentOnScrollEdge>
|
||||
<NativeTabs.Trigger.Icon
|
||||
sf="music.note.square.stack.fill"
|
||||
md="library_music"
|
||||
/>
|
||||
<NativeTabs.Trigger.Label>Library</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="library"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? libraryColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon
|
||||
sf="music.note.square.stack.fill"
|
||||
md="library_music"
|
||||
/>
|
||||
<NativeTabs.Trigger.Label>
|
||||
{tabletLayout ? "Recently Added" : "Library"}
|
||||
</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
|
||||
<NativeTabs.Trigger name="search" disableTransparentOnScrollEdge>
|
||||
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
||||
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
</NativeTabs>
|
||||
<NativeTabs.Trigger
|
||||
name="search"
|
||||
unstable_nativeProps={
|
||||
Platform.OS === "android" ? searchColors : undefined
|
||||
}
|
||||
disableTransparentOnScrollEdge
|
||||
contentStyle={androidContentStyle}
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
|
||||
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(albums)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="square.stack" />
|
||||
<NativeTabs.Trigger.Label>Albums</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(artists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="mic" />
|
||||
<NativeTabs.Trigger.Label>Artists</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(songs)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="music.note" />
|
||||
<NativeTabs.Trigger.Label>Songs</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(playlists)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="music.note.list" />
|
||||
<NativeTabs.Trigger.Label>All Playlists</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(favorites)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="star" />
|
||||
<NativeTabs.Trigger.Label>Favorites</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
<NativeTabs.Trigger
|
||||
name="(recent)"
|
||||
hidden={!(Platform.OS === "ios" && Platform.isPad)}
|
||||
disableTransparentOnScrollEdge
|
||||
>
|
||||
<NativeTabs.Trigger.Icon sf="clock" />
|
||||
<NativeTabs.Trigger.Label>Recently Played</NativeTabs.Trigger.Label>
|
||||
</NativeTabs.Trigger>
|
||||
</NativeTabs>
|
||||
{!keyboardVisible ? <AndroidMiniPlayer /> : null}
|
||||
{tabletLayout ? <TabletMiniPlayer /> : null}
|
||||
</Animated.View>
|
||||
</ThemeProvider>
|
||||
)
|
||||
}
|
||||
|
||||
export default function TabsLayout() {
|
||||
return (
|
||||
<ScreenPaletteProvider>
|
||||
<TabletPlayerLayoutProvider>
|
||||
<TabsContent />
|
||||
</TabletPlayerLayoutProvider>
|
||||
</ScreenPaletteProvider>
|
||||
)
|
||||
}
|
||||
@@ -1,10 +1,11 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
export const unstable_settings = {
|
||||
initialRouteName: "index",
|
||||
anchor: "index",
|
||||
}
|
||||
|
||||
export default function HomeLayout() {
|
||||
@@ -12,7 +13,7 @@ export default function HomeLayout() {
|
||||
|
||||
return (
|
||||
<Stack
|
||||
initialRouteName="index"
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Home",
|
||||
|
||||
@@ -1,14 +1,34 @@
|
||||
import { Stack, useIsFocused, useLocalSearchParams } from "expo-router"
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import {
|
||||
useSwipeRowGroup,
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link, 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 { Ionicons } from "@expo/vector-icons"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
CollectionDivider,
|
||||
collectionInset,
|
||||
DiscHeader,
|
||||
} from "@/components/collection-list"
|
||||
import { AudioFormatBadge } from "@/components/audio-format-badge"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
|
||||
import {
|
||||
@@ -53,18 +73,36 @@ export default function AlbumScreen() {
|
||||
handleAlbumTrackAction,
|
||||
isAlbumFavorite: isAlbumFav,
|
||||
} = useMediaMenuActions()
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const isFocused = useIsFocused()
|
||||
const coverUri =
|
||||
config && typeof id === "string" ? albumCoverUrl(config.serverUrl, id) : ""
|
||||
const { palette, settled } = useCoverPalette(
|
||||
const heroLayout = useCollectionHeroLayout()
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
album ? album.cover != null : album === null ? false : undefined
|
||||
)
|
||||
const { palette, onLayout, backgroundStyle } =
|
||||
useScreenPalette(artworkPalette)
|
||||
const songIds = useMemo(
|
||||
() => album?.tracks.map((track) => track.id as Id<"songs">) ?? [],
|
||||
[album]
|
||||
)
|
||||
|
||||
// Older servers do not include album format availability yet.
|
||||
const formatTracks = useCachedQuery(
|
||||
api.library.getSongsForPlayback,
|
||||
album && (album.hasLossless === undefined || album.hasAtmos === undefined)
|
||||
? { ids: songIds }
|
||||
: "skip"
|
||||
)
|
||||
const hasLossless =
|
||||
album?.hasLossless ??
|
||||
formatTracks?.some((track) => track && "lossless" in track.files)
|
||||
const hasAtmos =
|
||||
album?.hasAtmos ??
|
||||
formatTracks?.some((track) => track && "atmos" in track.files)
|
||||
|
||||
useEffect(() => {
|
||||
if (album) {
|
||||
rememberSongs(albumDetailSongs(album))
|
||||
@@ -80,13 +118,16 @@ export default function AlbumScreen() {
|
||||
}
|
||||
return album ? (
|
||||
<AlbumTrackRow
|
||||
swipeGroup={swipeGroup}
|
||||
track={item.track}
|
||||
number={item.number}
|
||||
album={album}
|
||||
songIds={songIds}
|
||||
palette={palette}
|
||||
favorited={isSongFavorite(item.track.id)}
|
||||
onPlay={playFromSong}
|
||||
onPlay={(songId, ids) =>
|
||||
playFromSong(songId, ids, `album:${album.id}`)
|
||||
}
|
||||
onAction={handleAlbumTrackAction}
|
||||
/>
|
||||
) : null
|
||||
@@ -98,6 +139,7 @@ export default function AlbumScreen() {
|
||||
palette,
|
||||
playFromSong,
|
||||
songIds,
|
||||
swipeGroup,
|
||||
]
|
||||
)
|
||||
|
||||
@@ -108,9 +150,25 @@ export default function AlbumScreen() {
|
||||
options={{
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton />
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={220}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
Platform.OS === "android" ? palette.background : undefined
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -125,9 +183,9 @@ export default function AlbumScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
Album not found.
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -146,102 +204,215 @@ export default function AlbumScreen() {
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
}
|
||||
: {}),
|
||||
headerRight: () => (
|
||||
<MediaActionMenu
|
||||
stationArtistId={album.artist.id}
|
||||
selectedCount={album.tracks.length}
|
||||
favorited={isAlbumFav(album.id)}
|
||||
share={{ type: "album", albumId: album.id }}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
onAction={(action) =>
|
||||
void handleAlbumDetailAction(
|
||||
album.id as Id<"albums">,
|
||||
songIds,
|
||||
action
|
||||
action,
|
||||
album.artist.id as Id<"artists">
|
||||
)
|
||||
}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.foreground}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
<FlatList
|
||||
<Animated.FlatList
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={listItems}
|
||||
keyExtractor={albumListItemKey}
|
||||
style={{ flex: 1, backgroundColor: palette.background }}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: palette.background },
|
||||
backgroundStyle,
|
||||
]}
|
||||
contentContainerStyle={{ paddingBottom: contentBottomInset }}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||
ListHeaderComponent={
|
||||
<View>
|
||||
<View style={styles.hero}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={album.cover != null}
|
||||
style={styles.cover}
|
||||
/>
|
||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Pressable onPress={() => push(`/artist/${album.artist.id}`)}>
|
||||
<Text style={[styles.artist, { color: palette.accentText }]}>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
{metadata ? (
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{metadata}
|
||||
</Text>
|
||||
) : null}
|
||||
<View style={styles.actions}>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
hitSlop={8}
|
||||
<MusicEntityView kind="album" id={album.id}>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={album.cover != null}
|
||||
style={[
|
||||
styles.cover,
|
||||
heroLayout.coverSize
|
||||
? {
|
||||
width: heroLayout.coverSize,
|
||||
height: heroLayout.coverSize,
|
||||
}
|
||||
: undefined,
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={
|
||||
<View
|
||||
style={[
|
||||
styles.actions,
|
||||
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||
]}
|
||||
>
|
||||
<Pressable
|
||||
onPress={() => void toggleAlbumFavorite(album.id)}
|
||||
hitSlop={8}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={favorited ? "accent" : "foreground"}
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
{ color: palette.foreground },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
name={favorited ? "star" : "star-outline"}
|
||||
size={24}
|
||||
color={favorited ? palette.accent : palette.foreground}
|
||||
/>
|
||||
{album.title}
|
||||
</PaletteText>
|
||||
<Pressable
|
||||
onPress={() => push(`/artist/${album.artist.id}`)}
|
||||
style={styles.artistPressable}
|
||||
>
|
||||
<PaletteText
|
||||
tone="accentText"
|
||||
style={[
|
||||
styles.artist,
|
||||
heroLayout.landscape && styles.artistLandscape,
|
||||
{ color: palette.accentText },
|
||||
]}
|
||||
>
|
||||
{album.artist.name}
|
||||
</PaletteText>
|
||||
</Pressable>
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={() => void playAlbum(album.id, songIds)}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: heroLayout.landscape
|
||||
? "flex-start"
|
||||
: "center",
|
||||
flexWrap: "wrap",
|
||||
gap: 8,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={() => void playAlbumShuffled(album.id, songIds)}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{ backgroundColor: palette.surface },
|
||||
]}
|
||||
>
|
||||
<Ionicons
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
</View>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{metadata}
|
||||
</PaletteText>
|
||||
) : null}
|
||||
{hasLossless ? (
|
||||
<>
|
||||
{metadata ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="lossless"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
{hasAtmos ? (
|
||||
<>
|
||||
{metadata || hasLossless ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
·
|
||||
</PaletteText>
|
||||
) : null}
|
||||
<AudioFormatBadge
|
||||
artwork
|
||||
format="atmos"
|
||||
color={palette.secondaryForeground}
|
||||
backgroundColor={palette.background}
|
||||
/>
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
</CollectionHero>
|
||||
</MusicEntityView>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</View>
|
||||
}
|
||||
@@ -294,6 +465,7 @@ function albumListItemKey(item: AlbumListItem) {
|
||||
|
||||
const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
track,
|
||||
swipeGroup,
|
||||
number,
|
||||
album,
|
||||
songIds,
|
||||
@@ -303,6 +475,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
onAction,
|
||||
}: {
|
||||
track: BrowseAlbumTrack
|
||||
swipeGroup: SwipeRowGroup
|
||||
number: number
|
||||
album: BrowseAlbumDetail
|
||||
songIds: Id<"songs">[]
|
||||
@@ -315,8 +488,23 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
action: MediaAction
|
||||
) => Promise<void>
|
||||
}) {
|
||||
const Row = Platform.OS === "ios" ? SongSwipeRow : Pressable
|
||||
const { config } = useServerConfig()
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={
|
||||
config
|
||||
? {
|
||||
kind: "song",
|
||||
title: track.title,
|
||||
artist: album.artist.name,
|
||||
album: album.title,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
|
||||
hasArtwork: album.cover != null,
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
stationArtistId={album.artist.id}
|
||||
favorited={favorited}
|
||||
navigation={{
|
||||
artist: { id: album.artist.id },
|
||||
@@ -326,60 +514,73 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
|
||||
type: "song",
|
||||
albumId: album.id,
|
||||
songId: track.id,
|
||||
title: `${track.title} - ${album.title}`,
|
||||
}}
|
||||
onAction={(action) => void onAction(track, album, action)}
|
||||
>
|
||||
<Pressable
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
<Text
|
||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||
<MusicEntityView kind="song" id={track.id}>
|
||||
<Row
|
||||
group={swipeGroup}
|
||||
backgroundColor={palette.background}
|
||||
onPlayNext={() => void onAction(track, album, "play-next")}
|
||||
style={styles.trackRow}
|
||||
onPress={() => void onPlay(track.id as Id<"songs">, songIds)}
|
||||
>
|
||||
{number}
|
||||
</Text>
|
||||
<View
|
||||
style={[styles.trackContent, { borderBottomColor: palette.divider }]}
|
||||
>
|
||||
<View style={styles.trackMeta}>
|
||||
<Text
|
||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.title}
|
||||
</Text>
|
||||
{track.artists ? (
|
||||
<Text
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[styles.trackNumber, { color: palette.secondaryForeground }]}
|
||||
>
|
||||
{number}
|
||||
</PaletteText>
|
||||
<View
|
||||
style={[
|
||||
styles.trackContent,
|
||||
{ borderBottomColor: palette.divider },
|
||||
]}
|
||||
>
|
||||
<View style={styles.trackMeta}>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[styles.trackTitle, { color: palette.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</Text>
|
||||
) : null}
|
||||
{track.title}
|
||||
</PaletteText>
|
||||
{track.artists ? (
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{track.artists.join(", ")}
|
||||
</PaletteText>
|
||||
) : null}
|
||||
</View>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={{ color: palette.secondaryForeground }}
|
||||
>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</PaletteText>
|
||||
</View>
|
||||
<Text style={{ color: palette.secondaryForeground }}>
|
||||
{formatDuration(track.durationSeconds)}
|
||||
</Text>
|
||||
</View>
|
||||
</Pressable>
|
||||
</Row>
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
hero: {
|
||||
alignItems: "center",
|
||||
padding: spacing.lg,
|
||||
gap: spacing.sm,
|
||||
},
|
||||
cover: {
|
||||
width: 220,
|
||||
height: 220,
|
||||
borderRadius: radius.lg,
|
||||
},
|
||||
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
||||
artist: { fontSize: 16, fontWeight: "600" },
|
||||
titleLandscape: { textAlign: "left", fontSize: 22 },
|
||||
artistLandscape: { textAlign: "left", fontSize: 22, fontWeight: "400" },
|
||||
artistPressable: { alignSelf: "stretch" },
|
||||
artist: { fontSize: 16, fontWeight: "600", textAlign: "center" },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Stack, useLocalSearchParams } from "expo-router"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
@@ -74,7 +75,11 @@ export default function ArtistScreen() {
|
||||
<MediaActionMenu
|
||||
selectedCount={data.albums.length}
|
||||
favorited={isArtistFav(data.artist.id)}
|
||||
share={{ type: "artist", artistId: data.artist.id }}
|
||||
share={{
|
||||
type: "artist",
|
||||
artistId: data.artist.id,
|
||||
title: data.artist.name,
|
||||
}}
|
||||
onAction={(action) =>
|
||||
void handleArtistAction(data.artist, action)
|
||||
}
|
||||
@@ -95,7 +100,11 @@ export default function ArtistScreen() {
|
||||
paddingBottom={contentBottomInset}
|
||||
contentInset={false}
|
||||
ListHeaderComponent={
|
||||
<View style={styles.hero}>
|
||||
<MusicEntityView
|
||||
kind="artist"
|
||||
id={data.artist.id}
|
||||
style={styles.hero}
|
||||
>
|
||||
<CoverImage
|
||||
uri={artistCoverUrl(config.serverUrl, data.artist.id)}
|
||||
hasCover={data.artist.photo != null}
|
||||
@@ -138,7 +147,7 @@ export default function ArtistScreen() {
|
||||
<Ionicons name="shuffle" size={24} color={colors.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
</View>
|
||||
</MusicEntityView>
|
||||
}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -141,8 +141,14 @@ const ArtistRow = memo(function ArtistRow({
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "artist",
|
||||
title: artist.name,
|
||||
artworkUrl: artistCoverUrl(serverUrl, artist.id),
|
||||
hasArtwork: artist.photo != null,
|
||||
}}
|
||||
favorited={favorited}
|
||||
share={{ type: "artist", artistId: artist.id }}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
onAction={(action) => void onAction(artist, action)}
|
||||
>
|
||||
<Pressable
|
||||
@@ -160,7 +166,11 @@ const ArtistRow = memo(function ArtistRow({
|
||||
>
|
||||
{artist.name}
|
||||
</Text>
|
||||
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={16}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
|
||||
@@ -1,6 +1,26 @@
|
||||
import {
|
||||
CollectionHero,
|
||||
useCollectionHeroLayout,
|
||||
} from "@/components/collection-hero"
|
||||
import {
|
||||
PaletteText,
|
||||
PaletteIcon,
|
||||
renderArtworkBackButton,
|
||||
} from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import {
|
||||
renderAndroidArtworkBackground,
|
||||
useScreenPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { useMutation } from "convex/react"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import {
|
||||
Link,
|
||||
Stack,
|
||||
useIsFocused,
|
||||
useLocalSearchParams,
|
||||
@@ -8,21 +28,17 @@ import {
|
||||
} from "expo-router"
|
||||
import { StatusBar } from "expo-status-bar"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type ListRenderItemInfo,
|
||||
} from "react-native"
|
||||
import ReanimatedSwipeable from "react-native-gesture-handler/ReanimatedSwipeable"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
|
||||
import { CollectionDivider } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import {
|
||||
SwipeToRemoveRow,
|
||||
useSwipeRowGroup,
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
@@ -37,10 +53,7 @@ import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
useCachedPaginatedQuery,
|
||||
useCachedQuery,
|
||||
} from "@/hooks/use-cached-query"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useCoverPalette } from "@/hooks/use-cover-palette"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
@@ -49,11 +62,10 @@ import type { BrowsePlaylistDetail, BrowseSong } from "@otunes/convex/types"
|
||||
import type { CoverPalette } from "@/lib/cover-palette"
|
||||
import { longListProps } from "@/lib/list"
|
||||
import { rememberSongs } from "@/lib/song-cache"
|
||||
import { showError, showSuccess } from "@/lib/toast"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { playlistCoverUrl } from "@/lib/urls"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
const PAGE_SIZE = 50
|
||||
const PLAYLIST_LABEL = "Add to Another Playlist"
|
||||
const OWNER_MENU_ACTIONS: MediaAction[] = [
|
||||
"share",
|
||||
@@ -72,55 +84,50 @@ export default function PlaylistScreen() {
|
||||
const playlistId = typeof id === "string" ? (id as Id<"playlists">) : null
|
||||
const playlist = useCachedQuery(
|
||||
api.playlists.browsePlaylistDetail,
|
||||
playlistId
|
||||
? {
|
||||
id: playlistId,
|
||||
includeSongs: false,
|
||||
}
|
||||
: "skip"
|
||||
)
|
||||
const {
|
||||
results: songs,
|
||||
status,
|
||||
loadMore,
|
||||
isCached,
|
||||
} = useCachedPaginatedQuery(
|
||||
api.playlists.browsePlaylistSongsPaginated,
|
||||
playlistId ? { id: playlistId } : "skip",
|
||||
{ initialNumItems: PAGE_SIZE }
|
||||
)
|
||||
const allSongIds = useCachedQuery(
|
||||
api.playlists.getPlaylistSongIds,
|
||||
playlistId ? { playlistId } : "skip"
|
||||
playlistId ? { id: playlistId } : "skip"
|
||||
)
|
||||
const songs = playlist?.songs
|
||||
const coverUri =
|
||||
config && playlistId
|
||||
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
|
||||
: ""
|
||||
const { palette, settled } = useCoverPalette(
|
||||
const { palette: artworkPalette, settled } = useCoverPalette(
|
||||
coverUri,
|
||||
playlist ? playlist.cover != null : playlist === null ? false : undefined
|
||||
)
|
||||
const { palette, onLayout, backgroundStyle } =
|
||||
useScreenPalette(artworkPalette)
|
||||
|
||||
useEffect(() => {
|
||||
rememberSongs(songs)
|
||||
if (songs) rememberSongs(songs)
|
||||
}, [songs])
|
||||
|
||||
if (
|
||||
playlist === undefined ||
|
||||
(status === "LoadingFirstPage" && !isCached) ||
|
||||
!config ||
|
||||
!settled
|
||||
) {
|
||||
if (playlist === undefined || !config || !settled) {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
headerTintColor: palette.foreground,
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
/>
|
||||
<CollectionDetailSkeleton />
|
||||
<CollectionDetailSkeleton
|
||||
zoomCoverSize={200}
|
||||
onLayout={onLayout}
|
||||
style={backgroundStyle}
|
||||
backgroundColor={
|
||||
Platform.OS === "android" ? palette.background : undefined
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)
|
||||
}
|
||||
@@ -135,9 +142,9 @@ export default function PlaylistScreen() {
|
||||
}}
|
||||
/>
|
||||
<View style={[styles.empty, { backgroundColor: colors.background }]}>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
<PaletteText style={{ color: colors.mutedForeground }}>
|
||||
Playlist not found.
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
</>
|
||||
)
|
||||
@@ -145,32 +152,30 @@ export default function PlaylistScreen() {
|
||||
|
||||
return (
|
||||
<PlaylistContent
|
||||
backgroundStyle={backgroundStyle}
|
||||
onLayout={onLayout}
|
||||
playlist={playlist}
|
||||
songs={songs}
|
||||
allSongIds={allSongIds}
|
||||
songs={playlist.songs}
|
||||
coverUri={coverUri}
|
||||
palette={palette}
|
||||
onEndReached={() => {
|
||||
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
|
||||
}}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
function PlaylistContent({
|
||||
backgroundStyle,
|
||||
onLayout,
|
||||
playlist,
|
||||
songs,
|
||||
allSongIds,
|
||||
coverUri,
|
||||
palette,
|
||||
onEndReached,
|
||||
}: {
|
||||
onLayout?: () => void
|
||||
backgroundStyle: ReturnType<typeof useScreenPalette>["backgroundStyle"]
|
||||
playlist: BrowsePlaylistDetail
|
||||
songs: BrowseSong[]
|
||||
allSongIds: Id<"songs">[] | undefined
|
||||
coverUri: string
|
||||
palette: CoverPalette
|
||||
onEndReached: () => void
|
||||
}) {
|
||||
const router = useRouter()
|
||||
const isFocused = useIsFocused()
|
||||
@@ -186,13 +191,15 @@ function PlaylistContent({
|
||||
const playlistId = playlist.id
|
||||
const isSubscribed = playlist.isSubscribed
|
||||
const canEdit = playlist.isOwner && playlistId !== null
|
||||
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const songIds = allSongIds ?? loadedSongIds
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
[playFromSong, songIds]
|
||||
(song: BrowseSong) =>
|
||||
void playFromSong(song.id, songIds, `playlist:${playlistId}`),
|
||||
[playFromSong, songIds, playlistId]
|
||||
)
|
||||
|
||||
const handleSongMenuAction = useCallback(
|
||||
@@ -206,7 +213,6 @@ function PlaylistContent({
|
||||
if (!playlistId) return false
|
||||
try {
|
||||
await removeSongs({ playlistId, songIds: [songId] })
|
||||
showSuccess("Removed from playlist")
|
||||
return true
|
||||
} catch (error) {
|
||||
showError(
|
||||
@@ -221,22 +227,20 @@ function PlaylistContent({
|
||||
)
|
||||
|
||||
const handlePlay = useCallback(() => {
|
||||
if (playlistId) void playPlaylist(playlistId, allSongIds)
|
||||
}, [allSongIds, playPlaylist, playlistId])
|
||||
if (playlistId) void playPlaylist(playlistId, songIds)
|
||||
}, [playPlaylist, playlistId, songIds])
|
||||
|
||||
const handleShuffle = useCallback(() => {
|
||||
if (playlistId) void playPlaylistShuffled(playlistId, allSongIds)
|
||||
}, [allSongIds, playPlaylistShuffled, playlistId])
|
||||
if (playlistId) void playPlaylistShuffled(playlistId, songIds)
|
||||
}, [playPlaylistShuffled, playlistId, songIds])
|
||||
|
||||
const handleSubscribeToggle = useCallback(async () => {
|
||||
if (!playlistId) return
|
||||
try {
|
||||
if (isSubscribed) {
|
||||
await unsubscribe({ playlistId })
|
||||
showSuccess("Unsubscribed")
|
||||
} else {
|
||||
await subscribe({ playlistId })
|
||||
showSuccess("Subscribed")
|
||||
}
|
||||
} catch (error) {
|
||||
showError(
|
||||
@@ -250,7 +254,6 @@ function PlaylistContent({
|
||||
if (!playlistId) return
|
||||
try {
|
||||
await deletePlaylist({ playlistId })
|
||||
showSuccess("Playlist deleted")
|
||||
router.back()
|
||||
} catch (error) {
|
||||
showError(
|
||||
@@ -272,6 +275,17 @@ function PlaylistContent({
|
||||
title: "",
|
||||
headerLargeTitle: false,
|
||||
headerTintColor: palette.foreground,
|
||||
...(Platform.OS === "android"
|
||||
? {
|
||||
headerStyle: { backgroundColor: "transparent" },
|
||||
headerBackground: renderAndroidArtworkBackground,
|
||||
headerBackVisible: false,
|
||||
headerLeft: renderArtworkBackButton,
|
||||
statusBarStyle: palette.isDark
|
||||
? ("light" as const)
|
||||
: ("dark" as const),
|
||||
}
|
||||
: {}),
|
||||
headerRight: () => (
|
||||
<MediaActionMenu
|
||||
selectedCount={songIds.length}
|
||||
@@ -279,15 +293,17 @@ function PlaylistContent({
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlistId ?? "favorites",
|
||||
title: playlist?.title ?? "oTunes",
|
||||
}}
|
||||
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
|
||||
onAction={handlePlaylistMenuAction}
|
||||
>
|
||||
<Pressable hitSlop={8}>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="ellipsis-horizontal"
|
||||
size={22}
|
||||
color={palette.foreground}
|
||||
color={palette.isDark ? "#fff" : "#000"}
|
||||
/>
|
||||
</Pressable>
|
||||
</MediaActionMenu>
|
||||
@@ -298,7 +314,10 @@ function PlaylistContent({
|
||||
deletePlaylist,
|
||||
handlePlaylistDetailAction,
|
||||
palette.foreground,
|
||||
palette.background,
|
||||
palette.isDark,
|
||||
playlistId,
|
||||
playlist?.title,
|
||||
router,
|
||||
songIds,
|
||||
])
|
||||
@@ -333,20 +352,38 @@ function PlaylistContent({
|
||||
<StatusBar style={palette.isDark ? "light" : "dark"} />
|
||||
) : null}
|
||||
<Stack.Screen options={screenOptions} />
|
||||
<FlatList
|
||||
<PlaylistSearchBar
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
/>
|
||||
<Animated.FlatList
|
||||
onLayout={onLayout}
|
||||
{...longListProps}
|
||||
data={songs}
|
||||
data={filteredSongs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
style={{ flex: 1, backgroundColor: palette.background }}
|
||||
style={[
|
||||
{ flex: 1, backgroundColor: palette.background },
|
||||
backgroundStyle,
|
||||
]}
|
||||
indicatorStyle={palette.isDark ? "white" : "black"}
|
||||
contentContainerStyle={styles.listContent}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onEndReached={onEndReached}
|
||||
onEndReachedThreshold={0.5}
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
ListEmptyComponent={
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[
|
||||
styles.emptyResults,
|
||||
{ color: palette.secondaryForeground },
|
||||
]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</PaletteText>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<PlaylistHero
|
||||
entityId={playlistId ?? "otunes:favorites"}
|
||||
coverUri={coverUri}
|
||||
hasCover={playlist.cover != null}
|
||||
title={playlist.title}
|
||||
@@ -396,28 +433,24 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
playlistLabel={PLAYLIST_LABEL}
|
||||
palette={palette}
|
||||
inset
|
||||
swipe={
|
||||
Platform.OS === "ios"
|
||||
? {
|
||||
group: swipeGroup,
|
||||
backgroundColor: palette.background,
|
||||
onPlayNext: () => onAction(song, "play-next"),
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
onPlay={onPlay}
|
||||
onAction={onAction}
|
||||
/>
|
||||
)
|
||||
|
||||
if (!removable) {
|
||||
if (Platform.OS === "ios" || !removable) {
|
||||
return row
|
||||
}
|
||||
|
||||
if (Platform.OS === "ios") {
|
||||
return (
|
||||
<SwipeToRemoveRow
|
||||
group={swipeGroup}
|
||||
backgroundColor={palette.background}
|
||||
actionAccessibilityLabel={`Remove ${song.title} from playlist`}
|
||||
onRemove={handleRemove}
|
||||
>
|
||||
{row}
|
||||
</SwipeToRemoveRow>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<ReanimatedSwipeable
|
||||
friction={2}
|
||||
@@ -436,15 +469,19 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
}}
|
||||
style={[styles.removeAction, { backgroundColor: colors.destructive }]}
|
||||
>
|
||||
<Ionicons name="trash" size={22} color={colors.primaryForeground} />
|
||||
<Text
|
||||
<PaletteIcon
|
||||
name="trash"
|
||||
size={22}
|
||||
color={colors.primaryForeground}
|
||||
/>
|
||||
<PaletteText
|
||||
style={[
|
||||
styles.removeActionText,
|
||||
{ color: colors.primaryForeground },
|
||||
]}
|
||||
>
|
||||
Remove
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</Pressable>
|
||||
)}
|
||||
>
|
||||
@@ -454,6 +491,7 @@ const PlaylistSongRow = memo(function PlaylistSongRow({
|
||||
})
|
||||
|
||||
const PlaylistHero = memo(function PlaylistHero({
|
||||
entityId,
|
||||
coverUri,
|
||||
hasCover,
|
||||
title,
|
||||
@@ -465,6 +503,7 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
onPlay,
|
||||
onShuffle,
|
||||
}: {
|
||||
entityId: string
|
||||
coverUri: string
|
||||
hasCover: boolean
|
||||
title: string
|
||||
@@ -476,76 +515,125 @@ const PlaylistHero = memo(function PlaylistHero({
|
||||
onPlay: () => void
|
||||
onShuffle: () => void
|
||||
}) {
|
||||
const heroLayout = useCollectionHeroLayout()
|
||||
return (
|
||||
<View>
|
||||
<View style={styles.hero}>
|
||||
<CoverImage uri={coverUri} hasCover={hasCover} style={styles.cover} />
|
||||
<Text style={[styles.title, { color: palette.foreground }]}>
|
||||
{title}
|
||||
</Text>
|
||||
<Text style={{ color: palette.secondaryForeground }}>{ownerName}</Text>
|
||||
<View style={styles.actions}>
|
||||
{showSubscribe ? (
|
||||
<MusicEntityView kind="playlist" id={entityId}>
|
||||
<CollectionHero
|
||||
artwork={
|
||||
<Link.AppleZoomTarget>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={coverUri}
|
||||
hasCover={hasCover}
|
||||
style={[
|
||||
styles.cover,
|
||||
heroLayout.coverSize
|
||||
? {
|
||||
width: heroLayout.coverSize,
|
||||
height: heroLayout.coverSize,
|
||||
}
|
||||
: undefined,
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoomTarget>
|
||||
}
|
||||
actions={
|
||||
<View
|
||||
style={[
|
||||
styles.actions,
|
||||
heroLayout.landscape && { flexDirection: "row-reverse" },
|
||||
]}
|
||||
>
|
||||
{showSubscribe ? (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
||||
accessibilityState={{ selected: isSubscribed }}
|
||||
hitSlop={8}
|
||||
onPress={onSubscribeToggle}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{
|
||||
backgroundColor: isSubscribed
|
||||
? palette.surface
|
||||
: palette.accent,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone={isSubscribed ? "foreground" : "accentForeground"}
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
size={24}
|
||||
color={
|
||||
isSubscribed ? palette.foreground : palette.accentForeground
|
||||
}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={isSubscribed ? "Subscribed" : "Subscribe"}
|
||||
accessibilityState={{ selected: isSubscribed }}
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onSubscribeToggle}
|
||||
style={[
|
||||
styles.iconAction,
|
||||
{
|
||||
backgroundColor: isSubscribed
|
||||
? palette.surface
|
||||
: palette.accent,
|
||||
},
|
||||
]}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons
|
||||
name={isSubscribed ? "checkmark" : "add"}
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="shuffle"
|
||||
size={24}
|
||||
color={
|
||||
isSubscribed ? palette.foreground : palette.accentForeground
|
||||
}
|
||||
color={palette.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Button
|
||||
title="Play"
|
||||
icon="play"
|
||||
onPress={onPlay}
|
||||
style={styles.playButton}
|
||||
tint={{
|
||||
background: palette.accent,
|
||||
foreground: palette.accentForeground,
|
||||
}}
|
||||
/>
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Shuffle"
|
||||
hitSlop={8}
|
||||
onPress={onShuffle}
|
||||
style={[styles.iconAction, { backgroundColor: palette.surface }]}
|
||||
>
|
||||
<Ionicons name="shuffle" size={24} color={palette.foreground} />
|
||||
</Pressable>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
}
|
||||
>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
styles.title,
|
||||
heroLayout.landscape && styles.titleLandscape,
|
||||
{ color: palette.foreground },
|
||||
]}
|
||||
>
|
||||
{title}
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={{
|
||||
color: palette.foreground,
|
||||
fontSize: heroLayout.landscape ? 22 : 16,
|
||||
}}
|
||||
>
|
||||
{ownerName}
|
||||
</PaletteText>
|
||||
</CollectionHero>
|
||||
<CollectionDivider color={palette.divider} />
|
||||
</View>
|
||||
</MusicEntityView>
|
||||
)
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
listContent: { paddingBottom: contentBottomInset },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
cover: {
|
||||
width: 200,
|
||||
height: 200,
|
||||
borderRadius: radius.lg,
|
||||
},
|
||||
title: { fontSize: 24, fontWeight: "800", textAlign: "center" },
|
||||
titleLandscape: { textAlign: "left", fontSize: 22 },
|
||||
actions: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import {
|
||||
PlaylistSearchBar,
|
||||
usePlaylistSearch,
|
||||
} from "@/components/playlist-search-bar"
|
||||
import { memo, useCallback, useEffect, useMemo } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
@@ -15,10 +19,7 @@ import { contentBottomInset, SongListRow } from "@/components/player"
|
||||
import { useFavorites } from "@/contexts/favorites"
|
||||
import { usePlaybackActions } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
useCachedPaginatedQuery,
|
||||
useCachedQuery,
|
||||
} from "@/hooks/use-cached-query"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { useMediaMenuActions } from "@/hooks/use-media-menu-actions"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { MediaAction } from "@/components/media-context-menu"
|
||||
@@ -29,32 +30,23 @@ import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
const PAGE_SIZE = 50
|
||||
const SCREEN_OPTIONS = { title: "", headerLargeTitle: false }
|
||||
|
||||
export default function FavoritesScreen() {
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const favorites = useCachedQuery(api.favorites.browseFavoritesSummary)
|
||||
const {
|
||||
results: songs,
|
||||
status,
|
||||
loadMore,
|
||||
isCached,
|
||||
} = useCachedPaginatedQuery(
|
||||
api.favorites.browseFavoritesSongsPaginated,
|
||||
{},
|
||||
{ initialNumItems: PAGE_SIZE }
|
||||
)
|
||||
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
|
||||
const songs = favorites?.songs ?? []
|
||||
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
|
||||
const { isSongFavorite } = useFavorites()
|
||||
const { handleSongAction } = useMediaMenuActions()
|
||||
const loadedSongIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const songIds = favorites?.songIds ?? loadedSongIds
|
||||
const songIds = useMemo(() => songs.map((song) => song.id), [songs])
|
||||
const { filteredSongs, onQueryChange, onSearchSubmit } =
|
||||
usePlaylistSearch(songs)
|
||||
|
||||
useEffect(() => {
|
||||
rememberSongs(songs)
|
||||
}, [songs])
|
||||
if (favorites) rememberSongs(favorites.songs)
|
||||
}, [favorites])
|
||||
|
||||
const handlePlaySong = useCallback(
|
||||
(song: BrowseSong) => void playFromSong(song.id, songIds),
|
||||
@@ -88,11 +80,7 @@ export default function FavoritesScreen() {
|
||||
[handlePlaySong, handleSongMenuAction, isSongFavorite]
|
||||
)
|
||||
|
||||
if (
|
||||
favorites === undefined ||
|
||||
(status === "LoadingFirstPage" && !isCached) ||
|
||||
!config
|
||||
) {
|
||||
if (favorites === undefined || !config) {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
@@ -117,18 +105,25 @@ export default function FavoritesScreen() {
|
||||
return (
|
||||
<>
|
||||
<Stack.Screen options={SCREEN_OPTIONS} />
|
||||
<PlaylistSearchBar
|
||||
onQueryChange={onQueryChange}
|
||||
onSearchSubmit={onSearchSubmit}
|
||||
/>
|
||||
<FlatList
|
||||
{...longListProps}
|
||||
data={songs}
|
||||
data={filteredSongs}
|
||||
keyExtractor={songKey}
|
||||
renderItem={renderItem}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={styles.listContent}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
onEndReached={() => {
|
||||
if (status === "CanLoadMore") loadMore(PAGE_SIZE)
|
||||
}}
|
||||
onEndReachedThreshold={0.5}
|
||||
ListEmptyComponent={
|
||||
<Text
|
||||
style={[styles.emptyResults, { color: colors.mutedForeground }]}
|
||||
>
|
||||
{songs.length ? "No songs found." : "No songs in this playlist."}
|
||||
</Text>
|
||||
}
|
||||
ListHeaderComponent={
|
||||
<FavoritesHero
|
||||
title={favorites.title}
|
||||
@@ -195,6 +190,7 @@ const FavoritesHero = memo(function FavoritesHero({
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
emptyResults: { padding: spacing.lg, textAlign: "center" },
|
||||
empty: { flex: 1, alignItems: "center", justifyContent: "center" },
|
||||
listContent: { paddingBottom: contentBottomInset },
|
||||
hero: { alignItems: "center", padding: spacing.lg, gap: spacing.sm },
|
||||
|
||||
@@ -160,7 +160,7 @@ export default function QueueScreen() {
|
||||
)
|
||||
)}
|
||||
</View>
|
||||
) : null
|
||||
) : undefined
|
||||
}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import { dolbyAtmosSupported } from "@/lib/playback-capabilities"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { useAction, useMutation, useQuery } from "convex/react"
|
||||
import { Image } from "expo-image"
|
||||
import * as ImagePicker from "expo-image-picker"
|
||||
import { useRouter } from "expo-router"
|
||||
import { useState } from "react"
|
||||
import { router } from "expo-router"
|
||||
import {
|
||||
Platform,
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
@@ -18,11 +20,16 @@ import { contentBottomInset } from "@/components/player"
|
||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
setArtworkColorsEnabled,
|
||||
useArtworkColorsEnabled,
|
||||
useArtworkColorPreferenceLoaded,
|
||||
} from "@/lib/artwork-color-preference"
|
||||
import { initialsFromName } from "@/lib/format"
|
||||
import { useCachedQuery } from "@/hooks/use-cached-query"
|
||||
import { clearLocalData, signOutToSignIn } from "@/lib/session"
|
||||
import { changeServer, signOut } from "@/lib/session"
|
||||
import { radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
import { showError, showSuccess } from "@/lib/toast"
|
||||
import { showError } from "@/lib/toast"
|
||||
import type { PlaybackQuality } from "@/lib/urls"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
@@ -73,7 +80,6 @@ const SECTIONS: SectionConfig[] = [
|
||||
|
||||
export default function SettingsScreen() {
|
||||
const colors = useThemeColors()
|
||||
const router = useRouter()
|
||||
const user = useCachedQuery(api.auth.currentUser)
|
||||
const { invalidateSession } = useInvalidateAuthSession()
|
||||
const { clearServer } = useServerConfig()
|
||||
@@ -91,14 +97,19 @@ export default function SettingsScreen() {
|
||||
const visibleSections = SECTIONS.filter((item) => !item.admin || isAdmin)
|
||||
|
||||
async function handleSignOut() {
|
||||
await signOutToSignIn(router, invalidateSession)
|
||||
try {
|
||||
await signOut(invalidateSession)
|
||||
} catch {
|
||||
showError("Could not clear all local data.")
|
||||
}
|
||||
}
|
||||
|
||||
async function handleChangeServer() {
|
||||
await invalidateSession()
|
||||
await clearLocalData()
|
||||
await clearServer()
|
||||
router.replace("/server")
|
||||
try {
|
||||
await changeServer(invalidateSession, clearServer)
|
||||
} catch {
|
||||
showError("Could not clear all local data.")
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -137,7 +148,12 @@ export default function SettingsScreen() {
|
||||
})}
|
||||
</View>
|
||||
|
||||
{section === "profile" ? <ProfileSection user={user} /> : null}
|
||||
{section === "profile" ? (
|
||||
<>
|
||||
<AppearanceSection />
|
||||
<ProfileSection user={user} />
|
||||
</>
|
||||
) : null}
|
||||
{section === "quality" ? <QualitySection user={user} /> : null}
|
||||
{section === "library" && isAdmin ? <LibrarySection /> : null}
|
||||
{section === "users" && isAdmin && allUsers ? (
|
||||
@@ -154,6 +170,33 @@ export default function SettingsScreen() {
|
||||
)
|
||||
}
|
||||
|
||||
function AppearanceSection() {
|
||||
const enabled = useArtworkColorsEnabled()
|
||||
const loaded = useArtworkColorPreferenceLoaded()
|
||||
const [saving, setSaving] = useState(false)
|
||||
|
||||
return (
|
||||
<SettingsCard title="Appearance">
|
||||
<SwitchRow
|
||||
title="New artwork colors"
|
||||
subtitle="Use the new color algorithm on this device."
|
||||
value={enabled}
|
||||
disabled={!loaded || saving}
|
||||
onValueChange={async (checked) => {
|
||||
setSaving(true)
|
||||
try {
|
||||
await setArtworkColorsEnabled(checked)
|
||||
} catch {
|
||||
showError("Could not save artwork colors preference.")
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</SettingsCard>
|
||||
)
|
||||
}
|
||||
|
||||
function ProfileSection({ user }: { user: CurrentUser }) {
|
||||
const colors = useThemeColors()
|
||||
const updateName = useMutation(api.users.updateProfileName)
|
||||
@@ -179,7 +222,6 @@ function ProfileSection({ user }: { user: CurrentUser }) {
|
||||
await updateImage({
|
||||
image: `data:${mime};base64,${result.assets[0].base64}`,
|
||||
})
|
||||
showSuccess("Profile photo updated")
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update photo"
|
||||
@@ -190,7 +232,6 @@ function ProfileSection({ user }: { user: CurrentUser }) {
|
||||
async function removeImage() {
|
||||
try {
|
||||
await updateImage({ image: null })
|
||||
showSuccess("Profile photo removed")
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to remove photo"
|
||||
@@ -209,7 +250,6 @@ function ProfileSection({ user }: { user: CurrentUser }) {
|
||||
await updatePassword({ newPassword })
|
||||
setNewPassword("")
|
||||
setConfirmPassword("")
|
||||
showSuccess("Password updated")
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error ? error.message : "Failed to update password"
|
||||
@@ -258,9 +298,8 @@ function ProfileSection({ user }: { user: CurrentUser }) {
|
||||
variant="secondary"
|
||||
disabled={name.trim() === user.name}
|
||||
onPress={() =>
|
||||
void updateName({ name: name.trim() }).then(
|
||||
() => showSuccess("Name updated"),
|
||||
(error: Error) => showError(error.message)
|
||||
void updateName({ name: name.trim() }).catch((error: Error) =>
|
||||
showError(error.message)
|
||||
)
|
||||
}
|
||||
/>
|
||||
@@ -279,9 +318,8 @@ function ProfileSection({ user }: { user: CurrentUser }) {
|
||||
variant="secondary"
|
||||
disabled={email.trim() === user.email}
|
||||
onPress={() =>
|
||||
void updateEmail({ email: email.trim() }).then(
|
||||
() => showSuccess("Email updated"),
|
||||
(error: Error) => showError(error.message)
|
||||
void updateEmail({ email: email.trim() }).catch((error: Error) =>
|
||||
showError(error.message)
|
||||
)
|
||||
}
|
||||
/>
|
||||
@@ -375,8 +413,13 @@ function QualitySection({ user }: { user: CurrentUser }) {
|
||||
<SettingsCard title="Spatial Audio">
|
||||
<SwitchRow
|
||||
title="Prefer Dolby Atmos"
|
||||
subtitle="Use Atmos versions when they are available."
|
||||
value={user.preferAtmos ?? false}
|
||||
subtitle={
|
||||
dolbyAtmosSupported
|
||||
? "Use Atmos versions when they are available."
|
||||
: "This device does not support Dolby Atmos playback."
|
||||
}
|
||||
disabled={!dolbyAtmosSupported}
|
||||
value={dolbyAtmosSupported && (user.preferAtmos ?? false)}
|
||||
onValueChange={(checked) =>
|
||||
void updateAtmos({ preferAtmos: checked }).catch((error: Error) =>
|
||||
showError(error.message)
|
||||
@@ -407,7 +450,6 @@ function LibrarySection() {
|
||||
setUpdating(true)
|
||||
try {
|
||||
await updateLibrary({})
|
||||
showSuccess("Library updated")
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error
|
||||
@@ -427,8 +469,7 @@ function LibrarySection() {
|
||||
onPress={async () => {
|
||||
setCleaningHls(true)
|
||||
try {
|
||||
const result = await cleanupHlsStreams({})
|
||||
showSuccess(`Removed ${result.removed} idle HLS streams`)
|
||||
await cleanupHlsStreams({})
|
||||
} catch (error) {
|
||||
showError(
|
||||
error instanceof Error
|
||||
@@ -462,7 +503,7 @@ function UsersSection({
|
||||
<SettingsCard title="Sign Up">
|
||||
<SwitchRow
|
||||
title="Disable account creation"
|
||||
subtitle="Stop people from registering themselves. Admins can still create accounts from the web app."
|
||||
subtitle="Stop people from registering themselves. Admins can still create accounts."
|
||||
value={appSettings?.disableAccountCreation ?? false}
|
||||
onValueChange={(checked) =>
|
||||
void setDisableCreation({ disabled: checked }).catch(
|
||||
@@ -476,6 +517,10 @@ function UsersSection({
|
||||
title="People"
|
||||
subtitle="Manage who can access this server."
|
||||
>
|
||||
<Button
|
||||
title="Create account"
|
||||
onPress={() => router.push("/(app)/create-account")}
|
||||
/>
|
||||
<View style={styles.userList}>
|
||||
{users.map((user, index) => (
|
||||
<View
|
||||
@@ -499,7 +544,10 @@ function UsersSection({
|
||||
</Text>
|
||||
{user.isAdmin ? (
|
||||
<View
|
||||
style={[styles.badge, { backgroundColor: colors.muted }]}
|
||||
style={[
|
||||
styles.badge,
|
||||
{ backgroundColor: colors.muted },
|
||||
]}
|
||||
>
|
||||
<Text
|
||||
style={[
|
||||
@@ -529,10 +577,7 @@ function UsersSection({
|
||||
void setAdmin({
|
||||
userId: user._id,
|
||||
isAdmin: !user.isAdmin,
|
||||
}).then(
|
||||
() => showSuccess("Updated permissions"),
|
||||
(error: Error) => showError(error.message)
|
||||
)
|
||||
}).catch((error: Error) => showError(error.message))
|
||||
}
|
||||
style={styles.userActionButton}
|
||||
/>
|
||||
@@ -540,8 +585,7 @@ function UsersSection({
|
||||
title="Delete"
|
||||
variant="destructive"
|
||||
onPress={() =>
|
||||
void deleteUserMutation({ userId: user._id }).then(
|
||||
() => showSuccess("User deleted"),
|
||||
void deleteUserMutation({ userId: user._id }).catch(
|
||||
(error: Error) => showError(error.message)
|
||||
)
|
||||
}
|
||||
@@ -640,10 +684,12 @@ function SwitchRow({
|
||||
subtitle,
|
||||
value,
|
||||
onValueChange,
|
||||
disabled,
|
||||
}: {
|
||||
title: string
|
||||
subtitle?: string
|
||||
value: boolean
|
||||
disabled?: boolean
|
||||
onValueChange: (checked: boolean) => void
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
@@ -658,7 +704,17 @@ function SwitchRow({
|
||||
<Text style={{ color: colors.mutedForeground }}>{subtitle}</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<Switch value={value} onValueChange={onValueChange} />
|
||||
<Switch
|
||||
value={value}
|
||||
disabled={disabled}
|
||||
onValueChange={onValueChange}
|
||||
{...(Platform.OS === "android"
|
||||
? {
|
||||
trackColor: { false: colors.muted, true: colors.primary },
|
||||
thumbColor: colors.foreground,
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,21 +1,26 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
export const unstable_settings = {
|
||||
initialRouteName: "index",
|
||||
anchor: "index",
|
||||
}
|
||||
|
||||
export default function LibraryLayout() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const baseOptions = useStackScreenOptions({ title: "Library" })
|
||||
|
||||
return (
|
||||
<Stack
|
||||
initialRouteName="index"
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Library",
|
||||
title:
|
||||
tabStackScreenTitles[route.name] ??
|
||||
(tabletLayout ? "Recently Added" : "Library"),
|
||||
headerRight:
|
||||
route.name === "index" ? () => <ProfileHeaderButton /> : undefined,
|
||||
unstable_headerRightItems:
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import { useMemo } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { SymbolView } from "expo-symbols"
|
||||
@@ -12,14 +13,22 @@ import { useAppNavigation } from "@/lib/app-navigation"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import { appleMusic, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
const PAGE_SIZE = 16
|
||||
const PAGE_SIZE = 24
|
||||
|
||||
const links = [
|
||||
{ title: "Playlists", href: "/browse/playlists", icon: "music.note.list" as const },
|
||||
{
|
||||
title: "Playlists",
|
||||
href: "/browse/playlists",
|
||||
icon: "music.note.list" as const,
|
||||
},
|
||||
{ title: "Artists", href: "/browse/artists", icon: "mic.fill" as const },
|
||||
{ title: "Albums", href: "/browse/albums", icon: "square.stack" as const },
|
||||
{ title: "Songs", href: "/browse/songs", icon: "music.note" as const },
|
||||
{ title: "Recently Played", href: "/recently-played", icon: "clock" as const },
|
||||
{
|
||||
title: "Recently Played",
|
||||
href: "/recently-played",
|
||||
icon: "clock" as const,
|
||||
},
|
||||
{ title: "Favorites", href: "/playlist/favorites", icon: "star" as const },
|
||||
]
|
||||
|
||||
@@ -43,11 +52,19 @@ function LibraryIcon({ name }: { name: (typeof links)[number]["icon"] }) {
|
||||
sparkles: "sparkles",
|
||||
star: "star",
|
||||
}
|
||||
return <Ionicons name={ionMap[name] ?? "musical-notes"} size={22} color={appleMusic.pink} />
|
||||
return (
|
||||
<Ionicons
|
||||
name={ionMap[name] ?? "musical-notes"}
|
||||
size={22}
|
||||
color={appleMusic.pink}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export default function LibraryScreen() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { push } = useAppNavigation()
|
||||
const isTablet = tabletLayout
|
||||
const colors = useThemeColors()
|
||||
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
|
||||
api.library.browseRecentlyAddedPaginated,
|
||||
@@ -58,29 +75,46 @@ export default function LibraryScreen() {
|
||||
const listHeader = useMemo(
|
||||
() => (
|
||||
<View>
|
||||
{links.map((link) => (
|
||||
<Pressable
|
||||
key={link.href}
|
||||
style={[styles.row, { borderBottomColor: colors.border }]}
|
||||
onPress={() => push(link.href)}
|
||||
>
|
||||
<LibraryIcon name={link.icon} />
|
||||
<Text style={[styles.rowTitle, { color: colors.foreground }]}>{link.title}</Text>
|
||||
<Ionicons name="chevron-forward" size={16} color={colors.mutedForeground} />
|
||||
</Pressable>
|
||||
))}
|
||||
{!isTablet ? (
|
||||
<>
|
||||
{links.map((link) => (
|
||||
<Pressable
|
||||
key={link.href}
|
||||
style={styles.row}
|
||||
onPress={() => push(link.href)}
|
||||
>
|
||||
<LibraryIcon name={link.icon} />
|
||||
<View
|
||||
style={[
|
||||
styles.rowContent,
|
||||
{ borderBottomColor: colors.border },
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.rowTitle, { color: colors.foreground }]}>
|
||||
{link.title}
|
||||
</Text>
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={16}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
</View>
|
||||
</Pressable>
|
||||
))}
|
||||
|
||||
<Pressable
|
||||
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
||||
onPress={() => push("/recently-added")}
|
||||
>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Recently Added
|
||||
</Text>
|
||||
</Pressable>
|
||||
<Pressable
|
||||
style={[styles.section, { paddingHorizontal: spacing.lg }]}
|
||||
onPress={() => push("/recently-added")}
|
||||
>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Recently Added
|
||||
</Text>
|
||||
</Pressable>
|
||||
</>
|
||||
) : null}
|
||||
</View>
|
||||
),
|
||||
[colors.border, colors.foreground, colors.mutedForeground, push]
|
||||
[colors.border, colors.foreground, colors.mutedForeground, push, isTablet]
|
||||
)
|
||||
|
||||
if (status === "LoadingFirstPage" && !isCached) {
|
||||
@@ -111,6 +145,12 @@ const styles = StyleSheet.create({
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
paddingHorizontal: spacing.lg,
|
||||
},
|
||||
rowContent: {
|
||||
flex: 1,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: spacing.md,
|
||||
paddingVertical: 14,
|
||||
borderBottomWidth: StyleSheet.hairlineWidth,
|
||||
},
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import { renderTabScreenContent } from "@/components/tab-screen-content"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { ProfileHeaderButton } from "@/components/profile-header-button"
|
||||
import { tabStackScreenTitles, useStackScreenOptions } from "@/lib/navigation"
|
||||
|
||||
export const unstable_settings = {
|
||||
initialRouteName: "index",
|
||||
anchor: "index",
|
||||
}
|
||||
|
||||
export default function SearchLayout() {
|
||||
@@ -12,7 +13,7 @@ export default function SearchLayout() {
|
||||
|
||||
return (
|
||||
<Stack
|
||||
initialRouteName="index"
|
||||
screenLayout={renderTabScreenContent}
|
||||
screenOptions={({ route }) => ({
|
||||
...baseOptions,
|
||||
title: tabStackScreenTitles[route.name] ?? "Search",
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
|
||||
<SearchResults searchQuery={searchQuery} />
|
||||
|
||||
@@ -1,31 +1,48 @@
|
||||
import { router, type Href } from "expo-router"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
incomingMediaLink,
|
||||
subscribeIncomingMediaLink,
|
||||
takeIncomingMediaLink,
|
||||
} from "@/lib/incoming-media-link"
|
||||
import { useConvexAuth as useLocalConvexAuth } from "@convex-dev/auth/react"
|
||||
import {
|
||||
useConvexAuth as useServerConvexAuth,
|
||||
useConvexConnectionState,
|
||||
} from "convex/react"
|
||||
import { Redirect, Stack } from "expo-router"
|
||||
import { Stack } from "expo-router"
|
||||
import { Platform } from "react-native"
|
||||
import { useEffect } from "react"
|
||||
import { useEffect, useSyncExternalStore } from "react"
|
||||
|
||||
import { AppIntentBridge } from "@/components/app-intent-bridge"
|
||||
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
|
||||
import { LoadingView } from "@/components/ui/primitives"
|
||||
import { AddToPlaylistProvider } from "@/contexts/add-to-playlist"
|
||||
import { useInvalidateAuthSession } from "@/contexts/convex-auth-session"
|
||||
import { FavoritesProvider } from "@/contexts/favorites"
|
||||
import { PlaybackProvider } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { useStackScreenOptions } from "@/lib/navigation"
|
||||
import { AppNavigationSync } from "@/lib/app-navigation"
|
||||
|
||||
const AUTH_HANDSHAKE_TIMEOUT_MS = 15_000
|
||||
|
||||
export default function AppLayout() {
|
||||
const { config } = useServerConfig()
|
||||
const localAuth = useLocalConvexAuth()
|
||||
const serverAuth = useServerConvexAuth()
|
||||
const { isWebSocketConnected } = useConvexConnectionState()
|
||||
const { invalidateSession } = useInvalidateAuthSession()
|
||||
const stackOptions = useStackScreenOptions()
|
||||
const { config } = useServerConfig()
|
||||
const pendingDestination = useSyncExternalStore(
|
||||
subscribeIncomingMediaLink,
|
||||
() => (config ? incomingMediaLink(config.serverUrl) : null),
|
||||
() => null
|
||||
)
|
||||
|
||||
useEffect(() => {
|
||||
if (!config || !pendingDestination) return
|
||||
const destination = takeIncomingMediaLink(config.serverUrl)
|
||||
if (destination) router.replace(destination as Href)
|
||||
}, [config, pendingDestination])
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
@@ -50,44 +67,52 @@ export default function AppLayout() {
|
||||
serverAuth?.isAuthenticated,
|
||||
])
|
||||
|
||||
if (!config) {
|
||||
return <Redirect href="/server" />
|
||||
}
|
||||
|
||||
if (!localAuth || localAuth.isLoading) {
|
||||
return <LoadingView />
|
||||
}
|
||||
|
||||
if (!localAuth.isAuthenticated) {
|
||||
return <Redirect href="/signin" />
|
||||
}
|
||||
|
||||
// Convex holds queries until the stored token is confirmed, so the app can
|
||||
// render cached data while the server handshake is still in progress.
|
||||
|
||||
return (
|
||||
<ConvexAuthRecovery onInvalidate={invalidateSession}>
|
||||
<PlaybackProvider>
|
||||
<AppIntentBridge />
|
||||
<AppNavigationSync />
|
||||
<AddToPlaylistProvider>
|
||||
<FavoritesProvider>
|
||||
<Stack screenOptions={stackOptions}>
|
||||
<Stack.Screen name="(tabs)" options={{ headerShown: false }} />
|
||||
<Stack.Screen
|
||||
name="(tabs)"
|
||||
options={{ headerShown: false, animation: "none" }}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="settings"
|
||||
options={{
|
||||
headerShown: false,
|
||||
presentation: Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
headerShown: Platform.OS === "android",
|
||||
title: "Settings",
|
||||
presentation:
|
||||
Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="create-account"
|
||||
options={{
|
||||
title: "Create account",
|
||||
presentation: "modal",
|
||||
headerLargeTitle: false,
|
||||
headerTransparent: false,
|
||||
headerStyle: { backgroundColor: "#000" },
|
||||
headerTintColor: "#fff",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="player"
|
||||
options={{
|
||||
headerShown: false,
|
||||
presentation: Platform.OS === "ios" ? "modal" : "fullScreenModal",
|
||||
// Keep the library visible behind the custom swipe animation.
|
||||
presentation: "transparentModal",
|
||||
contentStyle: { backgroundColor: "transparent" },
|
||||
animation: "slide_from_bottom",
|
||||
gestureEnabled: true,
|
||||
gestureDirection: "vertical",
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
import { useAction, useQuery } from "convex/react"
|
||||
import { ConvexError } from "convex/values"
|
||||
import { router, Stack } from "expo-router"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Switch,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
import { toast } from "sonner-native"
|
||||
|
||||
import { Button, Input, LoadingView } from "@/components/ui/primitives"
|
||||
import { colors, spacing } from "@/lib/theme"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
|
||||
export default function CreateAccountScreen() {
|
||||
const user = useQuery(api.auth.currentUser)
|
||||
const createUser = useAction(api.users.adminCreateUser)
|
||||
const [name, setName] = useState("")
|
||||
const [email, setEmail] = useState("")
|
||||
const [password, setPassword] = useState("")
|
||||
const [isAdmin, setIsAdmin] = useState(false)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const pending = useRef(false)
|
||||
const mounted = useRef(true)
|
||||
|
||||
useEffect(() => {
|
||||
mounted.current = true
|
||||
return () => {
|
||||
mounted.current = false
|
||||
}
|
||||
}, [])
|
||||
|
||||
async function handleCreate() {
|
||||
if (pending.current || !user?.isAdmin) return
|
||||
setError(null)
|
||||
if (!name.trim() || !email.trim().includes("@") || password.length < 8) {
|
||||
setError(
|
||||
"Enter a name, valid email, and password of at least 8 characters."
|
||||
)
|
||||
return
|
||||
}
|
||||
pending.current = true
|
||||
setSubmitting(true)
|
||||
try {
|
||||
await createUser({
|
||||
name: name.trim(),
|
||||
email: email.trim().toLowerCase(),
|
||||
password,
|
||||
isAdmin,
|
||||
})
|
||||
toast.success("Account created")
|
||||
if (mounted.current) router.back()
|
||||
} catch (error) {
|
||||
if (!mounted.current) return
|
||||
setError(
|
||||
error instanceof ConvexError && typeof error.data === "string"
|
||||
? error.data
|
||||
: "Could not create account. Try again."
|
||||
)
|
||||
} finally {
|
||||
pending.current = false
|
||||
if (mounted.current) setSubmitting(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<SafeAreaView edges={["bottom", "left", "right"]} style={styles.screen}>
|
||||
<Stack.Screen
|
||||
options={{
|
||||
gestureEnabled: !submitting,
|
||||
}}
|
||||
/>
|
||||
{user === undefined ? (
|
||||
<LoadingView />
|
||||
) : !user?.isAdmin ? (
|
||||
<Text style={[styles.text, styles.message]}>
|
||||
Admin access required.
|
||||
</Text>
|
||||
) : (
|
||||
<KeyboardAvoidingView
|
||||
style={styles.screen}
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
keyboardVerticalOffset={Platform.OS === "ios" ? 100 : 0}
|
||||
>
|
||||
<ScrollView
|
||||
contentContainerStyle={styles.form}
|
||||
keyboardShouldPersistTaps="handled"
|
||||
keyboardDismissMode="on-drag"
|
||||
>
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>Name</Text>
|
||||
<Input
|
||||
accessibilityLabel="Name"
|
||||
value={name}
|
||||
onChangeText={setName}
|
||||
autoCapitalize="words"
|
||||
autoComplete="off"
|
||||
editable={!submitting}
|
||||
style={styles.input}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>Email</Text>
|
||||
<Input
|
||||
accessibilityLabel="Email"
|
||||
value={email}
|
||||
onChangeText={setEmail}
|
||||
keyboardType="email-address"
|
||||
autoCapitalize="none"
|
||||
autoCorrect={false}
|
||||
autoComplete="off"
|
||||
editable={!submitting}
|
||||
style={styles.input}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.field}>
|
||||
<Text style={styles.label}>Password</Text>
|
||||
<Input
|
||||
accessibilityLabel="Password"
|
||||
value={password}
|
||||
onChangeText={setPassword}
|
||||
secureTextEntry
|
||||
autoCapitalize="none"
|
||||
autoCorrect={false}
|
||||
autoComplete="new-password"
|
||||
placeholder="At least 8 characters"
|
||||
editable={!submitting}
|
||||
style={styles.input}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.row}>
|
||||
<Text style={styles.text}>Grant admin access</Text>
|
||||
<Switch
|
||||
accessibilityLabel="Grant admin access"
|
||||
trackColor={{
|
||||
false: colors.dark.muted,
|
||||
true: colors.dark.primary,
|
||||
}}
|
||||
thumbColor={colors.dark.foreground}
|
||||
value={isAdmin}
|
||||
onValueChange={setIsAdmin}
|
||||
disabled={submitting}
|
||||
/>
|
||||
</View>
|
||||
{error ? (
|
||||
<Text accessibilityRole="alert" style={styles.error}>
|
||||
{error}
|
||||
</Text>
|
||||
) : null}
|
||||
<Button
|
||||
title={submitting ? "Creating account…" : "Create account"}
|
||||
disabled={submitting}
|
||||
onPress={() => void handleCreate()}
|
||||
tint={{
|
||||
background: colors.dark.primary,
|
||||
foreground: colors.dark.primaryForeground,
|
||||
}}
|
||||
/>
|
||||
</ScrollView>
|
||||
</KeyboardAvoidingView>
|
||||
)}
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
screen: { flex: 1, backgroundColor: "#000" },
|
||||
form: { padding: spacing.lg, gap: spacing.lg },
|
||||
field: { gap: spacing.sm },
|
||||
label: {
|
||||
color: colors.dark.mutedForeground,
|
||||
fontSize: 12,
|
||||
fontWeight: "600",
|
||||
textTransform: "uppercase",
|
||||
letterSpacing: 0.6,
|
||||
},
|
||||
text: { color: colors.dark.foreground, fontSize: 16, flexShrink: 1 },
|
||||
input: {
|
||||
backgroundColor: colors.dark.muted,
|
||||
color: colors.dark.foreground,
|
||||
borderColor: colors.dark.border,
|
||||
},
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
gap: spacing.md,
|
||||
minHeight: 48,
|
||||
},
|
||||
message: { padding: spacing.lg },
|
||||
error: { color: colors.dark.destructive, fontSize: 14, lineHeight: 20 },
|
||||
})
|
||||
@@ -1,5 +0,0 @@
|
||||
import { Redirect } from "expo-router"
|
||||
|
||||
export default function AppIndex() {
|
||||
return <Redirect href="/(app)/(tabs)/home" />
|
||||
}
|
||||
@@ -1 +1,16 @@
|
||||
export { default } from "./(tabs)/home/settings"
|
||||
import { Platform } from "react-native"
|
||||
import { SafeAreaView } from "react-native-safe-area-context"
|
||||
|
||||
import SettingsScreen from "./(tabs)/home/settings"
|
||||
|
||||
export default function Settings() {
|
||||
if (Platform.OS !== "android") return <SettingsScreen />
|
||||
return (
|
||||
<SafeAreaView
|
||||
edges={["bottom", "left", "right"]}
|
||||
style={{ flex: 1, backgroundColor: "#000" }}
|
||||
>
|
||||
<SettingsScreen />
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
@@ -1,28 +1,7 @@
|
||||
import { useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { Redirect, Stack } from "expo-router"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { LoadingView } from "@/components/ui/primitives"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
export const unstable_settings = { anchor: "signin" }
|
||||
|
||||
export default function AuthLayout() {
|
||||
const { config, isLoading: serverLoading } = useServerConfig()
|
||||
const auth = useConvexAuth()
|
||||
|
||||
if (serverLoading) {
|
||||
return <LoadingView />
|
||||
}
|
||||
|
||||
if (!config) {
|
||||
return <Redirect href="/server" />
|
||||
}
|
||||
|
||||
if (!auth || auth.isLoading) {
|
||||
return <LoadingView />
|
||||
}
|
||||
|
||||
if (auth.isAuthenticated) {
|
||||
return <Redirect href="/(app)/(tabs)/home" />
|
||||
}
|
||||
|
||||
return <Stack screenOptions={{ headerShown: false }} />
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import { loadServerConfig, parseServerHostname } from "@/lib/server-config"
|
||||
import { secureGetItem } from "@/lib/auth-storage"
|
||||
import {
|
||||
isMediaRoute,
|
||||
rememberIncomingMediaLink,
|
||||
} from "@/lib/incoming-media-link"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
export async function redirectSystemPath({
|
||||
path,
|
||||
}: {
|
||||
path: string
|
||||
initial: boolean
|
||||
}) {
|
||||
try {
|
||||
const link = new URL(path, "otunes:///")
|
||||
if (
|
||||
!["otunes:", "otunes-development:", "otunes-preview:"].includes(
|
||||
link.protocol
|
||||
) ||
|
||||
link.hostname !== "open"
|
||||
) {
|
||||
return path
|
||||
}
|
||||
|
||||
const target = new URL(link.searchParams.get("url") ?? "")
|
||||
const server = parseServerHostname(target.host)
|
||||
if (
|
||||
!server ||
|
||||
!["https:", "http:"].includes(target.protocol) ||
|
||||
target.username ||
|
||||
target.password ||
|
||||
new URL(server.serverUrl).origin !== target.origin ||
|
||||
!isMediaRoute(target.pathname)
|
||||
) {
|
||||
return "/"
|
||||
}
|
||||
|
||||
const config = await loadServerConfig(secureGetItem)
|
||||
if (config && new URL(config.serverUrl).origin !== target.origin) {
|
||||
showError("This link belongs to a different oTunes server")
|
||||
return "/"
|
||||
}
|
||||
|
||||
const query = new URLSearchParams()
|
||||
const songId = target.searchParams.get("s")
|
||||
if (target.pathname.startsWith("/album/") && songId) query.set("s", songId)
|
||||
const suffix = query.size ? `?${query}` : ""
|
||||
const destination = `/(app)/(tabs)/home${target.pathname}${suffix}`
|
||||
rememberIncomingMediaLink(destination, target.origin)
|
||||
return config
|
||||
? destination
|
||||
: `/server?hostname=${encodeURIComponent(server.hostname)}`
|
||||
} catch {
|
||||
return "/"
|
||||
}
|
||||
}
|
||||
@@ -1,28 +1,66 @@
|
||||
import { Stack } from "expo-router"
|
||||
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"
|
||||
|
||||
import { Toaster } from "@/components/ui/toaster"
|
||||
import { ConvexAppProvider } from "@/contexts/convex-app"
|
||||
import { ServerConfigProvider } from "@/contexts/server-config"
|
||||
import { ServerConfigProvider, useServerConfig } from "@/contexts/server-config"
|
||||
|
||||
export default function RootLayout() {
|
||||
const colorScheme = useColorScheme()
|
||||
import { HandoffBridge } from "@/components/handoff-bridge"
|
||||
|
||||
const navigationTheme = {
|
||||
...DarkTheme,
|
||||
colors: { ...DarkTheme.colors, background: "#000", card: "#000" },
|
||||
}
|
||||
|
||||
function RootNavigator() {
|
||||
const { config, isLoading } = useServerConfig()
|
||||
const auth = useConvexAuth()
|
||||
|
||||
if (isLoading || (config && (!auth || auth.isLoading))) {
|
||||
return null
|
||||
}
|
||||
|
||||
const isAuthenticated = Boolean(config && auth?.isAuthenticated)
|
||||
|
||||
return (
|
||||
<GestureHandlerRootView style={{ flex: 1 }}>
|
||||
<Stack
|
||||
screenOptions={{
|
||||
headerShown: false,
|
||||
animation: "none",
|
||||
contentStyle: { backgroundColor: "#000" },
|
||||
}}
|
||||
>
|
||||
<Stack.Screen name="index" />
|
||||
<Stack.Protected guard={isAuthenticated}>
|
||||
<Stack.Screen name="(app)" />
|
||||
</Stack.Protected>
|
||||
<Stack.Protected guard={Boolean(config) && !isAuthenticated}>
|
||||
<Stack.Screen name="(auth)" />
|
||||
</Stack.Protected>
|
||||
<Stack.Protected guard={!config}>
|
||||
<Stack.Screen name="server" />
|
||||
</Stack.Protected>
|
||||
</Stack>
|
||||
)
|
||||
}
|
||||
|
||||
export default function RootLayout() {
|
||||
const isDark = useIsDark()
|
||||
|
||||
return (
|
||||
<GestureHandlerRootView style={{ flex: 1, backgroundColor: "#000" }}>
|
||||
<SafeAreaProvider>
|
||||
<ServerConfigProvider>
|
||||
<ConvexAppProvider>
|
||||
<StatusBar style={colorScheme === "dark" ? "light" : "dark"} />
|
||||
<Stack screenOptions={{ headerShown: false }}>
|
||||
<Stack.Screen name="index" />
|
||||
<Stack.Screen name="server" />
|
||||
<Stack.Screen name="(auth)" />
|
||||
<Stack.Screen name="(app)" />
|
||||
</Stack>
|
||||
<StatusBar style={isDark ? "light" : "dark"} />
|
||||
<ThemeProvider value={navigationTheme}>
|
||||
<HandoffBridge />
|
||||
<RootNavigator />
|
||||
</ThemeProvider>
|
||||
<Toaster />
|
||||
</ConvexAppProvider>
|
||||
</ServerConfigProvider>
|
||||
|
||||
@@ -1,19 +1,27 @@
|
||||
import { Redirect } from "expo-router"
|
||||
import { useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { incomingMediaLink } from "@/lib/incoming-media-link"
|
||||
import { Redirect, type Href } from "expo-router"
|
||||
|
||||
import { LoadingView } from "@/components/ui/primitives"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import { AuthenticatedRedirect } from "@/components/authenticated-redirect"
|
||||
|
||||
export default function Index() {
|
||||
const { config, isLoading } = useServerConfig()
|
||||
|
||||
if (isLoading) {
|
||||
return <LoadingView />
|
||||
}
|
||||
const { config } = useServerConfig()
|
||||
const auth = useConvexAuth()
|
||||
|
||||
if (!config) {
|
||||
return <Redirect href="/server" />
|
||||
}
|
||||
|
||||
return <AuthenticatedRedirect />
|
||||
const destination = auth?.isAuthenticated
|
||||
? incomingMediaLink(config.serverUrl)
|
||||
: null
|
||||
|
||||
return (
|
||||
<Redirect
|
||||
href={
|
||||
(destination as Href) ??
|
||||
(auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin")
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -1,32 +1,28 @@
|
||||
import { useRouter } from "expo-router"
|
||||
import { useLocalSearchParams } from "expo-router"
|
||||
import { useEffect, 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"
|
||||
|
||||
export default function ServerScreen() {
|
||||
const router = useRouter()
|
||||
const colors = useThemeColors()
|
||||
const { config, isLoading, setServerHostname } = useServerConfig()
|
||||
const [hostname, setHostname] = useState("")
|
||||
const { setServerHostname } = useServerConfig()
|
||||
const { hostname: linkedHostname } = useLocalSearchParams<{
|
||||
hostname?: string
|
||||
}>()
|
||||
const [hostname, setHostname] = useState(linkedHostname ?? "")
|
||||
useEffect(() => {
|
||||
if (linkedHostname) setHostname(linkedHostname)
|
||||
}, [linkedHostname])
|
||||
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
if (config?.hostname) {
|
||||
setHostname(config.hostname)
|
||||
}
|
||||
}, [config?.hostname])
|
||||
|
||||
async function handleContinue() {
|
||||
setError(null)
|
||||
setSubmitting(true)
|
||||
@@ -38,7 +34,6 @@ export default function ServerScreen() {
|
||||
)
|
||||
return
|
||||
}
|
||||
router.replace("/signin")
|
||||
} catch {
|
||||
setError(
|
||||
"Could not save the server address. Check device storage and try again."
|
||||
@@ -48,16 +43,9 @@ export default function ServerScreen() {
|
||||
}
|
||||
}
|
||||
|
||||
if (isLoading) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
|
||||
<KeyboardAvoidingView
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
style={styles.container}
|
||||
>
|
||||
<KeyboardForm style={styles.container}>
|
||||
<View style={styles.hero}>
|
||||
<Text style={[styles.brand, { color: colors.foreground }]}>
|
||||
oTunes
|
||||
@@ -95,7 +83,7 @@ export default function ServerScreen() {
|
||||
onPress={() => void handleContinue()}
|
||||
/>
|
||||
</Card>
|
||||
</KeyboardAvoidingView>
|
||||
</KeyboardForm>
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
|
||||
|
After Width: | Height: | Size: 8.1 KiB |
|
After Width: | Height: | Size: 8.0 KiB |
|
After Width: | Height: | Size: 7.9 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 324 KiB |
|
After Width: | Height: | Size: 310 KiB |
|
After Width: | Height: | Size: 286 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 284 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 324 KiB |
|
Before Width: | Height: | Size: 963 KiB After Width: | Height: | Size: 284 KiB |
@@ -26,7 +26,7 @@
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1,
|
||||
"scale" : 1.5,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
|
||||
|
After Width: | Height: | Size: 8.8 KiB |
@@ -0,0 +1,53 @@
|
||||
{
|
||||
"fill" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.00000,0.55106,0.91748,1.00000",
|
||||
"display-p3:0.00320,0.24546,0.91602,1.00000"
|
||||
]
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : "automatic"
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.00000,0.55106,0.91748,1.00000",
|
||||
"display-p3:0.00320,0.24546,0.91602,1.00000"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.6
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : false,
|
||||
"value" : 0.2
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 8.8 KiB |
@@ -0,0 +1,53 @@
|
||||
{
|
||||
"fill" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.03297,0.65562,0.91748,1.00000",
|
||||
"display-p3:0.01787,0.85470,0.91602,1.00000"
|
||||
]
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : "automatic"
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"linear-gradient" : [
|
||||
"display-p3:0.03297,0.65562,0.91748,1.00000",
|
||||
"display-p3:0.01787,0.85470,0.91602,1.00000"
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"image-name" : "music.note.png",
|
||||
"name" : "music.note",
|
||||
"position" : {
|
||||
"scale" : 1.5,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.6
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : false,
|
||||
"value" : 0.2
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,5 @@ module.exports = function (api) {
|
||||
api.cache(true)
|
||||
return {
|
||||
presets: ["babel-preset-expo"],
|
||||
plugins: ["react-native-reanimated/plugin"],
|
||||
}
|
||||
}
|
||||
@@ -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 (
|
||||
<KeyboardAvoidingView behavior="height" style={{ flex: 1 }}>
|
||||
<SafeAreaView edges={["bottom", "left", "right"]} style={{ flex: 1 }}>
|
||||
{children}
|
||||
</SafeAreaView>
|
||||
</KeyboardAvoidingView>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,822 @@
|
||||
import { useConvex, useQuery } from "convex/react"
|
||||
import * as AppIntents from "expo-app-intents"
|
||||
import type { AppIntentEntity, AppIntentInvocation } from "expo-app-intents"
|
||||
import { useEffect, useMemo, useRef, useSyncExternalStore } from "react"
|
||||
import { AppState } from "react-native"
|
||||
import {
|
||||
completeMusicInvocation,
|
||||
publishMusicCatalog,
|
||||
trackMusicCatalogSync,
|
||||
} from "@/lib/app-intents"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
|
||||
import {
|
||||
ANONYMOUS_CACHE_SCOPE,
|
||||
useCacheScope,
|
||||
} from "@/contexts/persistent-cache"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import {
|
||||
FAVORITES_PLAYLIST_ID,
|
||||
loadHandledIntentIds,
|
||||
rememberHandledIntentId,
|
||||
} from "@/lib/app-intent-handled"
|
||||
import { showError } from "@/lib/toast"
|
||||
import { fetchCachedQuery } from "@otunes/convex/client/cached-query"
|
||||
import { getPlaybackStore } from "@otunes/convex/client/playback-store"
|
||||
import type { RepeatMode } from "@otunes/convex/client/playback-queue"
|
||||
import { api } from "@otunes/convex/_generated/api"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
|
||||
const warmedAudioIds = new Set<string>()
|
||||
|
||||
class IntentRejected extends Error {}
|
||||
|
||||
const KNOWN_INTENTS = new Set([
|
||||
"playMusic",
|
||||
"warmupAudio",
|
||||
"addToPlaylist",
|
||||
"addToUpNext",
|
||||
"clearUpNext",
|
||||
"createPlaylist",
|
||||
"createStation",
|
||||
"updateAffinity",
|
||||
"transport",
|
||||
"openMusic",
|
||||
])
|
||||
|
||||
type MusicSource = {
|
||||
kind: string
|
||||
id: string
|
||||
}
|
||||
|
||||
function readString(value: unknown) {
|
||||
return typeof value === "string" && value.trim() ? value : null
|
||||
}
|
||||
|
||||
function readSources(value: unknown): MusicSource[] {
|
||||
if (!Array.isArray(value)) {
|
||||
return []
|
||||
}
|
||||
return value.flatMap((entry) => {
|
||||
if (!entry || typeof entry !== "object") {
|
||||
return []
|
||||
}
|
||||
const source = entry as { kind?: unknown; id?: unknown }
|
||||
if (typeof source.kind !== "string" || typeof source.id !== "string") {
|
||||
return []
|
||||
}
|
||||
if (!source.kind || !source.id) {
|
||||
return []
|
||||
}
|
||||
return [{ kind: source.kind, id: source.id }]
|
||||
})
|
||||
}
|
||||
|
||||
function shuffleChoice(value: unknown, fallback: boolean) {
|
||||
if (value === "songs") return true
|
||||
if (value === "off") return false
|
||||
if (value == null) return fallback
|
||||
throw new IntentRejected("Shuffle must be Off or Songs.")
|
||||
}
|
||||
|
||||
function repeatChoice(value: unknown): RepeatMode | null {
|
||||
if (value == null) return null
|
||||
if (value === "none") return "none"
|
||||
if (value === "one") return "once"
|
||||
if (value === "all") return "always"
|
||||
throw new IntentRejected("Repeat must be None, One, or All.")
|
||||
}
|
||||
|
||||
function ensureActive(invocation: AppIntentInvocation) {
|
||||
const deadline = invocation.params.deadline
|
||||
if (typeof deadline === "number" && Date.now() >= deadline) {
|
||||
throw new IntentRejected("This request expired. Please try again.")
|
||||
}
|
||||
}
|
||||
|
||||
function isTransient(error: unknown) {
|
||||
const message = (
|
||||
error instanceof Error ? error.message : String(error)
|
||||
).toLowerCase()
|
||||
return (
|
||||
message.includes("not authenticated") ||
|
||||
message.includes("network") ||
|
||||
message.includes("fetch") ||
|
||||
message.includes("connection") ||
|
||||
message.includes("timed out") ||
|
||||
message.includes("timeout")
|
||||
)
|
||||
}
|
||||
|
||||
function songEntity(song: {
|
||||
id: string
|
||||
title: string
|
||||
artistName: string
|
||||
artistId: string
|
||||
albumTitle: string
|
||||
albumId: string
|
||||
durationSeconds: number
|
||||
genres?: string
|
||||
year?: number
|
||||
track?: number
|
||||
diskNumber?: number | null
|
||||
favorite?: boolean
|
||||
}): AppIntentEntity {
|
||||
return {
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
subtitle: song.artistName,
|
||||
synonyms: song.artistName ? [song.artistName] : undefined,
|
||||
metadata: {
|
||||
artistName: song.artistName,
|
||||
artistId: song.artistId,
|
||||
albumTitle: song.albumTitle,
|
||||
albumId: song.albumId,
|
||||
duration: String(song.durationSeconds),
|
||||
genres: song.genres ?? "",
|
||||
year: song.year == null ? "" : String(song.year),
|
||||
track: song.track == null ? "" : String(song.track),
|
||||
disk: song.diskNumber == null ? "" : String(song.diskNumber),
|
||||
favorite: song.favorite ? "1" : "0",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export function AppIntentBridge() {
|
||||
const scope = useCacheScope()
|
||||
const store = useMemo(
|
||||
() => getPlaybackStore(scope === ANONYMOUS_CACHE_SCOPE ? null : scope),
|
||||
[scope]
|
||||
)
|
||||
const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot)
|
||||
const user = useQuery(api.auth.currentUser)
|
||||
return user && snapshot.hydrated ? <ReadyAppIntentBridge key={scope} /> : null
|
||||
}
|
||||
|
||||
function ReadyAppIntentBridge() {
|
||||
const convex = useConvex()
|
||||
const cacheScope = useCacheScope()
|
||||
const playback = usePlayback()
|
||||
const user = useQuery(api.auth.currentUser)
|
||||
const navigation = useAppNavigation()
|
||||
const favorites = useQuery(api.favorites.getUserFavorites)
|
||||
const catalogUserKey = user ? JSON.stringify([user._id, favorites]) : null
|
||||
const store = useMemo(
|
||||
() =>
|
||||
getPlaybackStore(
|
||||
cacheScope === ANONYMOUS_CACHE_SCOPE ? null : cacheScope
|
||||
),
|
||||
[cacheScope]
|
||||
)
|
||||
const snapshot = useSyncExternalStore(store.subscribe, store.getSnapshot)
|
||||
const handledIds = useRef<Set<string> | null>(null)
|
||||
const publishChain = useRef(Promise.resolve())
|
||||
const publishGeneration = useRef(0)
|
||||
const playbackRef = useRef(playback)
|
||||
playbackRef.current = playback
|
||||
|
||||
useEffect(() => {
|
||||
if (!AppIntents.isAvailable() || !user) return
|
||||
const generation = ++publishGeneration.current
|
||||
let stopped = false
|
||||
let refreshing = false
|
||||
const refresh = () => {
|
||||
if (refreshing || stopped) return
|
||||
refreshing = true
|
||||
publishChain.current = publishChain.current
|
||||
.catch(() => undefined)
|
||||
.then(async () => {
|
||||
for (const kind of ["artist", "album", "song", "playlist"] as const) {
|
||||
const entities: AppIntentEntity[] = []
|
||||
let cursor: string | null = null
|
||||
do {
|
||||
const result: {
|
||||
page: AppIntentEntity[]
|
||||
isDone: boolean
|
||||
continueCursor: string
|
||||
} = await convex.query(api.library.intentCatalogPage, {
|
||||
kind,
|
||||
paginationOpts: { cursor, numItems: 200 },
|
||||
})
|
||||
if (stopped || generation !== publishGeneration.current) return
|
||||
entities.push(...result.page)
|
||||
cursor = result.isDone ? null : result.continueCursor
|
||||
} while (cursor !== null)
|
||||
await publishMusicCatalog(kind, entities)
|
||||
}
|
||||
})
|
||||
.catch((error) =>
|
||||
console.warn("Could not publish music catalog.", error)
|
||||
)
|
||||
.finally(() => {
|
||||
refreshing = false
|
||||
})
|
||||
trackMusicCatalogSync(publishChain.current)
|
||||
}
|
||||
refresh()
|
||||
const subscription = AppState.addEventListener("change", (state) => {
|
||||
if (state === "active") refresh()
|
||||
})
|
||||
const timer = setInterval(() => {
|
||||
if (AppState.currentState === "active") refresh()
|
||||
}, 5 * 60_000)
|
||||
return () => {
|
||||
stopped = true
|
||||
++publishGeneration.current
|
||||
subscription.remove()
|
||||
clearInterval(timer)
|
||||
}
|
||||
}, [convex, cacheScope, catalogUserKey])
|
||||
|
||||
const currentSongId = playback.queueSongIds[0] ?? null
|
||||
const currentSong = playback.currentSong
|
||||
|
||||
useEffect(() => {
|
||||
if (!snapshot.hydrated || !AppIntents.isAvailable()) {
|
||||
return
|
||||
}
|
||||
if (!currentSongId) {
|
||||
void publishMusicCatalog("nowPlaying", []).catch((error) => {
|
||||
console.warn("Could not clear the current song.", error)
|
||||
})
|
||||
return
|
||||
}
|
||||
if (!currentSong || currentSong.id !== currentSongId) {
|
||||
return
|
||||
}
|
||||
void publishMusicCatalog("nowPlaying", [
|
||||
songEntity({
|
||||
id: currentSong.id,
|
||||
title: currentSong.title,
|
||||
artistName: currentSong.artist.name,
|
||||
artistId: currentSong.artist.id,
|
||||
albumTitle: currentSong.album.title,
|
||||
albumId: currentSong.album.id,
|
||||
durationSeconds: currentSong.durationSeconds,
|
||||
}),
|
||||
]).catch((error) => {
|
||||
console.warn("Could not publish the current song.", error)
|
||||
})
|
||||
}, [currentSong, currentSongId, snapshot.hydrated])
|
||||
|
||||
AppIntents.useAppIntents(async (pendingIntents) => {
|
||||
if (!handledIds.current) {
|
||||
handledIds.current = await loadHandledIntentIds()
|
||||
}
|
||||
const handled = handledIds.current
|
||||
|
||||
for (const invocation of pendingIntents) {
|
||||
if (handled.has(invocation.id)) {
|
||||
const token = readString(invocation.params.completionToken)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
if (!KNOWN_INTENTS.has(invocation.name)) {
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
continue
|
||||
}
|
||||
const token = readString(invocation.params.completionToken)
|
||||
try {
|
||||
ensureActive(invocation)
|
||||
await performInvocation(invocation)
|
||||
if (
|
||||
["playMusic", "warmupAudio", "transport", "createStation"].includes(
|
||||
invocation.name
|
||||
)
|
||||
) {
|
||||
const id = store.getState().queue[0]
|
||||
const song = playbackRef.current.currentSong
|
||||
if (!id) await publishMusicCatalog("nowPlaying", [])
|
||||
else if (song?.id === id)
|
||||
await publishMusicCatalog("nowPlaying", [
|
||||
songEntity({
|
||||
id: song.id,
|
||||
title: song.title,
|
||||
artistName: song.artist.name,
|
||||
artistId: song.artist.id,
|
||||
albumTitle: song.album.title,
|
||||
albumId: song.album.id,
|
||||
durationSeconds: song.durationSeconds,
|
||||
}),
|
||||
])
|
||||
}
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
if (token) await completeMusicInvocation(token, null)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (error) {
|
||||
if (token) {
|
||||
await completeMusicInvocation(
|
||||
token,
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
)
|
||||
}
|
||||
if (token || error instanceof IntentRejected || !isTransient(error)) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : "oTunes couldn't do that."
|
||||
if (!(error instanceof IntentRejected) || message) {
|
||||
showError(message)
|
||||
}
|
||||
try {
|
||||
await rememberHandledIntentId(handled, invocation.id)
|
||||
await AppIntents.removePendingInvocationAsync(invocation.id)
|
||||
} catch (removeError) {
|
||||
console.warn(
|
||||
"App Intent remains pending",
|
||||
invocation.id,
|
||||
removeError
|
||||
)
|
||||
}
|
||||
continue
|
||||
}
|
||||
console.warn("App Intent remains pending", invocation.id, error)
|
||||
}
|
||||
}
|
||||
|
||||
async function songIdsFor(kind: string, id: string) {
|
||||
if (kind === "song") {
|
||||
return [id as Id<"songs">]
|
||||
}
|
||||
if (kind === "album") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{
|
||||
albumId: id as Id<"albums">,
|
||||
}
|
||||
)
|
||||
}
|
||||
if (kind === "artist") {
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getOrderedArtistSongIds,
|
||||
{ artistId: id as Id<"artists"> }
|
||||
)
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
if (id === FAVORITES_PLAYLIST_ID) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
return favorites.favoriteSongs
|
||||
}
|
||||
return fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getPlaylistSongIds,
|
||||
{ playlistId: id as Id<"playlists"> }
|
||||
)
|
||||
}
|
||||
throw new IntentRejected("Choose a song, album, artist, or playlist.")
|
||||
}
|
||||
|
||||
async function uniqueSongIds(sources: MusicSource[]) {
|
||||
const ids: Id<"songs">[] = []
|
||||
for (const source of sources) {
|
||||
ids.push(...(await songIdsFor(source.kind, source.id)))
|
||||
}
|
||||
return [...new Set(ids)]
|
||||
}
|
||||
|
||||
async function performInvocation(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
switch (invocation.name) {
|
||||
case "openMusic": {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id || !kind) throw new IntentRejected("Choose music to open.")
|
||||
if (kind === "song") {
|
||||
const song = await convex.query(api.library.getSong, {
|
||||
id: id as Id<"songs">,
|
||||
})
|
||||
if (!song)
|
||||
throw new IntentRejected("This song is no longer available.")
|
||||
navigation.push(`/album/${song.album}`)
|
||||
} else if (kind === "playlist" && id === FAVORITES_PLAYLIST_ID) {
|
||||
navigation.push("/playlist/favorites")
|
||||
} else if (["album", "artist", "playlist"].includes(kind)) {
|
||||
navigation.push(`/${kind}/${id}`)
|
||||
} else throw new IntentRejected("Unknown music type.")
|
||||
return
|
||||
}
|
||||
case "playMusic":
|
||||
await playMusic(invocation)
|
||||
if (!["next", "tail"].includes(String(invocation.params.queue))) {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
}
|
||||
return
|
||||
case "warmupAudio":
|
||||
await warmup(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(false)
|
||||
warmedAudioIds.add(invocation.id)
|
||||
return
|
||||
case "addToPlaylist":
|
||||
await addToPlaylist(invocation)
|
||||
return
|
||||
case "addToUpNext":
|
||||
await addToUpNext(invocation)
|
||||
return
|
||||
case "clearUpNext":
|
||||
ensureActive(invocation)
|
||||
await actions.clearUpNext()
|
||||
return
|
||||
case "createPlaylist":
|
||||
await createPlaylist(invocation)
|
||||
return
|
||||
case "createStation":
|
||||
await createStation(invocation)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.waitForPlaybackReady(true)
|
||||
return
|
||||
case "updateAffinity":
|
||||
await updateAffinity(invocation)
|
||||
return
|
||||
case "transport":
|
||||
await transport(invocation)
|
||||
if (store.getState().queue.length > 0) {
|
||||
const command = invocation.params.command
|
||||
await playbackRef.current.waitForPlaybackReady(
|
||||
command === "resume"
|
||||
? true
|
||||
: command === "pause"
|
||||
? false
|
||||
: undefined
|
||||
)
|
||||
}
|
||||
return
|
||||
default:
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
async function playMusic(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const queue = readString(invocation.params.queue) ?? "now"
|
||||
const warmupId = readString(invocation.params.warmupId)
|
||||
const repeat = repeatChoice(invocation.params.repeat)
|
||||
if (repeat) {
|
||||
ensureActive(invocation)
|
||||
await actions.setRepeatMode(repeat)
|
||||
}
|
||||
|
||||
if (queue === "next" || queue === "tail") {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
if (queue === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueNext(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.addToQueueLast(ids)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (warmupId && warmedAudioIds.has(warmupId)) {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const kind = readString(invocation.params.kind) ?? "resume"
|
||||
if (kind === "resume") {
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (shuffled !== actions.shuffleEnabled) {
|
||||
ensureActive(invocation)
|
||||
await actions.setShuffleEnabled(shuffled)
|
||||
}
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
const favorites = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.favorites.getUserFavorites,
|
||||
{}
|
||||
)
|
||||
if (favorites.favoriteSongs.length === 0) {
|
||||
throw new IntentRejected(
|
||||
"Nothing is queued, and your favorites are empty."
|
||||
)
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(favorites.favoriteSongs)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(favorites.favoriteSongs)
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
|
||||
const id = readString(invocation.params.id)
|
||||
if (!id) {
|
||||
throw new IntentRejected("Choose music to play.")
|
||||
}
|
||||
const shuffled = shuffleChoice(
|
||||
invocation.params.shuffle,
|
||||
actions.shuffleEnabled
|
||||
)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await actions.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
true
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to play.")
|
||||
}
|
||||
if (shuffled) {
|
||||
ensureActive(invocation)
|
||||
await actions.playShuffled(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await actions.playInOrder(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function warmup(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
if (!kind || !id) {
|
||||
throw new IntentRejected("Choose music to get ready.")
|
||||
}
|
||||
const shuffled = shuffleChoice(invocation.params.shuffle, false)
|
||||
if (kind === "song") {
|
||||
const song = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.library.getSong,
|
||||
{
|
||||
id: id as Id<"songs">,
|
||||
}
|
||||
)
|
||||
if (!song) {
|
||||
throw new IntentRejected("That song is no longer in your library.")
|
||||
}
|
||||
const albumSongIds = await fetchCachedQuery(
|
||||
convex,
|
||||
cacheScope,
|
||||
api.playlists.getAlbumSongIds,
|
||||
{ albumId: song.album }
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.startFromSong(
|
||||
song._id,
|
||||
albumSongIds.length > 0 ? albumSongIds : [song._id],
|
||||
shuffled,
|
||||
false
|
||||
)
|
||||
} else {
|
||||
const ids = await songIdsFor(kind, id)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to get ready.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.prepareQueue(ids, shuffled)
|
||||
}
|
||||
}
|
||||
|
||||
async function addToPlaylist(invocation: AppIntentInvocation) {
|
||||
const playlistId = readString(invocation.params.playlistId)
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (!playlistId || sources.length === 0) {
|
||||
throw new IntentRejected("Choose music and a playlist.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(sources)
|
||||
if (songIds.length === 0) {
|
||||
throw new IntentRejected("Those items have no songs to add.")
|
||||
}
|
||||
if (playlistId === FAVORITES_PLAYLIST_ID) {
|
||||
for (const source of sources) {
|
||||
if (source.kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSong, {
|
||||
songId: source.id as Id<"songs">,
|
||||
})
|
||||
} else if (source.kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteAlbum, {
|
||||
albumId: source.id as Id<"albums">,
|
||||
})
|
||||
} else if (source.kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteArtist, {
|
||||
artistId: source.id as Id<"artists">,
|
||||
})
|
||||
} else if (source.kind === "playlist") {
|
||||
const ids = await songIdsFor(source.kind, source.id)
|
||||
if (ids.length > 0) {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSongs, {
|
||||
songIds: ids,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"Choose a song, album, artist, or playlist."
|
||||
)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.addSongsToPlaylist, {
|
||||
playlistId: playlistId as Id<"playlists">,
|
||||
songIds,
|
||||
})
|
||||
}
|
||||
|
||||
async function addToUpNext(invocation: AppIntentInvocation) {
|
||||
const sources = readSources(invocation.params.sources)
|
||||
if (sources.length === 0) {
|
||||
throw new IntentRejected("Choose music to add to Up Next.")
|
||||
}
|
||||
const ids = await uniqueSongIds(sources)
|
||||
if (ids.length === 0) {
|
||||
throw new IntentRejected("Nothing to add to Up Next.")
|
||||
}
|
||||
const position =
|
||||
readString(invocation.params.position) === "last" ? "last" : "next"
|
||||
if (position === "last") {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueLast(ids)
|
||||
} else {
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.addToQueueNext(ids)
|
||||
}
|
||||
}
|
||||
|
||||
async function createPlaylist(invocation: AppIntentInvocation) {
|
||||
const name = readString(invocation.params.name)
|
||||
if (!name) {
|
||||
throw new IntentRejected("A playlist needs a name.")
|
||||
}
|
||||
const songIds = await uniqueSongIds(
|
||||
readSources(invocation.params.sources)
|
||||
)
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.playlists.createPlaylist, {
|
||||
name,
|
||||
songIds,
|
||||
invocationId: invocation.id,
|
||||
})
|
||||
}
|
||||
|
||||
async function createStation(invocation: AppIntentInvocation) {
|
||||
const artistId = readString(invocation.params.artistId)
|
||||
if (!artistId) {
|
||||
throw new IntentRejected("Nothing is playing in oTunes.")
|
||||
}
|
||||
const ids = await songIdsFor("artist", artistId)
|
||||
if (ids.length === 0)
|
||||
throw new IntentRejected("This artist has no songs to play.")
|
||||
ensureActive(invocation)
|
||||
await playbackRef.current.playShuffled(ids)
|
||||
}
|
||||
|
||||
async function updateAffinity(invocation: AppIntentInvocation) {
|
||||
const kind = readString(invocation.params.kind)
|
||||
const id = readString(invocation.params.id)
|
||||
const state = readString(invocation.params.state)
|
||||
if (!kind || !id || (state !== "like" && state !== "unset")) {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love or unlike a song, album, or artist."
|
||||
)
|
||||
}
|
||||
if (kind === "playlist") {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
if (state === "like") {
|
||||
if (kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteSong, {
|
||||
songId: id as Id<"songs">,
|
||||
})
|
||||
} else if (kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteAlbum, {
|
||||
albumId: id as Id<"albums">,
|
||||
})
|
||||
} else if (kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.favoriteArtist, {
|
||||
artistId: id as Id<"artists">,
|
||||
})
|
||||
} else {
|
||||
throw new IntentRejected(
|
||||
"oTunes can love songs, albums, and artists."
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
if (kind === "song") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteSong, {
|
||||
songId: id as Id<"songs">,
|
||||
})
|
||||
} else if (kind === "album") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteAlbum, {
|
||||
albumId: id as Id<"albums">,
|
||||
})
|
||||
} else if (kind === "artist") {
|
||||
ensureActive(invocation)
|
||||
await convex.mutation(api.favorites.unfavoriteArtist, {
|
||||
artistId: id as Id<"artists">,
|
||||
})
|
||||
} else {
|
||||
throw new IntentRejected("oTunes can love songs, albums, and artists.")
|
||||
}
|
||||
}
|
||||
|
||||
async function transport(invocation: AppIntentInvocation) {
|
||||
const actions = playbackRef.current
|
||||
const command = readString(invocation.params.command)
|
||||
if (command === "pause") {
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(false)
|
||||
return
|
||||
}
|
||||
if (command === "resume") {
|
||||
if (actions.queueSongIds.length === 0) {
|
||||
throw new IntentRejected("Nothing is queued in oTunes.")
|
||||
}
|
||||
ensureActive(invocation)
|
||||
actions.setIsPlaying(true)
|
||||
return
|
||||
}
|
||||
if (command === "next") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipNext()
|
||||
return
|
||||
}
|
||||
if (command === "previous") {
|
||||
ensureActive(invocation)
|
||||
await actions.skipPrevious()
|
||||
return
|
||||
}
|
||||
throw new IntentRejected("oTunes doesn't know that playback control.")
|
||||
}
|
||||
})
|
||||
|
||||
return null
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import Svg, { G, Path } from "react-native-svg"
|
||||
|
||||
import type { PlaybackFormat } from "@otunes/convex/playback-stream"
|
||||
|
||||
const LABEL_SIZE = 13
|
||||
const MARK_HEIGHT = 11
|
||||
|
||||
function DolbyMark({ color }: { color: string }) {
|
||||
return (
|
||||
<Svg
|
||||
width={(MARK_HEIGHT * 23) / 16}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="0 0 23 16"
|
||||
>
|
||||
<Path d="M0 0H2.5A8 8 0 0 1 2.5 16H0Z" fill={color} />
|
||||
<Path d="M23 0H20.5A8 8 0 0 0 20.5 16H23Z" fill={color} />
|
||||
</Svg>
|
||||
)
|
||||
}
|
||||
|
||||
const LOSSLESS_PEAKS = [110, 215, 320]
|
||||
const LOSSLESS_THIN_WIDTH = 24
|
||||
const LOSSLESS_STROKES: [peak: number, d: string][] = [
|
||||
[110, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[215, "M-70 320C-62 245 -38 166 0 166"],
|
||||
[320, "M-30 185C-22 173 -11 166 0 166"],
|
||||
[110, "M166 413C176 413 186 406 194 395"],
|
||||
[215, "M166 413C200 413 226 340 240 275"],
|
||||
[320, "M166 413C200 413 226 340 240 275"],
|
||||
]
|
||||
const LOSSLESS_FALL =
|
||||
"M0 178L4 179L8 181L12 184L16 189L20 196L23 204L27 213L30 223L34 233L39 243L43 254L48 266L53 278L58 289L62 301L66 313L71 325L75 336L79 347L83 357L86 364L89 370L93 377L97 382L101 387L105 392L109 397L113 401L117 405L121 408L126 412L130 415L134 417L139 419L143 421L148 423L152 424L157 424L161 425L166 425L166 401L163 401L161 400L159 400L157 399L154 397L152 396L151 394L149 392L147 389L145 386L143 383L142 380L140 376L138 371L137 367L135 362L134 357L132 351L130 345L127 339L124 330L120 319L116 308L111 297L107 285L102 272L98 260L93 248L88 235L82 223L76 212L69 201L61 192L53 183L45 175L37 168L28 163L19 158L10 155L0 154Z"
|
||||
const LOSSLESS_FALL_GAP =
|
||||
"M0 178L4 180L6 184L8 190L9 197L11 203L14 210L17 219L21 228L24 238L29 248L33 259L38 270L43 282L47 293L52 305L56 317L60 328L64 340L68 351L73 361L76 368L79 375L83 381L87 387L91 393L95 398L100 403L104 408L109 412L113 416L118 419L124 422L130 424L135 425L141 426L147 426L152 426L157 425L161 425L166 425L166 401L163 401L161 399L159 398L158 395L157 393L156 390L155 387L155 384L154 381L153 379L152 376L150 373L149 369L148 366L146 361L145 357L143 352L142 347L140 341L137 335L134 326L130 315L126 304L122 293L117 281L113 268L108 256L103 243L98 231L92 219L86 207L79 196L71 186L62 177L53 168L44 161L32 157L21 155L10 154L0 154Z"
|
||||
|
||||
/**
|
||||
* Three overlapping waves. Each thick downstroke is outlined in the
|
||||
* background color so it reads as passing over the strokes behind it.
|
||||
*/
|
||||
function LosslessMark({
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
return (
|
||||
<Svg
|
||||
width={(MARK_HEIGHT * 544) / 271}
|
||||
height={MARK_HEIGHT}
|
||||
viewBox="28 154 544 271"
|
||||
>
|
||||
{LOSSLESS_STROKES.map(([peak, d], index) => (
|
||||
<Path
|
||||
key={index}
|
||||
d={d}
|
||||
x={peak}
|
||||
stroke={color}
|
||||
strokeWidth={LOSSLESS_THIN_WIDTH}
|
||||
strokeLinecap="round"
|
||||
fill="none"
|
||||
/>
|
||||
))}
|
||||
{LOSSLESS_PEAKS.map((peak) => (
|
||||
<G key={peak} x={peak}>
|
||||
<Path d={LOSSLESS_FALL_GAP} fill={backgroundColor} />
|
||||
<Path d={LOSSLESS_FALL} fill={color} />
|
||||
</G>
|
||||
))}
|
||||
</Svg>
|
||||
)
|
||||
}
|
||||
|
||||
/** The Dolby Atmos or Lossless label shown under the progress bar. */
|
||||
export function AudioFormatBadge({
|
||||
artwork = false,
|
||||
format,
|
||||
color,
|
||||
backgroundColor,
|
||||
}: {
|
||||
artwork?: boolean
|
||||
format: PlaybackFormat
|
||||
color: string
|
||||
backgroundColor: string
|
||||
}) {
|
||||
const label = format === "atmos" ? "Dolby Atmos" : "Lossless"
|
||||
return (
|
||||
<View style={styles.badge} accessibilityLabel={label}>
|
||||
{format === "atmos" ? (
|
||||
<DolbyMark color={color} />
|
||||
) : (
|
||||
<LosslessMark color={color} backgroundColor={backgroundColor} />
|
||||
)}
|
||||
<PaletteText
|
||||
tone={artwork ? "secondaryForeground" : undefined}
|
||||
style={[styles.label, { color }]}
|
||||
>
|
||||
{label}
|
||||
</PaletteText>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
badge: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 3,
|
||||
},
|
||||
label: {
|
||||
fontSize: LABEL_SIZE,
|
||||
fontWeight: "500",
|
||||
},
|
||||
})
|
||||
@@ -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<boolean>
|
||||
}
|
||||
|
||||
const audioOutput =
|
||||
requireOptionalNativeModule<AudioOutputModule>("AudioOutput")
|
||||
const AirPlayPicker =
|
||||
Platform.OS === "ios" && audioOutput
|
||||
? requireNativeView<ViewProps & { tint: string }>("AudioOutput")
|
||||
: null
|
||||
|
||||
export function AudioOutputButton({
|
||||
color,
|
||||
style,
|
||||
}: {
|
||||
color: string
|
||||
style: StyleProp<ViewStyle>
|
||||
}) {
|
||||
if (AirPlayPicker) {
|
||||
return <AirPlayPicker tint={color} style={style} />
|
||||
}
|
||||
|
||||
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 (
|
||||
<Pressable
|
||||
onPress={showPicker}
|
||||
disabled={!available}
|
||||
hitSlop={8}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={Platform.OS === "ios" ? "AirPlay" : "Audio output"}
|
||||
accessibilityState={{ disabled: !available }}
|
||||
style={[style, !available && { opacity: 0.35 }]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="airplay.audio"
|
||||
fallback={{ material: "cast" }}
|
||||
size={27}
|
||||
weight="semibold"
|
||||
color={color}
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
@@ -1,21 +1,17 @@
|
||||
import { useAuthActions, useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { Link, useRouter } from "expo-router"
|
||||
import { useAuthActions } from "@convex-dev/auth/react"
|
||||
import { Link } from "expo-router"
|
||||
import { useQuery } from "convex/react"
|
||||
import { useEffect, useState } from "react"
|
||||
import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
} from "react-native"
|
||||
import { useState } from "react"
|
||||
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"
|
||||
import { spacing, useThemeColors } from "@/lib/theme"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
type AuthFlow = "signIn" | "signUp"
|
||||
|
||||
@@ -50,10 +46,8 @@ const copy: Record<
|
||||
|
||||
export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
const { signIn } = useAuthActions()
|
||||
const auth = useConvexAuth()
|
||||
const router = useRouter()
|
||||
const colors = useThemeColors()
|
||||
const { config } = useServerConfig()
|
||||
const { config, clearServer } = useServerConfig()
|
||||
const appSettings = useQuery(api.users.getAppSettings)
|
||||
const [name, setName] = useState("")
|
||||
const [email, setEmail] = useState("")
|
||||
@@ -61,12 +55,6 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [submitting, setSubmitting] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
if (auth.isAuthenticated) {
|
||||
router.replace("/(app)/(tabs)/home")
|
||||
}
|
||||
}, [auth.isAuthenticated, router])
|
||||
|
||||
const text = copy[flow]
|
||||
const accountCreationDisabled = appSettings?.disableAccountCreation ?? false
|
||||
const signupsDisabled = flow === "signUp" && accountCreationDisabled
|
||||
@@ -99,14 +87,15 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
|
||||
return (
|
||||
<SafeAreaView style={[styles.safe, { backgroundColor: colors.background }]}>
|
||||
<KeyboardAvoidingView
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
style={styles.container}
|
||||
>
|
||||
<KeyboardForm style={styles.container}>
|
||||
<Card>
|
||||
<View style={styles.header}>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>{text.title}</Text>
|
||||
<Text style={[styles.description, { color: colors.mutedForeground }]}>
|
||||
<Text style={[styles.title, { color: colors.foreground }]}>
|
||||
{text.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.description, { color: colors.mutedForeground }]}
|
||||
>
|
||||
{text.description}
|
||||
</Text>
|
||||
{config ? (
|
||||
@@ -118,8 +107,8 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
|
||||
{signupsDisabled ? (
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
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.
|
||||
</Text>
|
||||
) : (
|
||||
<View style={styles.form}>
|
||||
@@ -144,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 ? (
|
||||
<Text style={{ color: colors.destructive }}>{error}</Text>
|
||||
) : null}
|
||||
<Button
|
||||
title={text.submit}
|
||||
loading={submitting}
|
||||
onPress={() => void handleSubmit()}
|
||||
/>
|
||||
{error ? <Text style={{ color: colors.destructive }}>{error}</Text> : null}
|
||||
<Button title={text.submit} loading={submitting} onPress={() => void handleSubmit()} />
|
||||
{!hideSignUpLink ? (
|
||||
<View style={styles.switchRow}>
|
||||
<Text style={{ color: colors.mutedForeground }}>{text.switchPrompt} </Text>
|
||||
<Text style={{ color: colors.mutedForeground }}>
|
||||
{text.switchPrompt}{" "}
|
||||
</Text>
|
||||
<Link href={text.switchHref} asChild>
|
||||
<Pressable>
|
||||
<Text style={{ color: colors.foreground, fontWeight: "600" }}>
|
||||
<Text
|
||||
style={{ color: colors.foreground, fontWeight: "600" }}
|
||||
>
|
||||
{text.switchLabel}
|
||||
</Text>
|
||||
</Pressable>
|
||||
@@ -164,12 +165,17 @@ export function AuthForm({ flow }: { flow: AuthFlow }) {
|
||||
)}
|
||||
</Card>
|
||||
|
||||
<Link href="/server" asChild>
|
||||
<Pressable style={styles.changeServer}>
|
||||
<Text style={{ color: colors.mutedForeground }}>Change server</Text>
|
||||
</Pressable>
|
||||
</Link>
|
||||
</KeyboardAvoidingView>
|
||||
<Pressable
|
||||
style={styles.changeServer}
|
||||
onPress={() =>
|
||||
void clearServer().catch(() =>
|
||||
showError("Could not clear the server address.")
|
||||
)
|
||||
}
|
||||
>
|
||||
<Text style={{ color: colors.mutedForeground }}>Change server</Text>
|
||||
</Pressable>
|
||||
</KeyboardForm>
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
import { useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { Redirect } from "expo-router"
|
||||
|
||||
import { LoadingView } from "@/components/ui/primitives"
|
||||
|
||||
export function AuthenticatedRedirect() {
|
||||
const auth = useConvexAuth()
|
||||
|
||||
if (!auth) {
|
||||
return <LoadingView />
|
||||
}
|
||||
|
||||
const { isLoading, isAuthenticated } = auth
|
||||
|
||||
if (isLoading) {
|
||||
return <LoadingView />
|
||||
}
|
||||
|
||||
if (!isAuthenticated) {
|
||||
return <Redirect href="/signin" />
|
||||
}
|
||||
|
||||
return <Redirect href="/(app)/(tabs)/home" />
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import type { ReactNode } from "react"
|
||||
import { Platform, StyleSheet, useWindowDimensions, View } from "react-native"
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
export function useCollectionHeroLayout() {
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { width, height } = useWindowDimensions()
|
||||
const insets = useSafeAreaInsets()
|
||||
const paneWidth = width - insets.left - insets.right
|
||||
const isTablet =
|
||||
Platform.OS === "ios" ? tabletLayout : Math.min(width, height) >= 600
|
||||
const landscape = isTablet && width > height && paneWidth >= 640
|
||||
return {
|
||||
landscape,
|
||||
coverSize: landscape
|
||||
? Math.min(300, Math.max(180, (paneWidth - 100) * 0.4))
|
||||
: undefined,
|
||||
}
|
||||
}
|
||||
|
||||
/** Tablet artwork and controls share a bottom edge, with metadata above the controls. */
|
||||
export function CollectionHero({
|
||||
artwork,
|
||||
actions,
|
||||
children,
|
||||
}: {
|
||||
artwork: ReactNode
|
||||
actions: ReactNode
|
||||
children: ReactNode
|
||||
}) {
|
||||
const { landscape } = useCollectionHeroLayout()
|
||||
return (
|
||||
<View style={[styles.hero, landscape && styles.landscape]}>
|
||||
{artwork}
|
||||
<View style={[styles.details, landscape && styles.landscapeDetails]}>
|
||||
<View style={[styles.metadata, landscape && styles.landscapeMetadata]}>
|
||||
{children}
|
||||
</View>
|
||||
{actions}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
hero: { padding: 16, gap: 8, alignItems: "center" },
|
||||
landscape: {
|
||||
flexDirection: "row",
|
||||
alignItems: "stretch",
|
||||
paddingHorizontal: 32,
|
||||
paddingTop: 34,
|
||||
paddingBottom: 40,
|
||||
gap: 34,
|
||||
},
|
||||
details: { alignItems: "center", gap: 8, alignSelf: "stretch" },
|
||||
landscapeDetails: {
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
paddingTop: 64,
|
||||
justifyContent: "space-between",
|
||||
alignItems: "flex-start",
|
||||
},
|
||||
metadata: { gap: 8, alignSelf: "stretch", alignItems: "center" },
|
||||
landscapeMetadata: { alignItems: "flex-start", gap: 4 },
|
||||
})
|
||||
@@ -1,5 +1,6 @@
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { memo } from "react"
|
||||
import { StyleSheet, Text, View } from "react-native"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
|
||||
@@ -25,9 +26,12 @@ export const DiscHeader = memo(function DiscHeader({
|
||||
}) {
|
||||
const colors = useThemeColors()
|
||||
return (
|
||||
<Text style={[styles.discHeader, { color: color ?? colors.foreground }]}>
|
||||
<PaletteText
|
||||
tone={color ? "foreground" : undefined}
|
||||
style={[styles.discHeader, { color: color ?? colors.foreground }]}
|
||||
>
|
||||
{label}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ import { Ionicons } from "@expo/vector-icons"
|
||||
import { Image, type ImageContentFit, type ImageStyle } from "expo-image"
|
||||
import { memo, useMemo } from "react"
|
||||
import {
|
||||
Platform,
|
||||
PixelRatio,
|
||||
StyleProp,
|
||||
StyleSheet,
|
||||
@@ -9,6 +10,8 @@ import {
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { prefetchCoverPalette } from "@/hooks/use-cover-palette"
|
||||
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
coverImageSizes,
|
||||
@@ -106,6 +109,9 @@ export const CoverImage = memo(function CoverImage({
|
||||
contentFit={contentFit}
|
||||
transition={150}
|
||||
blurRadius={blurRadius}
|
||||
onLoad={
|
||||
Platform.OS === "android" ? () => prefetchCoverPalette(uri) : undefined
|
||||
}
|
||||
cachePolicy="memory-disk"
|
||||
recyclingKey={sourceUri}
|
||||
enforceEarlyResizing
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
import { useConvexAuth } from "@convex-dev/auth/react"
|
||||
import { requireOptionalNativeModule, type NativeModule } from "expo"
|
||||
import { usePathname } from "expo-router"
|
||||
import { useEffect } from "react"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import {
|
||||
isMediaRoute,
|
||||
rememberIncomingMediaLink,
|
||||
} from "@/lib/incoming-media-link"
|
||||
import { showError } from "@/lib/toast"
|
||||
|
||||
type Activity = { server: string; route: string }
|
||||
declare class HandoffModule extends NativeModule<{ onActivity: () => void }> {
|
||||
takeActivity(): Promise<Activity | null>
|
||||
publish(server: string | null, route: string | null): Promise<void>
|
||||
}
|
||||
|
||||
const handoff =
|
||||
Platform.OS === "ios"
|
||||
? requireOptionalNativeModule<HandoffModule>("Handoff")
|
||||
: null
|
||||
|
||||
export function HandoffBridge() {
|
||||
const { config, isLoading } = useServerConfig()
|
||||
const auth = useConvexAuth()
|
||||
const pathname = usePathname()
|
||||
|
||||
useEffect(() => {
|
||||
if (!handoff || isLoading) return
|
||||
let active = true
|
||||
async function receive() {
|
||||
const activity = await handoff!.takeActivity()
|
||||
if (!active || !activity) return
|
||||
try {
|
||||
const source = new URL(activity.server)
|
||||
if (!config) {
|
||||
showError("Connect to an oTunes server to continue this activity.")
|
||||
return
|
||||
}
|
||||
if (source.origin !== new URL(config.serverUrl).origin) {
|
||||
showError("This activity belongs to a different oTunes server.")
|
||||
return
|
||||
}
|
||||
if (
|
||||
!["http:", "https:"].includes(source.protocol) ||
|
||||
source.username ||
|
||||
source.password ||
|
||||
!isMediaRoute(activity.route)
|
||||
)
|
||||
return
|
||||
rememberIncomingMediaLink(
|
||||
`/(app)/(tabs)/home${activity.route}`,
|
||||
source.origin
|
||||
)
|
||||
} catch {
|
||||
// Ignore malformed activities without navigating or changing servers.
|
||||
}
|
||||
}
|
||||
const subscription = handoff.addListener("onActivity", () => {
|
||||
void receive()
|
||||
})
|
||||
void receive()
|
||||
return () => {
|
||||
active = false
|
||||
subscription.remove()
|
||||
}
|
||||
}, [config, isLoading])
|
||||
|
||||
useEffect(() => {
|
||||
if (!handoff) return
|
||||
const route = pathname.replace(/^\/(home|search|library)/, "")
|
||||
const canPublish = config && auth?.isAuthenticated && isMediaRoute(route)
|
||||
void handoff.publish(
|
||||
canPublish ? config.serverUrl : null,
|
||||
canPublish ? route : null
|
||||
)
|
||||
return () => {
|
||||
void handoff.publish(null, null)
|
||||
}
|
||||
}, [config, auth?.isAuthenticated, pathname])
|
||||
|
||||
return null
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
import type { PropsWithChildren } from "react"
|
||||
import {
|
||||
KeyboardAvoidingView,
|
||||
Platform,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
/** Center account forms on wide windows; scroll when the keyboard reduces height. */
|
||||
export function KeyboardForm({
|
||||
children,
|
||||
style,
|
||||
}: PropsWithChildren<{ style?: StyleProp<ViewStyle> }>) {
|
||||
return (
|
||||
<KeyboardAvoidingView
|
||||
behavior={Platform.OS === "ios" ? "padding" : undefined}
|
||||
style={styles.fill}
|
||||
>
|
||||
<ScrollView
|
||||
style={styles.fill}
|
||||
contentContainerStyle={[style, styles.content]}
|
||||
keyboardShouldPersistTaps="handled"
|
||||
keyboardDismissMode={Platform.OS === "ios" ? "interactive" : "on-drag"}
|
||||
>
|
||||
{children}
|
||||
</ScrollView>
|
||||
</KeyboardAvoidingView>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
fill: { flex: 1 },
|
||||
content: {
|
||||
flex: undefined,
|
||||
flexGrow: 1,
|
||||
width: "100%",
|
||||
maxWidth: 528,
|
||||
alignSelf: "center",
|
||||
},
|
||||
})
|
||||
@@ -0,0 +1,100 @@
|
||||
import { useEffect, useState } from "react"
|
||||
import {
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type StyleProp,
|
||||
type TextStyle,
|
||||
} from "react-native"
|
||||
import Animated, {
|
||||
cancelAnimation,
|
||||
Easing,
|
||||
useAnimatedStyle,
|
||||
useSharedValue,
|
||||
withDelay,
|
||||
withRepeat,
|
||||
withSequence,
|
||||
withTiming,
|
||||
} from "react-native-reanimated"
|
||||
|
||||
const GAP = 48
|
||||
const PAUSE_MS = 2500
|
||||
const POINTS_PER_SECOND = 30
|
||||
// Wide enough that the measured text is never wrapped or truncated.
|
||||
const MEASURE_WIDTH = 10_000
|
||||
|
||||
/**
|
||||
* One line of text that scrolls when it doesn't fit, pausing at the start of
|
||||
* each loop like the Now Playing title in Apple Music.
|
||||
*/
|
||||
export function MarqueeText({
|
||||
text,
|
||||
style,
|
||||
}: {
|
||||
text: string
|
||||
style: StyleProp<TextStyle>
|
||||
}) {
|
||||
const [containerWidth, setContainerWidth] = useState(0)
|
||||
const [textWidth, setTextWidth] = useState(0)
|
||||
const offset = useSharedValue(0)
|
||||
const overflows = containerWidth > 0 && textWidth > containerWidth + 1
|
||||
|
||||
useEffect(() => {
|
||||
cancelAnimation(offset)
|
||||
offset.value = 0
|
||||
if (!overflows) return
|
||||
const distance = textWidth + GAP
|
||||
offset.value = withRepeat(
|
||||
withSequence(
|
||||
withDelay(
|
||||
PAUSE_MS,
|
||||
withTiming(-distance, {
|
||||
duration: (distance / POINTS_PER_SECOND) * 1000,
|
||||
easing: Easing.linear,
|
||||
})
|
||||
),
|
||||
withTiming(0, { duration: 0 })
|
||||
),
|
||||
-1
|
||||
)
|
||||
return () => cancelAnimation(offset)
|
||||
}, [offset, overflows, text, textWidth])
|
||||
|
||||
const trackStyle = useAnimatedStyle(() => ({
|
||||
transform: [{ translateX: offset.value }],
|
||||
}))
|
||||
|
||||
return (
|
||||
<View
|
||||
style={styles.container}
|
||||
onLayout={(event) => setContainerWidth(event.nativeEvent.layout.width)}
|
||||
accessible
|
||||
accessibilityLabel={text}
|
||||
>
|
||||
<Animated.View style={[styles.track, trackStyle]}>
|
||||
<Text
|
||||
style={style}
|
||||
numberOfLines={1}
|
||||
onLayout={(event) => setTextWidth(event.nativeEvent.layout.width)}
|
||||
>
|
||||
{text}
|
||||
</Text>
|
||||
{overflows ? (
|
||||
<Text style={[style, { marginLeft: GAP }]} numberOfLines={1}>
|
||||
{text}
|
||||
</Text>
|
||||
) : null}
|
||||
</Animated.View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
overflow: "hidden",
|
||||
},
|
||||
track: {
|
||||
flexDirection: "row",
|
||||
width: MEASURE_WIDTH,
|
||||
},
|
||||
})
|
||||
@@ -1,8 +1,17 @@
|
||||
import { useTabletLayout } from "@/hooks/use-tablet-layout"
|
||||
import Animated from "react-native-reanimated"
|
||||
import { tabletLayoutTransition } from "@/lib/tablet-motion"
|
||||
import { TabletMediaGrid } from "@/components/tablet-media-grid"
|
||||
import { useMediaGridLayout } from "@/hooks/use-media-grid-layout"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { Link } from "expo-router"
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { memo, useCallback, type ReactElement } from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
@@ -21,61 +30,81 @@ import type {
|
||||
PlaylistSummary,
|
||||
} from "@otunes/convex/types"
|
||||
import { albumCoverUrl, artistCoverUrl, playlistCoverUrl } from "@/lib/urls"
|
||||
import {
|
||||
carouselCardWidth,
|
||||
radius,
|
||||
spacing,
|
||||
useThemeColors,
|
||||
useTwoColumnCardWidth,
|
||||
} from "@/lib/theme"
|
||||
import { carouselCardWidth, radius, spacing, useThemeColors } from "@/lib/theme"
|
||||
|
||||
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,
|
||||
width = carouselCardWidth,
|
||||
fluid = false,
|
||||
}: {
|
||||
album: BrowseAlbum
|
||||
width?: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
const { push } = useAppNavigation()
|
||||
const { href } = useAppNavigation()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleAlbumAction, isAlbumFavorite } = useMediaMenuActions()
|
||||
const onPress = useCallback(() => {
|
||||
push(`/album/${album.id}`)
|
||||
}, [push, album.id])
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, album.id)}
|
||||
hasCover={album.cover != null}
|
||||
style={{ width, height: width, borderRadius: radius.md }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={2}
|
||||
<Link href={href(`/album/${album.id}`)} push asChild>
|
||||
<Pressable
|
||||
style={StyleSheet.flatten([
|
||||
styles.card,
|
||||
{ width: fluid ? "100%" : width },
|
||||
])}
|
||||
>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</Pressable>
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, album.id)}
|
||||
hasCover={album.cover != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||
: { width, height: width, borderRadius: radius.md }
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoom>
|
||||
<MusicEntityView kind="album" id={album.id} style={styles.card}>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
>
|
||||
{album.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{album.artist.name}
|
||||
</Text>
|
||||
</MusicEntityView>
|
||||
</Pressable>
|
||||
</Link>
|
||||
)
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "album",
|
||||
title: album.title,
|
||||
artist: album.artist.name,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, album.id),
|
||||
hasArtwork: album.cover != null,
|
||||
}}
|
||||
favorited={isAlbumFavorite(album.id)}
|
||||
stationArtistId={album.artist.id}
|
||||
navigation={{ artist: { id: album.artist.id } }}
|
||||
share={{ type: "album", albumId: album.id }}
|
||||
share={{ type: "album", albumId: album.id, title: album.title }}
|
||||
onAction={(action) => void handleAlbumAction(album, action)}
|
||||
>
|
||||
{card}
|
||||
@@ -86,11 +115,14 @@ export const AlbumCard = memo(function AlbumCard({
|
||||
export const ArtistCard = memo(function ArtistCard({
|
||||
artist,
|
||||
width = carouselCardWidth,
|
||||
fluid = false,
|
||||
}: {
|
||||
artist: BrowseArtist
|
||||
width?: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
const { push } = useAppNavigation()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handleArtistAction, isArtistFavorite } = useMediaMenuActions()
|
||||
@@ -100,15 +132,22 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<Pressable
|
||||
style={[styles.card, { width: fluid ? "100%" : width }]}
|
||||
onPress={onPress}
|
||||
>
|
||||
<CoverImage
|
||||
uri={artistCoverUrl(config.serverUrl, artist.id)}
|
||||
hasCover={artist.photo != null}
|
||||
style={{ width, height: width, borderRadius: width / 2 }}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: 9999 }
|
||||
: { width, height: width, borderRadius: width / 2 }
|
||||
}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={2}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
>
|
||||
{artist.name}
|
||||
</Text>
|
||||
@@ -117,11 +156,19 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
preview={{
|
||||
kind: "artist",
|
||||
title: artist.name,
|
||||
artworkUrl: artistCoverUrl(config.serverUrl, artist.id),
|
||||
hasArtwork: artist.photo != null,
|
||||
}}
|
||||
favorited={isArtistFavorite(artist.id)}
|
||||
share={{ type: "artist", artistId: artist.id }}
|
||||
share={{ type: "artist", artistId: artist.id, title: artist.name }}
|
||||
onAction={(action) => void handleArtistAction(artist, action)}
|
||||
>
|
||||
{card}
|
||||
<MusicEntityView kind="artist" id={artist.id}>
|
||||
{card}
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
})
|
||||
@@ -129,45 +176,66 @@ export const ArtistCard = memo(function ArtistCard({
|
||||
export const PlaylistCard = memo(function PlaylistCard({
|
||||
playlist,
|
||||
width = carouselCardWidth,
|
||||
fluid = false,
|
||||
}: {
|
||||
playlist: PlaylistSummary
|
||||
width?: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
const { push } = useAppNavigation()
|
||||
const { href } = useAppNavigation()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { config } = useServerConfig()
|
||||
const colors = useThemeColors()
|
||||
const { handlePlaylistAction } = useMediaMenuActions()
|
||||
const onPress = useCallback(() => {
|
||||
push(`/playlist/${playlist.id}`)
|
||||
}, [push, playlist.id])
|
||||
if (!config) return null
|
||||
|
||||
const card = (
|
||||
<Pressable style={[styles.card, { width }]} onPress={onPress}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={{ width, height: width, borderRadius: radius.md }}
|
||||
/>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={2}
|
||||
<Link href={href(`/playlist/${playlist.id}`)} push asChild>
|
||||
<Pressable
|
||||
style={StyleSheet.flatten([
|
||||
styles.card,
|
||||
{ width: fluid ? "100%" : width },
|
||||
])}
|
||||
>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{playlist.owner}
|
||||
</Text>
|
||||
</Pressable>
|
||||
<Link.AppleZoom>
|
||||
<View collapsable={false}>
|
||||
<CoverImage
|
||||
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
|
||||
hasCover={playlist.cover != null}
|
||||
style={
|
||||
fluid
|
||||
? { width: "100%", aspectRatio: 1, borderRadius: radius.md }
|
||||
: { width, height: width, borderRadius: radius.md }
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
</Link.AppleZoom>
|
||||
<MusicEntityView kind="playlist" id={playlist.id} style={styles.card}>
|
||||
<Text
|
||||
style={[styles.title, { color: colors.foreground }]}
|
||||
numberOfLines={tabletLayout ? 1 : 2}
|
||||
>
|
||||
{playlist.title}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.subtitle, { color: colors.mutedForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{playlist.owner}
|
||||
</Text>
|
||||
</MusicEntityView>
|
||||
</Pressable>
|
||||
</Link>
|
||||
)
|
||||
|
||||
return (
|
||||
<MediaContextMenu
|
||||
showFavorite={false}
|
||||
share={{ type: "playlist", playlistId: playlist.id }}
|
||||
share={{
|
||||
type: "playlist",
|
||||
playlistId: playlist.id,
|
||||
title: playlist.title,
|
||||
}}
|
||||
onAction={(action) => void handlePlaylistAction(playlist, action)}
|
||||
>
|
||||
{card}
|
||||
@@ -178,29 +246,42 @@ export const PlaylistCard = memo(function PlaylistCard({
|
||||
const CarouselCard = memo(function CarouselCard({
|
||||
item,
|
||||
width,
|
||||
fluid = false,
|
||||
}: {
|
||||
item: MediaItem
|
||||
width: number
|
||||
fluid?: boolean
|
||||
}) {
|
||||
if ("owner" in item) return <PlaylistCard playlist={item} width={width} />
|
||||
if ("artist" in item) return <AlbumCard album={item} width={width} />
|
||||
return <ArtistCard artist={item} width={width} />
|
||||
if ("owner" in item)
|
||||
return <PlaylistCard playlist={item} width={width} fluid={fluid} />
|
||||
if ("artist" in item)
|
||||
return <AlbumCard album={item} width={width} fluid={fluid} />
|
||||
return <ArtistCard artist={item} width={width} fluid={fluid} />
|
||||
})
|
||||
|
||||
export function MediaGrid({ content }: { content: MediaItem[] }) {
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { cardWidth, onLayout, ready } = useMediaGridLayout()
|
||||
|
||||
return (
|
||||
<View style={styles.grid}>
|
||||
{content.map((item) => (
|
||||
<View key={item.id} style={{ width: cardWidth }}>
|
||||
<CarouselCard item={item} width={cardWidth} />
|
||||
</View>
|
||||
<View style={styles.grid} onLayout={onLayout}>
|
||||
{(ready ? content : []).map((item) => (
|
||||
<Animated.View
|
||||
key={item.id}
|
||||
layout={tabletLayout ? tabletLayoutTransition : undefined}
|
||||
style={{ width: cardWidth }}
|
||||
>
|
||||
<CarouselCard item={item} width={cardWidth} fluid={tabletLayout} />
|
||||
</Animated.View>
|
||||
))}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function renderTabletCard(item: MediaItem, width: number) {
|
||||
return <CarouselCard item={item} width={width} fluid />
|
||||
}
|
||||
|
||||
export function MediaGridList({
|
||||
content,
|
||||
paddingBottom,
|
||||
@@ -211,10 +292,12 @@ export function MediaGridList({
|
||||
content: MediaItem[]
|
||||
paddingBottom: number
|
||||
onEndReached?: () => void
|
||||
ListHeaderComponent?: ReactElement | null
|
||||
ListHeaderComponent?: ReactElement
|
||||
contentInset?: boolean
|
||||
}) {
|
||||
const cardWidth = useTwoColumnCardWidth()
|
||||
const tabletLayout = useTabletLayout()
|
||||
const { columns, cardWidth, onLayout, horizontalPadding, gap } =
|
||||
useMediaGridLayout()
|
||||
const colors = useThemeColors()
|
||||
const renderItem = useCallback(
|
||||
({ item }: ListRenderItemInfo<MediaItem>) => (
|
||||
@@ -225,23 +308,43 @@ export function MediaGridList({
|
||||
[cardWidth]
|
||||
)
|
||||
|
||||
if (tabletLayout) {
|
||||
return (
|
||||
<TabletMediaGrid
|
||||
content={content}
|
||||
paddingBottom={paddingBottom}
|
||||
onEndReached={onEndReached}
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
contentInset={contentInset}
|
||||
renderCard={renderTabletCard}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<FlatList
|
||||
key={columns}
|
||||
onLayout={onLayout}
|
||||
data={content}
|
||||
keyExtractor={mediaItemKey}
|
||||
renderItem={renderItem}
|
||||
numColumns={2}
|
||||
numColumns={columns}
|
||||
initialNumToRender={GRID_INITIAL_ROWS}
|
||||
maxToRenderPerBatch={GRID_INITIAL_ROWS}
|
||||
windowSize={longListProps.windowSize}
|
||||
style={{ flex: 1, backgroundColor: colors.background }}
|
||||
contentContainerStyle={[
|
||||
contentInset ? styles.gridListContent : styles.gridListContentInset,
|
||||
{ paddingBottom },
|
||||
{
|
||||
paddingBottom,
|
||||
gap,
|
||||
...(contentInset ? { paddingHorizontal: horizontalPadding } : {}),
|
||||
},
|
||||
]}
|
||||
columnWrapperStyle={[
|
||||
styles.gridListRow,
|
||||
!contentInset && styles.gridListRowInset,
|
||||
!contentInset && { paddingHorizontal: horizontalPadding },
|
||||
{ gap },
|
||||
]}
|
||||
contentInsetAdjustmentBehavior="automatic"
|
||||
ListHeaderComponent={ListHeaderComponent}
|
||||
@@ -298,14 +401,30 @@ function ContentCarouselBody({
|
||||
/>
|
||||
) : null}
|
||||
</Pressable>
|
||||
<FlatList
|
||||
data={content}
|
||||
keyExtractor={mediaItemKey}
|
||||
renderItem={renderCarouselItem}
|
||||
horizontal
|
||||
showsHorizontalScrollIndicator={false}
|
||||
contentContainerStyle={styles.carouselContent}
|
||||
/>
|
||||
{Platform.OS === "android" &&
|
||||
content.length <= MAX_NON_VIRTUAL_CAROUSEL_ITEMS ? (
|
||||
<ScrollView
|
||||
horizontal
|
||||
style={styles.androidCarousel}
|
||||
showsHorizontalScrollIndicator={false}
|
||||
contentContainerStyle={styles.carouselContent}
|
||||
>
|
||||
{content.map((item) => (
|
||||
<View key={mediaItemKey(item)}>
|
||||
<CarouselCard item={item} width={carouselCardWidth} />
|
||||
</View>
|
||||
))}
|
||||
</ScrollView>
|
||||
) : (
|
||||
<FlatList
|
||||
data={content}
|
||||
keyExtractor={mediaItemKey}
|
||||
renderItem={renderCarouselItem}
|
||||
horizontal
|
||||
showsHorizontalScrollIndicator={false}
|
||||
contentContainerStyle={styles.carouselContent}
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -335,6 +454,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,
|
||||
},
|
||||
|
||||
@@ -1,13 +1,22 @@
|
||||
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 {
|
||||
Platform,
|
||||
Text,
|
||||
useWindowDimensions,
|
||||
View,
|
||||
type StyleProp,
|
||||
type ViewProps,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import { useAppNavigation } from "@/lib/app-navigation"
|
||||
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { MediaShareContext } from "@/lib/media-links"
|
||||
import { shouldShowShare } from "@/lib/media-links"
|
||||
@@ -19,6 +28,7 @@ export type MediaAction =
|
||||
| "play-next"
|
||||
| "play-last"
|
||||
| "shuffle"
|
||||
| "create-station"
|
||||
| "favorite"
|
||||
| "go-artist"
|
||||
| "go-album"
|
||||
@@ -29,11 +39,22 @@ export type MediaNavigation = {
|
||||
album?: { id: string }
|
||||
}
|
||||
|
||||
export type MediaMenuPreview = {
|
||||
title: string
|
||||
artist?: string
|
||||
album?: string
|
||||
artworkUrl: string
|
||||
hasArtwork: boolean
|
||||
kind: "album" | "artist" | "song"
|
||||
}
|
||||
|
||||
export type MediaMenuConfig = {
|
||||
preview?: MediaMenuPreview
|
||||
selectedCount?: number
|
||||
playlistLabel?: string
|
||||
favorited?: boolean
|
||||
showFavorite?: boolean
|
||||
stationArtistId?: string
|
||||
navigation?: MediaNavigation
|
||||
share?: MediaShareContext
|
||||
includeActions?: MediaAction[]
|
||||
@@ -77,15 +98,20 @@ const MEDIA_ACTION_ITEMS: {
|
||||
label: (countSuffix) => `Shuffle${countSuffix}`,
|
||||
image: "shuffle",
|
||||
},
|
||||
{
|
||||
action: "create-station",
|
||||
label: () => "Create Station",
|
||||
image: "shuffle",
|
||||
},
|
||||
{
|
||||
action: "go-artist",
|
||||
label: () => "Go to Artist",
|
||||
image: "person",
|
||||
image: "music.mic",
|
||||
},
|
||||
{
|
||||
action: "go-album",
|
||||
label: () => "Go to Album",
|
||||
image: "opticaldisc",
|
||||
image: "square.stack",
|
||||
},
|
||||
{
|
||||
action: "favorite",
|
||||
@@ -104,6 +130,10 @@ function isActionIncluded(
|
||||
action: MediaAction,
|
||||
config: Omit<MediaMenuConfig, "onAction">
|
||||
): boolean {
|
||||
if (action === "create-station" && !config.stationArtistId) {
|
||||
return false
|
||||
}
|
||||
|
||||
if (config.includeActions) {
|
||||
return config.includeActions.includes(action)
|
||||
}
|
||||
@@ -159,8 +189,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,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -202,10 +231,95 @@ function MediaMenuBase({
|
||||
const NativeContextMenuView =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
ViewProps & { disableForceFlatten?: boolean; children: ReactNode }
|
||||
ViewProps & {
|
||||
disableForceFlatten?: boolean
|
||||
children: ReactNode
|
||||
onPreviewTappedAnimationCompleted?: () => void
|
||||
}
|
||||
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewView")
|
||||
: null
|
||||
|
||||
const NativeContextMenuPreview =
|
||||
Platform.OS === "ios"
|
||||
? requireNativeView<
|
||||
ViewProps & {
|
||||
preferredContentSize: { width: number; height: number }
|
||||
children: ReactNode
|
||||
}
|
||||
>("ExpoRouterNativeLinkPreview", "NativeLinkPreviewContentView")
|
||||
: null
|
||||
|
||||
function MediaPreview({ preview }: { preview: MediaMenuPreview }) {
|
||||
const colors = useThemeColors()
|
||||
const { width: windowWidth, fontScale } = useWindowDimensions()
|
||||
if (!NativeContextMenuPreview) return null
|
||||
|
||||
const width = Math.min(360, windowWidth - 32)
|
||||
const height = Math.max(124, 32 + 76 * fontScale)
|
||||
const isArtist = preview.kind === "artist"
|
||||
return (
|
||||
// Match Expo Router's preview wrapper: UIKit mounts this separately, but
|
||||
// Yoga must also keep it out of the trigger's normal layout.
|
||||
<NativeContextMenuPreview
|
||||
preferredContentSize={{ width, height }}
|
||||
style={{ position: "absolute", top: 0, left: 0 }}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
width,
|
||||
height,
|
||||
padding: 16,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 16,
|
||||
backgroundColor: colors.card,
|
||||
}}
|
||||
>
|
||||
<CoverImage
|
||||
uri={preview.artworkUrl}
|
||||
hasCover={preview.hasArtwork}
|
||||
style={{ width: 88, height: 88, borderRadius: isArtist ? 44 : 12 }}
|
||||
/>
|
||||
<View style={{ flex: 1, gap: 2 }}>
|
||||
<Text
|
||||
numberOfLines={2}
|
||||
style={{
|
||||
color: colors.foreground,
|
||||
fontSize: 17,
|
||||
fontWeight: "600",
|
||||
}}
|
||||
>
|
||||
{preview.title}
|
||||
</Text>
|
||||
{preview.artist ? (
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
style={{ color: colors.mutedForeground, fontSize: 15 }}
|
||||
>
|
||||
{preview.artist}
|
||||
</Text>
|
||||
) : null}
|
||||
{preview.album ? (
|
||||
<Text
|
||||
numberOfLines={1}
|
||||
style={{ color: colors.mutedForeground, fontSize: 14 }}
|
||||
>
|
||||
{preview.album}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
{preview.kind !== "song" ? (
|
||||
<Ionicons
|
||||
name="chevron-forward"
|
||||
size={20}
|
||||
color={colors.mutedForeground}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
</NativeContextMenuPreview>
|
||||
)
|
||||
}
|
||||
|
||||
const NativeContextMenuAction: ComponentType<{
|
||||
identifier: string
|
||||
title: string
|
||||
@@ -221,11 +335,13 @@ const NativeContextMenuAction: ComponentType<{
|
||||
|
||||
function NativeMediaContextMenu({
|
||||
children,
|
||||
preview,
|
||||
onAction,
|
||||
share,
|
||||
...actionConfig
|
||||
}: MediaMenuWrapperProps) {
|
||||
const { config } = useServerConfig()
|
||||
const { push } = useAppNavigation()
|
||||
|
||||
if (!NativeContextMenuView || !NativeContextMenuAction) {
|
||||
return children
|
||||
@@ -240,8 +356,21 @@ function NativeMediaContextMenu({
|
||||
}
|
||||
|
||||
return (
|
||||
<NativeContextMenuView style={{ display: "contents" }} disableForceFlatten>
|
||||
{children}
|
||||
<NativeContextMenuView
|
||||
style={{ display: "contents" }}
|
||||
disableForceFlatten
|
||||
onPreviewTappedAnimationCompleted={() => {
|
||||
if (share?.type === "artist") push(`/artist/${share.artistId}`)
|
||||
else if (share?.type === "album" || share?.type === "song")
|
||||
push(`/album/${share.albumId}`)
|
||||
}}
|
||||
>
|
||||
{/* The native menu retains its first trigger. Keep that view mounted when
|
||||
focus changes replace the Siri entity wrapper inside it. */}
|
||||
<View collapsable={false}>{children}</View>
|
||||
{preview && (actionConfig.selectedCount ?? 1) === 1 ? (
|
||||
<MediaPreview preview={preview} />
|
||||
) : null}
|
||||
{buildMediaMenuActions({ ...actionConfig, share }).map((action) => (
|
||||
<NativeContextMenuAction
|
||||
key={action.id}
|
||||
|
||||
@@ -0,0 +1,140 @@
|
||||
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<MediaAction, ComponentProps<typeof Ionicons>["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 (
|
||||
<View style={style}>
|
||||
<Host
|
||||
colorScheme="dark"
|
||||
seedColor={appleMusic.pink}
|
||||
colorOverrides={{
|
||||
primary: appleMusic.pink,
|
||||
onPrimary: "#FFFFFF",
|
||||
surface: "#000000",
|
||||
onSurface: "#FFFFFF",
|
||||
onSurfaceVariant: "#FFFFFF",
|
||||
surfaceContainer: "#1C1C1E",
|
||||
surfaceContainerHigh: "#1C1C1E",
|
||||
surfaceTint: "#000000",
|
||||
outline: "#545458",
|
||||
outlineVariant: "#545458",
|
||||
error: "#FF453A",
|
||||
}}
|
||||
// Rows fill their parent width; compact action buttons keep intrinsic sizing.
|
||||
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||
>
|
||||
<DropdownMenu
|
||||
expanded={expanded}
|
||||
onDismissRequest={() => setExpanded(false)}
|
||||
color={appleMusic.elevated}
|
||||
cornerRadius={4}
|
||||
shadowElevation={0}
|
||||
properties={{ clippingEnabled: false }}
|
||||
>
|
||||
<DropdownMenu.Trigger>
|
||||
<RNHostView
|
||||
matchContents={shouldOpenOnLongPress ? { vertical: true } : true}
|
||||
>
|
||||
{shouldOpenOnLongPress ? (
|
||||
<GestureDetector gesture={longPress}>
|
||||
<View collapsable={false}>{children}</View>
|
||||
</GestureDetector>
|
||||
) : (
|
||||
<Pressable
|
||||
onPress={() => setExpanded(true)}
|
||||
accessible={false}
|
||||
focusable={false}
|
||||
android_disableSound
|
||||
>
|
||||
<View pointerEvents="none">{children}</View>
|
||||
</Pressable>
|
||||
)}
|
||||
</RNHostView>
|
||||
</DropdownMenu.Trigger>
|
||||
<DropdownMenu.Items>
|
||||
{actions
|
||||
.filter((action) => !action.attributes?.hidden)
|
||||
.map((action) => (
|
||||
<DropdownMenuItem
|
||||
key={action.id ?? action.title}
|
||||
enabled={!action.attributes?.disabled}
|
||||
elementColors={{
|
||||
textColor: action.attributes?.destructive
|
||||
? "#FF453A"
|
||||
: "#FFFFFF",
|
||||
}}
|
||||
onClick={() => {
|
||||
setExpanded(false)
|
||||
onPressAction?.({
|
||||
nativeEvent: { event: action.id ?? action.title },
|
||||
})
|
||||
}}
|
||||
>
|
||||
<DropdownMenuItem.LeadingIcon>
|
||||
<RNHostView matchContents>
|
||||
<Ionicons
|
||||
name={
|
||||
action.id === "favorite" &&
|
||||
action.image === "star.fill"
|
||||
? "star"
|
||||
: (actionIcons[action.id as MediaAction] ??
|
||||
"ellipsis-horizontal")
|
||||
}
|
||||
size={20}
|
||||
color={
|
||||
action.attributes?.destructive ? "#FF453A" : "#FFFFFF"
|
||||
}
|
||||
accessible={false}
|
||||
/>
|
||||
</RNHostView>
|
||||
</DropdownMenuItem.LeadingIcon>
|
||||
<DropdownMenuItem.Text>
|
||||
<Text>{action.title}</Text>
|
||||
</DropdownMenuItem.Text>
|
||||
</DropdownMenuItem>
|
||||
))}
|
||||
</DropdownMenu.Items>
|
||||
</DropdownMenu>
|
||||
</Host>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
import type { MenuComponentProps } from "@expo/ui/community/menu"
|
||||
import { Button, Host, Menu, RNHostView } from "@expo/ui/swift-ui"
|
||||
import { disabled, menuOrder } from "@expo/ui/swift-ui/modifiers"
|
||||
|
||||
// SwiftUI's automatic order reverses menus that open upward in the player.
|
||||
// Keep the same top-to-bottom order as the UIKit long-press menus.
|
||||
export function MenuView({
|
||||
actions,
|
||||
children,
|
||||
style,
|
||||
testID,
|
||||
onPressAction,
|
||||
}: MenuComponentProps) {
|
||||
return (
|
||||
<Host matchContents style={style} testID={testID} ignoreSafeArea="all">
|
||||
<Menu
|
||||
modifiers={[menuOrder("fixed")]}
|
||||
label={
|
||||
<RNHostView matchContents>
|
||||
<>{children}</>
|
||||
</RNHostView>
|
||||
}
|
||||
>
|
||||
{actions
|
||||
.filter((action) => !action.attributes?.hidden)
|
||||
.map((action) => (
|
||||
<Button
|
||||
key={action.id ?? action.title}
|
||||
label={action.title}
|
||||
systemImage={
|
||||
typeof action.image === "string" ? action.image : undefined
|
||||
}
|
||||
role={action.attributes?.destructive ? "destructive" : undefined}
|
||||
modifiers={[disabled(action.attributes?.disabled ?? false)]}
|
||||
onPress={() =>
|
||||
onPressAction?.({
|
||||
nativeEvent: { event: action.id ?? action.title },
|
||||
})
|
||||
}
|
||||
/>
|
||||
))}
|
||||
</Menu>
|
||||
</Host>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { MenuView } from "@expo/ui/community/menu"
|
||||
@@ -1,20 +1,22 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import { NativeTabs } from "expo-router/unstable-native-tabs"
|
||||
import { PaletteText, PaletteIcon } from "@/components/palette-text"
|
||||
import Animated from "react-native-reanimated"
|
||||
import {
|
||||
useAndroidTabPalette,
|
||||
useAndroidTabBackgroundStyle,
|
||||
useAndroidTabHasArtworkPalette,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
import { NativeTabs } from "expo-router/native-tabs"
|
||||
import { useRouter } from "expo-router"
|
||||
import { Platform, Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context"
|
||||
|
||||
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,
|
||||
@@ -25,10 +27,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
|
||||
@@ -56,7 +67,8 @@ function MiniPlayerContent({
|
||||
<View
|
||||
style={isAccessory ? styles.accessoryInlineMeta : styles.inlineMeta}
|
||||
>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -64,7 +76,7 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
@@ -74,7 +86,8 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={20}
|
||||
color={colors.foreground}
|
||||
@@ -92,7 +105,8 @@ function MiniPlayerContent({
|
||||
style={artworkStyle}
|
||||
/>
|
||||
<View style={isAccessory ? styles.accessoryMeta : styles.meta}>
|
||||
<Text
|
||||
<PaletteText
|
||||
tone="foreground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryTitle : styles.title,
|
||||
{ color: colors.foreground },
|
||||
@@ -100,8 +114,9 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.title}
|
||||
</Text>
|
||||
<Text
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone="secondaryForeground"
|
||||
style={[
|
||||
isAccessory ? styles.accessoryArtist : styles.artist,
|
||||
{ color: colors.mutedForeground },
|
||||
@@ -109,9 +124,28 @@ function MiniPlayerContent({
|
||||
numberOfLines={1}
|
||||
>
|
||||
{currentSong.artist.name}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<View style={styles.controls}>
|
||||
{Platform.OS === "android" && !isAccessory ? (
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Previous track"
|
||||
onPress={(event) => {
|
||||
event.stopPropagation()
|
||||
void skipPrevious()
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-back"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
) : null}
|
||||
<Pressable
|
||||
style={styles.controlButton}
|
||||
onPress={(event) => {
|
||||
@@ -120,7 +154,8 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name={isPlaying ? "pause" : "play"}
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
@@ -134,7 +169,12 @@ function MiniPlayerContent({
|
||||
}}
|
||||
hitSlop={6}
|
||||
>
|
||||
<Ionicons name="play-forward" size={24} color={colors.foreground} />
|
||||
<PaletteIcon
|
||||
tone="foreground"
|
||||
name="play-forward"
|
||||
size={24}
|
||||
color={colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
</View>
|
||||
</Pressable>
|
||||
@@ -142,14 +182,30 @@ function MiniPlayerContent({
|
||||
}
|
||||
|
||||
function MiniPlayerChrome({ children }: { children: React.ReactNode }) {
|
||||
const colors = useThemeColors()
|
||||
const backgroundColor = useMiniPlayerBackground()
|
||||
const palette = useAndroidTabPalette()
|
||||
const hasArtworkPalette = useAndroidTabHasArtworkPalette()
|
||||
const backgroundStyle = useAndroidTabBackgroundStyle()
|
||||
|
||||
return (
|
||||
<View style={[styles.androidBar, { backgroundColor }]}>
|
||||
<View style={[styles.topBorder, { backgroundColor: colors.border }]} />
|
||||
<Animated.View style={[styles.androidBar, backgroundStyle]}>
|
||||
{children}
|
||||
</View>
|
||||
{hasArtworkPalette ? (
|
||||
<View
|
||||
style={[
|
||||
styles.separator,
|
||||
styles.topBorder,
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
) : null}
|
||||
<View
|
||||
style={[
|
||||
styles.separator,
|
||||
styles.bottomBorder,
|
||||
{ backgroundColor: palette.secondaryForeground },
|
||||
]}
|
||||
/>
|
||||
</Animated.View>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -178,43 +234,31 @@ export function TabBottomAccessory() {
|
||||
|
||||
return content
|
||||
}
|
||||
//
|
||||
// function useFloatingMiniPlayerLayout() {
|
||||
// const segments = useSegments() as string[]
|
||||
// const insets = useSafeAreaInsets()
|
||||
//
|
||||
// const onPlayerModal = segments.includes("player")
|
||||
// const onAuthFlow =
|
||||
// segments.includes("signin") ||
|
||||
// segments.includes("signup") ||
|
||||
// segments.includes("server")
|
||||
// const onTabs = segments.includes("(tabs)")
|
||||
//
|
||||
// const bottom = insets.bottom + (onTabs ? 0 : 0)
|
||||
//
|
||||
// return {
|
||||
// bottom,
|
||||
// hidden: onPlayerModal || onAuthFlow || onTabs,
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// export function FloatingMiniPlayer() {
|
||||
// const router = useRouter()
|
||||
// const { bottom, hidden } = useFloatingMiniPlayerLayout()
|
||||
// const { currentSong, queueSongIds } = usePlayback()
|
||||
//
|
||||
// if (hidden || !currentSong || queueSongIds.length === 0) {
|
||||
// return null
|
||||
// }
|
||||
//
|
||||
// return (
|
||||
// <View pointerEvents="box-none" style={[styles.floatingContainer, { bottom }]}>
|
||||
// <MiniPlayerChrome>
|
||||
// <MiniPlayerContent onOpenPlayer={() => router.push("/player")} />
|
||||
// </MiniPlayerChrome>
|
||||
// </View>
|
||||
// )
|
||||
// }
|
||||
/** 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 (
|
||||
<View
|
||||
style={[
|
||||
styles.floatingContainer,
|
||||
{ bottom: tabBarHeight + insets.bottom },
|
||||
]}
|
||||
>
|
||||
<MiniPlayerChrome>
|
||||
<MiniPlayerContent
|
||||
placement="regular"
|
||||
variant="bar"
|
||||
onOpenPlayer={() => router.push("/player")}
|
||||
/>
|
||||
</MiniPlayerChrome>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
floatingContainer: {
|
||||
@@ -234,9 +278,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",
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import { useIsFocused } from "expo-router"
|
||||
import { AppEntityView } from "expo-app-intents"
|
||||
import type { PropsWithChildren } from "react"
|
||||
import { View, type ViewProps } from "react-native"
|
||||
import type { MusicEntityKind } from "@/lib/app-intents"
|
||||
|
||||
/** Only the focused screen contributes entities to Siri's on-screen context. */
|
||||
export function MusicEntityView({
|
||||
kind,
|
||||
id,
|
||||
children,
|
||||
...props
|
||||
}: PropsWithChildren<
|
||||
ViewProps & {
|
||||
kind: MusicEntityKind
|
||||
id: string
|
||||
}
|
||||
>) {
|
||||
const focused = useIsFocused()
|
||||
return focused ? (
|
||||
<AppEntityView entity={kind} entityId={id} {...props}>
|
||||
{children}
|
||||
</AppEntityView>
|
||||
) : (
|
||||
<View {...props}>{children}</View>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,852 @@
|
||||
import * as Haptics from "expo-haptics"
|
||||
import {
|
||||
memo,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
type ReactNode,
|
||||
} from "react"
|
||||
import {
|
||||
FlatList,
|
||||
Platform,
|
||||
Pressable,
|
||||
StyleSheet,
|
||||
Text,
|
||||
View,
|
||||
type LayoutChangeEvent,
|
||||
type StyleProp,
|
||||
type ViewStyle,
|
||||
} from "react-native"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
import Animated, {
|
||||
useAnimatedStyle,
|
||||
useSharedValue,
|
||||
withDelay,
|
||||
withTiming,
|
||||
type SharedValue,
|
||||
} from "react-native-reanimated"
|
||||
import Svg, { Defs, LinearGradient, Rect, Stop } from "react-native-svg"
|
||||
import { scheduleOnRN } from "react-native-worklets"
|
||||
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import {
|
||||
SwipeToRemoveRow,
|
||||
useSwipeRowGroup,
|
||||
type SwipeRowGroup,
|
||||
} from "@/components/ios-swipe-to-remove-row"
|
||||
import { PlayerSymbol } from "@/components/player-symbol"
|
||||
import { usePlayback } from "@/contexts/playback"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
import type { Id } from "@otunes/convex/_generated/dataModel"
|
||||
import type { NowPlayingColors } from "@/lib/now-playing-colors"
|
||||
import { useSong } from "@/lib/song-cache"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
|
||||
export const QUEUE_HORIZONTAL_INSET = 26
|
||||
|
||||
const ROW_HEIGHT = 64
|
||||
const HISTORY_HEADER_HEIGHT = 48
|
||||
const CURRENT_HEIGHT = 92
|
||||
const CONTROLS_HEIGHT = 108
|
||||
const TOGGLES_ONLY_HEIGHT = 64
|
||||
const BOTTOM_FADE_HEIGHT = 36
|
||||
const DRAG_SETTLE = { duration: 180 }
|
||||
const DRAG_HIGHLIGHT_Z_INDEX = 5
|
||||
const TAP_HIGHLIGHT_DELAY_MS = 80
|
||||
|
||||
type QueueListItem =
|
||||
| { type: "history-header"; key: string }
|
||||
| { type: "history"; key: string; songId: Id<"songs">; historyIndex: number }
|
||||
| { type: "current"; key: string }
|
||||
| { type: "controls"; key: string; showTitle: boolean; tablet?: boolean }
|
||||
| { type: "upcoming"; key: string; songId: Id<"songs">; queueIndex: number }
|
||||
| { type: "empty"; key: string; height: number }
|
||||
|
||||
function itemHeight(item: QueueListItem) {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return HISTORY_HEADER_HEIGHT
|
||||
case "current":
|
||||
return CURRENT_HEIGHT
|
||||
case "controls":
|
||||
return item.tablet
|
||||
? 44
|
||||
: item.showTitle
|
||||
? CONTROLS_HEIGHT
|
||||
: TOGGLES_ONLY_HEIGHT
|
||||
case "empty":
|
||||
return item.height
|
||||
default:
|
||||
return ROW_HEIGHT
|
||||
}
|
||||
}
|
||||
|
||||
type DragState = {
|
||||
from: SharedValue<number>
|
||||
to: SharedValue<number>
|
||||
y: SharedValue<number>
|
||||
/** Set once a drag is released so it settles and drops only once. */
|
||||
dropping: SharedValue<boolean>
|
||||
}
|
||||
|
||||
/**
|
||||
* The queue shown in place of the artwork: history above (scrolled out of view
|
||||
* at first), then the current song, the shuffle and repeat toggles, and the
|
||||
* upcoming songs, which can be dragged to reorder or swiped away.
|
||||
*/
|
||||
export function NowPlayingQueue({
|
||||
colors,
|
||||
viewportHeight,
|
||||
currentHeader,
|
||||
tablet = false,
|
||||
fadeColor,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
viewportHeight: number
|
||||
currentHeader: ReactNode
|
||||
tablet?: boolean
|
||||
fadeColor?: string
|
||||
}) {
|
||||
const {
|
||||
queueSongIds,
|
||||
queueHistorySongIds,
|
||||
shuffleEnabled,
|
||||
repeatEnabled,
|
||||
toggleShuffle,
|
||||
cycleRepeat,
|
||||
clearHistory,
|
||||
reorderQueue,
|
||||
skipToQueueIndex,
|
||||
skipToHistoryIndex,
|
||||
} = usePlayback()
|
||||
const [viewportWidth, setViewportWidth] = useState(0)
|
||||
const swipeGroup = useSwipeRowGroup()
|
||||
const [scrollEnabled, setScrollEnabled] = useState(true)
|
||||
const dragFrom = useSharedValue(-1)
|
||||
const dragTo = useSharedValue(-1)
|
||||
const dragY = useSharedValue(0)
|
||||
const dragDropping = useSharedValue(false)
|
||||
const drag = useMemo<DragState>(
|
||||
() => ({ from: dragFrom, to: dragTo, y: dragY, dropping: dragDropping }),
|
||||
[dragDropping, dragFrom, dragTo, dragY]
|
||||
)
|
||||
const listRef = useRef<FlatList<QueueListItem>>(null)
|
||||
const queueRef = useRef(queueSongIds)
|
||||
queueRef.current = queueSongIds
|
||||
const resetDragOnCommit = useRef(false)
|
||||
|
||||
const items = useMemo(() => {
|
||||
const list: QueueListItem[] = []
|
||||
if (queueHistorySongIds.length > 0) {
|
||||
list.push({ type: "history-header", key: "history-header" })
|
||||
queueHistorySongIds.forEach((songId, historyIndex) =>
|
||||
list.push({
|
||||
type: "history",
|
||||
key: `history:${historyIndex}:${songId}`,
|
||||
songId,
|
||||
historyIndex,
|
||||
})
|
||||
)
|
||||
}
|
||||
if (!tablet) list.push({ type: "current", key: "current" })
|
||||
const hasUpcoming = queueSongIds.length > 1
|
||||
list.push({
|
||||
type: "controls",
|
||||
key: "controls",
|
||||
showTitle: hasUpcoming,
|
||||
tablet,
|
||||
})
|
||||
const occurrences = new Map<string, number>()
|
||||
queueSongIds.forEach((songId, queueIndex) => {
|
||||
const occurrence = occurrences.get(songId) ?? 0
|
||||
occurrences.set(songId, occurrence + 1)
|
||||
if (queueIndex === 0) return
|
||||
list.push({
|
||||
type: "upcoming",
|
||||
key: `${songId}:${occurrence}`,
|
||||
songId,
|
||||
queueIndex,
|
||||
})
|
||||
})
|
||||
if (!hasUpcoming) {
|
||||
// Fills the rest of the page so the message sits in its middle.
|
||||
list.push({
|
||||
type: "empty",
|
||||
key: "empty",
|
||||
height: Math.max(
|
||||
ROW_HEIGHT * 2,
|
||||
viewportHeight - CURRENT_HEIGHT - TOGGLES_ONLY_HEIGHT
|
||||
),
|
||||
})
|
||||
}
|
||||
return list
|
||||
}, [queueHistorySongIds, queueSongIds, viewportHeight, tablet])
|
||||
|
||||
const offsets = useMemo(() => {
|
||||
const result: number[] = []
|
||||
let offset = 0
|
||||
for (const item of items) {
|
||||
result.push(offset)
|
||||
offset += itemHeight(item)
|
||||
}
|
||||
return result
|
||||
}, [items])
|
||||
|
||||
const currentIndex = items.findIndex(
|
||||
(item) => item.type === (tablet ? "controls" : "current")
|
||||
)
|
||||
const controlsIndex = tablet ? currentIndex : currentIndex + 1
|
||||
const belowCurrentHeight = items
|
||||
.slice(currentIndex)
|
||||
.reduce((sum, item) => sum + itemHeight(item), 0)
|
||||
// Lets the current song scroll to the top even when little is queued.
|
||||
const footerHeight = Math.max(
|
||||
BOTTOM_FADE_HEIGHT,
|
||||
viewportHeight - belowCurrentHeight
|
||||
)
|
||||
|
||||
// Keep the current song at the top as playback moves through the queue.
|
||||
const currentSongId = queueSongIds[0]
|
||||
const currentOffset = offsets[currentIndex] ?? 0
|
||||
const scrolledSongId = useRef(currentSongId)
|
||||
useEffect(() => {
|
||||
if (scrolledSongId.current === currentSongId) return
|
||||
scrolledSongId.current = currentSongId
|
||||
listRef.current?.scrollToOffset({ offset: currentOffset, animated: true })
|
||||
}, [currentOffset, currentSongId])
|
||||
|
||||
const getItemLayout = useCallback(
|
||||
(data: ArrayLike<QueueListItem> | null | undefined, index: number) => ({
|
||||
length: data ? itemHeight(data[index]) : ROW_HEIGHT,
|
||||
offset: offsets[index] ?? 0,
|
||||
index,
|
||||
}),
|
||||
[offsets]
|
||||
)
|
||||
|
||||
const resetDrag = useCallback(() => {
|
||||
drag.from.value = -1
|
||||
drag.to.value = -1
|
||||
drag.y.value = 0
|
||||
drag.dropping.value = false
|
||||
}, [drag])
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (!resetDragOnCommit.current) return
|
||||
resetDragOnCommit.current = false
|
||||
resetDrag()
|
||||
}, [queueSongIds, resetDrag])
|
||||
|
||||
const handleDragStart = useCallback(() => {
|
||||
setScrollEnabled(false)
|
||||
swipeGroup.closeOpenRow()
|
||||
void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium)
|
||||
}, [swipeGroup])
|
||||
|
||||
const handleDrop = useCallback(
|
||||
(songId: Id<"songs">, from: number, to: number) => {
|
||||
setScrollEnabled(true)
|
||||
const queue = queueRef.current
|
||||
if (
|
||||
from === to ||
|
||||
queue[from] !== songId ||
|
||||
to < 1 ||
|
||||
to >= queue.length
|
||||
) {
|
||||
resetDrag()
|
||||
return
|
||||
}
|
||||
const next = [...queue]
|
||||
const [moved] = next.splice(from, 1)
|
||||
next.splice(to, 0, moved)
|
||||
resetDragOnCommit.current = true
|
||||
void reorderQueue(next)
|
||||
},
|
||||
[reorderQueue, resetDrag]
|
||||
)
|
||||
|
||||
const handleRemove = useCallback(
|
||||
async (queueIndex: number) => {
|
||||
const queue = queueRef.current
|
||||
if (queueIndex < 1 || queueIndex >= queue.length) return false
|
||||
await reorderQueue(queue.filter((_, index) => index !== queueIndex))
|
||||
return true
|
||||
},
|
||||
[reorderQueue]
|
||||
)
|
||||
|
||||
const CellRenderer = useMemo(
|
||||
() =>
|
||||
function QueueCell({
|
||||
item,
|
||||
style,
|
||||
children,
|
||||
onLayout,
|
||||
}: {
|
||||
item: QueueListItem
|
||||
style: StyleProp<ViewStyle>
|
||||
children: ReactNode
|
||||
onLayout?: (event: LayoutChangeEvent) => void
|
||||
}) {
|
||||
const queueIndex = item.type === "upcoming" ? item.queueIndex : -1
|
||||
const lift = useAnimatedStyle(() => ({
|
||||
zIndex:
|
||||
queueIndex > 0 && drag.from.value === queueIndex
|
||||
? DRAG_HIGHLIGHT_Z_INDEX
|
||||
: 0,
|
||||
}))
|
||||
return (
|
||||
<Animated.View style={[style, lift]} onLayout={onLayout}>
|
||||
{children}
|
||||
</Animated.View>
|
||||
)
|
||||
},
|
||||
[drag]
|
||||
)
|
||||
|
||||
const renderItem = ({ item }: { item: QueueListItem }) => {
|
||||
switch (item.type) {
|
||||
case "history-header":
|
||||
return (
|
||||
<View style={styles.historyHeader}>
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
History
|
||||
</Text>
|
||||
<Pressable onPress={() => void clearHistory()} hitSlop={10}>
|
||||
<Text
|
||||
style={[styles.clear, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Clear
|
||||
</Text>
|
||||
</Pressable>
|
||||
</View>
|
||||
)
|
||||
case "history":
|
||||
return (
|
||||
<HistoryRow
|
||||
songId={item.songId}
|
||||
historyIndex={item.historyIndex}
|
||||
colors={colors}
|
||||
onPress={skipToHistoryIndex}
|
||||
/>
|
||||
)
|
||||
case "current":
|
||||
return <View style={styles.current}>{currentHeader}</View>
|
||||
case "controls":
|
||||
return (
|
||||
<View
|
||||
style={[
|
||||
styles.controls,
|
||||
{
|
||||
height: itemHeight(item),
|
||||
backgroundColor: tablet ? "transparent" : colors.background,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{!tablet ? (
|
||||
<View style={styles.toggles}>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={shuffleEnabled}
|
||||
label="Shuffle"
|
||||
symbol="shuffle"
|
||||
fallback="shuffle"
|
||||
onPress={toggleShuffle}
|
||||
/>
|
||||
<QueueToggle
|
||||
colors={colors}
|
||||
selected={repeatEnabled !== "none"}
|
||||
label={repeatEnabled === "once" ? "Repeat one" : "Repeat"}
|
||||
symbol={repeatEnabled === "once" ? "repeat.1" : "repeat"}
|
||||
fallback="repeat"
|
||||
onPress={cycleRepeat}
|
||||
/>
|
||||
</View>
|
||||
) : null}
|
||||
{item.showTitle ? (
|
||||
<Text style={[styles.sectionTitle, { color: colors.foreground }]}>
|
||||
Continue Playing
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
case "upcoming":
|
||||
return (
|
||||
<UpcomingRow
|
||||
songId={item.songId}
|
||||
queueIndex={item.queueIndex}
|
||||
lastIndex={queueSongIds.length - 1}
|
||||
tablet={tablet}
|
||||
colors={colors}
|
||||
drag={drag}
|
||||
swipeGroup={swipeGroup}
|
||||
onPress={skipToQueueIndex}
|
||||
onRemove={handleRemove}
|
||||
onDragStart={handleDragStart}
|
||||
onDrop={handleDrop}
|
||||
/>
|
||||
)
|
||||
case "empty":
|
||||
return (
|
||||
<View style={[styles.empty, { height: item.height }]}>
|
||||
<Text
|
||||
style={[styles.emptyText, { color: colors.secondaryForeground }]}
|
||||
>
|
||||
Nothing else is queued.
|
||||
</Text>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<View
|
||||
style={styles.root}
|
||||
onLayout={(event) => setViewportWidth(event.nativeEvent.layout.width)}
|
||||
>
|
||||
<FlatList
|
||||
ref={listRef}
|
||||
data={items}
|
||||
keyExtractor={(item) => item.key}
|
||||
renderItem={renderItem}
|
||||
getItemLayout={getItemLayout}
|
||||
CellRendererComponent={CellRenderer}
|
||||
initialScrollIndex={currentIndex}
|
||||
stickyHeaderIndices={[controlsIndex]}
|
||||
scrollEnabled={scrollEnabled}
|
||||
onScrollBeginDrag={swipeGroup.closeOpenRow}
|
||||
showsVerticalScrollIndicator={false}
|
||||
initialNumToRender={16}
|
||||
maxToRenderPerBatch={10}
|
||||
windowSize={9}
|
||||
ListFooterComponent={<View style={{ height: footerHeight }} />}
|
||||
/>
|
||||
<Svg
|
||||
key={viewportWidth}
|
||||
pointerEvents="none"
|
||||
style={styles.bottomFade}
|
||||
width={viewportWidth}
|
||||
height={BOTTOM_FADE_HEIGHT}
|
||||
>
|
||||
<Defs>
|
||||
<LinearGradient id="queue-fade" x1="0" y1="0" x2="0" y2="1">
|
||||
<Stop
|
||||
offset="0"
|
||||
stopColor={fadeColor ?? colors.background}
|
||||
stopOpacity={0}
|
||||
/>
|
||||
<Stop
|
||||
offset="1"
|
||||
stopColor={fadeColor ?? colors.background}
|
||||
stopOpacity={1}
|
||||
/>
|
||||
</LinearGradient>
|
||||
</Defs>
|
||||
<Rect
|
||||
width={viewportWidth}
|
||||
height={BOTTOM_FADE_HEIGHT}
|
||||
fill="url(#queue-fade)"
|
||||
/>
|
||||
</Svg>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function QueueToggle({
|
||||
colors,
|
||||
selected,
|
||||
label,
|
||||
symbol,
|
||||
fallback,
|
||||
onPress,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
selected: boolean
|
||||
label: string
|
||||
symbol: "shuffle" | "repeat" | "repeat.1"
|
||||
fallback: "shuffle" | "repeat"
|
||||
onPress: () => Promise<void>
|
||||
}) {
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="switch"
|
||||
accessibilityLabel={label}
|
||||
accessibilityState={{ checked: selected }}
|
||||
onPress={() => {
|
||||
void Haptics.selectionAsync()
|
||||
void onPress()
|
||||
}}
|
||||
style={({ pressed }) => [
|
||||
styles.toggle,
|
||||
{
|
||||
backgroundColor: selected ? colors.selected : colors.control,
|
||||
opacity: pressed ? 0.7 : 1,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<PlayerSymbol
|
||||
name={symbol}
|
||||
fallback={fallback}
|
||||
size={24}
|
||||
weight="semibold"
|
||||
color={selected ? colors.selectedForeground : colors.foreground}
|
||||
/>
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
function QueueSongContent({
|
||||
songId,
|
||||
colors,
|
||||
trailing,
|
||||
}: {
|
||||
songId: Id<"songs">
|
||||
colors: NowPlayingColors
|
||||
trailing?: ReactNode
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const song = useSong(songId)
|
||||
|
||||
return (
|
||||
<View style={styles.row}>
|
||||
<CoverImage
|
||||
uri={
|
||||
song && config ? albumCoverUrl(config.serverUrl, song.album.id) : ""
|
||||
}
|
||||
hasCover={song ? song.album.cover != null : false}
|
||||
style={styles.rowArtwork}
|
||||
/>
|
||||
<View style={styles.rowMeta}>
|
||||
<Text
|
||||
style={[styles.rowTitle, { color: colors.foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song?.title ?? " "}
|
||||
</Text>
|
||||
<Text
|
||||
style={[styles.rowSubtitle, { color: colors.secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song?.artist.name ?? " "}
|
||||
</Text>
|
||||
</View>
|
||||
{trailing}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A row tap that takes part in gesture arbitration, so swiping the row or
|
||||
* dragging its handle cancels it. A `Pressable` would still fire, since the row
|
||||
* moves with the finger.
|
||||
*/
|
||||
function RowTap({
|
||||
colors,
|
||||
onPress,
|
||||
children,
|
||||
}: {
|
||||
colors: NowPlayingColors
|
||||
onPress: () => void
|
||||
children: ReactNode
|
||||
}) {
|
||||
const pressed = useSharedValue(0)
|
||||
const tap = useMemo(
|
||||
() =>
|
||||
Gesture.Tap()
|
||||
.maxDistance(10)
|
||||
.onBegin(() => {
|
||||
pressed.value = withDelay(
|
||||
TAP_HIGHLIGHT_DELAY_MS,
|
||||
withTiming(1, { duration: 0 })
|
||||
)
|
||||
})
|
||||
.onEnd((_event, success) => {
|
||||
if (success) scheduleOnRN(onPress)
|
||||
})
|
||||
.onFinalize(() => {
|
||||
pressed.value = withTiming(0, { duration: 150 })
|
||||
}),
|
||||
[onPress, pressed]
|
||||
)
|
||||
const highlightStyle = useAnimatedStyle(() => ({ opacity: pressed.value }))
|
||||
|
||||
return (
|
||||
<GestureDetector gesture={tap}>
|
||||
<View accessible accessibilityRole="button" onAccessibilityTap={onPress}>
|
||||
{children}
|
||||
<Animated.View
|
||||
pointerEvents="none"
|
||||
style={[
|
||||
StyleSheet.absoluteFill,
|
||||
{ backgroundColor: colors.highlight },
|
||||
highlightStyle,
|
||||
]}
|
||||
/>
|
||||
</View>
|
||||
</GestureDetector>
|
||||
)
|
||||
}
|
||||
|
||||
const HistoryRow = memo(function HistoryRow({
|
||||
songId,
|
||||
historyIndex,
|
||||
colors,
|
||||
onPress,
|
||||
}: {
|
||||
songId: Id<"songs">
|
||||
historyIndex: number
|
||||
colors: NowPlayingColors
|
||||
onPress: (historyIndex: number) => Promise<void>
|
||||
}) {
|
||||
const handlePress = useCallback(
|
||||
() => void onPress(historyIndex),
|
||||
[historyIndex, onPress]
|
||||
)
|
||||
return (
|
||||
<RowTap colors={colors} onPress={handlePress}>
|
||||
<QueueSongContent songId={songId} colors={colors} />
|
||||
</RowTap>
|
||||
)
|
||||
})
|
||||
|
||||
const UpcomingRow = memo(function UpcomingRow({
|
||||
songId,
|
||||
queueIndex,
|
||||
lastIndex,
|
||||
tablet = false,
|
||||
colors,
|
||||
drag,
|
||||
swipeGroup,
|
||||
onPress,
|
||||
onRemove,
|
||||
onDragStart,
|
||||
onDrop,
|
||||
}: {
|
||||
songId: Id<"songs">
|
||||
queueIndex: number
|
||||
lastIndex: number
|
||||
tablet?: boolean
|
||||
colors: NowPlayingColors
|
||||
drag: DragState
|
||||
swipeGroup: SwipeRowGroup
|
||||
onPress: (queueIndex: number) => Promise<void>
|
||||
onRemove: (queueIndex: number) => Promise<boolean>
|
||||
onDragStart: () => void
|
||||
onDrop: (songId: Id<"songs">, from: number, to: number) => void
|
||||
}) {
|
||||
const handlePan = useMemo(() => {
|
||||
const tick = () => void Haptics.selectionAsync()
|
||||
return Gesture.Pan()
|
||||
.minDistance(0)
|
||||
.shouldCancelWhenOutside(false)
|
||||
.onStart(() => {
|
||||
if (drag.dropping.value) return
|
||||
drag.from.value = queueIndex
|
||||
drag.to.value = queueIndex
|
||||
drag.y.value = 0
|
||||
scheduleOnRN(onDragStart)
|
||||
})
|
||||
.onUpdate((event) => {
|
||||
if (drag.from.value !== queueIndex || drag.dropping.value) return
|
||||
drag.y.value = event.translationY
|
||||
const to = Math.min(
|
||||
lastIndex,
|
||||
Math.max(1, Math.round(queueIndex + event.translationY / ROW_HEIGHT))
|
||||
)
|
||||
if (to !== drag.to.value) {
|
||||
drag.to.value = to
|
||||
scheduleOnRN(tick)
|
||||
}
|
||||
})
|
||||
.onFinalize(() => {
|
||||
if (drag.from.value !== queueIndex || drag.dropping.value) return
|
||||
drag.dropping.value = true
|
||||
const to = drag.to.value
|
||||
drag.y.value = withTiming(
|
||||
(to - queueIndex) * ROW_HEIGHT,
|
||||
DRAG_SETTLE,
|
||||
() => scheduleOnRN(onDrop, songId, queueIndex, to)
|
||||
)
|
||||
})
|
||||
}, [drag, lastIndex, onDragStart, onDrop, queueIndex, songId])
|
||||
|
||||
const shiftStyle = useAnimatedStyle(() => {
|
||||
const from = drag.from.value
|
||||
if (from < 0) return { transform: [{ translateY: 0 }] }
|
||||
if (from === queueIndex) {
|
||||
return { transform: [{ translateY: drag.y.value }] }
|
||||
}
|
||||
const to = drag.to.value
|
||||
let shift = 0
|
||||
if (from < to && queueIndex > from && queueIndex <= to) shift = -ROW_HEIGHT
|
||||
if (from > to && queueIndex < from && queueIndex >= to) shift = ROW_HEIGHT
|
||||
return { transform: [{ translateY: withTiming(shift, DRAG_SETTLE) }] }
|
||||
})
|
||||
|
||||
const liftStyle = useAnimatedStyle(() => ({
|
||||
opacity: withTiming(drag.from.value === queueIndex ? 1 : 0, DRAG_SETTLE),
|
||||
}))
|
||||
|
||||
const handleRemove = useCallback(
|
||||
() => onRemove(queueIndex),
|
||||
[onRemove, queueIndex]
|
||||
)
|
||||
|
||||
const handlePress = useCallback(
|
||||
() => void onPress(queueIndex),
|
||||
[onPress, queueIndex]
|
||||
)
|
||||
|
||||
const content = (
|
||||
<RowTap colors={colors} onPress={handlePress}>
|
||||
<QueueSongContent
|
||||
songId={songId}
|
||||
colors={colors}
|
||||
trailing={
|
||||
<GestureDetector gesture={handlePan}>
|
||||
<View
|
||||
style={styles.handle}
|
||||
accessibilityLabel="Reorder"
|
||||
accessibilityHint="Drag to move this song in the queue"
|
||||
>
|
||||
<PlayerSymbol
|
||||
name="line.3.horizontal"
|
||||
fallback="reorder-three"
|
||||
size={20}
|
||||
color={colors.secondaryForeground}
|
||||
/>
|
||||
</View>
|
||||
</GestureDetector>
|
||||
}
|
||||
/>
|
||||
{tablet ? (
|
||||
<View
|
||||
pointerEvents="none"
|
||||
style={{
|
||||
position: "absolute",
|
||||
left: 88,
|
||||
right: 26,
|
||||
bottom: 0,
|
||||
height: StyleSheet.hairlineWidth,
|
||||
backgroundColor: colors.sliderTrack,
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<Animated.View
|
||||
pointerEvents="none"
|
||||
style={[
|
||||
StyleSheet.absoluteFill,
|
||||
{ backgroundColor: colors.highlight },
|
||||
liftStyle,
|
||||
]}
|
||||
/>
|
||||
</RowTap>
|
||||
)
|
||||
|
||||
return (
|
||||
<Animated.View style={shiftStyle}>
|
||||
{Platform.OS === "ios" ? (
|
||||
<SwipeToRemoveRow
|
||||
group={swipeGroup}
|
||||
backgroundColor={tablet ? "transparent" : colors.background}
|
||||
actionAccessibilityLabel="Remove from queue"
|
||||
onRemove={handleRemove}
|
||||
>
|
||||
{content}
|
||||
</SwipeToRemoveRow>
|
||||
) : (
|
||||
<View style={{ backgroundColor: colors.background }}>{content}</View>
|
||||
)}
|
||||
</Animated.View>
|
||||
)
|
||||
})
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
root: {
|
||||
flex: 1,
|
||||
},
|
||||
historyHeader: {
|
||||
height: HISTORY_HEADER_HEIGHT,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
paddingHorizontal: QUEUE_HORIZONTAL_INSET,
|
||||
},
|
||||
sectionTitle: {
|
||||
fontSize: 17,
|
||||
fontWeight: "700",
|
||||
},
|
||||
clear: {
|
||||
fontSize: 17,
|
||||
},
|
||||
current: {
|
||||
height: CURRENT_HEIGHT,
|
||||
justifyContent: "center",
|
||||
paddingHorizontal: QUEUE_HORIZONTAL_INSET,
|
||||
},
|
||||
controls: {
|
||||
justifyContent: "center",
|
||||
gap: 18,
|
||||
paddingHorizontal: QUEUE_HORIZONTAL_INSET,
|
||||
},
|
||||
toggles: {
|
||||
flexDirection: "row",
|
||||
gap: 12,
|
||||
},
|
||||
toggle: {
|
||||
flex: 1,
|
||||
height: 36,
|
||||
borderRadius: 18,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
row: {
|
||||
height: ROW_HEIGHT,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 14,
|
||||
paddingLeft: QUEUE_HORIZONTAL_INSET,
|
||||
paddingRight: QUEUE_HORIZONTAL_INSET - 10,
|
||||
},
|
||||
rowArtwork: {
|
||||
width: 48,
|
||||
height: 48,
|
||||
borderRadius: 6,
|
||||
},
|
||||
rowMeta: {
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
},
|
||||
rowTitle: {
|
||||
fontSize: 16,
|
||||
},
|
||||
rowSubtitle: {
|
||||
fontSize: 14,
|
||||
marginTop: 2,
|
||||
},
|
||||
handle: {
|
||||
width: 44,
|
||||
height: ROW_HEIGHT,
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
},
|
||||
empty: {
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
paddingHorizontal: QUEUE_HORIZONTAL_INSET,
|
||||
},
|
||||
emptyText: {
|
||||
fontSize: 20,
|
||||
fontWeight: "600",
|
||||
textAlign: "center",
|
||||
},
|
||||
bottomFade: {
|
||||
position: "absolute",
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
},
|
||||
})
|
||||
@@ -0,0 +1,49 @@
|
||||
import { Ionicons } from "@expo/vector-icons"
|
||||
import type { ComponentProps } from "react"
|
||||
import { Pressable, type TextProps } from "react-native"
|
||||
import { useRouter } from "expo-router"
|
||||
import Animated from "react-native-reanimated"
|
||||
|
||||
import {
|
||||
useAnimatedPaletteColor,
|
||||
type PaletteColor,
|
||||
} from "@/contexts/android-tab-theme"
|
||||
|
||||
const AnimatedIcon = Animated.createAnimatedComponent(Ionicons)
|
||||
|
||||
/** Keep artwork text colors on the same UI-thread animation as the background. */
|
||||
export function PaletteText({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: TextProps & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <Animated.Text {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
export function PaletteIcon({
|
||||
tone,
|
||||
style,
|
||||
...props
|
||||
}: ComponentProps<typeof Ionicons> & { tone?: PaletteColor }) {
|
||||
const colorStyle = useAnimatedPaletteColor(tone)
|
||||
return <AnimatedIcon {...props} style={[style, colorStyle]} />
|
||||
}
|
||||
|
||||
function ArtworkBackButton() {
|
||||
const router = useRouter()
|
||||
return (
|
||||
<Pressable
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel="Navigate up"
|
||||
hitSlop={8}
|
||||
onPress={() => router.back()}
|
||||
>
|
||||
<PaletteIcon tone="foreground" name="arrow-back" size={24} />
|
||||
</Pressable>
|
||||
)
|
||||
}
|
||||
|
||||
export function renderArtworkBackButton() {
|
||||
return <ArtworkBackButton />
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
import { useState, type ReactNode } from "react"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaActionMenu,
|
||||
type MediaAction,
|
||||
} from "@/components/media-context-menu"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
export function PlayerArtistMenu({
|
||||
song,
|
||||
onAction,
|
||||
children,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
onAction: (action: MediaAction) => void
|
||||
children: ReactNode
|
||||
}) {
|
||||
const [size, setSize] = useState({ width: 0, height: 0 })
|
||||
|
||||
return (
|
||||
<View
|
||||
style={styles.container}
|
||||
onLayout={({ nativeEvent: { layout } }) =>
|
||||
setSize({ width: layout.width, height: layout.height })
|
||||
}
|
||||
>
|
||||
<View
|
||||
pointerEvents="none"
|
||||
accessibilityElementsHidden
|
||||
importantForAccessibility="no-hide-descendants"
|
||||
>
|
||||
{children}
|
||||
</View>
|
||||
{size.width > 0 ? (
|
||||
<MediaActionMenu
|
||||
style={StyleSheet.absoluteFill}
|
||||
includeActions={["go-album", "go-artist"]}
|
||||
onAction={onAction}
|
||||
>
|
||||
<View
|
||||
style={size}
|
||||
accessible
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={song.artist.name}
|
||||
accessibilityHint="Opens album and artist options"
|
||||
/>
|
||||
</MediaActionMenu>
|
||||
) : null}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: { overflow: "hidden" },
|
||||
})
|
||||
@@ -0,0 +1,207 @@
|
||||
import { useEffect, useMemo, useRef, type ReactNode } from "react"
|
||||
import { StyleSheet, View } from "react-native"
|
||||
import { Gesture, GestureDetector } from "react-native-gesture-handler"
|
||||
import Animated, {
|
||||
cancelAnimation,
|
||||
interpolate,
|
||||
interpolateColor,
|
||||
useAnimatedStyle,
|
||||
useSharedValue,
|
||||
withSpring,
|
||||
withTiming,
|
||||
} from "react-native-reanimated"
|
||||
import { scheduleOnRN } from "react-native-worklets"
|
||||
|
||||
const IDLE_HEIGHT = 7
|
||||
const ACTIVE_HEIGHT = 13
|
||||
const TOUCH_HEIGHT = 36
|
||||
const ACTIVE_STRETCH = 1.03
|
||||
// Playback position lags a seek; hold the committed value until it catches up.
|
||||
const COMMIT_HOLD_MS = 800
|
||||
|
||||
/**
|
||||
* A thumbless bar that thickens while touched. Drags move the value relative to
|
||||
* where the finger started rather than jumping to the touch point.
|
||||
*/
|
||||
export function PlayerSlider({
|
||||
value,
|
||||
maximumValue,
|
||||
fillColor,
|
||||
activeFillColor,
|
||||
trackColor,
|
||||
onValueChange,
|
||||
onSlidingStart,
|
||||
onSlidingComplete,
|
||||
leading,
|
||||
trailing,
|
||||
accessibilityLabel,
|
||||
commitHoldMs = COMMIT_HOLD_MS,
|
||||
animateValueChanges = false,
|
||||
}: {
|
||||
value: number
|
||||
maximumValue: number
|
||||
fillColor: string
|
||||
activeFillColor: string
|
||||
trackColor: string
|
||||
onValueChange?: (value: number) => void
|
||||
onSlidingStart?: () => void
|
||||
onSlidingComplete?: (value: number) => void
|
||||
leading?: ReactNode
|
||||
trailing?: ReactNode
|
||||
accessibilityLabel: string
|
||||
animateValueChanges?: boolean
|
||||
/** 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))
|
||||
const startFraction = useSharedValue(0)
|
||||
const width = useSharedValue(0)
|
||||
const active = useSharedValue(0)
|
||||
const dragging = useSharedValue(false)
|
||||
const holdUntil = useRef(0)
|
||||
|
||||
useEffect(() => {
|
||||
if (dragging.value || Date.now() < holdUntil.current) return
|
||||
const next = clamp(value / max)
|
||||
fraction.value = animateValueChanges
|
||||
? withTiming(next, { duration: 160 })
|
||||
: next
|
||||
}, [animateValueChanges, dragging, fraction, max, value])
|
||||
|
||||
const callbacks = useRef({
|
||||
onValueChange,
|
||||
onSlidingStart,
|
||||
onSlidingComplete,
|
||||
value,
|
||||
commitHoldMs,
|
||||
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() + callbacks.current.commitHoldMs
|
||||
if (callbacks.current.commitHoldMs === 0) {
|
||||
fraction.value = clamp(callbacks.current.value / callbacks.current.max)
|
||||
}
|
||||
callbacks.current.onSlidingComplete?.(next * callbacks.current.max)
|
||||
}
|
||||
|
||||
return Gesture.Pan()
|
||||
.activeOffsetX([-2, 2])
|
||||
.failOffsetY([-24, 24])
|
||||
.shouldCancelWhenOutside(false)
|
||||
.onBegin(() => {
|
||||
active.value = withSpring(1, { duration: 250, dampingRatio: 0.8 })
|
||||
})
|
||||
.onStart(() => {
|
||||
cancelAnimation(fraction)
|
||||
dragging.value = true
|
||||
startFraction.value = fraction.value
|
||||
scheduleOnRN(start)
|
||||
})
|
||||
.onUpdate((event) => {
|
||||
if (width.value <= 0) return
|
||||
const next = Math.min(
|
||||
1,
|
||||
Math.max(0, startFraction.value + event.translationX / width.value)
|
||||
)
|
||||
fraction.value = next
|
||||
scheduleOnRN(change, next)
|
||||
})
|
||||
.onEnd(() => {
|
||||
scheduleOnRN(complete, fraction.value)
|
||||
})
|
||||
.onFinalize(() => {
|
||||
dragging.value = false
|
||||
active.value = withTiming(0, { duration: 250 })
|
||||
})
|
||||
}, [active, dragging, fraction, startFraction, width])
|
||||
|
||||
const trackStyle = useAnimatedStyle(() => {
|
||||
const height = interpolate(
|
||||
active.value,
|
||||
[0, 1],
|
||||
[IDLE_HEIGHT, ACTIVE_HEIGHT]
|
||||
)
|
||||
return {
|
||||
height,
|
||||
borderRadius: height / 2,
|
||||
transform: [
|
||||
{ scaleX: interpolate(active.value, [0, 1], [1, ACTIVE_STRETCH]) },
|
||||
],
|
||||
}
|
||||
})
|
||||
|
||||
const fillStyle = useAnimatedStyle(() => ({
|
||||
width: `${fraction.value * 100}%`,
|
||||
backgroundColor: interpolateColor(
|
||||
active.value,
|
||||
[0, 1],
|
||||
[fillColor, activeFillColor]
|
||||
),
|
||||
}))
|
||||
|
||||
return (
|
||||
<View style={styles.row}>
|
||||
{leading}
|
||||
<GestureDetector gesture={gesture}>
|
||||
<View
|
||||
style={styles.touchArea}
|
||||
onLayout={(event) => {
|
||||
width.value = event.nativeEvent.layout.width
|
||||
}}
|
||||
accessible
|
||||
accessibilityRole="adjustable"
|
||||
accessibilityLabel={accessibilityLabel}
|
||||
accessibilityValue={{
|
||||
min: 0,
|
||||
max: Math.round(max),
|
||||
now: Math.round(value),
|
||||
}}
|
||||
>
|
||||
<Animated.View
|
||||
style={[styles.track, { backgroundColor: trackColor }, trackStyle]}
|
||||
>
|
||||
<Animated.View style={[styles.fill, fillStyle]} />
|
||||
</Animated.View>
|
||||
</View>
|
||||
</GestureDetector>
|
||||
{trailing}
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
function clamp(fraction: number) {
|
||||
return Number.isFinite(fraction) ? Math.min(1, Math.max(0, fraction)) : 0
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 10,
|
||||
},
|
||||
touchArea: {
|
||||
flex: 1,
|
||||
height: TOUCH_HEIGHT,
|
||||
justifyContent: "center",
|
||||
},
|
||||
track: {
|
||||
overflow: "hidden",
|
||||
},
|
||||
fill: {
|
||||
height: "100%",
|
||||
},
|
||||
})
|
||||
@@ -0,0 +1,32 @@
|
||||
import { Ionicons, MaterialIcons } from "@expo/vector-icons"
|
||||
import { SymbolView, type SFSymbol } from "expo-symbols"
|
||||
import { Platform } from "react-native"
|
||||
|
||||
type Fallback =
|
||||
| keyof typeof Ionicons.glyphMap
|
||||
| { material: keyof typeof MaterialIcons.glyphMap }
|
||||
|
||||
/** An SF Symbol on iOS, or the closest Ionicon or Material icon elsewhere. */
|
||||
export function PlayerSymbol({
|
||||
name,
|
||||
fallback,
|
||||
size,
|
||||
color,
|
||||
weight = "regular",
|
||||
}: {
|
||||
name: SFSymbol
|
||||
fallback: Fallback
|
||||
size: number
|
||||
color: string
|
||||
weight?: "regular" | "medium" | "semibold" | "bold"
|
||||
}) {
|
||||
if (Platform.OS === "ios") {
|
||||
return (
|
||||
<SymbolView name={name} size={size} tintColor={color} weight={weight} />
|
||||
)
|
||||
}
|
||||
if (typeof fallback === "object") {
|
||||
return <MaterialIcons name={fallback.material} size={size} color={color} />
|
||||
}
|
||||
return <Ionicons name={fallback} size={size} color={color} />
|
||||
}
|
||||
@@ -1,3 +1,7 @@
|
||||
import { SongSwipeRow } from "@/components/song-swipe-row"
|
||||
import type { SwipeRowGroup } from "@/components/ios-swipe-to-remove-row"
|
||||
import { PaletteText } from "@/components/palette-text"
|
||||
import { MusicEntityView } from "@/components/music-entity-view"
|
||||
import { collectionInset } from "@/components/collection-list"
|
||||
import { CoverImage } from "@/components/cover-image"
|
||||
import { useServerConfig } from "@/contexts/server-config"
|
||||
@@ -5,9 +9,14 @@ import type { BrowseSong } from "@otunes/convex/types"
|
||||
import type { CoverPalette } from "@/lib/cover-palette"
|
||||
import { formatDuration } from "@/lib/format"
|
||||
import { albumCoverUrl } from "@/lib/urls"
|
||||
import { miniPlayerHeight, spacing, useThemeColors } from "@/lib/theme"
|
||||
import {
|
||||
miniPlayerHeight,
|
||||
tabletMiniPlayerHeight,
|
||||
spacing,
|
||||
useThemeColors,
|
||||
} from "@/lib/theme"
|
||||
import { memo, useCallback } from "react"
|
||||
import { Pressable, StyleSheet, Text, View } from "react-native"
|
||||
import { Platform, Pressable, StyleSheet, View } from "react-native"
|
||||
|
||||
import {
|
||||
MediaContextMenu,
|
||||
@@ -15,6 +24,8 @@ import {
|
||||
type MediaMenuConfig,
|
||||
} from "@/components/media-context-menu"
|
||||
|
||||
function consumeLongPress() {}
|
||||
|
||||
export const SongRow = memo(function SongRow({
|
||||
song,
|
||||
onPress,
|
||||
@@ -22,6 +33,7 @@ export const SongRow = memo(function SongRow({
|
||||
trailing,
|
||||
palette,
|
||||
inset = false,
|
||||
swipe,
|
||||
}: {
|
||||
song: BrowseSong
|
||||
onPress?: () => void
|
||||
@@ -30,6 +42,11 @@ export const SongRow = memo(function SongRow({
|
||||
}
|
||||
trailing?: React.ReactNode
|
||||
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
/** Album/playlist layout: the divider starts at the title, not the artwork. */
|
||||
inset?: boolean
|
||||
}) {
|
||||
@@ -45,27 +62,33 @@ export const SongRow = memo(function SongRow({
|
||||
const content = (
|
||||
<>
|
||||
<View style={styles.rowMeta}>
|
||||
<Text style={[styles.rowTitle, { color: foreground }]} numberOfLines={1}>
|
||||
<PaletteText
|
||||
tone={palette ? "foreground" : undefined}
|
||||
style={[styles.rowTitle, { color: foreground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.title}
|
||||
</Text>
|
||||
<Text style={[styles.rowSubtitle, { color: secondaryForeground }]} numberOfLines={1}>
|
||||
</PaletteText>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.rowSubtitle, { color: secondaryForeground }]}
|
||||
numberOfLines={1}
|
||||
>
|
||||
{song.artist.name} · {song.album.title}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
</View>
|
||||
<Text style={[styles.duration, { color: secondaryForeground }]}>
|
||||
<PaletteText
|
||||
tone={palette ? "secondaryForeground" : undefined}
|
||||
style={[styles.duration, { color: secondaryForeground }]}
|
||||
>
|
||||
{formatDuration(song.durationSeconds)}
|
||||
</Text>
|
||||
</PaletteText>
|
||||
{trailing}
|
||||
</>
|
||||
)
|
||||
|
||||
const row = (
|
||||
<Pressable
|
||||
style={
|
||||
inset ? styles.insetRow : [styles.row, { borderBottomColor: divider }]
|
||||
}
|
||||
onPress={onPress}
|
||||
>
|
||||
const rowContent = (
|
||||
<>
|
||||
<CoverImage
|
||||
uri={albumCoverUrl(config.serverUrl, song.album.id)}
|
||||
hasCover={song.album.cover != null}
|
||||
@@ -78,16 +101,45 @@ export const SongRow = memo(function SongRow({
|
||||
) : (
|
||||
content
|
||||
)}
|
||||
</Pressable>
|
||||
</>
|
||||
)
|
||||
const rowStyle = inset
|
||||
? styles.insetRow
|
||||
: [styles.row, { borderBottomColor: divider }]
|
||||
const row =
|
||||
swipe && Platform.OS === "ios" ? (
|
||||
<SongSwipeRow
|
||||
group={swipe.group}
|
||||
onPlayNext={swipe.onPlayNext}
|
||||
backgroundColor={swipe.backgroundColor}
|
||||
onPress={onPress}
|
||||
style={rowStyle}
|
||||
>
|
||||
{rowContent}
|
||||
</SongSwipeRow>
|
||||
) : (
|
||||
<Pressable
|
||||
style={rowStyle}
|
||||
onPress={onPress}
|
||||
onLongPress={contextMenu ? consumeLongPress : undefined}
|
||||
>
|
||||
{rowContent}
|
||||
</Pressable>
|
||||
)
|
||||
|
||||
if (!contextMenu) {
|
||||
return row
|
||||
return (
|
||||
<MusicEntityView kind="song" id={song.id}>
|
||||
{row}
|
||||
</MusicEntityView>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<MediaContextMenu {...contextMenu}>
|
||||
{row}
|
||||
<MusicEntityView kind="song" id={song.id}>
|
||||
{row}
|
||||
</MusicEntityView>
|
||||
</MediaContextMenu>
|
||||
)
|
||||
})
|
||||
@@ -103,6 +155,7 @@ export const SongListRow = memo(function SongListRow({
|
||||
playlistLabel,
|
||||
palette,
|
||||
inset,
|
||||
swipe,
|
||||
onPlay,
|
||||
onAction,
|
||||
}: {
|
||||
@@ -111,9 +164,15 @@ export const SongListRow = memo(function SongListRow({
|
||||
playlistLabel?: string
|
||||
palette?: Pick<CoverPalette, "foreground" | "secondaryForeground" | "divider">
|
||||
inset?: boolean
|
||||
swipe?: {
|
||||
group: SwipeRowGroup
|
||||
onPlayNext: () => void
|
||||
backgroundColor: string
|
||||
}
|
||||
onPlay: (song: BrowseSong) => void
|
||||
onAction: (song: BrowseSong, action: MediaAction) => void
|
||||
}) {
|
||||
const { config } = useServerConfig()
|
||||
const handlePress = useCallback(() => onPlay(song), [onPlay, song])
|
||||
|
||||
return (
|
||||
@@ -121,8 +180,20 @@ export const SongListRow = memo(function SongListRow({
|
||||
song={song}
|
||||
palette={palette}
|
||||
inset={inset}
|
||||
swipe={swipe}
|
||||
onPress={handlePress}
|
||||
contextMenu={{
|
||||
preview: config
|
||||
? {
|
||||
kind: "song",
|
||||
title: song.title,
|
||||
artist: song.artist.name,
|
||||
album: song.album.title,
|
||||
artworkUrl: albumCoverUrl(config.serverUrl, song.album.id),
|
||||
hasArtwork: song.album.cover != null,
|
||||
}
|
||||
: undefined,
|
||||
stationArtistId: song.artist.id,
|
||||
favorited,
|
||||
playlistLabel,
|
||||
navigation: {
|
||||
@@ -133,6 +204,7 @@ export const SongListRow = memo(function SongListRow({
|
||||
type: "song",
|
||||
albumId: song.album.id,
|
||||
songId: song.id,
|
||||
title: `${song.title} - ${song.album.title}`,
|
||||
},
|
||||
onAction: (action) => onAction(song, action),
|
||||
}}
|
||||
@@ -140,8 +212,15 @@ export const SongListRow = memo(function SongListRow({
|
||||
)
|
||||
})
|
||||
|
||||
export const tabContentBottomInset = spacing.lg
|
||||
export const contentBottomInset = miniPlayerHeight + spacing.lg
|
||||
const tabletPlayerInset = tabletMiniPlayerHeight + spacing.sm + spacing.lg
|
||||
export const tabContentBottomInset =
|
||||
Platform.OS === "ios" && Platform.isPad ? tabletPlayerInset : spacing.lg
|
||||
export const contentBottomInset =
|
||||
Platform.OS === "ios" && Platform.isPad
|
||||
? tabletPlayerInset
|
||||
: Platform.OS === "android"
|
||||
? spacing.lg
|
||||
: miniPlayerHeight + spacing.lg
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
row: {
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
import { useCallback, useMemo } from "react"
|
||||
import { Platform } from "react-native"
|
||||
import { Stack } from "expo-router"
|
||||
|
||||
import { useDebouncedSearch } from "@/hooks/use-debounced-search"
|
||||
import { useThemeColors } from "@/lib/theme"
|
||||
import type { BrowseSong } from "@otunes/convex/types"
|
||||
|
||||
export function usePlaylistSearch(songs: BrowseSong[]) {
|
||||
const search = useDebouncedSearch()
|
||||
const filteredSongs = useMemo(() => {
|
||||
const query = search.searchQuery.toLowerCase()
|
||||
if (!query) return songs
|
||||
return songs.filter((song) =>
|
||||
[song.title, song.artist.name, song.album.title].some((value) =>
|
||||
value.toLowerCase().includes(query)
|
||||
)
|
||||
)
|
||||
}, [songs, search.searchQuery])
|
||||
|
||||
return { ...search, filteredSongs }
|
||||
}
|
||||
|
||||
export function PlaylistSearchBar({
|
||||
onQueryChange,
|
||||
onSearchSubmit,
|
||||
}: Pick<
|
||||
ReturnType<typeof useDebouncedSearch>,
|
||||
"onQueryChange" | "onSearchSubmit"
|
||||
>) {
|
||||
const colors = useThemeColors()
|
||||
const handleChangeText = useCallback(
|
||||
(event: { nativeEvent: { text: string } }) => {
|
||||
onQueryChange(event.nativeEvent.text)
|
||||
},
|
||||
[onQueryChange]
|
||||
)
|
||||
|
||||
return (
|
||||
<Stack.SearchBar
|
||||
placeholder="Search playlist"
|
||||
onChangeText={handleChangeText}
|
||||
onSearchButtonPress={onSearchSubmit}
|
||||
autoCapitalize="none"
|
||||
{...(Platform.OS === "android"
|
||||
? {
|
||||
barTintColor: colors.background,
|
||||
textColor: colors.foreground,
|
||||
tintColor: colors.primary,
|
||||
hintTextColor: colors.mutedForeground,
|
||||
headerIconColor: colors.foreground,
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
)
|
||||
}
|
||||