21 Commits
Author SHA1 Message Date
TapTap cfab559e5e fix: keep the dragged queue row opaque
CI / build (push) Successful in 11m56s
CI / play (push) Successful in 3m16s
2026-11-17 08:55:38 +00:00
TapTap a63ee62673 feat: drag-to-reorder queue and a compact mobile player
CI / build (push) Successful in 4m51s
CI / play (push) Skipped
- long-press and drag queue rows, with auto-scroll near the edges
- pin the now-playing row above the upcoming queue
- move add-to-mood actions into an overflow menu so the title and
  artist get the full width on narrow phones
2026-11-17 08:54:23 +00:00
TapTap 3b40726edb feat: choose Deezer or YouTube Music per mood
CI / build (push) Successful in 3m35s
CI / play (push) Skipped
- models carry source and externalId instead of videoId
- AppCache v3 discards the old shape
- source selector in the create dialog, mood settings and search screen
- switching source patches the mood and re-runs the search
- client requests ten catalog results with a 60s timeout
2026-11-17 07:32:40 +00:00
TapTap 96ab25a91d feat: search YouTube Music and poll for the first recommendation batch
CI / build (push) Successful in 12m2s
CI / play (push) Successful in 3m18s
- label and document the YouTube Music search source
- allow up to 60s for a search and request ten results
- keep refreshing a new mood until its first recommendations arrive
2026-11-16 18:38:58 +00:00
TapTap c896f81306 fix: disable adding a search result that is already in the mood
CI / build (push) Successful in 12m13s
CI / play (push) Successful in 3m14s
2026-11-15 21:55:47 +00:00
TapTap 7ed518b047 fix: disable play until a mood has a song
CI / build (push) Successful in 3m53s
CI / play (push) Skipped
2026-11-15 21:48:33 +00:00
TapTap 6bfa12d673 feat: show which search results are already in the target mood
CI / build (push) Successful in 4m7s
CI / play (push) Skipped
2026-11-15 21:46:57 +00:00
TapTap 375bcc9c37 fix: refresh a mood after adding a song that is still downloading
CI / build (push) Successful in 4m1s
CI / play (push) Skipped
2026-11-15 21:45:12 +00:00
TapTap dc270f863c feat: move the client to searchable, downloadable moods
CI / build (push) Successful in 3m28s
CI / play (push) Skipped
- new mood/song/search/recommendation models and API calls
- AppCache v2 with moods and details only
- Search and Downloads screens; remove Library and Longform
- new mood detail with songs, add music and recommendation states
- song-keyed covers and updated tests/docs
2026-11-15 21:37:39 +00:00
TapTap 1bb23901eb docs: record the client side of the mood-first redesign [skip ci] 2026-11-15 21:06:32 +00:00
TapTap d9976a62bd build: publish tagged builds to Play internal testing
CI / build (push) Successful in 12m22s
CI / play (push) Successful in 3m19s
Apply Gradle Play Publisher 3.13.0 to the Android target, target the
internal track with AUTO version codes, and add a tag-only CI job that
decodes the upload keystore and uploads with the service account JSON
from repository secrets.

Document the one-time service account and secret setup.
2026-11-15 19:11:38 +00:00
TapTap 0491c78c7f test: cancel leftover store jobs via backgroundScope
CI / build (push) Successful in 2m0s
The reconnect loop could outlive the test body and intermittently fail
runTest with UncompletedCoroutinesError.
2026-11-15 18:52:23 +00:00
TapTap c53ed0a1b8 build: use the Play Console package name
CI / build (push) Failing after 2m25s
Set applicationId to win.tap_tap.audiomanager.client so the first upload
matches the existing Play Console app. The Kotlin namespace is unchanged;
relative manifest components are expanded against it, so no code moves.
2026-11-15 18:48:38 +00:00
TapTap 67414b5986 ci: install API 36 without a SIGPIPE from yes
CI / build (push) Successful in 2m2s
Also add platform 36 to the CI image for the next rebuild.
2026-11-15 18:40:44 +00:00
TapTap 9b105b3925 build: target API 36 and sign Play upload bundles
CI / build (push) Failing after 33s
- compileSdk/targetSdk 36: Google Play rejects new apps below API 36 since
  31 August 2026.
- Release signing from ANDROID_KEYSTORE_* environment variables or
  local.properties; unsigned when no upload key is configured.
- versionCode/versionName overridable via VERSION_CODE/VERSION_NAME.
- scripts/build-release-aab.sh builds and verifies a signed AAB.
- CI installs platform 36 until the CI image is rebuilt.
- Document the internal-testing upload flow.
2026-11-15 18:39:24 +00:00
TapTap 43bd9629d3 fix: harden playback, sync, downloads and mood state
CI / build (push) Successful in 2m1s
Playback:
- Persist the playhead in the playback snapshot and resume from it; restored
  longform progress is no longer overwritten with 0 on first play.
- Previous compares elapsed playtime since the track start, so resuming at
  1:00:00 and pressing previous goes back instead of restarting the book.
- Auto-advance no longer overwrites completed=true with false, longform PUTs
  are serialized, and playing rows/search results resume saved positions.
- Pause cancels the 400 ms poll; seek errors are reported instead of crashing.

Sync and state:
- First-sync snapshots keep the first page revision; cached revisions are only
  trusted for the same server/user.
- Refresh re-reads /me, merges local and server longform progress by timestamp,
  replays newer local positions, and keeps cached longform after deltas.
- Logout cancels refresh jobs, suppresses late progress writes, clears after
  playback teardown, and closes the HTTP client on release.
- Failed/racing mood opens clear the previous mood; stale responses cannot
  replace a newer selection. Mood drafts survive background refreshes.

Downloads and storage:
- Stream downloads to a .part file and atomically rename on Android/desktop,
  with a download-specific timeout and no whole-file buffering.
- Cache writes are best-effort and atomic; blocked/full web storage no longer
  leaves the app on the splash screen or blocks playback.
- Artwork failures do not fail audio downloads; failed downloads refresh the
  download index.
- Android queues sleep-timer commands before the controller connects.

UI:
- Music search is wired, debounced and kept separate from mood search.
- Player bar respects navigation-bar insets and hides music-only mood actions
  for longform. Mood gradient handles Int.MIN_VALUE.
2026-11-15 18:18:30 +00:00
TapTap 14bebced10 fix: persist the restarted position for longform immediately
CI / build (push) Successful in 1m42s
Pressing previous after two seconds now saves position zero before the next
progress poll, so killing the app right after the restart keeps the right
resume point.
2026-11-15 17:13:08 +00:00
TapTap 17bda94bfc feat: previous/scrub controls, mood mix and artwork for downloads
CI / build (push) Successful in 2m16s
Playback:
- Previous button: after two seconds it restarts the current track, otherwise
  it restores the last played track and puts the outgoing one back in front of
  the queue. History is persisted in the playback snapshot.
- The progress slider is draggable on every platform. Desktop previously
  refused to seek; it now restarts the decoder at the requested position,
  asking the server for a timeOffset on remote streams and skipping PCM frames
  for local files.

Artwork:
- Client downloads store the 320px cover next to the MP3 and Android sets it as
  MediaMetadata artwork data, so the notification and offline playback keep the
  cover. Deleting a download removes the image too.

Moods:
- New mood setting and editor slider choose the seed share of each radio batch;
  the server generates the rest from recommendations.

Library:
- Delta refresh now seeds its song map from both cached music and cached
  longform. Longform used to disappear after the first delta, which is why the
  artist list and artist playlists were empty while search still worked.
2026-11-15 17:07:11 +00:00
TapTap c0ff586686 feat: edit the queue and browse longform with resume
CI / build (push) Successful in 2m32s
The player gains a queue sheet showing the current track and every upcoming
track, with move up/down and remove; changes are persisted in the playback
snapshot.

Music and longform are now separate: library sync splits songs by the user's
folder assignments, so longform no longer leaks into search, Shuffle all or
moods. The new Longform tab groups audiobooks and podcasts by artist, offers a
generated read-only playlist per artist, "Shuffle artist" for random tracks,
separate longform search, and a Continue listening list with progress bars and
resume. Positions are saved locally and to the server while playing, on pause
and on track changes.

Recommendation cards now show download progress (queued, downloading, failed
with error and retry) and the mood refreshes while downloads are running.
2026-11-15 13:26:22 +00:00
TapTap dc719f3e1a feat: review YT recommendations and resume queues offline
CI / build (push) Successful in 1m56s
The mood screen now shows recommendation cards with thumbnails, a refresh
action, and accept/reject buttons. Accepting a library match adds it as a seed
immediately; other accepted tracks are marked as queued for download.

The player persists the session, queue and current track, restores them paused
on the next launch and starts the track on the next tap. While offline the
store retries the library sync with exponential backoff, downloads retry three
times before failing, and covers plus YT thumbnails are cached for the app's
lifetime.
2026-11-15 12:44:30 +00:00
TapTap 2234192dc7 feat: shuffle downloads when the server is offline
CI / build (push) Successful in 2m19s
Shuffle all now queues only downloaded tracks in offline mode, matching how a
mood falls back to downloads, and says so when there are none.
2026-11-15 08:09:37 +00:00
34 changed files with 3396 additions and 809 deletions

No files matched your search

+59
View File
@@ -22,6 +22,20 @@ jobs:
image: gitea.tap-tap.win/taptap/audiomanager-client-ci:3 image: gitea.tap-tap.win/taptap/audiomanager-client-ci:3
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with:
persist-credentials: false
# The app targets API 36, which Play requires for new uploads. The CI
# image still ships API 35, so install 36 on demand until it is rebuilt.
- name: Ensure Android SDK 36
run: |
set -euo pipefail
if [ ! -d "$ANDROID_HOME/platforms/android-36" ]; then
# stdin is already covered by the image's accepted licenses; do not
# pipe `yes` here, it dies with SIGPIPE and fails under pipefail.
"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install \
"platforms;android-36" "build-tools;36.0.0" </dev/null >/dev/null
fi
- name: Test and build - name: Test and build
run: | run: |
@@ -58,3 +72,48 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: scripts/publish-release.sh dist run: scripts/publish-release.sh dist
play:
# Publish tagged builds to the Google Play internal testing track.
# Requires the repository secrets listed in README.md.
if: startsWith(github.ref, 'refs/tags/v')
needs: [build]
runs-on: ubuntu-latest
permissions:
contents: read
container:
image: gitea.tap-tap.win/taptap/audiomanager-client-ci:3
env:
ANDROID_KEYSTORE_PATH: /tmp/upload-keystore.jks
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
# GPP reads the JSON contents from this variable; nothing is written to
# the repository.
ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
steps:
- uses: actions/checkout@v4
with:
persist-credentials: false
- name: Ensure Android SDK 36
run: |
set -euo pipefail
if [ ! -d "$ANDROID_HOME/platforms/android-36" ]; then
"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install \
"platforms;android-36" "build-tools;36.0.0" </dev/null >/dev/null
fi
- name: Decode the upload keystore
env:
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
run: |
set -euo pipefail
printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 -d > "$ANDROID_KEYSTORE_PATH"
chmod 600 "$ANDROID_KEYSTORE_PATH"
- name: Publish to internal testing
run: |
set -euo pipefail
export VERSION_NAME="${GITHUB_REF#refs/tags/v}"
gradle :composeApp:publishBundle --console=plain
+2
View File
@@ -7,3 +7,5 @@ local.properties
.DS_Store .DS_Store
.kotlin/ .kotlin/
node_modules/ node_modules/
*.jks
*.keystore
+182 -39
View File
@@ -1,8 +1,11 @@
# AudioManager Client # AudioManager Client
Kotlin Multiplatform client for [AudioManager](../AudioManager) — a mood-first, self-hosted music server. Kotlin Multiplatform client for [AudioManager](../AudioManager) — a mood-first,
self-hosted music server.
The client and server are designed together. There is no OpenSubsonic compatibility layer: the app speaks the native `/api/v1` API, where playback is a server-driven radio session and "likes" are replaced by explicit **add to mood** actions. The client and server are designed together. There is no OpenSubsonic
compatibility layer: the app speaks the native `/api/v1` API, where playback is
a server-driven radio session and songs are added from Deezer or YouTube Music.
## Targets ## Targets
@@ -12,24 +15,70 @@ The client and server are designed together. There is no OpenSubsonic compatibil
| **Desktop (JVM)** | Compose Multiplatform | MP3SPI, decoded to PCM + `SourceDataLine` | Yes | | **Desktop (JVM)** | Compose Multiplatform | MP3SPI, decoded to PCM + `SourceDataLine` | Yes |
| **Web (Wasm)** | Compose Multiplatform | HTML5 `Audio` | Browser-managed cache only | | **Web (Wasm)** | Compose Multiplatform | HTML5 `Audio` | Browser-managed cache only |
The shared module contains the API client, session/cache storage, radio queue, app state and all screens. Platform code is limited to HTTP engines, storage, audio and back handling.
## Features ## Features
- Login with a server URL, username and password. The server returns a revocable bearer token. - Login with a server URL, username and password. The server returns a revocable
- Mood grid with live counts; create, rename, delete and edit moods. bearer token.
- Seed management: search the owner's music, add or remove anchors. - **Moods** are the only content model. Each user sees only their own moods.
- Server-driven radio: the app keeps a small queue and asks for more from the same mood session. - **Songs** belong to the mood's permanent collection. A mood needs at least one
- Playback events are reported automatically (`started`, `completed`, `skipped`) so the server learns. song before it can play.
- **Search Deezer or YouTube Music** from inside a mood or globally with a mood
picker. Each mood has a **Download source** selector; search, recommendations
and downloads follow it. Tracks over 10 minutes are hidden. Results that are already downloaded are marked and
add instantly; other videos are queued for server-side download.
- **Paste a YouTube URL** to add a specific video.
- **Recommendations** are downloaded automatically and play in the radio without
being permanent. Rows show the download state with:
- Add to mood;
- Not interested (permanent for the mood);
- Retry for failed downloads.
- **Radio** mixes the collection and ready recommendations using the mood's
`collectionPercent`. The app keeps a small queue and asks for more from the
same mood session.
- Playback events are reported automatically (`started`, `completed`, `skipped`)
so the server learns.
- Two add-to-mood actions in the player: - Two add-to-mood actions in the player:
- **Add to current mood** (the mood of the active radio session) - **Add to current mood** (the mood of the active radio session)
- **Choose another mood** (picker) - **Choose another mood** (picker)
- Library search and playback, plus **Shuffle all** to queue the whole library without starting a mood. - A queue sheet from the player: the current track is pinned, upcoming tracks
- **Sleep timer** (15/30/45/60/90 minutes) that pauses playback. On Android the pause is scheduled inside the media service, so it still fires when the app is backgrounded or the task is swiped away. can be reordered by **long-press and drag** or removed. Changes are persisted
- Offline library cache: moods, songs and the last sync revision are stored locally. When the server is unreachable, downloaded tracks still play. locally.
- Original MP3 downloads with progress state, removal and storage usage. - **Previous** from the player: after two seconds of playback it restarts the
- Session persistence: the login survives app restarts until the token is revoked or expires. current track; before that it restores the last played track.
- Android background playback through a Media3 `MediaSessionService`: notification, lock-screen and headset controls, audio focus, and playback that survives the app being backgrounded or the task being swiped away. - The bottom player keeps the cover and title/artist readable on narrow phones;
add-to-mood actions moved into the overflow menu.
- **Scrubbing**: the progress slider can be dragged on every platform. Android and
web seek natively; desktop restarts the decoder at the requested position.
- **Mood settings**: name, description, discovery hint, genres, collection share,
active recommendation count (0–30), and refresh interval.
- **Downloads** screen for device-side copies: play, delete, clear, storage
usage.
- **Sleep timer** (15/30/45/60/90 minutes) that pauses playback. On Android the
pause is scheduled inside the media service, so it still fires when the app is
backgrounded or the task is swiped away.
- Mood cache: moods and details are stored locally so the app opens instantly
and can show cached data offline.
- The play queue and current track are saved locally, so a restart reopens the
player paused and resumes on the next tap.
- Reconnects automatically with exponential backoff (15s to 5min) while offline.
- Session persistence: the login survives app restarts until the token is
revoked or expires.
- Android background playback through a Media3 `MediaSessionService`:
notification, lock-screen and headset controls, audio focus, and playback that
survives the app being backgrounded or the task being swiped away.
## Screens
`Moods | Mood Detail | Search | Downloads | Settings`
- **Moods** — grid with song and pick counts, create, global search.
- **Mood Detail** — songs, add music, recommendations, next batch, settings.
- **Search** — mood picker, source selector, catalog search, paste URL,
downloaded badges.
- **Downloads** — offline files and storage usage.
- **Settings** — account, server URL, offline storage, sign out.
There is no Library tab, no Longform tab and no global shuffle.
## Project layout ## Project layout
@@ -37,9 +86,9 @@ The shared module contains the API client, session/cache storage, radio queue, a
composeApp/ composeApp/
|-- src/commonMain/kotlin/win/taptap/musicmanager/client/ |-- src/commonMain/kotlin/win/taptap/musicmanager/client/
| |-- api/ # Ktor client and DTOs mirroring /api/v1 | |-- api/ # Ktor client and DTOs mirroring /api/v1
| |-- data/ # AppStorage, LibraryCache, session persistence | |-- data/ # AppStorage, AppCache, session persistence
| |-- playback/ # AudioPlayer abstraction | |-- playback/ # AudioPlayer abstraction
| |-- store/ # AppStore: state, radio queue, downloads, editing | |-- store/ # AppStore: state, search, radio queue, downloads
| `-- ui/ # Compose screens and theme | `-- ui/ # Compose screens and theme
|-- src/androidMain/ # Activity, Media3 player, filesystem storage |-- src/androidMain/ # Activity, Media3 player, filesystem storage
|-- src/desktopMain/ # Main window, MP3SPI player, filesystem storage |-- src/desktopMain/ # Main window, MP3SPI player, filesystem storage
@@ -51,15 +100,18 @@ composeApp/
## Build ## Build
Requirements: JDK 21, Android SDK 35 for the app target, Node (Kotlin downloads its own for web). Requirements: JDK 21, Android SDK 36 for the app target, Node (Kotlin downloads
its own for web).
With Nix, everything is provided by `shell.nix` (JDK 21, Gradle 8, Node 22, Android SDK 35 with build-tools 35.0.0, and the desktop runtime libraries): With Nix, everything is provided by `shell.nix` (JDK 21, Gradle 8, Node 22,
Android SDK 36 with build-tools 36.0.0, and the desktop runtime libraries):
```bash ```bash
nix-shell nix-shell
``` ```
The shell accepts the unfree Android SDK license for you; see the comment at the top of `shell.nix`. Without Nix, point `ANDROID_HOME` at an SDK containing platform 35 and build-tools 35.0.0. Without Nix, point `ANDROID_HOME` at an SDK containing platform 36 and
build-tools 36.0.0.
```bash ```bash
export ANDROID_HOME=/opt/android-sdk export ANDROID_HOME=/opt/android-sdk
@@ -82,21 +134,95 @@ gradle :composeApp:wasmJsBrowserDistribution
# composeApp/build/dist/wasmJs/productionExecutable # composeApp/build/dist/wasmJs/productionExecutable
``` ```
Serve the web bundle from any static host (for example `python3 -m http.server` inside the production directory). The server allows cross-origin API calls; enter its URL on the login screen. When the bundle is hosted on the same origin as the server, the URL is prefilled. Serve the web bundle from any static host (for example `python3 -m http.server`
inside the production directory). The server allows cross-origin API calls;
enter its URL on the login screen.
Android cleartext HTTP is enabled for local development. Use HTTPS in production. Android cleartext HTTP is enabled for local development. Use HTTPS in
production.
## Publishing to Google Play (internal testing)
The application id `win.tap_tap.audiomanager.client` is fixed after the first
upload. Google Play requires new apps to target API 36, and every upload needs a
higher `versionCode`.
### 1. Upload key (once)
Play App Signing keeps the real signing key; this project only needs an upload
key. Create it and store the keystore plus both passwords in a password manager:
```bash
keytool -genkeypair -v -keystore upload-keystore.jks -storetype PKCS12 \
-alias upload -keyalg RSA -keysize 4096 -validity 10000
```
Add the values to `local.properties` (git-ignored) or export them in CI:
```properties
UPLOAD_STORE_FILE=/absolute/path/upload-keystore.jks
UPLOAD_STORE_PASSWORD=...
UPLOAD_KEY_ALIAS=upload
UPLOAD_KEY_PASSWORD=...
```
CI equivalents: `ANDROID_KEYSTORE_PATH`, `ANDROID_KEYSTORE_PASSWORD`,
`ANDROID_KEY_ALIAS`, `ANDROID_KEY_PASSWORD`.
### 2. Build the bundle
```bash
scripts/build-release-aab.sh <versionCode> <versionName>
# composeApp/build/outputs/bundle/release/composeApp-release.aab
```
The script verifies the signature and prints the SHA-256.
### 3. Upload
In Play Console: **Testing → Internal testing → Create new release → App
integrity → Google-generated key**, upload the AAB, add release notes, then
**Save → Roll out**.
### 4. Automated uploads
Tagged builds (`v*`) publish to internal testing from CI. The Gitea secrets are:
| Secret | Value |
| --- | --- |
| `ANDROID_KEYSTORE_BASE64` | `base64 -w0 upload-keystore.jks` |
| `ANDROID_KEYSTORE_PASSWORD` | keystore password |
| `ANDROID_KEY_ALIAS` | `upload` |
| `ANDROID_KEY_PASSWORD` | key password |
| `PLAY_SERVICE_ACCOUNT_JSON` | contents of the service account JSON |
Then `git tag v0.3.0 && git push --tags` builds, signs and uploads the bundle.
Gradle Play Publisher asks Play for the next free `versionCode`
(`ResolutionStrategy.AUTO`), so only the tag/version name needs to change.
## App state and offline behaviour ## App state and offline behaviour
`AppStore` is a plain Kotlin class with a `StateFlow<AppState>`; Compose observes it. It owns: `AppStore` is a plain Kotlin class with a `StateFlow<AppState>`; Compose observes
it. It owns:
- **Auth** — restore token, refresh token, logout. - **Auth** — restore the saved token on launch and log out.
- **Library sync** — first launch pages through `/library/songs`; later launches use the `since` delta and tombstones. - **Mood sync** — GET `/moods` on login/refresh; details are fetched when a mood
- **Mood cache** — mood details are stored so the app can open them offline. is opened and cached.
- **Radio** — one session per mood, batches of 12, prefetch when the queue is short, no repeats within a session. - **Mood cache** — cached details power offline mood lists and downloads.
- **Downloads** — stored under the platform app directory, keyed by deterministic song ID. - **Search** — debounced remote catalog search with the selected target mood and
its source.
- **Radio** — one session per mood, batches of 12, prefetch when the queue is
short, no repeats within a session.
- **Downloads** — stored under the platform app directory, keyed by the shared
song id.
- **Playback snapshot** — the session, upcoming queue, current track, history and
position are persisted and restored on the next launch.
- **Offline retry** — a background loop retries the mood sync until the server
responds again.
On startup the app is usable before the network call completes: cached moods and library render immediately, then refresh in the background. On startup the app is usable before the network call completes: cached moods
render immediately, then refresh in the background. Offline playback uses the
mood's cached songs filtered by downloaded files.
## Radio and add-to-mood ## Radio and add-to-mood
@@ -111,14 +237,20 @@ open mood ──► POST /moods/{id}/sessions ──► queue (12 tracks)
└─ moodId: chosen mood └─ moodId: chosen mood
``` ```
Adding a song makes it a permanent seed, so it is always eligible in future radio and visible in the mood editor. Adding a song makes it permanent in the mood, so it is always eligible in future
radio and visible in the song list.
## CI and releases ## CI and releases
`.gitea/workflows/ci.yaml` runs on Gitea Actions using `gitea.tap-tap.win/taptap/audiomanager-client-ci:3`. The image has the Android SDK, Node, Yarn and a warmed Gradle dependency cache, so jobs do not download them on every run. `.gitea/workflows/ci.yaml` runs on Gitea Actions using
`gitea.tap-tap.win/taptap/audiomanager-client-ci:3`. The image has the Android
SDK, Node, Yarn and a warmed Gradle dependency cache.
- **main / PR:** run `desktopTest`, build the Android APK and the *development* Wasm bundle. The optimized Wasm build is CPU-bound and reserved for releases. - **main / PR:** run `desktopTest`, build the Android APK and the *development*
- **`v*` tag:** additionally build the desktop fat jar and the optimized Wasm bundle, then attach all three to the Gitea release. Wasm bundle.
- **`v*` tag:** additionally build the desktop fat jar and the optimized Wasm
bundle, attach the artifacts to the Gitea release, and publish the AAB to Play
internal testing.
Rebuild the CI image after changing `ci/Dockerfile` or dependency versions: Rebuild the CI image after changing `ci/Dockerfile` or dependency versions:
@@ -126,12 +258,23 @@ Rebuild the CI image after changing `ci/Dockerfile` or dependency versions:
scripts/build-ci-image.sh 3 scripts/build-ci-image.sh 3
``` ```
The image build performs one warm-up compile (`kotlinNodeJsSetup`, `kotlinYarnSetup`, `desktopTest`, `assembleDebug`, `compileKotlinWasmJs`) and then removes the sources, keeping only `/root/.gradle`.
## Known limitations ## Known limitations
- The media notification exposes play/pause and seeking. Queue actions (skip, add to mood) stay in the app because the mood session and its events belong to the server. - The media notification exposes play/pause and seeking. Queue actions (skip,
- Desktop playback cannot seek (sequential decoder); pause/resume and skipping work. MP3s are decoded to 16-bit PCM before the line is opened, because Java Sound has no line for the compressed format. add to mood) stay in the app because the mood session and its events belong to
- Web downloads are disabled because the browser owns its storage; the app still streams and caches metadata. the server.
- YT Music recommendations are displayed when the server provides them; discovery and downloading are server-side roadmap items. - Desktop playback supports seeking by reopening the decoder at the requested
position. MP3s are decoded to 16-bit PCM before the line is opened, because
Java Sound has no line for the compressed format.
- Web downloads are disabled because the browser owns its storage; the app still
streams and caches metadata.
- Downloads store the 320 px cover next to the MP3 (`<songId>.jpg`), so the
in-app cover and the Android notification artwork survive without the server.
- Search and downloads depend on the server's catalogs. YouTube bot checks can
fail a YouTube Music search (`502`) or leave a recommendation in `failed`
with Retry. Music search resolves every result for its artist/album/duration,
so a YouTube Music search takes roughly 10–15 seconds for ten results;
Deezer search is much faster.
- Deezer downloads need `DEEZER_ARL` on the server. A Free ARL is limited to
128 kbps; Premium enables 320 kbps. The client never stores the ARL.
- No iOS target yet. The shared module is ready for one. - No iOS target yet. The shared module is ready for one.
+1
View File
@@ -4,4 +4,5 @@ plugins {
id("org.jetbrains.kotlin.plugin.compose") version "2.1.20" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.1.20" apply false
id("org.jetbrains.compose") version "1.8.0" apply false id("org.jetbrains.compose") version "1.8.0" apply false
id("com.android.application") version "8.9.1" apply false id("com.android.application") version "8.9.1" apply false
id("com.github.triplet.play") version "3.13.0" apply false
} }
+2 -2
View File
@@ -39,8 +39,8 @@ RUN mkdir -p "$ANDROID_HOME/cmdline-tools" \
&& yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null \ && yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null \
&& "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \ && "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
"platform-tools" \ "platform-tools" \
"platforms;android-35" \ "platforms;android-36" \
"build-tools;35.0.0" \ "build-tools;36.0.0" \
&& rm -rf "$ANDROID_HOME/.temp" "$ANDROID_HOME/.downloadIntermediates" && rm -rf "$ANDROID_HOME/.temp" "$ANDROID_HOME/.downloadIntermediates"
# Warm the Gradle dependency cache and the Kotlin/Wasm (node, yarn, binaryen) # Warm the Gradle dependency cache and the Kotlin/Wasm (node, yarn, binaryen)
+74 -5
View File
@@ -1,5 +1,8 @@
@file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class) @file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
import java.util.Properties
import com.github.triplet.gradle.androidpublisher.ReleaseStatus
import com.github.triplet.gradle.androidpublisher.ResolutionStrategy
import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -9,8 +12,37 @@ plugins {
id("org.jetbrains.compose") id("org.jetbrains.compose")
id("org.jetbrains.kotlin.plugin.compose") id("org.jetbrains.kotlin.plugin.compose")
id("com.android.application") id("com.android.application")
id("com.github.triplet.play")
} }
// Release signing and version numbers come from the environment in CI, or from
// local.properties for local release builds. Nothing secret is committed:
// local.properties is git-ignored. Without an upload key the release build
// still works, but the AAB is unsigned and cannot be uploaded to Play.
val localProperties = Properties().apply {
val file = rootProject.file("local.properties")
if (file.exists()) file.inputStream().use { load(it) }
}
fun signingValue(property: String, env: String): String? =
(System.getenv(env) ?: localProperties.getProperty(property))?.takeIf { it.isNotBlank() }
val uploadKeyStore = signingValue("UPLOAD_STORE_FILE", "ANDROID_KEYSTORE_PATH")?.let { rootProject.file(it) }
val uploadKeyStorePassword = signingValue("UPLOAD_STORE_PASSWORD", "ANDROID_KEYSTORE_PASSWORD")
val uploadKeyAlias = signingValue("UPLOAD_KEY_ALIAS", "ANDROID_KEY_ALIAS")
val uploadKeyPassword = signingValue("UPLOAD_KEY_PASSWORD", "ANDROID_KEY_PASSWORD")
val hasUploadKey = uploadKeyStore?.exists() == true &&
!uploadKeyStorePassword.isNullOrEmpty() &&
!uploadKeyAlias.isNullOrEmpty() &&
!uploadKeyPassword.isNullOrEmpty()
// Play requires a strictly increasing versionCode for every upload. CI can pass
// VERSION_CODE / VERSION_NAME (for example from the git tag).
val appVersionCode = (System.getenv("VERSION_CODE") ?: localProperties.getProperty("VERSION_CODE") ?: "1").toInt()
val appVersionName = System.getenv("VERSION_NAME")
?: localProperties.getProperty("VERSION_NAME")
?: "0.3.0"
kotlin { kotlin {
androidTarget { androidTarget {
compilerOptions { compilerOptions {
@@ -47,6 +79,7 @@ kotlin {
implementation("io.ktor:ktor-serialization-kotlinx-json:3.1.2") implementation("io.ktor:ktor-serialization-kotlinx-json:3.1.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
} }
commonTest.dependencies { commonTest.dependencies {
@@ -84,14 +117,39 @@ kotlin {
android { android {
namespace = "win.taptap.musicmanager.client" namespace = "win.taptap.musicmanager.client"
compileSdk = 35 // Google Play requires new apps and updates to target API 36 from
// 31 August 2026.
compileSdk = 36
defaultConfig { defaultConfig {
applicationId = "win.taptap.musicmanager.client" // The package name shown in Play Console. It is permanent after the
// first upload. The Kotlin package/namespace stays as-is: the manifest
// and generated R/BuildConfig classes use the namespace, Play uses the
// application id.
applicationId = "win.tap_tap.audiomanager.client"
minSdk = 26 minSdk = 26
targetSdk = 35 targetSdk = 36
versionCode = 1 versionCode = appVersionCode
versionName = "0.1.0" versionName = appVersionName
}
signingConfigs {
if (hasUploadKey) {
create("release") {
storeFile = uploadKeyStore
storePassword = uploadKeyStorePassword
keyAlias = uploadKeyAlias
keyPassword = uploadKeyPassword
}
}
}
buildTypes {
release {
if (hasUploadKey) signingConfig = signingConfigs.getByName("release")
isMinifyEnabled = false
isShrinkResources = false
}
} }
compileOptions { compileOptions {
@@ -106,6 +164,17 @@ android {
} }
} }
play {
// Upload the release AAB to the internal testing track. Credentials are
// never committed: CI sets ANDROID_PUBLISHER_CREDENTIALS, and local runs
// can use the same variable or PLAY_SERVICE_ACCOUNT_JSON in local.properties.
track.set("internal")
defaultToAppBundles.set(true)
releaseStatus.set(ReleaseStatus.COMPLETED)
// Ask Play for the next free version code instead of hand-bumping it.
resolutionStrategy.set(ResolutionStrategy.AUTO)
}
compose.desktop { compose.desktop {
application { application {
mainClass = "win.taptap.musicmanager.client.MainKt" mainClass = "win.taptap.musicmanager.client.MainKt"
@@ -21,7 +21,7 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
private val appContext = context.applicationContext private val appContext = context.applicationContext
private var controller: MediaController? = null private var controller: MediaController? = null
private var pending: ((MediaController) -> Unit)? = null private val pending = ArrayDeque<(MediaController) -> Unit>()
private var connected = false private var connected = false
@Volatile private var finished = false @Volatile private var finished = false
@@ -45,15 +45,23 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
controller = sessionController controller = sessionController
sessionController.addListener(listener) sessionController.addListener(listener)
connected = true connected = true
pending?.invoke(sessionController) val queued = synchronized(pending) {
pending = null pending.toList().also { pending.clear() }
}
queued.forEach { action -> runCatching { action(sessionController) } }
} }
}, },
ContextCompat.getMainExecutor(appContext), ContextCompat.getMainExecutor(appContext),
) )
} }
override fun play(source: String, song: Song, local: Boolean, artworkUri: String?) { override fun play(
source: String,
song: Song,
local: Boolean,
artworkUri: String?,
artworkBytes: ByteArray?,
) {
finished = false finished = false
withController { controller -> withController { controller ->
val uri = if (local) Uri.fromFile(java.io.File(source)) else Uri.parse(source) val uri = if (local) Uri.fromFile(java.io.File(source)) else Uri.parse(source)
@@ -61,7 +69,16 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
.setTitle(song.title) .setTitle(song.title)
.setArtist(song.artist) .setArtist(song.artist)
.setAlbumTitle(song.album) .setAlbumTitle(song.album)
.setArtworkUri(artworkUri?.let(Uri::parse)) .apply {
if (artworkBytes != null && artworkBytes.isNotEmpty()) {
setArtworkData(
artworkBytes,
MediaMetadata.PICTURE_TYPE_FRONT_COVER,
)
} else {
setArtworkUri(artworkUri?.let(Uri::parse))
}
}
.build() .build()
val item = MediaItem.Builder() val item = MediaItem.Builder()
.setUri(uri) .setUri(uri)
@@ -110,9 +127,14 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
} }
override fun scheduleSleepTimer(seconds: Long?): Boolean { override fun scheduleSleepTimer(seconds: Long?): Boolean {
val current = controller ?: return false
val args = Bundle().apply { putLong(SLEEP_TIMER_SECONDS, seconds ?: 0L) } val args = Bundle().apply { putLong(SLEEP_TIMER_SECONDS, seconds ?: 0L) }
return runCatching { current.sendCustomCommand(SLEEP_TIMER_COMMAND, args) }.isSuccess val send: (MediaController) -> Boolean = { current ->
runCatching { current.sendCustomCommand(SLEEP_TIMER_COMMAND, args) }.isSuccess
}
val current = controller
if (current != null && connected) return send(current)
synchronized(pending) { pending.addLast { controller -> send(controller) } }
return true
} }
override fun release() { override fun release() {
@@ -120,7 +142,7 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
MediaController.releaseFuture(future) MediaController.releaseFuture(future)
controller = null controller = null
connected = false connected = false
pending = null synchronized(pending) { pending.clear() }
} }
private fun withController(block: (MediaController) -> Unit) { private fun withController(block: (MediaController) -> Unit) {
@@ -128,7 +150,9 @@ class MediaControllerAudioPlayer(context: Context) : AudioPlayer {
if (current != null && connected) { if (current != null && connected) {
block(current) block(current)
} else { } else {
pending = block // The first playback request can be followed immediately by a seek
// (long-form resume). Keep every action, not only the last one.
synchronized(pending) { pending.addLast(block) }
} }
} }
} }
@@ -6,6 +6,7 @@ import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.asImageBitmap
import io.ktor.client.engine.HttpClientEngine import io.ktor.client.engine.HttpClientEngine
import io.ktor.client.engine.okhttp.OkHttp import io.ktor.client.engine.okhttp.OkHttp
import io.ktor.utils.io.readAvailable
import java.io.File import java.io.File
import win.taptap.musicmanager.client.data.AppStorage import win.taptap.musicmanager.client.data.AppStorage
import win.taptap.musicmanager.client.playback.AudioPlayer import win.taptap.musicmanager.client.playback.AudioPlayer
@@ -32,7 +33,7 @@ class AndroidStorage(context: Context) : AppStorage {
override fun write(name: String, text: String) { override fun write(name: String, text: String) {
root.mkdirs() root.mkdirs()
File(root, name).writeText(text) atomicWrite(File(root, name)) { it.writeText(text) }
} }
override fun delete(name: String) { override fun delete(name: String) {
@@ -42,13 +43,53 @@ class AndroidStorage(context: Context) : AppStorage {
override fun saveDownload(songId: String, bytes: ByteArray): String? { override fun saveDownload(songId: String, bytes: ByteArray): String? {
downloads.mkdirs() downloads.mkdirs()
val file = File(downloads, "${safeName(songId)}.mp3") val file = File(downloads, "${safeName(songId)}.mp3")
file.writeBytes(bytes) atomicWrite(file) { it.writeBytes(bytes) }
return file.absolutePath return file.absolutePath
} }
override suspend fun saveDownloadStream(
songId: String,
source: io.ktor.utils.io.ByteReadChannel,
): String? {
downloads.mkdirs()
val target = File(downloads, "${safeName(songId)}.mp3")
val temp = File(downloads, "${safeName(songId)}.mp3.part")
try {
temp.outputStream().use { output ->
val buffer = ByteArray(64 * 1024)
while (true) {
val read = source.readAvailable(buffer)
if (read < 0) break
if (read > 0) output.write(buffer, 0, read)
}
output.flush()
}
if (temp.length() == 0L) error("empty download")
if (!temp.renameTo(target)) {
temp.copyTo(target, overwrite = true)
temp.delete()
}
return target.absolutePath
} catch (t: Throwable) {
temp.delete()
throw t
}
}
override fun downloadPath(songId: String): String? = override fun downloadPath(songId: String): String? =
File(downloads, "${safeName(songId)}.mp3").takeIf { it.isFile }?.absolutePath File(downloads, "${safeName(songId)}.mp3").takeIf { it.isFile }?.absolutePath
override fun saveArtwork(songId: String, bytes: ByteArray): String? {
if (bytes.isEmpty()) return null
downloads.mkdirs()
val file = File(downloads, "${safeName(songId)}.jpg")
atomicWrite(file) { it.writeBytes(bytes) }
return file.absolutePath
}
override fun artworkBytes(songId: String): ByteArray? =
File(downloads, "${safeName(songId)}.jpg").takeIf { it.isFile }?.readBytes()
override fun listDownloads(): Map<String, Long> = override fun listDownloads(): Map<String, Long> =
downloads.listFiles() downloads.listFiles()
?.filter { it.isFile && it.extension == "mp3" } ?.filter { it.isFile && it.extension == "mp3" }
@@ -57,11 +98,26 @@ class AndroidStorage(context: Context) : AppStorage {
override fun deleteDownload(songId: String) { override fun deleteDownload(songId: String) {
File(downloads, "${safeName(songId)}.mp3").delete() File(downloads, "${safeName(songId)}.mp3").delete()
File(downloads, "${safeName(songId)}.jpg").delete()
} }
override fun storageUsedBytes(): Long = override fun storageUsedBytes(): Long =
downloads.listFiles()?.sumOf { it.length() } ?: 0L downloads.listFiles()?.sumOf { it.length() } ?: 0L
private fun atomicWrite(target: File, write: (File) -> Unit) {
val temp = File(target.parentFile, "${target.name}.part")
try {
write(temp)
if (!temp.renameTo(target)) {
temp.copyTo(target, overwrite = true)
temp.delete()
}
} catch (t: Throwable) {
temp.delete()
throw t
}
}
private fun safeName(songId: String): String = private fun safeName(songId: String): String =
songId.map { if (it.isLetterOrDigit() || it == '-' || it == '_') it else '_' }.joinToString("") songId.map { if (it.isLetterOrDigit() || it == '-' || it == '_') it else '_' }.joinToString("")
} }
@@ -5,6 +5,7 @@ import io.ktor.client.call.body
import io.ktor.client.engine.HttpClientEngine import io.ktor.client.engine.HttpClientEngine
import io.ktor.client.plugins.HttpTimeout import io.ktor.client.plugins.HttpTimeout
import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
import io.ktor.client.plugins.timeout
import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.HttpRequestBuilder
import io.ktor.client.request.delete import io.ktor.client.request.delete
import io.ktor.client.request.get import io.ktor.client.request.get
@@ -14,6 +15,7 @@ import io.ktor.client.request.post
import io.ktor.client.request.setBody import io.ktor.client.request.setBody
import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.HttpResponse
import io.ktor.client.statement.bodyAsBytes import io.ktor.client.statement.bodyAsBytes
import io.ktor.client.statement.bodyAsChannel
import io.ktor.http.ContentType import io.ktor.http.ContentType
import io.ktor.http.HttpHeaders import io.ktor.http.HttpHeaders
import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode
@@ -21,6 +23,7 @@ import io.ktor.http.contentType
import io.ktor.http.encodeURLParameter import io.ktor.http.encodeURLParameter
import io.ktor.http.isSuccess import io.ktor.http.isSuccess
import io.ktor.serialization.kotlinx.json.json import io.ktor.serialization.kotlinx.json.json
import io.ktor.utils.io.ByteReadChannel
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
fun configuredHttpClient(engine: HttpClientEngine): HttpClient = HttpClient(engine) { fun configuredHttpClient(engine: HttpClientEngine): HttpClient = HttpClient(engine) {
@@ -40,7 +43,6 @@ fun configuredHttpClient(engine: HttpClientEngine): HttpClient = HttpClient(engi
} }
} }
/** /**
* Native API client. Media URLs carry the token in the query string because * Native API client. Media URLs carry the token in the query string because
* Android's Media3, desktop playback and HTML audio all fetch them directly. * Android's Media3, desktop playback and HTML audio all fetch them directly.
@@ -53,6 +55,7 @@ class ApiClient(private val http: HttpClient) {
private set private set
private val coverCache = mutableMapOf<String, ByteArray?>() private val coverCache = mutableMapOf<String, ByteArray?>()
private val imageCache = mutableMapOf<String, ByteArray?>()
suspend fun login( suspend fun login(
serverUrl: String, serverUrl: String,
@@ -79,6 +82,11 @@ class ApiClient(private val http: HttpClient) {
fun clear() { fun clear() {
token = null token = null
coverCache.clear() coverCache.clear()
imageCache.clear()
}
fun close() {
http.close()
} }
suspend fun me(): User = get("/me") suspend fun me(): User = get("/me")
@@ -114,37 +122,90 @@ class ApiClient(private val http: HttpClient) {
requestNoContent { http.delete(url("/moods/$id")) { auth() } } requestNoContent { http.delete(url("/moods/$id")) { auth() } }
} }
suspend fun addSeed(moodId: String, songId: String): AddToMoodResponse = suspend fun addSong(
moodId: String,
songId: String? = null,
source: String? = null,
externalId: String? = null,
url: String? = null,
): AddSongResponse =
parse( parse(
http.post(url("/moods/$moodId/seeds")) { http.post(url("/moods/$moodId/songs")) {
auth() auth()
contentType(ContentType.Application.Json) contentType(ContentType.Application.Json)
setBody(AddSeedRequest(songId)) setBody(
AddSongRequest(
songId = songId,
source = source,
externalId = externalId,
url = url,
),
)
}, },
) )
suspend fun removeSeed(moodId: String, songId: String) { suspend fun removeSong(moodId: String, songId: String) {
requestNoContent { http.delete(url("/moods/$moodId/seeds/$songId")) { auth() } } requestNoContent { http.delete(url("/moods/$moodId/songs/$songId")) { auth() } }
} }
suspend fun recommendations(moodId: String): List<Recommendation> =
get<RecommendationsResponse>("/moods/$moodId/recommendations").recommendations
suspend fun refreshRecommendations(moodId: String): MoodDetail =
parse(
http.post(url("/moods/$moodId/recommendations/refresh")) {
auth()
// yt-dlp searches a few queries in parallel; give the server room.
timeout {
requestTimeoutMillis = 120_000
socketTimeoutMillis = 120_000
}
},
)
suspend fun addRecommendation(moodId: String, externalId: String): RecommendationDecision =
parse(
http.post(url("/moods/$moodId/recommendations/$externalId/add")) {
auth()
},
)
suspend fun rejectRecommendation(moodId: String, externalId: String): RecommendationDecision =
parse(
http.post(url("/moods/$moodId/recommendations/$externalId/reject")) {
auth()
},
)
suspend fun retryRecommendation(moodId: String, externalId: String): MoodDetail =
parse(
http.post(url("/moods/$moodId/recommendations/$externalId/retry")) {
auth()
},
)
suspend fun preview(moodId: String, limit: Int = 20): List<Song> = suspend fun preview(moodId: String, limit: Int = 20): List<Song> =
get<SearchResponse>("/moods/$moodId/preview?limit=$limit").songs get<TracksResponse>("/moods/$moodId/preview?limit=$limit").songs
suspend fun search(query: String, limit: Int = 50): List<Song> = suspend fun search(
get<SearchResponse>("/library/search?q=${query.encodeURLParameter()}&limit=$limit").songs query: String,
limit: Int = 10,
suspend fun library( source: String? = null,
cursor: String? = null, moodId: String? = null,
since: String? = null, ): List<SearchResult> {
limit: Int = 500, val sourceParam = source?.let { "&source=${it.encodeURLParameter()}" }.orEmpty()
scope: String = "all", val mood = moodId?.let { "&moodId=${it.encodeURLParameter()}" }.orEmpty()
): LibraryPage { return parse<SearchResponse>(
val query = buildString { http.get(url("/search?q=${query.encodeURLParameter()}&limit=$limit$sourceParam$mood")) {
append("?limit=$limit&scope=$scope") auth()
cursor?.let { append("&cursor=${it.encodeURLParameter()}") } // yt-dlp resolves every YouTube Music hit to get artist, album
since?.let { append("&since=${it.encodeURLParameter()}") } // and duration, so a search takes longer than a plain API call.
timeout {
requestTimeoutMillis = 60_000
socketTimeoutMillis = 60_000
} }
return get("/library/songs$query") },
).results
} }
suspend fun startSession(moodId: String, limit: Int = 12): Session = suspend fun startSession(moodId: String, limit: Int = 12): Session =
@@ -191,38 +252,78 @@ class ApiClient(private val http: HttpClient) {
suspend fun devices(): List<Device> = get("/auth/devices") suspend fun devices(): List<Device> = get("/auth/devices")
suspend fun scanStatus(): ScanStatus = get("/scan") suspend fun cover(songId: String, size: Int = 320): ByteArray? {
val key = "$songId:$size"
suspend fun startScan(): ScanStatus =
parse(
http.post(url("/scan")) {
auth()
},
)
suspend fun cover(albumId: String, size: Int = 320): ByteArray? {
val key = "$albumId:$size"
if (coverCache.containsKey(key)) return coverCache[key] if (coverCache.containsKey(key)) return coverCache[key]
val bytes = runCatching { val result = runCatching {
http.get("$baseUrl/api/v1/covers/$albumId?size=$size&token=${token.orEmpty().encodeURLParameter()}") val response = http.get(
.bodyAsBytes() "$baseUrl/api/v1/songs/$songId/cover?size=$size&token=${token.orEmpty().encodeURLParameter()}",
)
if (response.status.isSuccess()) {
response.bodyAsBytes().takeIf { it.isNotEmpty() }
} else {
null
}
}.getOrNull() }.getOrNull()
val result = bytes?.takeIf { it.isNotEmpty() } if (coverCache.size > MAX_CACHED_IMAGES) coverCache.clear()
coverCache[key] = result // Do not cache failures: a cover can appear after a download finishes.
if (result != null) coverCache[key] = result
return result return result
} }
suspend fun download(songId: String): ByteArray = /** Remote artwork such as YT thumbnails, cached for the app's lifetime. */
http.get("$baseUrl/api/v1/songs/$songId/stream") { suspend fun image(url: String): ByteArray? {
if (imageCache.containsKey(url)) return imageCache[url]
val result = runCatching {
val response = http.get(url)
if (response.status.isSuccess()) {
response.bodyAsBytes().takeIf { it.isNotEmpty() }
} else {
null
}
}.getOrNull()
if (imageCache.size > MAX_CACHED_IMAGES) imageCache.clear()
if (result != null) imageCache[url] = result
return result
}
suspend fun download(songId: String): ByteArray {
val response = downloadResponse(songId)
return response.bodyAsBytes().takeIf { it.isNotEmpty() }
?: throw ApiException(
status = response.status.value,
code = "empty_download",
message = "The server returned an empty audio file",
)
}
/** Streams an audio download into [sink] instead of buffering it in RAM. */
suspend fun downloadTo(
songId: String,
sink: suspend (ByteReadChannel) -> String?,
): String? {
val response = downloadResponse(songId)
return sink(response.bodyAsChannel())
}
private suspend fun downloadResponse(songId: String): HttpResponse {
val response = http.get("$baseUrl/api/v1/songs/$songId/stream") {
auth() auth()
url.parameters.append("download", "true") url.parameters.append("download", "true")
}.bodyAsBytes() timeout {
requestTimeoutMillis = 6 * 60 * 60 * 1000
socketTimeoutMillis = 60_000
}
}
if (!response.status.isSuccess()) throw error(response)
return response
}
fun streamUrl(songId: String): String = fun streamUrl(songId: String): String =
"$baseUrl/api/v1/songs/$songId/stream?token=${token.orEmpty().encodeURLParameter()}" "$baseUrl/api/v1/songs/$songId/stream?token=${token.orEmpty().encodeURLParameter()}"
fun coverUrl(albumId: String, size: Int = 320): String = fun coverUrl(songId: String, size: Int = 320): String =
"$baseUrl/api/v1/covers/$albumId?size=$size&token=${token.orEmpty().encodeURLParameter()}" "$baseUrl/api/v1/songs/$songId/cover?size=$size&token=${token.orEmpty().encodeURLParameter()}"
private suspend inline fun <reified T> get(path: String): T = private suspend inline fun <reified T> get(path: String): T =
parse(http.get(url(path)) { auth() }) parse(http.get(url(path)) { auth() })
@@ -253,6 +354,10 @@ class ApiClient(private val http: HttpClient) {
) )
} }
private companion object {
const val MAX_CACHED_IMAGES = 200
}
private fun normalize(serverUrl: String): String { private fun normalize(serverUrl: String): String {
var value = serverUrl.trim().trimEnd('/') var value = serverUrl.trim().trimEnd('/')
if (value.isEmpty()) value = "http://localhost:8080" if (value.isEmpty()) value = "http://localhost:8080"
@@ -23,8 +23,6 @@ data class LoginRequest(
data class User( data class User(
val name: String, val name: String,
val admin: Boolean, val admin: Boolean,
val musicFolders: List<Int> = emptyList(),
val longformFolders: List<Int> = emptyList(),
) )
@Serializable @Serializable
@@ -37,22 +35,19 @@ data class LoginResponse(
@Serializable @Serializable
data class Song( data class Song(
val id: String, val id: String,
val source: String = "youtube",
val externalId: String,
val title: String, val title: String,
val artist: String, val artist: String,
val album: String, val album: String? = null,
val albumId: String,
val trackNumber: Int? = null,
val discNumber: Int = 1,
val year: Int? = null,
val duration: Int, val duration: Int,
val bitRate: Int, val bitRate: Int = 0,
val size: Long, val size: Long = 0,
val suffix: String, val suffix: String = "mp3",
val genres: List<String> = emptyList(), val thumbnail: String? = null,
val folderId: Int, ) {
val relativePath: String, val subtitle: String get() = album?.takeIf { it.isNotBlank() } ?: artist
val updatedAt: String, }
)
@Serializable @Serializable
data class Mood( data class Mood(
@@ -61,60 +56,88 @@ data class Mood(
val description: String? = null, val description: String? = null,
val query: String? = null, val query: String? = null,
val genres: List<String> = emptyList(), val genres: List<String> = emptyList(),
val targetSize: Int, val source: String = "youtube",
val refreshHours: Int, val collectionPercent: Int = 50,
val ytEnabled: Boolean, val recommendationPercent: Int = 50,
val recommendationCount: Int = 10,
val refreshHours: Int = 24,
val lastDiscoveryAt: String? = null, val lastDiscoveryAt: String? = null,
val createdAt: String, val createdAt: String,
val changedAt: String, val changedAt: String,
val lastError: String? = null, val lastError: String? = null,
val seedCount: Int, val songCount: Int = 0,
val newRecommendations: Int = 0, val recommendationReady: Int = 0,
val recommendationDownloading: Int = 0,
val recommendationFailed: Int = 0,
) )
@Serializable @Serializable
data class Seed( data class MoodSong(
val song: Song, val song: Song,
val origin: String, val origin: String,
val addedAt: String, val addedAt: String,
) )
@Serializable
data class Download(
val state: String,
val attempts: Int = 0,
val error: String? = null,
val updatedAt: String = "",
)
@Serializable @Serializable
data class Recommendation( data class Recommendation(
val videoId: String, val source: String = "youtube",
val externalId: String,
val title: String, val title: String,
val artist: String, val artist: String,
val album: String? = null, val album: String? = null,
val duration: Int? = null, val duration: Int? = null,
val thumbnail: String? = null, val thumbnail: String? = null,
val state: String, val state: String,
val matchedSong: Song? = null, val song: Song? = null,
val timesAdded: Int = 0, val download: Download? = null,
val firstSeen: String, val error: String? = null,
val lastSeen: String, val firstSeen: String = "",
val lastSeen: String = "",
) )
@Serializable @Serializable
data class MoodDetail( data class MoodDetail(
val mood: Mood, val mood: Mood,
val seeds: List<Seed> = emptyList(), val songs: List<MoodSong> = emptyList(),
val recommendations: List<Recommendation> = emptyList(), val recommendations: List<Recommendation> = emptyList(),
) )
@Serializable @Serializable
data class MoodsResponse(val moods: List<Mood>) data class MoodsResponse(val moods: List<Mood> = emptyList())
@Serializable @Serializable
data class LibraryPage( data class RecommendationsResponse(val recommendations: List<Recommendation> = emptyList())
val songs: List<Song> = emptyList(),
val deletedSongIds: List<String> = emptyList(), @Serializable
val revision: String, data class RecommendationDecision(
val nextCursor: String? = null, val detail: MoodDetail,
val nextSince: String? = null, val recommendation: Recommendation,
) )
@Serializable @Serializable
data class SearchResponse(val songs: List<Song> = emptyList()) data class SearchResult(
val source: String = "youtube",
val externalId: String,
val title: String,
val artist: String,
val album: String? = null,
val duration: Int? = null,
val thumbnail: String? = null,
val songId: String? = null,
val downloaded: Boolean = false,
val inMood: Boolean = false,
)
@Serializable
data class SearchResponse(val results: List<SearchResult> = emptyList())
@Serializable @Serializable
data class Session( data class Session(
@@ -157,8 +180,21 @@ data class AddToMoodRequest(val songId: String, val moodId: String? = null)
@Serializable @Serializable
data class AddToMoodResponse(val mood: Mood, val added: Boolean) data class AddToMoodResponse(val mood: Mood, val added: Boolean)
/** Adds an existing song, a search result's video id, or a pasted URL. */
@Serializable @Serializable
data class AddSeedRequest(val songId: String, val origin: String = "manual") data class AddSongRequest(
val songId: String? = null,
val source: String? = null,
val externalId: String? = null,
val url: String? = null,
)
@Serializable
data class AddSongResponse(
val detail: MoodDetail,
val added: Boolean = false,
val downloading: Boolean = false,
)
@Serializable @Serializable
data class CreateMoodRequest( data class CreateMoodRequest(
@@ -166,10 +202,10 @@ data class CreateMoodRequest(
val description: String? = null, val description: String? = null,
val query: String? = null, val query: String? = null,
val genres: List<String> = emptyList(), val genres: List<String> = emptyList(),
val targetSize: Int = 30, val source: String? = null,
val collectionPercent: Int = 50,
val recommendationCount: Int = 10,
val refreshHours: Int = 24, val refreshHours: Int = 24,
val ytEnabled: Boolean = true,
val seedSongIds: List<String> = emptyList(),
) )
@Serializable @Serializable
@@ -180,9 +216,10 @@ data class UpdateMoodRequest(
val query: String? = null, val query: String? = null,
val clearQuery: Boolean = false, val clearQuery: Boolean = false,
val genres: List<String>? = null, val genres: List<String>? = null,
val targetSize: Int? = null, val source: String? = null,
val collectionPercent: Int? = null,
val recommendationCount: Int? = null,
val refreshHours: Int? = null, val refreshHours: Int? = null,
val ytEnabled: Boolean? = null,
) )
@Serializable @Serializable
@@ -0,0 +1,106 @@
package win.taptap.musicmanager.client.data
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import win.taptap.musicmanager.client.api.Mood
import win.taptap.musicmanager.client.api.MoodDetail
import win.taptap.musicmanager.client.api.Session
import win.taptap.musicmanager.client.api.Song
import win.taptap.musicmanager.client.api.User
@Serializable
data class SessionState(
val serverUrl: String,
val token: String,
val user: User,
)
/**
* Offline cache. Version 3 adds the download source and the source-neutral
* external track id; older shapes are discarded instead of mis-decoding.
*/
@Serializable
data class CachedState(
val version: Int = CACHE_VERSION,
val serverUrl: String = "",
val userName: String = "",
val moods: List<Mood> = emptyList(),
val moodDetails: List<MoodDetail> = emptyList(),
) {
companion object {
const val CACHE_VERSION = 3
}
}
/** The queue survives a restart so the next launch can resume where it stopped. */
@Serializable
data class PlaybackSnapshot(
val session: Session? = null,
val queue: List<Song> = emptyList(),
val current: Song? = null,
val history: List<Song> = emptyList(),
val positionSeconds: Double = 0.0,
)
class AppCache(private val storage: AppStorage) {
private val json = Json {
ignoreUnknownKeys = true
encodeDefaults = true
explicitNulls = false
}
fun loadSession(): SessionState? =
read(SESSION_FILE)?.let {
runCatching { json.decodeFromString<SessionState>(it) }.getOrNull()
}
fun saveSession(session: SessionState?) {
if (session == null) delete(SESSION_FILE) else write(SESSION_FILE, json.encodeToString(session))
}
fun load(): CachedState {
val cached = read(CACHE_FILE)?.let {
runCatching { json.decodeFromString<CachedState>(it) }.getOrNull()
} ?: return CachedState()
return if (cached.version == CachedState.CACHE_VERSION) cached else CachedState()
}
fun save(state: CachedState) {
write(CACHE_FILE, json.encodeToString(state))
}
fun loadPlayback(): PlaybackSnapshot? =
read(PLAYBACK_FILE)?.let {
runCatching { json.decodeFromString<PlaybackSnapshot>(it) }.getOrNull()
}
fun savePlayback(snapshot: PlaybackSnapshot?) {
if (snapshot == null || (snapshot.current == null && snapshot.queue.isEmpty())) {
delete(PLAYBACK_FILE)
} else {
write(PLAYBACK_FILE, json.encodeToString(snapshot))
}
}
fun clear() {
delete(CACHE_FILE)
delete(PLAYBACK_FILE)
}
// Web storage can be blocked (Safari private mode) or full. Cache failure
// must never prevent the app from reaching the login screen or playing.
private fun read(name: String): String? = runCatching { storage.read(name) }.getOrNull()
private fun write(name: String, text: String) {
runCatching { storage.write(name, text) }
}
private fun delete(name: String) {
runCatching { storage.delete(name) }
}
private companion object {
const val SESSION_FILE = "session.json"
const val CACHE_FILE = "mood-cache.json"
const val PLAYBACK_FILE = "playback.json"
}
}
@@ -9,6 +9,13 @@ interface AppStorage {
/** Returns a platform-specific handle for playback, or null when unsupported. */ /** Returns a platform-specific handle for playback, or null when unsupported. */
fun saveDownload(songId: String, bytes: ByteArray): String? fun saveDownload(songId: String, bytes: ByteArray): String?
fun downloadPath(songId: String): String? fun downloadPath(songId: String): String?
/** Streams a download to disk and returns the final playback path. */
suspend fun saveDownloadStream(songId: String, source: io.ktor.utils.io.ByteReadChannel): String? = null
/** Stores the cover next to the audio file so offline playback keeps artwork. */
fun saveArtwork(songId: String, bytes: ByteArray): String?
fun artworkBytes(songId: String): ByteArray?
fun listDownloads(): Map<String, Long> fun listDownloads(): Map<String, Long>
fun deleteDownload(songId: String) fun deleteDownload(songId: String)
fun storageUsedBytes(): Long fun storageUsedBytes(): Long
@@ -1,61 +0,0 @@
package win.taptap.musicmanager.client.data
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import win.taptap.musicmanager.client.api.Mood
import win.taptap.musicmanager.client.api.MoodDetail
import win.taptap.musicmanager.client.api.Song
import win.taptap.musicmanager.client.api.User
@Serializable
data class SessionState(
val serverUrl: String,
val token: String,
val user: User,
)
@Serializable
data class CachedState(
val serverUrl: String = "",
val userName: String = "",
val revision: String? = null,
val songs: List<Song> = emptyList(),
val moods: List<Mood> = emptyList(),
val moodDetails: List<MoodDetail> = emptyList(),
)
class LibraryCache(private val storage: AppStorage) {
private val json = Json {
ignoreUnknownKeys = true
encodeDefaults = true
explicitNulls = false
}
fun loadSession(): SessionState? =
storage.read(SESSION_FILE)?.let {
runCatching { json.decodeFromString<SessionState>(it) }.getOrNull()
}
fun saveSession(session: SessionState?) {
if (session == null) storage.delete(SESSION_FILE) else storage.write(SESSION_FILE, json.encodeToString(session))
}
fun load(): CachedState =
storage.read(CACHE_FILE)?.let {
runCatching { json.decodeFromString<CachedState>(it) }.getOrNull()
} ?: CachedState()
fun save(state: CachedState) {
storage.write(CACHE_FILE, json.encodeToString(state))
}
fun clear() {
storage.delete(CACHE_FILE)
}
private companion object {
const val SESSION_FILE = "session.json"
const val CACHE_FILE = "library.json"
}
}
@@ -9,7 +9,13 @@ import win.taptap.musicmanager.client.api.Song
* store polls [isFinished] because some backends have no callback support. * store polls [isFinished] because some backends have no callback support.
*/ */
interface AudioPlayer { interface AudioPlayer {
fun play(source: String, song: Song, local: Boolean, artworkUri: String? = null) fun play(
source: String,
song: Song,
local: Boolean,
artworkUri: String? = null,
artworkBytes: ByteArray? = null,
)
fun pause() fun pause()
fun resume() fun resume()
fun stop() fun stop()
File diff suppressed because it is too large. Load diff
@@ -1,18 +1,17 @@
package win.taptap.musicmanager.client.ui package win.taptap.musicmanager.client.ui
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.ArrowBack import androidx.compose.material.icons.rounded.ArrowBack
import androidx.compose.material.icons.rounded.Delete import androidx.compose.material.icons.rounded.Delete
import androidx.compose.material.icons.rounded.LibraryMusic import androidx.compose.material.icons.rounded.DownloadDone
import androidx.compose.material.icons.rounded.Refresh import androidx.compose.material.icons.rounded.Refresh
import androidx.compose.material.icons.rounded.Search
import androidx.compose.material.icons.rounded.Settings import androidx.compose.material.icons.rounded.Settings
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
@@ -138,7 +137,8 @@ private fun MainScreen(state: AppState, store: AppStore) {
val title = when (state.screen) { val title = when (state.screen) {
Screen.Moods -> "Moods" Screen.Moods -> "Moods"
Screen.MoodDetail -> state.selectedMood?.mood?.name ?: "Mood" Screen.MoodDetail -> state.selectedMood?.mood?.name ?: "Mood"
Screen.Library -> "Library & downloads" Screen.Search -> "Add music"
Screen.Downloads -> "Downloads"
Screen.Settings -> "Settings" Screen.Settings -> "Settings"
} }
Text(title, fontWeight = FontWeight.SemiBold) Text(title, fontWeight = FontWeight.SemiBold)
@@ -157,8 +157,11 @@ private fun MainScreen(state: AppState, store: AppStore) {
IconButton(onClick = { store.refreshAll() }) { IconButton(onClick = { store.refreshAll() }) {
Icon(Icons.Rounded.Refresh, contentDescription = "Refresh") Icon(Icons.Rounded.Refresh, contentDescription = "Refresh")
} }
IconButton(onClick = { store.openLibrary() }) { IconButton(onClick = { store.openSearch() }) {
Icon(Icons.Rounded.LibraryMusic, contentDescription = "Library") Icon(Icons.Rounded.Search, contentDescription = "Add music")
}
IconButton(onClick = { store.openDownloads() }) {
Icon(Icons.Rounded.DownloadDone, contentDescription = "Downloads")
} }
IconButton(onClick = { store.openSettings() }) { IconButton(onClick = { store.openSettings() }) {
Icon(Icons.Rounded.Settings, contentDescription = "Settings") Icon(Icons.Rounded.Settings, contentDescription = "Settings")
@@ -169,7 +172,8 @@ private fun MainScreen(state: AppState, store: AppStore) {
Icon(Icons.Rounded.Delete, contentDescription = "Delete mood") Icon(Icons.Rounded.Delete, contentDescription = "Delete mood")
} }
} }
Screen.Library -> { Screen.Search -> Unit
Screen.Downloads -> {
IconButton(onClick = { store.openSettings() }) { IconButton(onClick = { store.openSettings() }) {
Icon(Icons.Rounded.Settings, contentDescription = "Settings") Icon(Icons.Rounded.Settings, contentDescription = "Settings")
} }
@@ -189,7 +193,8 @@ private fun MainScreen(state: AppState, store: AppStore) {
when (state.screen) { when (state.screen) {
Screen.Moods -> MoodsScreen(state, store) Screen.Moods -> MoodsScreen(state, store)
Screen.MoodDetail -> MoodDetailScreen(state, store) Screen.MoodDetail -> MoodDetailScreen(state, store)
Screen.Library -> LibraryScreen(state, store) Screen.Search -> SearchScreen(state, store)
Screen.Downloads -> DownloadsScreen(state, store)
Screen.Settings -> SettingsScreen(state, store) Screen.Settings -> SettingsScreen(state, store)
} }
} }
@@ -200,7 +205,12 @@ private fun MainScreen(state: AppState, store: AppStore) {
AlertDialog( AlertDialog(
onDismissRequest = { confirmDelete = false }, onDismissRequest = { confirmDelete = false },
title = { Text("Delete mood?") }, title = { Text("Delete mood?") },
text = { Text("\"$name\" and its seeds will be removed. Downloads stay on this device.") }, text = {
Text(
"\"$name\" and its recommendation history will be removed. " +
"Unused downloads are deleted from the server.",
)
},
confirmButton = { confirmButton = {
TextButton( TextButton(
onClick = { onClick = {
@@ -50,15 +50,15 @@ import win.taptap.musicmanager.client.store.AppStore
@Composable @Composable
fun Cover( fun Cover(
store: AppStore, store: AppStore,
albumId: String?, songId: String?,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
size: Int = 320, size: Int = 320,
) { ) {
var bitmap by remember(albumId, size) { mutableStateOf<ImageBitmap?>(null) } var bitmap by remember(songId, size) { mutableStateOf<ImageBitmap?>(null) }
LaunchedEffect(albumId, size) { LaunchedEffect(songId, size) {
if (albumId == null) return@LaunchedEffect if (songId == null) return@LaunchedEffect
val bytes = store.cover(albumId) val bytes = store.cover(songId)
bitmap = bytes?.let { data -> runCatching { decodeImage(data) }.getOrNull() } bitmap = bytes?.let { data -> runCatching { decodeImage(data) }.getOrNull() }
} }
@@ -91,6 +91,42 @@ fun Cover(
} }
} }
@Composable
fun RemoteImage(store: AppStore, url: String?, modifier: Modifier = Modifier) {
var bitmap by remember(url) { mutableStateOf<ImageBitmap?>(null) }
LaunchedEffect(url) {
if (url == null) return@LaunchedEffect
bitmap = store.image(url)?.let { data -> runCatching { decodeImage(data) }.getOrNull() }
}
Box(
modifier = modifier
.clip(RoundedCornerShape(10.dp))
.background(
Brush.linearGradient(listOf(Color(0xFF28344A), Color(0xFF1A2230))),
),
contentAlignment = Alignment.Center,
) {
val image = bitmap
if (image != null) {
Image(
bitmap = image,
contentDescription = null,
modifier = Modifier.fillMaxSize(),
contentScale = ContentScale.Crop,
)
} else {
Icon(
Icons.Rounded.MusicNote,
contentDescription = null,
tint = Color(0xFF5E6C84),
modifier = Modifier.size(20.dp),
)
}
}
}
@Composable @Composable
fun EmptyState(title: String, subtitle: String? = null, modifier: Modifier = Modifier) { fun EmptyState(title: String, subtitle: String? = null, modifier: Modifier = Modifier) {
Column( Column(
@@ -149,7 +185,7 @@ fun SongRow(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp), horizontalArrangement = Arrangement.spacedBy(12.dp),
) { ) {
Cover(store, song.albumId, Modifier.size(44.dp), size = 96) Cover(store, song.id, Modifier.size(44.dp), size = 96)
Column(Modifier.weight(1f)) { Column(Modifier.weight(1f)) {
Text( Text(
song.title, song.title,
@@ -158,7 +194,7 @@ fun SongRow(
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
) )
Text( Text(
"${song.artist} · ${song.album}", "${song.artist} · ${song.album ?: "Single"}",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1, maxLines = 1,
@@ -179,7 +215,7 @@ fun MoodGradient(name: String): Brush {
Color(0xFF1864AB) to Color(0xFF1098AD), Color(0xFF1864AB) to Color(0xFF1098AD),
Color(0xFF5F3DC4) to Color(0xFF862E9C), Color(0xFF5F3DC4) to Color(0xFF862E9C),
) )
val palette = palettes[abs(name.hashCode()) % palettes.size] val palette = palettes[(name.hashCode() % palettes.size + palettes.size) % palettes.size]
return Brush.linearGradient(listOf(palette.first, palette.second)) return Brush.linearGradient(listOf(palette.first, palette.second))
} }
@@ -241,7 +277,7 @@ fun MoodPickerDialog(
Column(Modifier.weight(1f)) { Column(Modifier.weight(1f)) {
Text(mood.name, style = MaterialTheme.typography.bodyLarge) Text(mood.name, style = MaterialTheme.typography.bodyLarge)
Text( Text(
if (mood.id == currentMoodId) "Current mood" else "${mood.seedCount} seeds", if (mood.id == currentMoodId) "Current mood" else "${mood.songCount} songs",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
@@ -0,0 +1,130 @@
package win.taptap.musicmanager.client.ui
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Delete
import androidx.compose.material.icons.rounded.DeleteSweep
import androidx.compose.material.icons.rounded.DownloadDone
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import win.taptap.musicmanager.client.store.AppState
import win.taptap.musicmanager.client.store.AppStore
/** Device-side copies for offline playback. The server keeps the originals. */
@Composable
fun DownloadsScreen(state: AppState, store: AppStore) {
if (state.downloads.isEmpty()) {
EmptyState(
"No downloads",
"Download a song from a mood to play it without the server.",
Modifier.fillMaxSize(),
)
return
}
val songs = state.downloads.mapNotNull { state.knownSongs[it] }
val unknown = state.downloads - songs.map { it.id }.toSet()
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(20.dp),
verticalArrangement = Arrangement.spacedBy(10.dp),
) {
item {
Surface(
shape = RoundedCornerShape(16.dp),
color = MaterialTheme.colorScheme.surfaceVariant,
modifier = Modifier.fillMaxWidth(),
) {
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
Text(
"${state.downloads.size} downloaded",
style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.SemiBold,
)
Text(
"${formatBytes(store.storageBytes())} used on this device",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
OutlinedButton(onClick = { store.clearDownloads() }) {
Icon(Icons.Rounded.DeleteSweep, contentDescription = null)
Spacer(Modifier.width(6.dp))
Text("Clear all")
}
}
}
}
items(songs, key = { it.id }) { song ->
SongRow(store, song, onPlay = { store.playSong(song) }) {
Icon(
Icons.Rounded.DownloadDone,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(18.dp),
)
IconButton(onClick = { store.toggleDownload(song) }) {
Icon(Icons.Rounded.Delete, contentDescription = "Delete download")
}
}
}
items(unknown.toList(), key = { "unknown-$it" }) { id ->
Row(
modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
Column(Modifier.weight(1f)) {
Text("Downloaded track", style = MaterialTheme.typography.bodyLarge)
Text(
id,
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
IconButton(
onClick = {
store.toggleDownload(
win.taptap.musicmanager.client.api.Song(
id = id,
source = "youtube",
externalId = id,
title = id,
artist = "",
duration = 0,
),
)
},
) {
Icon(Icons.Rounded.Delete, contentDescription = "Delete download")
}
}
}
}
}
@@ -1,196 +0,0 @@
package win.taptap.musicmanager.client.ui
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.CheckCircle
import androidx.compose.material.icons.rounded.DeleteOutline
import androidx.compose.material.icons.rounded.Download
import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material.icons.rounded.Search
import androidx.compose.material.icons.rounded.Shuffle
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import win.taptap.musicmanager.client.api.Song
import win.taptap.musicmanager.client.platformName
import win.taptap.musicmanager.client.store.AppState
import win.taptap.musicmanager.client.store.AppStore
@Composable
fun LibraryScreen(state: AppState, store: AppStore) {
var query by remember { mutableStateOf("") }
val supported = platformName != "web"
val downloadedSongs = state.library.filter { it.id in state.downloads }
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(20.dp),
verticalArrangement = Arrangement.spacedBy(6.dp),
) {
item {
OutlinedTextField(
value = query,
onValueChange = { query = it },
singleLine = true,
label = { Text("Search library") },
leadingIcon = { Icon(Icons.Rounded.Search, contentDescription = null) },
trailingIcon = {
if (state.searching) {
CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp)
}
},
modifier = Modifier.fillMaxWidth(),
)
}
item {
Surface(
shape = RoundedCornerShape(18.dp),
color = MaterialTheme.colorScheme.surfaceVariant,
modifier = Modifier.fillMaxWidth(),
) {
Row(
modifier = Modifier.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
Column(Modifier.weight(1f)) {
Text("All music", style = MaterialTheme.typography.titleMedium)
Text(
if (state.library.isEmpty()) {
"Nothing in the library yet"
} else {
"${state.library.size} tracks, shuffled into a queue"
},
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
Button(
onClick = { store.playAll() },
enabled = state.library.isNotEmpty(),
) {
Icon(Icons.Rounded.Shuffle, contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(6.dp))
Text("Shuffle all")
}
}
}
}
if (state.searchResults.isNotEmpty()) {
item {
SectionTitle("Search results") {
Text(
"${state.searchResults.size}",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
items(state.searchResults, key = { "search-${it.id}" }) { song ->
LibrarySongRow(song, state, store, supported)
}
item { HorizontalDivider(Modifier.padding(vertical = 14.dp)) }
}
item {
SectionTitle("Downloads") {
Text(
"${state.downloads.size} tracks · ${formatBytes(store.storageBytes())}",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
if (!supported) {
item {
Text(
"The browser plays from the server and lets the browser manage its cache. Install the Android or desktop app for offline downloads.",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
} else if (downloadedSongs.isEmpty()) {
item {
Text(
"No downloads yet. Search for a song and press the download icon.",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
} else {
items(downloadedSongs, key = { "download-${it.id}" }) { song ->
LibrarySongRow(song, state, store, supported)
}
item {
Text(
"Offline playback uses these files when the server is unreachable.",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.padding(top = 8.dp),
)
}
}
}
}
@Composable
private fun LibrarySongRow(song: Song, state: AppState, store: AppStore, supported: Boolean) {
SongRow(store = store, song = song, onPlay = { store.playSong(song) }) {
if (supported) {
when {
song.id in state.downloading -> CircularProgressIndicator(Modifier.size(20.dp), strokeWidth = 2.dp)
song.id in state.downloads -> {
IconButton(onClick = { store.toggleDownload(song) }) {
Icon(Icons.Rounded.DeleteOutline, contentDescription = "Delete download")
}
}
else -> {
IconButton(onClick = { store.toggleDownload(song) }) {
Icon(Icons.Rounded.Download, contentDescription = "Download")
}
}
}
}
if (song.id in state.downloads) {
Icon(
Icons.Rounded.CheckCircle,
contentDescription = "Downloaded",
tint = MaterialTheme.colorScheme.secondary,
modifier = Modifier.size(18.dp),
)
}
IconButton(onClick = { store.playSong(song) }) {
Icon(Icons.Rounded.PlayArrow, contentDescription = "Play")
}
}
}
@@ -1,6 +1,7 @@
package win.taptap.musicmanager.client.ui package win.taptap.musicmanager.client.ui
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@@ -15,10 +16,17 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Add import androidx.compose.material.icons.rounded.Add
import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.Download
import androidx.compose.material.icons.rounded.DownloadDone
import androidx.compose.material.icons.rounded.PlayArrow import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material.icons.rounded.Refresh
import androidx.compose.material.icons.rounded.RemoveCircleOutline import androidx.compose.material.icons.rounded.RemoveCircleOutline
import androidx.compose.material.icons.rounded.Search
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@@ -26,10 +34,12 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Slider
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Switch
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@@ -39,16 +49,23 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import win.taptap.musicmanager.client.api.Song import kotlin.math.roundToInt
import win.taptap.musicmanager.client.api.MoodSong
import win.taptap.musicmanager.client.api.Recommendation
import win.taptap.musicmanager.client.store.AppState import win.taptap.musicmanager.client.store.AppState
import win.taptap.musicmanager.client.store.AppStore import win.taptap.musicmanager.client.store.AppStore
import win.taptap.musicmanager.client.store.sourceLabel
@Composable @Composable
fun MoodDetailScreen(state: AppState, store: AppStore) { fun MoodDetailScreen(state: AppState, store: AppStore) {
val detail = state.selectedMood val detail = state.selectedMood
if (state.loading && detail == null) { if (state.loading && detail == null) {
Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally) { Column(
Modifier.fillMaxSize(),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
) {
CircularProgressIndicator() CircularProgressIndicator()
} }
return return
@@ -60,17 +77,31 @@ fun MoodDetailScreen(state: AppState, store: AppStore) {
} }
val mood = detail.mood val mood = detail.mood
var seedQuery by remember { mutableStateOf("") } var name by remember(mood.id) { mutableStateOf(mood.name) }
var name by remember(mood.id, mood.changedAt) { mutableStateOf(mood.name) } var description by remember(mood.id) { mutableStateOf(mood.description.orEmpty()) }
var description by remember(mood.id, mood.changedAt) { mutableStateOf(mood.description.orEmpty()) } var genres by remember(mood.id) { mutableStateOf(mood.genres.joinToString(", ")) }
var genres by remember(mood.id, mood.changedAt) { mutableStateOf(mood.genres.joinToString(", ")) } var query by remember(mood.id) { mutableStateOf(mood.query.orEmpty()) }
var query by remember(mood.id, mood.changedAt) { mutableStateOf(mood.query.orEmpty()) } var source by remember(mood.id) { mutableStateOf(mood.source) }
var target by remember(mood.id, mood.changedAt) { mutableStateOf(mood.targetSize.toString()) } var sourceMenu by remember { mutableStateOf(false) }
var hours by remember(mood.id, mood.changedAt) { mutableStateOf(mood.refreshHours.toString()) } var collectionPercent by remember(mood.id) { mutableStateOf(mood.collectionPercent.toFloat()) }
var yt by remember(mood.id, mood.changedAt) { mutableStateOf(mood.ytEnabled) } var recommendations by remember(mood.id) { mutableStateOf(mood.recommendationCount.toFloat()) }
var hours by remember(mood.id) { mutableStateOf(mood.refreshHours.toString()) }
val seedIds = detail.seeds.map { it.song.id }.toSet() val inFlight = mood.recommendationDownloading +
val searchResults = state.searchResults.filterNot { it.id in seedIds } detail.recommendations.count {
it.download?.state == "queued" || it.download?.state == "downloading"
}
// A new mood gets its first batch from a background discovery run, which
// resolves the YouTube Music search. Keep refreshing until it lands.
val waitingForFirstBatch = mood.recommendationCount > 0 && detail.recommendations.isEmpty()
LaunchedEffect(mood.id, inFlight, waitingForFirstBatch) {
var polls = 0
while ((inFlight > 0 || waitingForFirstBatch) && polls < 60) {
kotlinx.coroutines.delay(5_000)
store.refreshSelectedMood()
polls += 1
}
}
LazyColumn( LazyColumn(
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
@@ -85,93 +116,71 @@ fun MoodDetailScreen(state: AppState, store: AppStore) {
) { ) {
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
Text( Text(
mood.description ?: "Server-driven radio", mood.description ?: "Your private mix",
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { Row(
Text("${mood.seedCount} seeds", style = MaterialTheme.typography.labelMedium) verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(10.dp),
) {
Text("${mood.songCount} songs", style = MaterialTheme.typography.labelMedium)
Text("·", color = MaterialTheme.colorScheme.onSurfaceVariant) Text("·", color = MaterialTheme.colorScheme.onSurfaceVariant)
Text("${mood.targetSize} batch", style = MaterialTheme.typography.labelMedium) Text(
"${mood.collectionPercent}% collection",
style = MaterialTheme.typography.labelMedium,
)
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))
Button(onClick = { store.playMood(mood.id) }) { Button(onClick = { store.playMood(mood.id) }, enabled = mood.songCount > 0) {
Icon(Icons.Rounded.PlayArrow, contentDescription = null, modifier = Modifier.size(18.dp)) Icon(Icons.Rounded.PlayArrow, contentDescription = null, modifier = Modifier.size(18.dp))
Spacer(Modifier.width(6.dp)) Spacer(Modifier.width(6.dp))
Text("Play radio") Text("Play radio")
} }
} }
if (mood.lastError != null) { if (mood.lastError != null) {
Text(mood.lastError, color = MaterialTheme.colorScheme.error, style = MaterialTheme.typography.bodySmall) Text(
mood.lastError,
color = MaterialTheme.colorScheme.error,
style = MaterialTheme.typography.bodySmall,
)
} }
} }
} }
} }
item { item {
SectionTitle("Seeds") { SectionTitle("Songs") {
Text( Text(
"${detail.seeds.size}", "${detail.songs.size}",
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
} }
} }
if (detail.seeds.isEmpty()) { if (detail.songs.isEmpty()) {
item { item {
Text( Text(
"No seeds yet. Add a few songs below; every seed is always part of the radio.", "A mood needs at least one song before it can play. Use Add music to search YouTube.",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
} }
} else { } else {
items(detail.seeds, key = { it.song.id }) { seed -> items(detail.songs, key = { it.song.id }) { entry ->
SongRow( MoodSongRow(entry, store, mood.id, downloaded = entry.song.id in state.downloads)
store = store,
song = seed.song,
onPlay = { store.playSong(seed.song) },
) {
Text(seed.origin, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
IconButton(onClick = { store.removeSeed(mood.id, seed.song.id) }) {
Icon(Icons.Rounded.RemoveCircleOutline, contentDescription = "Remove seed")
} }
} }
}
}
item {
HorizontalDivider(Modifier.padding(vertical = 12.dp))
SectionTitle("Add songs")
}
item { item {
Row( Row(
verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(top = 4.dp),
horizontalArrangement = Arrangement.spacedBy(10.dp), horizontalArrangement = Arrangement.spacedBy(10.dp),
modifier = Modifier.fillMaxWidth(),
) { ) {
OutlinedTextField( FilledTonalButton(onClick = { store.openSearch(mood.id) }) {
value = seedQuery, Icon(Icons.Rounded.Search, contentDescription = null, modifier = Modifier.size(18.dp))
onValueChange = { seedQuery = it }, Spacer(Modifier.width(6.dp))
singleLine = true, Text("Add music")
label = { Text("Search your music") },
modifier = Modifier.weight(1f),
)
OutlinedButton(onClick = { store.search(seedQuery) }, enabled = seedQuery.isNotBlank()) {
Text("Search")
}
}
}
if (state.searching) {
item { CircularProgressIndicator(Modifier.size(22.dp)) }
}
items(searchResults.take(12), key = { it.id }) { song ->
SongRow(store = store, song = song, onPlay = { store.playSong(song) }) {
IconButton(onClick = { store.addSeed(mood.id, song.id) }) {
Icon(Icons.Rounded.Add, contentDescription = "Add seed")
} }
} }
} }
@@ -182,32 +191,55 @@ fun MoodDetailScreen(state: AppState, store: AppStore) {
SectionTitle("Next batch") SectionTitle("Next batch")
} }
items(state.preview, key = { "preview-${it.id}" }) { song -> items(state.preview, key = { "preview-${it.id}" }) { song ->
SongRow(store = store, song = song, onPlay = { store.playSong(song) }) { SongRow(store, song, onPlay = { store.playSong(song) }) {
Text(formatDuration(song.duration), style = MaterialTheme.typography.labelSmall) Text(formatDuration(song.duration), style = MaterialTheme.typography.labelSmall)
} }
} }
} }
if (detail.recommendations.isNotEmpty()) {
item { item {
HorizontalDivider(Modifier.padding(vertical = 12.dp)) HorizontalDivider(Modifier.padding(vertical = 12.dp))
SectionTitle("Recommendations") SectionTitle("Recommendations") {
Row(verticalAlignment = Alignment.CenterVertically) {
if (state.discovering) {
CircularProgressIndicator(Modifier.size(16.dp), strokeWidth = 2.dp)
Spacer(Modifier.width(8.dp))
} }
items(detail.recommendations, key = { it.videoId }) { recommendation -> TextButton(
Row( onClick = { store.refreshRecommendations() },
modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp), enabled = !state.discovering && mood.recommendationCount > 0,
verticalAlignment = Alignment.CenterVertically,
) { ) {
Column(Modifier.weight(1f)) { Icon(Icons.Rounded.Refresh, contentDescription = null, modifier = Modifier.size(16.dp))
Text(recommendation.title, maxLines = 1, overflow = TextOverflow.Ellipsis) Spacer(Modifier.width(4.dp))
Text("Refresh")
}
}
}
}
if (mood.recommendationCount == 0) {
item {
Text( Text(
recommendation.artist, "Recommendations are off for this mood. Raise the count in settings to let the server download picks.",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
} }
Text(recommendation.state, style = MaterialTheme.typography.labelSmall) } else if (detail.recommendations.isEmpty()) {
item {
Text(
if (state.discovering) {
"Searching and downloading picks…"
} else {
"No recommendations yet. The server tops this mood up automatically."
},
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
} }
} else {
items(detail.recommendations, key = { "rec-${it.source}-${it.externalId}" }) { recommendation ->
RecommendationRow(recommendation, state.discovering, store)
} }
} }
@@ -242,30 +274,90 @@ fun MoodDetailScreen(state: AppState, store: AppStore) {
OutlinedTextField( OutlinedTextField(
value = query, value = query,
onValueChange = { query = it }, onValueChange = { query = it },
label = { Text("Free-text hint") }, label = { Text("Discovery hint") },
singleLine = true, singleLine = true,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) )
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { Row(
OutlinedTextField( modifier = Modifier.fillMaxWidth(),
value = target, verticalAlignment = Alignment.CenterVertically,
onValueChange = { target = it }, ) {
label = { Text("Batch size") }, Column(Modifier.weight(1f)) {
singleLine = true, Text("Download source", style = MaterialTheme.typography.bodyMedium)
modifier = Modifier.weight(1f), Text(
"Search, recommendations and downloads use this catalog.",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
}
Box {
OutlinedButton(onClick = { sourceMenu = true }) {
Text(sourceLabel(source))
}
DropdownMenu(
expanded = sourceMenu,
onDismissRequest = { sourceMenu = false },
) {
listOf("deezer", "youtube").forEach { option ->
DropdownMenuItem(
text = { Text(sourceLabel(option)) },
onClick = {
sourceMenu = false
source = option
},
)
}
}
}
}
if (source != mood.source) {
Text(
"Changing the source clears active recommendations and refills them.",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.tertiary,
)
}
Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
Text(
"Collection share: ${collectionPercent.roundToInt()}% · ${100 - collectionPercent.roundToInt()}% recommendations",
style = MaterialTheme.typography.bodySmall,
)
Slider(
value = collectionPercent,
onValueChange = { collectionPercent = it },
valueRange = 0f..100f,
steps = 9,
)
Text(
"Each queue slot rolls this share; when one pool runs out the other fills in.",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
Text(
"Active recommendations: ${recommendations.roundToInt()}",
style = MaterialTheme.typography.bodySmall,
)
Slider(
value = recommendations,
onValueChange = { recommendations = it },
valueRange = 0f..30f,
steps = 29,
)
Text(
"Downloaded picks that count as active slots (0 turns discovery off).",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
OutlinedTextField( OutlinedTextField(
value = hours, value = hours,
onValueChange = { hours = it }, onValueChange = { hours = it },
label = { Text("Refresh h") }, label = { Text("Refresh interval (hours)") },
singleLine = true, singleLine = true,
modifier = Modifier.weight(1f), modifier = Modifier.fillMaxWidth(),
) )
}
Row(verticalAlignment = Alignment.CenterVertically) {
Text("YT Music discovery", Modifier.weight(1f))
Switch(checked = yt, onCheckedChange = { yt = it })
}
FilledTonalButton( FilledTonalButton(
enabled = !state.saving && name.isNotBlank(), enabled = !state.saving && name.isNotBlank(),
onClick = { onClick = {
@@ -275,9 +367,10 @@ fun MoodDetailScreen(state: AppState, store: AppStore) {
description = description.trim().takeIf { it.isNotEmpty() }, description = description.trim().takeIf { it.isNotEmpty() },
genres = genres.split(',').map { it.trim() }.filter { it.isNotEmpty() }, genres = genres.split(',').map { it.trim() }.filter { it.isNotEmpty() },
query = query.trim().takeIf { it.isNotEmpty() }, query = query.trim().takeIf { it.isNotEmpty() },
targetSize = target.toIntOrNull() ?: mood.targetSize, source = source,
collectionPercent = collectionPercent.roundToInt(),
recommendationCount = recommendations.roundToInt(),
refreshHours = hours.toIntOrNull() ?: mood.refreshHours, refreshHours = hours.toIntOrNull() ?: mood.refreshHours,
ytEnabled = yt,
) )
}, },
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -290,3 +383,106 @@ fun MoodDetailScreen(state: AppState, store: AppStore) {
item { Spacer(Modifier.size(24.dp)) } item { Spacer(Modifier.size(24.dp)) }
} }
} }
@Composable
private fun MoodSongRow(entry: MoodSong, store: AppStore, moodId: String, downloaded: Boolean) {
val song = entry.song
SongRow(store, song, onPlay = { store.playSong(song) }) {
IconButton(onClick = { store.toggleDownload(song) }) {
Icon(
if (downloaded) Icons.Rounded.DownloadDone else Icons.Rounded.Download,
contentDescription = if (downloaded) "Delete download" else "Download for offline",
tint = if (downloaded) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurfaceVariant
},
)
}
IconButton(onClick = { store.removeSong(moodId, song.id) }) {
Icon(Icons.Rounded.RemoveCircleOutline, contentDescription = "Remove from mood")
}
}
}
@Composable
private fun RecommendationRow(
recommendation: Recommendation,
busy: Boolean,
store: AppStore,
) {
val failed = recommendation.state == "failed" ||
recommendation.download?.state == "failed"
Row(
modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
if (recommendation.song != null) {
Cover(store, recommendation.song.id, Modifier.size(48.dp), size = 96)
} else {
RemoteImage(store, recommendation.thumbnail, Modifier.size(48.dp))
}
Column(Modifier.weight(1f)) {
Text(
recommendation.title,
style = MaterialTheme.typography.bodyLarge,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(
buildString {
append(recommendation.artist)
recommendation.duration?.let { append(" · ").append(formatDuration(it)) }
},
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(
when {
failed -> "Download failed"
recommendation.state == "ready" -> "Ready to add"
else -> "Downloading…"
},
style = MaterialTheme.typography.labelSmall,
color = if (failed) {
MaterialTheme.colorScheme.error
} else {
MaterialTheme.colorScheme.primary
},
)
if (failed && recommendation.error != null) {
Text(
recommendation.error,
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.error,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
}
}
if (failed) {
IconButton(
onClick = { store.retryRecommendation(recommendation.externalId) },
enabled = !busy,
) {
Icon(Icons.Rounded.Refresh, contentDescription = "Retry download")
}
} else {
IconButton(
onClick = { store.addRecommendation(recommendation.externalId) },
enabled = !busy,
) {
Icon(Icons.Rounded.Add, contentDescription = "Add to mood")
}
}
IconButton(
onClick = { store.rejectRecommendation(recommendation.externalId) },
enabled = !busy,
) {
Icon(Icons.Rounded.Close, contentDescription = "Not interested")
}
}
}
@@ -27,11 +27,14 @@ import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Switch import androidx.compose.material3.Slider
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@@ -46,9 +49,11 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import kotlin.math.roundToInt
import win.taptap.musicmanager.client.api.Mood import win.taptap.musicmanager.client.api.Mood
import win.taptap.musicmanager.client.store.AppState import win.taptap.musicmanager.client.store.AppState
import win.taptap.musicmanager.client.store.AppStore import win.taptap.musicmanager.client.store.AppStore
import win.taptap.musicmanager.client.store.sourceLabel
@Composable @Composable
fun MoodsScreen(state: AppState, store: AppStore) { fun MoodsScreen(state: AppState, store: AppStore) {
@@ -66,7 +71,7 @@ fun MoodsScreen(state: AppState, store: AppStore) {
fontWeight = FontWeight.SemiBold, fontWeight = FontWeight.SemiBold,
) )
Text( Text(
"Radio is generated live and learns from what you finish or skip.", "Songs are downloaded from YouTube. Recommendations refill automatically.",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
@@ -88,7 +93,7 @@ fun MoodsScreen(state: AppState, store: AppStore) {
if (state.moods.isEmpty()) { if (state.moods.isEmpty()) {
EmptyState( EmptyState(
title = "No moods yet", title = "No moods yet",
subtitle = "Create a mood, add a few seed songs, and press play. The server builds the rest.", subtitle = "Create a mood, add a few songs, and press play. The server builds and downloads the rest.",
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
) )
} else { } else {
@@ -114,9 +119,18 @@ fun MoodsScreen(state: AppState, store: AppStore) {
CreateMoodDialog( CreateMoodDialog(
saving = state.saving, saving = state.saving,
onDismiss = { creating = false }, onDismiss = { creating = false },
onCreate = { name, description, genres, query, target, hours, yt -> onCreate = { name, description, genres, query, source, collectionPercent, recommendations, hours ->
creating = false creating = false
store.createMood(name, description, genres, query, target, hours, yt) store.createMood(
name,
description,
genres,
query,
source,
collectionPercent,
recommendations,
hours,
)
}, },
) )
} }
@@ -142,7 +156,7 @@ private fun MoodCard(mood: Mood, onOpen: () -> Unit, onPlay: () -> Unit) {
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
) )
Text( Text(
mood.description ?: mood.genres.joinToString(" · ").ifBlank { "Server-driven radio" }, mood.description ?: mood.genres.joinToString(" · ").ifBlank { "Your private mix" },
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = Color.White.copy(alpha = 0.78f), color = Color.White.copy(alpha = 0.78f),
maxLines = 2, maxLines = 2,
@@ -151,21 +165,29 @@ private fun MoodCard(mood: Mood, onOpen: () -> Unit, onPlay: () -> Unit) {
) )
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Text( Text(
"${mood.seedCount} seeds", "${mood.songCount} songs",
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelMedium,
color = Color.White.copy(alpha = 0.85f), color = Color.White.copy(alpha = 0.85f),
) )
if (mood.newRecommendations > 0) { val picks = mood.recommendationReady + mood.recommendationDownloading
if (picks > 0) {
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
Text( Text(
"${mood.newRecommendations} picks", "$picks picks",
style = MaterialTheme.typography.labelMedium, style = MaterialTheme.typography.labelMedium,
color = Color.White.copy(alpha = 0.85f), color = Color.White.copy(alpha = 0.85f),
) )
} }
Spacer(Modifier.width(8.dp))
Text(
sourceLabel(mood.source),
style = MaterialTheme.typography.labelMedium,
color = Color.White.copy(alpha = 0.7f),
)
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))
FilledTonalButton( FilledTonalButton(
onClick = onPlay, onClick = onPlay,
enabled = mood.songCount > 0,
colors = ButtonDefaults.filledTonalButtonColors( colors = ButtonDefaults.filledTonalButtonColors(
containerColor = Color.White.copy(alpha = 0.16f), containerColor = Color.White.copy(alpha = 0.16f),
contentColor = Color.White, contentColor = Color.White,
@@ -184,15 +206,17 @@ private fun MoodCard(mood: Mood, onOpen: () -> Unit, onPlay: () -> Unit) {
private fun CreateMoodDialog( private fun CreateMoodDialog(
saving: Boolean, saving: Boolean,
onDismiss: () -> Unit, onDismiss: () -> Unit,
onCreate: (String, String?, List<String>, String?, Int, Int, Boolean) -> Unit, onCreate: (String, String?, List<String>, String?, String, Int, Int, Int) -> Unit,
) { ) {
var name by remember { mutableStateOf("") } var name by remember { mutableStateOf("") }
var description by remember { mutableStateOf("") } var description by remember { mutableStateOf("") }
var genres by remember { mutableStateOf("") } var genres by remember { mutableStateOf("") }
var query by remember { mutableStateOf("") } var query by remember { mutableStateOf("") }
var target by remember { mutableStateOf("30") } var source by remember { mutableStateOf("deezer") }
var sourceMenu by remember { mutableStateOf(false) }
var collectionPercent by remember { mutableStateOf(50f) }
var recommendations by remember { mutableStateOf(10f) }
var hours by remember { mutableStateOf("24") } var hours by remember { mutableStateOf("24") }
var yt by remember { mutableStateOf(true) }
AlertDialog( AlertDialog(
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
@@ -223,30 +247,69 @@ private fun CreateMoodDialog(
OutlinedTextField( OutlinedTextField(
value = query, value = query,
onValueChange = { query = it }, onValueChange = { query = it },
label = { Text("Free-text hint") }, label = { Text("Discovery hint") },
singleLine = true, singleLine = true,
) )
Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { Row(
OutlinedTextField( modifier = Modifier.fillMaxWidth(),
value = target, verticalAlignment = Alignment.CenterVertically,
onValueChange = { target = it }, ) {
label = { Text("Batch size") }, Text(
singleLine = true, "Download source",
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
Box {
OutlinedButton(onClick = { sourceMenu = true }) {
Text(sourceLabel(source))
}
DropdownMenu(
expanded = sourceMenu,
onDismissRequest = { sourceMenu = false },
) {
listOf("deezer", "youtube").forEach { option ->
DropdownMenuItem(
text = { Text(sourceLabel(option)) },
onClick = {
sourceMenu = false
source = option
},
)
}
}
}
}
Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
Text(
"Collection share: ${collectionPercent.roundToInt()}% · ${100 - collectionPercent.roundToInt()}% recommendations",
style = MaterialTheme.typography.bodySmall,
)
Slider(
value = collectionPercent,
onValueChange = { collectionPercent = it },
valueRange = 0f..100f,
steps = 9,
)
}
Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
Text(
"Active recommendations: ${recommendations.roundToInt()}",
style = MaterialTheme.typography.bodySmall,
)
Slider(
value = recommendations,
onValueChange = { recommendations = it },
valueRange = 0f..30f,
steps = 29,
)
}
OutlinedTextField( OutlinedTextField(
value = hours, value = hours,
onValueChange = { hours = it }, onValueChange = { hours = it },
label = { Text("Refresh h") }, label = { Text("Refresh interval (hours)") },
singleLine = true, singleLine = true,
modifier = Modifier.weight(1f),
) )
} }
Row(verticalAlignment = Alignment.CenterVertically) {
Text("YT Music discovery", Modifier.weight(1f))
Switch(checked = yt, onCheckedChange = { yt = it })
}
}
}, },
confirmButton = { confirmButton = {
TextButton( TextButton(
@@ -257,9 +320,10 @@ private fun CreateMoodDialog(
description.trim().takeIf { it.isNotEmpty() }, description.trim().takeIf { it.isNotEmpty() },
genres.split(',').map { it.trim() }.filter { it.isNotEmpty() }, genres.split(',').map { it.trim() }.filter { it.isNotEmpty() },
query.trim().takeIf { it.isNotEmpty() }, query.trim().takeIf { it.isNotEmpty() },
target.toIntOrNull() ?: 30, source,
collectionPercent.roundToInt(),
recommendations.roundToInt(),
hours.toIntOrNull() ?: 24, hours.toIntOrNull() ?: 24,
yt,
) )
}, },
) { Text("Create") } ) { Text("Create") }
@@ -1,21 +1,36 @@
package win.taptap.musicmanager.client.ui package win.taptap.musicmanager.client.ui
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
import androidx.compose.foundation.gestures.scrollBy
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.AddCircleOutline import androidx.compose.material.icons.rounded.AddCircleOutline
import androidx.compose.material.icons.rounded.Bedtime import androidx.compose.material.icons.rounded.Bedtime
import androidx.compose.material.icons.rounded.Close
import androidx.compose.material.icons.rounded.DragHandle
import androidx.compose.material.icons.rounded.MoreVert
import androidx.compose.material.icons.rounded.Pause import androidx.compose.material.icons.rounded.Pause
import androidx.compose.material.icons.rounded.PlayArrow import androidx.compose.material.icons.rounded.PlayArrow
import androidx.compose.material.icons.rounded.PlaylistAdd import androidx.compose.material.icons.rounded.PlaylistAdd
import androidx.compose.material.icons.rounded.QueueMusic
import androidx.compose.material.icons.rounded.SkipNext import androidx.compose.material.icons.rounded.SkipNext
import androidx.compose.material.icons.rounded.SkipPrevious
import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
@@ -25,29 +40,43 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Slider import androidx.compose.material3.Slider
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.zIndex
import kotlinx.coroutines.delay
import kotlin.math.roundToInt
import win.taptap.musicmanager.client.store.AppState import win.taptap.musicmanager.client.store.AppState
import win.taptap.musicmanager.client.store.AppStore import win.taptap.musicmanager.client.store.AppStore
private val QUEUE_ROW_HEIGHT = 58.dp
@Composable @Composable
fun PlayerBar(state: AppState, store: AppStore) { fun PlayerBar(state: AppState, store: AppStore) {
val song = state.current ?: return val song = state.current ?: return
var picker by remember { mutableStateOf(false) } var picker by remember { mutableStateOf(false) }
var sleepMenu by remember { mutableStateOf(false) } var sleepMenu by remember { mutableStateOf(false) }
var moreMenu by remember { mutableStateOf(false) }
var queueOpen by remember { mutableStateOf(false) }
var dragSeconds by remember(song.id) { mutableStateOf<Float?>(null) } var dragSeconds by remember(song.id) { mutableStateOf<Float?>(null) }
val sleepRemaining = state.sleepTimerRemainingSeconds val sleepRemaining = state.sleepTimerRemainingSeconds
Surface( Surface(
color = MaterialTheme.colorScheme.surfaceVariant, color = MaterialTheme.colorScheme.surfaceVariant,
tonalElevation = 8.dp, tonalElevation = 8.dp,
modifier = Modifier.navigationBarsPadding(),
) { ) {
Column(Modifier.fillMaxWidth()) { Column(Modifier.fillMaxWidth()) {
val progress = if (state.durationSeconds > 0) { val progress = if (state.durationSeconds > 0) {
@@ -63,12 +92,49 @@ fun PlayerBar(state: AppState, store: AppStore) {
value = dragSeconds ?: progress, value = dragSeconds ?: progress,
onValueChange = { dragSeconds = it }, onValueChange = { dragSeconds = it },
onValueChangeFinished = { onValueChangeFinished = {
dragSeconds?.let { store.seekTo(it * state.durationSeconds) } dragSeconds?.let { fraction ->
if (state.durationSeconds > 0) {
store.seekTo(fraction * state.durationSeconds)
}
}
dragSeconds = null dragSeconds = null
}, },
enabled = store.canSeek(), enabled = store.canSeek() && state.durationSeconds > 0,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
) )
IconButton(onClick = { queueOpen = true }) {
Icon(Icons.Rounded.QueueMusic, contentDescription = "Queue")
}
Box {
IconButton(onClick = { moreMenu = true }) {
Icon(Icons.Rounded.MoreVert, contentDescription = "More actions")
}
DropdownMenu(
expanded = moreMenu,
onDismissRequest = { moreMenu = false },
) {
DropdownMenuItem(
text = { Text("Add to current mood") },
leadingIcon = {
Icon(Icons.Rounded.AddCircleOutline, contentDescription = null)
},
onClick = {
moreMenu = false
store.addCurrentToMood(null)
},
)
DropdownMenuItem(
text = { Text("Add to another mood") },
leadingIcon = {
Icon(Icons.Rounded.PlaylistAdd, contentDescription = null)
},
onClick = {
moreMenu = false
picker = true
},
)
}
}
Box { Box {
IconButton(onClick = { sleepMenu = true }) { IconButton(onClick = { sleepMenu = true }) {
Icon( Icon(
@@ -109,11 +175,13 @@ fun PlayerBar(state: AppState, store: AppStore) {
} }
Row( Row(
modifier = Modifier.fillMaxWidth().padding(start = 12.dp, end = 8.dp, bottom = 8.dp), modifier = Modifier
.fillMaxWidth()
.padding(start = 12.dp, end = 8.dp, bottom = 8.dp),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(10.dp), horizontalArrangement = Arrangement.spacedBy(6.dp),
) { ) {
Cover(store, song.albumId, Modifier.size(48.dp), size = 160) Cover(store, song.id, Modifier.size(48.dp), size = 160)
Column(Modifier.weight(1f)) { Column(Modifier.weight(1f)) {
Text( Text(
song.title, song.title,
@@ -145,25 +213,43 @@ fun PlayerBar(state: AppState, store: AppStore) {
) )
} }
IconButton(onClick = { store.addCurrentToMood(null) }) { IconButton(
Icon(Icons.Rounded.AddCircleOutline, contentDescription = "Add to current mood") onClick = { store.previous() },
modifier = Modifier.size(40.dp),
) {
Icon(
Icons.Rounded.SkipPrevious,
contentDescription = "Previous",
modifier = Modifier.size(26.dp),
)
} }
IconButton(onClick = { picker = true }) { IconButton(
Icon(Icons.Rounded.PlaylistAdd, contentDescription = "Add to another mood") onClick = { store.togglePlayPause() },
} modifier = Modifier.size(48.dp),
IconButton(onClick = { store.skip() }) { ) {
Icon(Icons.Rounded.SkipNext, contentDescription = "Skip")
}
IconButton(onClick = { store.togglePlayPause() }) {
Icon( Icon(
if (state.playing) Icons.Rounded.Pause else Icons.Rounded.PlayArrow, if (state.playing) Icons.Rounded.Pause else Icons.Rounded.PlayArrow,
contentDescription = if (state.playing) "Pause" else "Play", contentDescription = if (state.playing) "Pause" else "Play",
modifier = Modifier.size(30.dp), modifier = Modifier.size(30.dp),
) )
} }
IconButton(
onClick = { store.skip() },
modifier = Modifier.size(40.dp),
) {
Icon(
Icons.Rounded.SkipNext,
contentDescription = "Skip",
modifier = Modifier.size(26.dp),
)
} }
} }
} }
}
if (queueOpen) {
QueueDialog(state, store) { queueOpen = false }
}
if (picker) { if (picker) {
MoodPickerDialog( MoodPickerDialog(
@@ -177,3 +263,200 @@ fun PlayerBar(state: AppState, store: AppStore) {
) )
} }
} }
@Composable
private fun QueueDialog(state: AppState, store: AppStore, onDismiss: () -> Unit) {
val listState = rememberLazyListState()
var draggingIndex by remember { mutableStateOf<Int?>(null) }
var dragPointerY by remember { mutableStateOf(0f) }
var grabOffset by remember { mutableStateOf(0f) }
val edgePx = with(LocalDensity.current) { 48.dp.toPx() }
fun queueIndexAt(y: Float): Int? =
listState.layoutInfo.visibleItemsInfo
.firstOrNull { y >= it.offset && y < it.offset + it.size }
?.index
LaunchedEffect(draggingIndex) {
while (draggingIndex != null) {
val y = dragPointerY
val edge = edgePx
val viewport = listState.layoutInfo.viewportEndOffset.toFloat()
if (y < edge) {
listState.scrollBy(-18f)
} else if (y > viewport - edge) {
listState.scrollBy(18f)
}
val from = draggingIndex
val to = queueIndexAt(y)
if (from != null && to != null && to != from) {
store.moveInQueue(from, to)
draggingIndex = to
}
delay(16)
}
}
Dialog(onDismissRequest = onDismiss) {
Surface(
shape = RoundedCornerShape(18.dp),
color = MaterialTheme.colorScheme.surface,
tonalElevation = 6.dp,
modifier = Modifier.fillMaxWidth().heightIn(max = 620.dp),
) {
Column {
Row(
modifier = Modifier.padding(20.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Column(Modifier.weight(1f)) {
Text("Queue", style = MaterialTheme.typography.titleMedium)
Text(
if (state.queue.isEmpty()) {
"Nothing queued"
} else {
"${state.queue.size} upcoming · long-press and drag to reorder"
},
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
TextButton(onClick = onDismiss) { Text("Close") }
}
HorizontalDivider()
state.current?.let { song ->
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 20.dp, vertical = 10.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
Cover(store, song.id, Modifier.size(40.dp), size = 96)
Column(Modifier.weight(1f)) {
Text(
song.title,
style = MaterialTheme.typography.bodyLarge,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(
"Now playing",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.primary,
)
}
}
HorizontalDivider()
}
if (state.queue.isEmpty()) {
Text(
"Nothing queued. Start a mood to build a radio queue.",
modifier = Modifier.padding(20.dp),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
} else {
Box(
modifier = Modifier
.fillMaxWidth()
.pointerInput(Unit) {
detectDragGesturesAfterLongPress(
onDragStart = { offset ->
val index = queueIndexAt(offset.y)
val info = listState.layoutInfo.visibleItemsInfo
.firstOrNull { it.index == index }
if (index != null && info != null) {
draggingIndex = index
dragPointerY = offset.y
grabOffset = offset.y - info.offset
}
},
onDrag = { change, _ ->
change.consume()
dragPointerY = change.position.y
val from = draggingIndex
val to = queueIndexAt(change.position.y)
if (from != null && to != null && to != from) {
store.moveInQueue(from, to)
draggingIndex = to
}
},
onDragEnd = { draggingIndex = null },
onDragCancel = { draggingIndex = null },
)
},
) {
LazyColumn(
state = listState,
modifier = Modifier.fillMaxWidth().heightIn(max = 500.dp),
) {
itemsIndexed(state.queue, key = { _, song -> song.id }) { index, song ->
val isDragging = index == draggingIndex
val rowInfo = if (isDragging) {
listState.layoutInfo.visibleItemsInfo
.firstOrNull { it.index == index }
} else {
null
}
val translation = if (rowInfo != null) {
dragPointerY - rowInfo.offset - grabOffset
} else {
0f
}
Row(
modifier = Modifier
.fillMaxWidth()
.height(QUEUE_ROW_HEIGHT)
.background(MaterialTheme.colorScheme.surface)
.zIndex(if (isDragging) 1f else 0f)
.graphicsLayer {
translationY = translation
shadowElevation = if (isDragging) 8.dp.toPx() else 0f
}
.padding(start = 20.dp, end = 8.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(10.dp),
) {
Cover(store, song.id, Modifier.size(36.dp), size = 96)
Column(Modifier.weight(1f)) {
Text(
song.title,
style = MaterialTheme.typography.bodyMedium,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
Text(
song.artist,
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
}
Icon(
Icons.Rounded.DragHandle,
contentDescription = "Drag to reorder",
tint = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.size(22.dp),
)
IconButton(
onClick = {
val from = store.state.value.queue
.indexOfFirst { it.id == song.id }
if (from >= 0) store.removeFromQueue(from)
},
) {
Icon(Icons.Rounded.Close, contentDescription = "Remove from queue")
}
}
}
}
}
}
}
}
}
}
@@ -0,0 +1,263 @@
package win.taptap.musicmanager.client.ui
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Add
import androidx.compose.material.icons.rounded.ArrowDropDown
import androidx.compose.material.icons.rounded.Check
import androidx.compose.material.icons.rounded.DownloadDone
import androidx.compose.material.icons.rounded.Link
import androidx.compose.material.icons.rounded.Search
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import win.taptap.musicmanager.client.api.SearchResult
import win.taptap.musicmanager.client.store.AppState
import win.taptap.musicmanager.client.store.AppStore
import win.taptap.musicmanager.client.store.sourceLabel
@Composable
fun SearchScreen(state: AppState, store: AppStore) {
if (state.moods.isEmpty()) {
EmptyState(
"Create a mood first",
"Search results are always added to a mood.",
Modifier.fillMaxSize(),
)
return
}
var url by remember { mutableStateOf("") }
var moodMenu by remember { mutableStateOf(false) }
var sourceMenu by remember { mutableStateOf(false) }
val target = state.moods.firstOrNull { it.id == state.searchTargetMoodId } ?: state.moods.first()
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(20.dp),
verticalArrangement = Arrangement.spacedBy(10.dp),
) {
item {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(10.dp),
) {
Text("Add to", style = MaterialTheme.typography.bodyMedium)
Box {
OutlinedButton(onClick = { moodMenu = true }) {
Text(target.name, maxLines = 1, overflow = TextOverflow.Ellipsis)
Icon(Icons.Rounded.ArrowDropDown, contentDescription = null)
}
DropdownMenu(expanded = moodMenu, onDismissRequest = { moodMenu = false }) {
state.moods.forEach { mood ->
DropdownMenuItem(
text = { Text(mood.name) },
onClick = {
moodMenu = false
store.selectSearchMood(mood.id)
},
)
}
}
}
}
}
item {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(10.dp),
) {
Text("Download source", style = MaterialTheme.typography.bodyMedium)
Box {
OutlinedButton(onClick = { sourceMenu = true }) {
Text(sourceLabel(target.source))
Icon(Icons.Rounded.ArrowDropDown, contentDescription = null)
}
DropdownMenu(
expanded = sourceMenu,
onDismissRequest = { sourceMenu = false },
) {
listOf("deezer", "youtube").forEach { option ->
DropdownMenuItem(
text = { Text(sourceLabel(option)) },
onClick = {
sourceMenu = false
store.setMoodSource(target.id, option)
},
)
}
}
}
}
}
item {
OutlinedTextField(
value = state.searchQuery,
onValueChange = store::setSearchQuery,
label = { Text("Search ${sourceLabel(target.source)}") },
singleLine = true,
leadingIcon = { Icon(Icons.Rounded.Search, contentDescription = null) },
modifier = Modifier.fillMaxWidth(),
)
}
item {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(10.dp),
modifier = Modifier.fillMaxWidth(),
) {
OutlinedTextField(
value = url,
onValueChange = { url = it },
label = { Text("Paste a YouTube or Deezer URL") },
singleLine = true,
leadingIcon = { Icon(Icons.Rounded.Link, contentDescription = null) },
modifier = Modifier.weight(1f),
)
FilledTonalButton(
enabled = url.isNotBlank(),
onClick = {
store.addByUrl(url)
url = ""
},
) {
Text("Add")
}
}
}
if (state.searching) {
item {
Row(verticalAlignment = Alignment.CenterVertically) {
CircularProgressIndicator(Modifier.size(18.dp), strokeWidth = 2.dp)
Spacer(Modifier.width(10.dp))
Text("Searching YouTube Music…", style = MaterialTheme.typography.bodySmall)
}
}
}
if (!state.searching && state.searchQuery.isNotBlank() && state.searchResults.isEmpty()) {
item {
Text(
"No tracks up to 10 minutes were found.",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
items(state.searchResults, key = { "${it.source}-${it.externalId}" }) { result ->
SearchRow(result, store)
}
item { Spacer(Modifier.size(24.dp)) }
}
}
@Composable
private fun SearchRow(result: SearchResult, store: AppStore) {
Row(
modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
RemoteImage(store, result.thumbnail, Modifier.size(52.dp))
Column(Modifier.weight(1f)) {
Text(
result.title,
style = MaterialTheme.typography.bodyLarge,
maxLines = 2,
overflow = TextOverflow.Ellipsis,
)
Text(
buildString {
append(result.artist)
result.album?.takeIf { it.isNotBlank() }?.let { append(" · ").append(it) }
result.duration?.let { append(" · ").append(formatDuration(it)) }
},
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
if (result.inMood) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Rounded.Check,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(14.dp),
)
Spacer(Modifier.width(4.dp))
Text(
"Already in this mood",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.primary,
)
}
} else if (result.downloaded) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
Icons.Rounded.DownloadDone,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(14.dp),
)
Spacer(Modifier.width(4.dp))
Text(
"Downloaded — adds instantly",
style = MaterialTheme.typography.labelSmall,
color = MaterialTheme.colorScheme.primary,
)
}
}
}
IconButton(
onClick = { store.addSearchResult(result) },
enabled = !result.inMood,
) {
Icon(
Icons.Rounded.Add,
contentDescription = "Add to ${result.title}",
)
}
}
}
@@ -2,19 +2,19 @@ package win.taptap.musicmanager.client.ui
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.DeleteSweep import androidx.compose.material.icons.rounded.DeleteSweep
import androidx.compose.material.icons.rounded.Logout import androidx.compose.material.icons.rounded.Logout
import androidx.compose.material.icons.rounded.Refresh import androidx.compose.material.icons.rounded.Refresh
import androidx.compose.material.icons.rounded.TravelExplore
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.FilledTonalButton
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@@ -35,7 +35,7 @@ import win.taptap.musicmanager.client.store.AppStore
fun SettingsScreen(state: AppState, store: AppStore) { fun SettingsScreen(state: AppState, store: AppStore) {
LazyColumn( LazyColumn(
modifier = Modifier.fillMaxSize(), modifier = Modifier.fillMaxSize(),
contentPadding = androidx.compose.foundation.layout.PaddingValues(20.dp), contentPadding = PaddingValues(20.dp),
verticalArrangement = Arrangement.spacedBy(14.dp), verticalArrangement = Arrangement.spacedBy(14.dp),
) { ) {
item { item {
@@ -57,6 +57,11 @@ fun SettingsScreen(state: AppState, store: AppStore) {
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
FilledTonalButton(onClick = { store.refreshAll() }) {
Icon(Icons.Rounded.Refresh, contentDescription = null)
Spacer(Modifier.width(6.dp))
Text("Sync moods")
}
} }
} }
} }
@@ -68,31 +73,25 @@ fun SettingsScreen(state: AppState, store: AppStore) {
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) { ) {
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
Text("Library", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Text("Offline", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
Text( Text(
"${state.library.size} songs cached · ${state.downloads.size} downloaded · ${formatBytes(store.storageBytes())}", "${state.downloads.size} downloaded · ${formatBytes(store.storageBytes())}",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
Row(horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically) { Row(
FilledTonalButton(onClick = { store.refreshAll() }) { horizontalArrangement = Arrangement.spacedBy(10.dp),
Icon(Icons.Rounded.Refresh, contentDescription = null) verticalAlignment = Alignment.CenterVertically,
Spacer(Modifier.width(6.dp)) ) {
Text("Sync") OutlinedButton(onClick = { store.openDownloads() }) {
} Text("Manage downloads")
if (state.user?.admin == true) {
OutlinedButton(onClick = { store.scanLibrary() }) {
Icon(Icons.Rounded.TravelExplore, contentDescription = null)
Spacer(Modifier.width(6.dp))
Text("Scan")
}
}
} }
if (state.downloads.isNotEmpty()) { if (state.downloads.isNotEmpty()) {
OutlinedButton(onClick = { store.clearDownloads() }) { OutlinedButton(onClick = { store.clearDownloads() }) {
Icon(Icons.Rounded.DeleteSweep, contentDescription = null) Icon(Icons.Rounded.DeleteSweep, contentDescription = null)
Spacer(Modifier.width(6.dp)) Spacer(Modifier.width(6.dp))
Text("Clear downloads") Text("Clear")
}
} }
} }
} }
@@ -108,12 +107,13 @@ fun SettingsScreen(state: AppState, store: AppStore) {
Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) {
Text("About", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) Text("About", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold)
Text( Text(
"AudioManager 0.1.0 · $platformName", "AudioManager 0.3.0 · $platformName",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
Text( Text(
"Moods are radio: the server chooses the next batch and learns from skips and completions. Add a track to a mood with the two buttons in the player.", "Moods are private. Songs are downloaded from YouTube into a shared server store; " +
"recommendations refill automatically and stay playable without being permanent.",
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant,
) )
@@ -6,18 +6,19 @@ import io.ktor.client.engine.mock.respondError
import io.ktor.http.HttpHeaders import io.ktor.http.HttpHeaders
import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode
import io.ktor.http.headersOf import io.ktor.http.headersOf
import io.ktor.utils.io.readAvailable
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import kotlinx.serialization.json.Json
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertFailsWith import kotlin.test.assertFailsWith
import kotlin.test.assertNull import kotlin.test.assertNull
import kotlin.test.assertTrue
import win.taptap.musicmanager.client.api.ApiClient import win.taptap.musicmanager.client.api.ApiClient
import win.taptap.musicmanager.client.api.ApiException import win.taptap.musicmanager.client.api.ApiException
import win.taptap.musicmanager.client.api.Mood
import win.taptap.musicmanager.client.api.configuredHttpClient import win.taptap.musicmanager.client.api.configuredHttpClient
import win.taptap.musicmanager.client.data.AppStorage import win.taptap.musicmanager.client.data.AppCache
import win.taptap.musicmanager.client.data.CachedState import win.taptap.musicmanager.client.data.CachedState
import win.taptap.musicmanager.client.data.LibraryCache
class ApiClientTest { class ApiClientTest {
@@ -30,15 +31,16 @@ class ApiClientTest {
"/api/v1/auth/login" -> respond( "/api/v1/auth/login" -> respond(
""" """
{"token":"abc123","expiresAt":"2027-01-01T00:00:00Z", {"token":"abc123","expiresAt":"2027-01-01T00:00:00Z",
"user":{"name":"alice","admin":true,"musicFolders":[1],"longformFolders":[10]}} "user":{"name":"alice","admin":true}}
""".trimIndent(), """.trimIndent(),
HttpStatusCode.OK, HttpStatusCode.OK,
jsonHeaders, jsonHeaders,
) )
"/api/v1/moods" -> respond( "/api/v1/moods" -> respond(
""" """
{"moods":[{"id":"mo-1","name":"Focus","targetSize":30,"refreshHours":24, {"moods":[{"id":"mo-1","name":"Focus","source":"deezer","collectionPercent":60,
"ytEnabled":true,"createdAt":"now","changedAt":"now","seedCount":2}]} "recommendationPercent":40,"recommendationCount":10,"refreshHours":24,
"createdAt":"now","changedAt":"now","songCount":2,"recommendationReady":3}]}
""".trimIndent(), """.trimIndent(),
HttpStatusCode.OK, HttpStatusCode.OK,
jsonHeaders, jsonHeaders,
@@ -55,7 +57,87 @@ class ApiClientTest {
val moods = client.moods() val moods = client.moods()
assertEquals(1, moods.size) assertEquals(1, moods.size)
assertEquals("Focus", moods.first().name) assertEquals("Focus", moods.first().name)
assertEquals(2, moods.first().seedCount) assertEquals(2, moods.first().songCount)
assertEquals(3, moods.first().recommendationReady)
}
@Test
fun `search returns badges and adding a video queues a download`() = runTest {
val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/search" -> respond(
"""
{"results":[
{"source":"deezer","externalId":"v1","title":"Fresh","artist":"Artist",
"duration":180,"downloaded":false},
{"source":"deezer","externalId":"v2","title":"Old","artist":"Artist",
"duration":200,"songId":"sg-2","downloaded":true}
]}
""".trimIndent(),
HttpStatusCode.OK,
jsonHeaders,
)
"/api/v1/moods/mo-1/songs" -> respond(
"""
{"detail":{"mood":{"id":"mo-1","name":"Focus","createdAt":"now",
"changedAt":"now","songCount":1},"songs":[],"recommendations":[]},
"added":false,"downloading":true}
""".trimIndent(),
HttpStatusCode.Accepted,
jsonHeaders,
)
else -> respondError(HttpStatusCode.NotFound)
}
}
val client = ApiClient(configuredHttpClient(engine))
client.restore("http://music", "token")
val results = client.search("fresh")
assertEquals(2, results.size)
assertNull(results[0].songId)
assertEquals("sg-2", results[1].songId)
assertTrue(results[1].downloaded)
assertEquals("v2", results[1].externalId)
val added = client.addSong("mo-1", source = "deezer", externalId = "v1")
assertTrue(added.downloading)
assertEquals(1, added.detail.mood.songCount)
}
@Test
fun `adding and rejecting recommendations parse the decision`() = runTest {
val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/moods/mo-1/recommendations/v1/add" -> respond(
"""
{"detail":{"mood":{"id":"mo-1","name":"Focus","createdAt":"now",
"changedAt":"now","songCount":2},"songs":[],"recommendations":[]},
"recommendation":{"source":"deezer","externalId":"v1","title":"Pick",
"artist":"Artist","state":"added"}}
""".trimIndent(),
HttpStatusCode.OK,
jsonHeaders,
)
"/api/v1/moods/mo-1/recommendations/v2/reject" -> respond(
"""
{"detail":{"mood":{"id":"mo-1","name":"Focus","createdAt":"now",
"changedAt":"now","songCount":2},"songs":[],"recommendations":[]},
"recommendation":{"source":"deezer","externalId":"v2","title":"Other",
"artist":"Artist","state":"rejected"}}
""".trimIndent(),
HttpStatusCode.OK,
jsonHeaders,
)
else -> respondError(HttpStatusCode.NotFound)
}
}
val client = ApiClient(configuredHttpClient(engine))
client.restore("http://music", "token")
assertEquals("added", client.addRecommendation("mo-1", "v1").recommendation.state)
assertEquals("rejected", client.rejectRecommendation("mo-1", "v2").recommendation.state)
} }
@Test @Test
@@ -74,23 +156,74 @@ class ApiClientTest {
} }
@Test @Test
fun `cache round-trips songs and moods`() = runTest { fun `failed downloads and images do not return error bodies`() = runTest {
val engine = MockEngine {
respond(
"""{"error":{"code":"not_found","message":"Song not found"}}""",
HttpStatusCode.NotFound,
jsonHeaders,
)
}
val client = ApiClient(configuredHttpClient(engine))
client.restore("http://music", "token")
val error = assertFailsWith<ApiException> { client.download("sg-missing") }
assertEquals(404, error.status)
assertNull(client.image("http://music/missing.jpg"))
}
@Test
fun `downloadTo streams bytes into the storage sink`() = runTest {
val payload = ByteArray(100_000) { (it % 251).toByte() }
val engine = MockEngine {
respond(payload, HttpStatusCode.OK, headersOf(HttpHeaders.ContentType, "audio/mpeg"))
}
val client = ApiClient(configuredHttpClient(engine))
client.restore("http://music", "token")
var received = 0
val path = client.downloadTo("sg-1") { channel ->
val buffer = ByteArray(8 * 1024)
while (true) {
val read = channel.readAvailable(buffer)
if (read < 0) break
received += read
}
"saved.mp3"
}
assertEquals("saved.mp3", path)
assertEquals(payload.size, received)
}
@Test
fun `cache round-trips moods and discards the old cache version`() = runTest {
val storage = MemoryStorage() val storage = MemoryStorage()
val cache = LibraryCache(storage) val cache = AppCache(storage)
assertNull(cache.loadSession()) assertNull(cache.loadSession())
val mood = Mood(
id = "mo-1",
name = "Focus",
createdAt = "now",
changedAt = "now",
songCount = 2,
)
cache.save( cache.save(
CachedState( CachedState(
serverUrl = "http://localhost:8080", serverUrl = "http://localhost:8080",
userName = "alice", userName = "alice",
revision = "2026-11-14T00:00:00Z", moods = listOf(mood),
songs = emptyList(),
moods = emptyList(),
), ),
) )
val loaded = cache.load() val loaded = cache.load()
assertEquals("2026-11-14T00:00:00Z", loaded.revision) assertEquals(listOf("mo-1"), loaded.moods.map { it.id })
assertEquals("alice", loaded.userName) assertEquals("alice", loaded.userName)
storage.write("mood-cache.json", """{"version":1,"songs":[{"id":"old"}]}""")
val invalidated = cache.load()
assertTrue(invalidated.moods.isEmpty())
assertEquals(3, invalidated.version)
} }
} }
@@ -1,12 +1,19 @@
package win.taptap.musicmanager.client package win.taptap.musicmanager.client
import io.ktor.client.engine.mock.MockEngine import io.ktor.client.engine.mock.MockEngine
import io.ktor.client.engine.mock.respond
import io.ktor.client.engine.mock.respondError import io.ktor.client.engine.mock.respondError
import io.ktor.http.HttpHeaders
import io.ktor.http.HttpStatusCode import io.ktor.http.HttpStatusCode
import io.ktor.http.headersOf
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.delay
import kotlinx.coroutines.test.TestScope
import kotlinx.coroutines.test.advanceTimeBy import kotlinx.coroutines.test.advanceTimeBy
import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runCurrent
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.withContext
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertFalse import kotlin.test.assertFalse
@@ -15,9 +22,12 @@ import kotlin.test.assertNull
import kotlin.test.assertTrue import kotlin.test.assertTrue
import win.taptap.musicmanager.client.api.ApiClient import win.taptap.musicmanager.client.api.ApiClient
import win.taptap.musicmanager.client.api.Song import win.taptap.musicmanager.client.api.Song
import win.taptap.musicmanager.client.api.User
import win.taptap.musicmanager.client.api.configuredHttpClient import win.taptap.musicmanager.client.api.configuredHttpClient
import win.taptap.musicmanager.client.data.AppCache
import win.taptap.musicmanager.client.data.CachedState import win.taptap.musicmanager.client.data.CachedState
import win.taptap.musicmanager.client.data.LibraryCache import win.taptap.musicmanager.client.data.PlaybackSnapshot
import win.taptap.musicmanager.client.data.SessionState
import win.taptap.musicmanager.client.playback.AudioPlayer import win.taptap.musicmanager.client.playback.AudioPlayer
import win.taptap.musicmanager.client.store.AppStore import win.taptap.musicmanager.client.store.AppStore
@@ -25,48 +35,203 @@ import win.taptap.musicmanager.client.store.AppStore
class AppStoreTest { class AppStoreTest {
@Test @Test
fun `play all queues the whole library and starts playback`() = runTest { fun `playing a mood starts the server session and the first track`() = runTest {
val storage = MemoryStorage() val storage = MemoryStorage()
val cache = LibraryCache(storage) val cache = AppCache(storage)
val songs = listOf(song("a"), song("b"), song("c")) cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
cache.save(CachedState(serverUrl = "http://music", songs = songs))
val player = FakePlayer() val player = FakePlayer()
val store = store(storage, cache, player) val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/me" -> respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods" -> respond("""{"moods":[${moodJson(1)}]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1" -> respond(detailJson(listOf("a")), HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1/preview" -> respond("""{"songs":[]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1/sessions" -> respond(
"""{"id":"s1","moodId":"mo-1","moodName":"Focus","startedAt":"now",
"queue":[${songJson("a")}]}""",
HttpStatusCode.Created,
jsonHeaders,
)
else -> respondError(HttpStatusCode.NotFound)
}
}
val store = store(storage, cache, player, engine)
runCurrent() runCurrent()
store.openMood("mo-1")
awaitState { store.state.value.selectedMood != null }
store.playAll() store.playMood("mo-1")
runCurrent() awaitState { store.state.value.current != null }
val state = store.state.value val state = store.state.value
val current = assertNotNull(state.current) assertEquals("a", state.current?.id)
assertEquals("s1", state.session?.id)
assertTrue(state.playing) assertTrue(state.playing)
assertEquals(listOf(current.id), player.played) assertEquals(listOf("a"), player.played)
assertEquals(2, state.queue.size)
assertEquals(songs.map { it.id }.toSet(), (state.queue + current).map { it.id }.toSet())
store.release() store.release()
} }
@Test @Test
fun `play all reports an empty library instead of starting playback`() = runTest { fun `an empty mood is rejected before any request`() = runTest {
val storage = MemoryStorage() val storage = MemoryStorage()
val cache = LibraryCache(storage) val cache = AppCache(storage)
cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
val player = FakePlayer() val player = FakePlayer()
val store = store(storage, cache, player) val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/me" -> respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods" -> respond("""{"moods":[${moodJson(0)}]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1" -> respond(detailJson(emptyList()), HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1/preview" -> respond("""{"songs":[]}""", HttpStatusCode.OK, jsonHeaders)
else -> respondError(HttpStatusCode.NotFound)
}
}
val store = store(storage, cache, player, engine)
runCurrent() runCurrent()
store.openMood("mo-1")
awaitState { store.state.value.selectedMood != null }
store.playAll() store.playMood("mo-1")
runCurrent() awaitState { store.state.value.message != null }
assertNull(store.state.value.current) assertNull(store.state.value.current)
assertTrue(player.played.isEmpty()) assertTrue(player.played.isEmpty())
assertTrue(store.state.value.messageIsError) assertTrue(store.state.value.messageIsError)
assertTrue(store.state.value.message!!.contains("at least one song"))
store.release()
}
@Test
fun `search is debounced and adding a result targets the chosen mood`() = runTest {
val storage = MemoryStorage()
val cache = AppCache(storage)
cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/me" -> respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods" -> respond("""{"moods":[${moodJson(0)}]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/search" -> respond(
"""{"results":[{"source":"youtube","externalId":"v1","title":"Fresh",
"artist":"Artist","duration":180,"downloaded":false}]}""",
HttpStatusCode.OK,
jsonHeaders,
)
"/api/v1/moods/mo-1/songs" -> respond(
"""{"detail":${detailJson(emptyList())},"added":false,"downloading":true}""",
HttpStatusCode.Accepted,
jsonHeaders,
)
else -> respondError(HttpStatusCode.NotFound)
}
}
val store = store(storage, cache, FakePlayer(), engine)
runCurrent()
awaitState { store.state.value.moods.isNotEmpty() }
store.openSearch("mo-1")
store.setSearchQuery("fresh")
advanceTimeBy(350)
runCurrent()
awaitState { store.state.value.searchResults.isNotEmpty() }
assertEquals("v1", store.state.value.searchResults.single().externalId)
store.addSearchResult(store.state.value.searchResults.single())
awaitState { store.state.value.message != null }
assertEquals("Downloading for Focus", store.state.value.message)
store.release()
}
@Test
fun `adding a recommendation refreshes the selected mood`() = runTest {
val storage = MemoryStorage()
val cache = AppCache(storage)
cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/me" -> respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods" -> respond("""{"moods":[${moodJson(1)}]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1" -> respond(
detailJson(listOf("a"), recommendationJson()),
HttpStatusCode.OK,
jsonHeaders,
)
"/api/v1/moods/mo-1/preview" -> respond("""{"songs":[]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1/recommendations/v1/add" -> respond(
"""{"detail":${detailJson(listOf("a"))},
"recommendation":${recommendationJson(state = "added", songId = "a")}}""",
HttpStatusCode.OK,
jsonHeaders,
)
else -> respondError(HttpStatusCode.NotFound)
}
}
val store = store(storage, cache, FakePlayer(), engine)
runCurrent()
store.openMood("mo-1")
awaitState { store.state.value.selectedMood != null }
store.addRecommendation("v1")
awaitState { store.state.value.message != null }
val detail = assertNotNull(store.state.value.selectedMood)
assertTrue(detail.recommendations.isEmpty())
assertEquals(1, detail.mood.songCount)
assertEquals("Added to Focus", store.state.value.message)
store.release()
}
@Test
fun `changing the mood source re-runs the search against the new catalog`() = runTest {
val storage = MemoryStorage()
val cache = AppCache(storage)
cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
val engine = MockEngine { request ->
when {
request.url.encodedPath == "/api/v1/me" ->
respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
request.url.encodedPath == "/api/v1/moods" ->
respond("""{"moods":[${moodJson(0)}]}""", HttpStatusCode.OK, jsonHeaders)
request.method.value == "PATCH" && request.url.encodedPath == "/api/v1/moods/mo-1" ->
respond(detailJson(emptyList(), source = "deezer"), HttpStatusCode.OK, jsonHeaders)
request.url.encodedPath == "/api/v1/moods/mo-1" ->
respond(detailJson(emptyList()), HttpStatusCode.OK, jsonHeaders)
request.url.encodedPath == "/api/v1/moods/mo-1/preview" ->
respond("""{"songs":[]}""", HttpStatusCode.OK, jsonHeaders)
request.url.encodedPath == "/api/v1/search" -> {
val source = request.url.parameters["source"]
val body = if (source == "deezer") {
"""{"results":[{"source":"deezer","externalId":"67238732",
"title":"Instant Crush","artist":"Daft Punk","duration":337,
"downloaded":false}]}"""
} else {
"""{"results":[]}"""
}
respond(body, HttpStatusCode.OK, jsonHeaders)
}
else -> respondError(HttpStatusCode.NotFound)
}
}
val store = store(storage, cache, FakePlayer(), engine)
runCurrent()
store.openMood("mo-1")
awaitState { store.state.value.selectedMood != null }
store.openSearch("mo-1")
store.setSearchQuery("daft")
advanceTimeBy(350)
runCurrent()
store.setMoodSource("mo-1", "deezer")
awaitState { store.state.value.searchResults.any { it.source == "deezer" } }
assertEquals("deezer", store.state.value.moods.first { it.id == "mo-1" }.source)
assertEquals("67238732", store.state.value.searchResults.single().externalId)
store.release() store.release()
} }
@Test @Test
fun `sleep timer pauses playback when it expires`() = runTest { fun `sleep timer pauses playback when it expires`() = runTest {
val storage = MemoryStorage() val storage = MemoryStorage()
val cache = LibraryCache(storage) val cache = AppCache(storage)
val player = FakePlayer() val player = FakePlayer()
val store = store(storage, cache, player) val store = store(storage, cache, player)
runCurrent() runCurrent()
@@ -81,72 +246,207 @@ class AppStoreTest {
advanceTimeBy(60_000) advanceTimeBy(60_000)
runCurrent() runCurrent()
val state = store.state.value assertFalse(store.state.value.playing)
assertFalse(state.playing) assertNull(store.state.value.sleepTimerRemainingSeconds)
assertNull(state.sleepTimerRemainingSeconds)
assertTrue(player.paused) assertTrue(player.paused)
store.release() store.release()
} }
@Test @Test
fun `turning the sleep timer off keeps playback running`() = runTest { fun `bootstrap restores the saved queue and resumes on play`() = runTest {
val storage = MemoryStorage() val storage = MemoryStorage()
val cache = LibraryCache(storage) val cache = AppCache(storage)
cache.savePlayback(
PlaybackSnapshot(
queue = listOf(song("b")),
current = song("a"),
positionSeconds = 12.0,
),
)
val player = FakePlayer() val player = FakePlayer()
val store = store(storage, cache, player) val store = store(storage, cache, player)
runCurrent() runCurrent()
store.playSong(song("a")) assertEquals("a", store.state.value.current?.id)
assertEquals(listOf("b"), store.state.value.queue.map { it.id })
assertEquals(12.0, store.state.value.positionSeconds)
assertTrue(player.played.isEmpty())
store.togglePlayPause()
runCurrent() runCurrent()
store.setSleepTimer(30)
assertEquals(1_800L, store.state.value.sleepTimerRemainingSeconds)
store.setSleepTimer(null)
assertNull(store.state.value.sleepTimerRemainingSeconds)
advanceTimeBy(120_000)
runCurrent()
assertTrue(store.state.value.playing) assertTrue(store.state.value.playing)
assertEquals(listOf("a"), player.played)
assertEquals(12.0, player.seeks.last())
store.release() store.release()
} }
private fun kotlinx.coroutines.test.TestScope.store( @Test
fun `queue reordering and removal persist in the snapshot`() = runTest {
val storage = MemoryStorage()
val cache = AppCache(storage)
cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/me" -> respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods" -> respond("""{"moods":[${moodJson(3)}]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1" -> respond(
detailJson(listOf("a", "b", "c")),
HttpStatusCode.OK,
jsonHeaders,
)
"/api/v1/moods/mo-1/preview" -> respond("""{"songs":[]}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods/mo-1/sessions" -> respond(
"""{"id":"s1","moodId":"mo-1","moodName":"Focus","startedAt":"now",
"queue":[${songJson("a")},${songJson("b")},${songJson("c")}]}""",
HttpStatusCode.Created,
jsonHeaders,
)
else -> respondError(HttpStatusCode.NotFound)
}
}
val store = store(storage, cache, FakePlayer(), engine)
runCurrent()
store.openMood("mo-1")
awaitState { store.state.value.selectedMood != null }
store.playMood("mo-1")
awaitState { store.state.value.current?.id == "a" }
assertEquals(listOf("b", "c"), store.state.value.queue.map { it.id })
store.moveInQueue(1, 0)
assertEquals(listOf("c", "b"), store.state.value.queue.map { it.id })
store.removeFromQueue(0)
assertEquals(listOf("b"), store.state.value.queue.map { it.id })
assertEquals(listOf("b"), cache.loadPlayback()?.queue?.map { it.id })
store.release()
}
@Test
fun `logout clears the session and the mood cache`() = runTest {
val storage = MemoryStorage()
val cache = AppCache(storage)
cache.saveSession(SessionState("http://music", "token", User("alice", admin = false)))
cache.save(
CachedState(
serverUrl = "http://music",
userName = "alice",
moods = emptyList(),
),
)
val engine = MockEngine { request ->
when (request.url.encodedPath) {
"/api/v1/auth/logout" -> respond("", HttpStatusCode.NoContent)
"/api/v1/me" -> respond("""{"name":"alice","admin":false}""", HttpStatusCode.OK, jsonHeaders)
"/api/v1/moods" -> respond("""{"moods":[]}""", HttpStatusCode.OK, jsonHeaders)
else -> respondError(HttpStatusCode.NotFound)
}
}
val store = store(storage, cache, FakePlayer(), engine)
runCurrent()
awaitState { store.state.value.authenticated }
store.logout()
awaitState { !store.state.value.authenticated }
assertNull(cache.loadSession())
assertTrue(cache.load().moods.isEmpty())
store.release()
}
private suspend fun TestScope.awaitState(predicate: () -> Boolean) {
repeat(500) {
runCurrent()
if (predicate()) return
withContext(Dispatchers.Default) { delay(10) }
}
throw AssertionError("state did not settle")
}
private val jsonHeaders = headersOf(HttpHeaders.ContentType, "application/json")
private fun songJson(id: String) = """
{"id":"$id","source":"youtube","externalId":"video-$id","title":"Song $id",
"artist":"Artist","album":"Album","duration":180,"bitRate":320,"size":1000,"suffix":"mp3"}
""".trimIndent()
private fun moodJson(songCount: Int, source: String = "youtube") = """
{"id":"mo-1","name":"Focus","source":"$source","collectionPercent":50,
"recommendationPercent":50,"recommendationCount":10,"refreshHours":24,
"createdAt":"2026-01-01T00:00:00Z","changedAt":"2026-01-01T00:00:00Z",
"songCount":$songCount}
""".trimIndent()
private fun recommendationJson(state: String = "new", songId: String? = null) = """
{"source":"youtube","externalId":"v1","title":"Pick","artist":"Artist",
"duration":180,"state":"$state",
${songId?.let { "\"song\":${songJson(it)}," } ?: ""}
"firstSeen":"2026-01-01T00:00:00Z","lastSeen":"2026-01-01T00:00:00Z"}
""".trimIndent()
private fun detailJson(
songs: List<String>,
recommendation: String? = null,
source: String = "youtube",
) = """
{"mood":${moodJson(songs.size, source)},
"songs":[${songs.joinToString(",") { """{"song":${songJson(it)},"origin":"search","addedAt":"now"}""" }}],
"recommendations":${recommendation?.let { "[$it]" } ?: "[]"}}
""".trimIndent()
private fun song(id: String, duration: Int = 180) = Song(
id = id,
source = "youtube",
externalId = "video-$id",
title = "Song $id",
artist = "Artist",
album = "Album",
duration = duration,
bitRate = 320,
size = 1_000,
)
private fun TestScope.store(
storage: MemoryStorage, storage: MemoryStorage,
cache: LibraryCache, cache: AppCache,
player: AudioPlayer, player: AudioPlayer,
engine: MockEngine = MockEngine { respondError(HttpStatusCode.NotFound) },
): AppStore = AppStore( ): AppStore = AppStore(
scope = this, // Background scope so leftover store jobs (reconnect loops, refreshes)
api = ApiClient(configuredHttpClient(MockEngine { respondError(HttpStatusCode.NotFound) })), // are cancelled by runTest instead of failing with UncompletedCoroutinesError.
scope = backgroundScope,
api = ApiClient(configuredHttpClient(engine)),
storage = storage, storage = storage,
player = player, player = player,
cache = cache, cache = cache,
) )
private fun song(id: String) = Song(
id = id,
title = "Song $id",
artist = "Artist",
album = "Album",
albumId = "al-1",
duration = 180,
bitRate = 320,
size = 1_000,
suffix = "mp3",
folderId = 1,
relativePath = "$id.mp3",
updatedAt = "2026-01-01T00:00:00Z",
)
private class FakePlayer : AudioPlayer { private class FakePlayer : AudioPlayer {
val played = mutableListOf<String>() val played = mutableListOf<String>()
val seeks = mutableListOf<Double>()
var paused = false var paused = false
private set private set
private var playing = false private var playing = false
var position = 0.0
private var finished = false
override fun play(source: String, song: Song, local: Boolean, artworkUri: String?) { fun finish() {
finished = true
}
override fun play(
source: String,
song: Song,
local: Boolean,
artworkUri: String?,
artworkBytes: ByteArray?,
) {
played += song.id played += song.id
playing = true playing = true
paused = false paused = false
position = 0.0
finished = false
} }
override fun pause() { override fun pause() {
@@ -164,11 +464,14 @@ class AppStoreTest {
} }
override fun isPlaying(): Boolean = playing override fun isPlaying(): Boolean = playing
override fun isFinished(): Boolean = false override fun isFinished(): Boolean = finished
override fun positionSeconds(): Double = 0.0 override fun positionSeconds(): Double = position
override fun durationSeconds(): Double = 0.0 override fun durationSeconds(): Double = 0.0
override val canSeek: Boolean = false override val canSeek: Boolean = true
override fun seekTo(seconds: Double) = Unit override fun seekTo(seconds: Double) {
position = seconds
seeks += seconds
}
override fun release() { override fun release() {
playing = false playing = false
} }
@@ -5,6 +5,7 @@ import win.taptap.musicmanager.client.data.AppStorage
/** In-memory [AppStorage] for store and cache tests. */ /** In-memory [AppStorage] for store and cache tests. */
internal class MemoryStorage : AppStorage { internal class MemoryStorage : AppStorage {
private val files = mutableMapOf<String, String>() private val files = mutableMapOf<String, String>()
private val artwork = mutableMapOf<String, ByteArray>()
override fun read(name: String): String? = files[name] override fun read(name: String): String? = files[name]
@@ -18,7 +19,14 @@ internal class MemoryStorage : AppStorage {
override fun saveDownload(songId: String, bytes: ByteArray): String? = null override fun saveDownload(songId: String, bytes: ByteArray): String? = null
override fun downloadPath(songId: String): String? = null override fun downloadPath(songId: String): String? = null
override fun saveArtwork(songId: String, bytes: ByteArray): String? {
artwork[songId] = bytes
return "memory://$songId.jpg"
}
override fun artworkBytes(songId: String): ByteArray? = artwork[songId]
override fun listDownloads(): Map<String, Long> = emptyMap() override fun listDownloads(): Map<String, Long> = emptyMap()
override fun deleteDownload(songId: String) = Unit override fun deleteDownload(songId: String) {
artwork.remove(songId)
}
override fun storageUsedBytes(): Long = 0 override fun storageUsedBytes(): Long = 0
} }
@@ -15,7 +15,11 @@ import win.taptap.musicmanager.client.playback.AudioPlayer
/** /**
* Desktop playback through the MP3SPI decoder and a PCM line. Pause/resume is a * Desktop playback through the MP3SPI decoder and a PCM line. Pause/resume is a
* decoder loop gate, so no audio device is reopened. Seeking is not supported. * decoder loop gate, so no audio device is reopened.
*
* Seeking restarts the decoder at the requested position. Remote streams ask
* the server to transcode from that offset (`timeOffset`); local files skip the
* decoded PCM frames. Both keep the reported position aligned with the song.
* *
* Java Sound cannot open a line for the compressed MP3 format itself; the * Java Sound cannot open a line for the compressed MP3 format itself; the
* decoded stream has to be converted to PCM_SIGNED first. Opening the encoded * decoded stream has to be converted to PCM_SIGNED first. Opening the encoded
@@ -30,23 +34,56 @@ class DesktopAudioPlayer : AudioPlayer {
private var worker: Thread? = null private var worker: Thread? = null
private val lock = Object() private val lock = Object()
private var currentSource: String? = null
private var currentSong: Song? = null
private var currentLocal = false
private var currentArtwork: String? = null
@Volatile private var paused = false @Volatile private var paused = false
@Volatile private var stopped = false @Volatile private var stopped = false
@Volatile private var finished = false @Volatile private var finished = false
@Volatile private var framesRead = 0L @Volatile private var framesRead = 0L
@Volatile private var baseSeconds = 0.0
private var frameSize = 4 private var frameSize = 4
private var frameRate = 44_100f private var frameRate = 44_100f
private var duration = 0.0 private var duration = 0.0
override fun play(source: String, song: Song, local: Boolean, artworkUri: String?) { override fun play(
source: String,
song: Song,
local: Boolean,
artworkUri: String?,
artworkBytes: ByteArray?,
) {
currentSource = source
currentSong = song
currentLocal = local
currentArtwork = artworkUri
start(source, song, local, startAtSeconds = 0.0)
}
private fun start(source: String, song: Song, local: Boolean, startAtSeconds: Double) {
stop() stop()
finished = false finished = false
paused = false paused = false
stopped = false stopped = false
framesRead = 0 framesRead = 0
baseSeconds = startAtSeconds.coerceAtLeast(0.0)
duration = song.duration.toDouble() duration = song.duration.toDouble()
val raw = if (local) FileInputStream(File(source)) else URI(source).toURL().openStream() val requestSource = if (!local && startAtSeconds > 0) {
withTimeOffset(source, startAtSeconds)
} else {
source
}
val raw = if (local) {
FileInputStream(File(requestSource))
} else {
val connection = URI(requestSource).toURL().openConnection()
connection.connectTimeout = 15_000
connection.readTimeout = 30_000
connection.getInputStream()
}
val buffered = BufferedInputStream(raw, 128 * 1024) val buffered = BufferedInputStream(raw, 128 * 1024)
input = buffered input = buffered
val encoded = AudioSystem.getAudioInputStream(buffered) val encoded = AudioSystem.getAudioInputStream(buffered)
@@ -55,6 +92,13 @@ class DesktopAudioPlayer : AudioPlayer {
frameSize = audio.format.frameSize.takeIf { it > 0 } ?: 4 frameSize = audio.format.frameSize.takeIf { it > 0 } ?: 4
frameRate = audio.format.frameRate.takeIf { it > 0 } ?: 44_100f frameRate = audio.format.frameRate.takeIf { it > 0 } ?: 44_100f
// A remote stream already starts at the whole-second offset; local
// files and the fractional part are skipped in the decoded PCM.
val skipSeconds = if (local) startAtSeconds else startAtSeconds - kotlin.math.floor(startAtSeconds)
if (skipSeconds > 0) {
skipPcm(audio, skipSeconds)
}
val info = javax.sound.sampled.DataLine.Info(SourceDataLine::class.java, audio.format) val info = javax.sound.sampled.DataLine.Info(SourceDataLine::class.java, audio.format)
val dataLine = AudioSystem.getLine(info) as SourceDataLine val dataLine = AudioSystem.getLine(info) as SourceDataLine
dataLine.open(audio.format) dataLine.open(audio.format)
@@ -89,6 +133,23 @@ class DesktopAudioPlayer : AudioPlayer {
} }
} }
private fun skipPcm(audio: AudioInputStream, seconds: Double) {
var remaining = (seconds * frameRate * frameSize).toLong().coerceAtLeast(0L)
val buffer = ByteArray(16 * 1024)
while (remaining > 0 && !stopped) {
val skipped = runCatching { audio.skip(remaining) }.getOrDefault(0L)
if (skipped > 0) {
remaining -= skipped
} else {
val read = runCatching {
audio.read(buffer, 0, minOf(buffer.size.toLong(), remaining).toInt())
}.getOrDefault(-1)
if (read <= 0) break
remaining -= read
}
}
}
override fun pause() { override fun pause() {
paused = true paused = true
} }
@@ -122,19 +183,32 @@ class DesktopAudioPlayer : AudioPlayer {
override fun isFinished(): Boolean = finished override fun isFinished(): Boolean = finished
override fun positionSeconds(): Double { override fun positionSeconds(): Double {
val seconds = framesRead.toDouble() / frameSize / frameRate val seconds = baseSeconds + framesRead.toDouble() / frameSize / frameRate
return seconds.coerceIn(0.0, duration.takeIf { it > 0 } ?: seconds) return seconds.coerceIn(0.0, duration.takeIf { it > 0 } ?: seconds)
} }
override fun durationSeconds(): Double = duration override fun durationSeconds(): Double = duration
override val canSeek: Boolean = false override val canSeek: Boolean = true
override fun seekTo(seconds: Double) = Unit override fun seekTo(seconds: Double) {
val source = currentSource ?: return
val song = currentSong ?: return
val wasPaused = paused
start(source, song, currentLocal, seconds.coerceAtLeast(0.0))
if (wasPaused) pause()
}
override fun release() { override fun release() {
stop() stop()
} }
/** Adds the server's `timeOffset` parameter, replacing an earlier one. */
private fun withTimeOffset(source: String, seconds: Double): String {
val cleaned = source.replace(Regex("[?&]timeOffset=\\d+"), "")
val separator = if (cleaned.contains('?')) "&" else "?"
return "$cleaned${separator}timeOffset=${seconds.toInt()}"
}
} }
/** /**
@@ -4,6 +4,7 @@ import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.toComposeImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap
import io.ktor.client.engine.HttpClientEngine import io.ktor.client.engine.HttpClientEngine
import io.ktor.client.engine.cio.CIO import io.ktor.client.engine.cio.CIO
import io.ktor.utils.io.readAvailable
import java.io.File import java.io.File
import win.taptap.musicmanager.client.data.AppStorage import win.taptap.musicmanager.client.data.AppStorage
import win.taptap.musicmanager.client.playback.AudioPlayer import win.taptap.musicmanager.client.playback.AudioPlayer
@@ -32,7 +33,7 @@ class DesktopStorage : AppStorage {
override fun write(name: String, text: String) { override fun write(name: String, text: String) {
root.mkdirs() root.mkdirs()
File(root, name).writeText(text) atomicWrite(File(root, name)) { it.writeText(text) }
} }
override fun delete(name: String) { override fun delete(name: String) {
@@ -42,13 +43,53 @@ class DesktopStorage : AppStorage {
override fun saveDownload(songId: String, bytes: ByteArray): String? { override fun saveDownload(songId: String, bytes: ByteArray): String? {
downloads.mkdirs() downloads.mkdirs()
val file = File(downloads, "${safeName(songId)}.mp3") val file = File(downloads, "${safeName(songId)}.mp3")
file.writeBytes(bytes) atomicWrite(file) { it.writeBytes(bytes) }
return file.absolutePath return file.absolutePath
} }
override suspend fun saveDownloadStream(
songId: String,
source: io.ktor.utils.io.ByteReadChannel,
): String? {
downloads.mkdirs()
val target = File(downloads, "${safeName(songId)}.mp3")
val temp = File(downloads, "${safeName(songId)}.mp3.part")
try {
temp.outputStream().use { output ->
val buffer = ByteArray(64 * 1024)
while (true) {
val read = source.readAvailable(buffer)
if (read < 0) break
if (read > 0) output.write(buffer, 0, read)
}
output.flush()
}
if (temp.length() == 0L) error("empty download")
if (!temp.renameTo(target)) {
temp.copyTo(target, overwrite = true)
temp.delete()
}
return target.absolutePath
} catch (t: Throwable) {
temp.delete()
throw t
}
}
override fun downloadPath(songId: String): String? = override fun downloadPath(songId: String): String? =
File(downloads, "${safeName(songId)}.mp3").takeIf { it.isFile }?.absolutePath File(downloads, "${safeName(songId)}.mp3").takeIf { it.isFile }?.absolutePath
override fun saveArtwork(songId: String, bytes: ByteArray): String? {
if (bytes.isEmpty()) return null
downloads.mkdirs()
val file = File(downloads, "${safeName(songId)}.jpg")
atomicWrite(file) { it.writeBytes(bytes) }
return file.absolutePath
}
override fun artworkBytes(songId: String): ByteArray? =
File(downloads, "${safeName(songId)}.jpg").takeIf { it.isFile }?.readBytes()
override fun listDownloads(): Map<String, Long> = override fun listDownloads(): Map<String, Long> =
downloads.listFiles() downloads.listFiles()
?.filter { it.isFile && it.extension == "mp3" } ?.filter { it.isFile && it.extension == "mp3" }
@@ -57,11 +98,26 @@ class DesktopStorage : AppStorage {
override fun deleteDownload(songId: String) { override fun deleteDownload(songId: String) {
File(downloads, "${safeName(songId)}.mp3").delete() File(downloads, "${safeName(songId)}.mp3").delete()
File(downloads, "${safeName(songId)}.jpg").delete()
} }
override fun storageUsedBytes(): Long = override fun storageUsedBytes(): Long =
downloads.listFiles()?.sumOf { it.length() } ?: 0L downloads.listFiles()?.sumOf { it.length() } ?: 0L
private fun atomicWrite(target: File, write: (File) -> Unit) {
val temp = File(target.parentFile, "${target.name}.part")
try {
write(temp)
if (!temp.renameTo(target)) {
temp.copyTo(target, overwrite = true)
temp.delete()
}
} catch (t: Throwable) {
temp.delete()
throw t
}
}
private fun safeName(songId: String): String = private fun safeName(songId: String): String =
songId.map { if (it.isLetterOrDigit() || it == '-' || it == '_') it else '_' }.joinToString("") songId.map { if (it.isLetterOrDigit() || it == '-' || it == '_') it else '_' }.joinToString("")
} }
@@ -29,6 +29,12 @@ class WebStorage : AppStorage {
override fun saveDownload(songId: String, bytes: ByteArray): String? = null override fun saveDownload(songId: String, bytes: ByteArray): String? = null
override fun downloadPath(songId: String): String? = null override fun downloadPath(songId: String): String? = null
override suspend fun saveDownloadStream(
songId: String,
source: io.ktor.utils.io.ByteReadChannel,
): String? = null
override fun saveArtwork(songId: String, bytes: ByteArray): String? = null
override fun artworkBytes(songId: String): ByteArray? = null
override fun listDownloads(): Map<String, Long> = emptyMap() override fun listDownloads(): Map<String, Long> = emptyMap()
override fun deleteDownload(songId: String) = Unit override fun deleteDownload(songId: String) = Unit
override fun storageUsedBytes(): Long = 0L override fun storageUsedBytes(): Long = 0L
@@ -12,7 +12,13 @@ class WebAudioPlayer : AudioPlayer {
preload = "auto" preload = "auto"
} }
override fun play(source: String, song: Song, local: Boolean, artworkUri: String?) { override fun play(
source: String,
song: Song,
local: Boolean,
artworkUri: String?,
artworkBytes: ByteArray?,
) {
audio.src = source audio.src = source
audio.play() audio.play()
} }
+68
View File
@@ -0,0 +1,68 @@
# Mood-first redesign — client notes
The canonical design and decision log lives in the server repo:
- local: `/home/taptap/AudioManager/docs/design/mood-first.md`
- web: https://gitea.tap-tap.win/TapTap/AudioManager/src/branch/main/docs/design/mood-first.md
Read that first. This file only records the client-side consequences.
## What the client becomes
- Moods are the only content model. No Library, no Longform, no mounted music.
- All music is downloaded on the server from Deezer or YouTube Music; the client searches and
adds songs to a mood.
- A mood has **songs** (collection) and **recommendations** (auto-downloaded,
playable in radio, not permanent until added).
- Playback mixes collection and ready recommendations using `collectionPercent`.
- A mood needs at least one song to play.
## Screens
`Moods | MoodDetail | Search | Downloads | Settings`
- **Moods**: mood list, create, global search.
- **MoodDetail**: songs, add music, recommendations (Add / Not interested /
Retry), next batch, mood settings (query, genres, collectionPercent,
recommendationCount 0–30, refreshHours).
- **Search**: remote Deezer/YouTube Music search, results over 10 minutes hidden, add to the
current or a chosen mood, already-downloaded/in-mood badges, paste URL.
- **Downloads**: device-side offline files, delete/clear, storage usage.
- **Settings**: server/account/devices/logout (no scan UI).
Remove `LibraryScreen` and all longform UI.
## State/API changes
- Remove `library`, `longform`, `longformResults`, `longformProgress`,
`musicResults`, local `searchResults`, `playAll`, `playLongform*`,
`resumeLongform`, longform progress reporting.
- Add remote search state (`searchResults`, `searchTargetMoodId`), add/remove
song, recommendation add/reject/retry, mood song counts.
- `CachedState` becomes version 2 with moods + mood details only; invalidate old
caches.
- `SongDto` gains `videoId` and `thumbnail`; loses folder/album-id/path/genres.
- Cover art is song-keyed: `coverUrl(songId)`.
- Playback snapshot/history, desktop seek, Android media session, sleep timer
and device downloads remain.
- Offline mood playback uses device downloads and cached mood details.
## Implementation status (2026-11-15)
Implemented. Concretely:
- `Models.kt` reflects the mood-first DTOs: `Song(videoId, thumbnail)`,
`Mood(collectionPercent, recommendationCount, song counts)`,
`MoodSong`, `Recommendation(song, download)`, `SearchResult`.
- `ApiClient` uses `/moods/{id}/songs`, `/search`, recommendation
`add|reject|retry`, and `/songs/{id}/cover`.
- `AppCache` (version 2) stores moods and details only; old cache shapes are
discarded. Session and playback snapshots are kept.
- `AppStore` has `Moods | MoodDetail | Search | Downloads | Settings`, remote
Deezer/YouTube Music search with a target mood and a per-mood source, add/remove song, recommendation actions, offline
playback from device downloads, and no longform/library paths.
- The UI has a dedicated Search screen (mood picker, paste URL, downloaded
badges) and a Downloads screen. Mood Detail shows songs, add music,
recommendation states and the new options. The player keeps drag-to-reorder queue editing,
previous/seek and the sleep timer.
- Device downloads store covers by song id (`<songId>.jpg`).
+55
View File
@@ -0,0 +1,55 @@
#!/usr/bin/env bash
#
# Build a signed Android App Bundle for the Google Play internal testing track.
#
# Usage:
# scripts/build-release-aab.sh [versionCode] [versionName]
#
# Signing values are read by Gradle from the environment or local.properties:
# UPLOAD_STORE_FILE absolute path to the upload keystore
# UPLOAD_STORE_PASSWORD
# UPLOAD_KEY_ALIAS
# UPLOAD_KEY_PASSWORD
#
# Play requires a versionCode that is higher than every previous upload.
set -euo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
cd "$ROOT"
GRADLE="${GRADLE:-gradle}"
AAB="composeApp/build/outputs/bundle/release/composeApp-release.aab"
prop() {
local key="$1"
[ -f local.properties ] || return 0
grep -E "^${key}=" local.properties | tail -1 | cut -d= -f2-
}
if [ -z "${ANDROID_KEYSTORE_PATH:-}" ] && [ -z "$(prop UPLOAD_STORE_FILE)" ]; then
echo "No upload key configured: set UPLOAD_STORE_FILE in local.properties" >&2
echo "or ANDROID_KEYSTORE_PATH in the environment." >&2
exit 1
fi
VERSION_CODE="${1:-${VERSION_CODE:-$(prop VERSION_CODE)}}"
VERSION_NAME="${2:-${VERSION_NAME:-$(prop VERSION_NAME)}}"
VERSION_CODE="${VERSION_CODE:-1}"
VERSION_NAME="${VERSION_NAME:-0.1.0}"
export VERSION_CODE VERSION_NAME
export ANDROID_HOME="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-$HOME/Android/Sdk}}"
echo "Building AAB versionCode=$VERSION_CODE versionName=$VERSION_NAME"
"$GRADLE" :composeApp:bundleRelease --console=plain
if ! jarsigner -verify "$AAB" >/dev/null 2>&1; then
echo "AAB is not signed; check the upload keystore settings." >&2
exit 1
fi
echo
echo "Signed bundle: $ROOT/$AAB"
sha256sum "$AAB"
echo
echo "Upload it to Play Console > Testing > Internal testing > Create new release."
+2 -2
View File
@@ -14,8 +14,8 @@ let
node = pkgs.nodejs_22; node = pkgs.nodejs_22;
androidPackages = pkgs.androidenv.composeAndroidPackages { androidPackages = pkgs.androidenv.composeAndroidPackages {
platformVersions = [ "35" ]; platformVersions = [ "36" ];
buildToolsVersions = [ "35.0.0" ]; buildToolsVersions = [ "36.0.0" ];
includeEmulator = false; includeEmulator = false;
includeSystemImages = false; includeSystemImages = false;
includeNDK = false; includeNDK = false;