From 4c978efa8020253fa39ee98c5101a9929462e731 Mon Sep 17 00:00:00 2001 From: Yuriy Panov Date: Fri, 23 Oct 2026 10:07:16 +0600 Subject: [PATCH] Split the shared code into a core module The Yandex Music client, the player, the app state and the stores move from the TV app to :core (it.panov.musyx.*), so a phone app can build on them. The TV app becomes :tv with the same application id. CoverHues, SessionPlayer and the strings the state layer shows move with them; LRCLIB's user agent is set by each app. Co-Authored-By: Claude Opus 5.5 --- README.md | 16 +++-- build.gradle.kts | 1 + core/build.gradle.kts | 36 ++++++++++ core/consumer-rules.pro | 1 + .../src/main/java/it/panov/musyx}/api/Auth.kt | 2 +- .../main/java/it/panov/musyx/api/CoverHues.kt | 19 +++++ .../java/it/panov/musyx}/api/Credentials.kt | 2 +- .../src/main/java/it/panov/musyx}/api/Json.kt | 2 +- .../main/java/it/panov/musyx}/api/Lrclib.kt | 9 +-- .../main/java/it/panov/musyx}/api/Lyrics.kt | 2 +- .../main/java/it/panov/musyx}/api/Models.kt | 3 +- .../main/java/it/panov/musyx}/api/Signing.kt | 2 +- .../java/it/panov/musyx}/api/Transport.kt | 2 +- .../src/main/java/it/panov/musyx}/api/Wave.kt | 2 +- .../main/java/it/panov/musyx}/api/YmClient.kt | 2 +- .../main/java/it/panov/musyx}/api/YmError.kt | 2 +- .../it/panov/musyx}/data/CredentialStore.kt | 4 +- .../it/panov/musyx}/data/SettingsStore.kt | 2 +- .../panov/musyx}/player/AesCtrDataSource.kt | 2 +- .../java/it/panov/musyx}/player/ExoEngine.kt | 10 +-- .../panov/musyx}/player/PlaybackController.kt | 14 ++-- .../java/it/panov/musyx}/player/PlayerCore.kt | 14 ++-- .../main/java/it/panov/musyx}/player/Queue.kt | 2 +- .../it/panov/musyx/player/SessionPlayer.kt | 48 ++----------- .../java/it/panov/musyx}/state/AppState.kt | 68 +++++++++--------- .../main/java/it/panov/musyx}/state/Common.kt | 8 +-- .../main/java/it/panov/musyx}/state/Route.kt | 4 +- .../java/it/panov/musyx}/state/SearchState.kt | 10 +-- .../java/it/panov/musyx}/state/SignInState.kt | 14 ++-- core/src/main/res/values-ru/strings.xml | 61 ++++++++++++++++ core/src/main/res/values/strings.xml | 59 +++++++++++++++ .../test/java/it/panov/musyx}/api/ApiTest.kt | 6 +- .../java/it/panov/musyx/api/CoverHuesTest.kt | 18 +++++ .../it/panov/musyx}/player/PlayerCoreTest.kt | 12 ++-- .../java/it/panov/musyx}/player/QueueTest.kt | 2 +- .../java/it/panov/musyx}/state/StateTest.kt | 6 +- gradle/libs.versions.toml | 2 + settings.gradle.kts | 2 +- tool/make_tv_assets.py | 4 +- tool/svg_to_vector.py | 4 +- {app => tv}/build.gradle.kts | 10 +-- {app => tv}/lint.xml | 0 {app => tv}/proguard-rules.pro | 0 {app => tv}/src/main/AndroidManifest.xml | 0 .../java/it/panov/musyx/tv/MainActivity.kt | 6 +- .../src/main/java/it/panov/musyx/tv/Musyx.kt | 12 +++- .../panov/musyx/tv/player/PlaybackService.kt | 44 ++++++++++++ .../main/java/it/panov/musyx/tv/ui/Format.kt | 12 ++-- .../java/it/panov/musyx/tv/ui/MusyxApp.kt | 6 +- .../panov/musyx/tv/ui/components/Controls.kt | 0 .../it/panov/musyx/tv/ui/components/Media.kt | 0 .../it/panov/musyx/tv/ui/components/Status.kt | 2 +- .../it/panov/musyx/tv/ui/components/Tracks.kt | 10 +-- .../it/panov/musyx/tv/ui/screens/Common.kt | 22 +++--- .../it/panov/musyx/tv/ui/screens/Detail.kt | 20 +++--- .../it/panov/musyx/tv/ui/screens/HomeWave.kt | 18 ++--- .../it/panov/musyx/tv/ui/screens/Library.kt | 12 ++-- .../it/panov/musyx/tv/ui/screens/Player.kt | 22 +++--- .../panov/musyx/tv/ui/screens/ScreenSaver.kt | 10 +-- .../it/panov/musyx/tv/ui/screens/Search.kt | 10 +-- .../musyx/tv/ui/screens/SessionScreens.kt | 4 +- .../it/panov/musyx/tv/ui/screens/Settings.kt | 12 ++-- .../it/panov/musyx/tv/ui/screens/Sheets.kt | 8 +-- .../java/it/panov/musyx/tv/ui/theme/Theme.kt | 17 ----- .../src/main/res/drawable-xhdpi/banner.png | Bin .../src/main/res/drawable/ic_audio_lines.xml | 0 {app => tv}/src/main/res/drawable/ic_ban.xml | 0 .../src/main/res/drawable/ic_check.xml | 0 .../src/main/res/drawable/ic_chevron_left.xml | 0 .../main/res/drawable/ic_chevron_right.xml | 0 .../src/main/res/drawable/ic_clock_3.xml | 0 {app => tv}/src/main/res/drawable/ic_copy.xml | 0 .../src/main/res/drawable/ic_disc_3.xml | 0 .../src/main/res/drawable/ic_ellipsis.xml | 0 .../src/main/res/drawable/ic_globe.xml | 0 .../main/res/drawable/ic_grip_vertical.xml | 0 .../src/main/res/drawable/ic_heart.xml | 0 .../src/main/res/drawable/ic_heart_fill.xml | 0 .../src/main/res/drawable/ic_house.xml | 0 .../src/main/res/drawable/ic_library.xml | 0 .../src/main/res/drawable/ic_list_music.xml | 0 {app => tv}/src/main/res/drawable/ic_lock.xml | 0 .../src/main/res/drawable/ic_log_out.xml | 0 .../src/main/res/drawable/ic_mic_vocal.xml | 0 .../src/main/res/drawable/ic_pause.xml | 0 .../src/main/res/drawable/ic_pause_fill.xml | 0 .../src/main/res/drawable/ic_pencil.xml | 0 {app => tv}/src/main/res/drawable/ic_play.xml | 0 .../src/main/res/drawable/ic_play_fill.xml | 0 {app => tv}/src/main/res/drawable/ic_plus.xml | 0 .../src/main/res/drawable/ic_podcast.xml | 0 .../src/main/res/drawable/ic_repeat.xml | 0 .../src/main/res/drawable/ic_repeat_1.xml | 0 .../src/main/res/drawable/ic_search.xml | 0 .../src/main/res/drawable/ic_settings.xml | 0 .../src/main/res/drawable/ic_shuffle.xml | 0 .../src/main/res/drawable/ic_skip_back.xml | 0 .../src/main/res/drawable/ic_skip_forward.xml | 0 .../res/drawable/ic_sliders_horizontal.xml | 0 .../src/main/res/drawable/ic_trash_2.xml | 0 .../src/main/res/drawable/ic_trending_up.xml | 0 .../src/main/res/drawable/ic_volume_2.xml | 0 .../src/main/res/drawable/ic_volume_x.xml | 0 {app => tv}/src/main/res/drawable/ic_x.xml | 0 .../src/main/res/font/onest_medium.ttf | Bin .../src/main/res/font/onest_regular.ttf | Bin .../src/main/res/font/onest_semibold.ttf | Bin .../src/main/res/font/unbounded_semibold.ttf | Bin .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../src/main/res/values-notnight/colors.xml | 0 .../src/main/res/values-ru/strings.xml | 57 --------------- {app => tv}/src/main/res/values/colors.xml | 0 {app => tv}/src/main/res/values/strings.xml | 55 -------------- {app => tv}/src/main/res/values/themes.xml | 0 {app => tv}/src/main/res/xml/backup_rules.xml | 0 .../main/res/xml/data_extraction_rules.xml | 0 .../it/panov/musyx/tv/ui/theme/ThemeTest.kt | 13 +--- 121 files changed, 464 insertions(+), 397 deletions(-) create mode 100644 core/build.gradle.kts create mode 100644 core/consumer-rules.pro rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Auth.kt (99%) create mode 100644 core/src/main/java/it/panov/musyx/api/CoverHues.kt rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Credentials.kt (98%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Json.kt (98%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Lrclib.kt (96%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Lyrics.kt (99%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Models.kt (99%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Signing.kt (98%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Transport.kt (99%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/Wave.kt (99%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/YmClient.kt (99%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/api/YmError.kt (98%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/data/CredentialStore.kt (97%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/data/SettingsStore.kt (98%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/player/AesCtrDataSource.kt (98%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/player/ExoEngine.kt (96%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/player/PlaybackController.kt (96%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/player/PlayerCore.kt (98%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/player/Queue.kt (99%) rename app/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt => core/src/main/java/it/panov/musyx/player/SessionPlayer.kt (58%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/state/AppState.kt (95%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/state/Common.kt (95%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/state/Route.kt (97%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/state/SearchState.kt (95%) rename {app/src/main/java/it/panov/musyx/tv => core/src/main/java/it/panov/musyx}/state/SignInState.kt (94%) create mode 100644 core/src/main/res/values-ru/strings.xml create mode 100644 core/src/main/res/values/strings.xml rename {app/src/test/java/it/panov/musyx/tv => core/src/test/java/it/panov/musyx}/api/ApiTest.kt (99%) create mode 100644 core/src/test/java/it/panov/musyx/api/CoverHuesTest.kt rename {app/src/test/java/it/panov/musyx/tv => core/src/test/java/it/panov/musyx}/player/PlayerCoreTest.kt (98%) rename {app/src/test/java/it/panov/musyx/tv => core/src/test/java/it/panov/musyx}/player/QueueTest.kt (99%) rename {app/src/test/java/it/panov/musyx/tv => core/src/test/java/it/panov/musyx}/state/StateTest.kt (95%) rename {app => tv}/build.gradle.kts (89%) rename {app => tv}/lint.xml (100%) rename {app => tv}/proguard-rules.pro (100%) rename {app => tv}/src/main/AndroidManifest.xml (100%) rename {app => tv}/src/main/java/it/panov/musyx/tv/MainActivity.kt (97%) rename {app => tv}/src/main/java/it/panov/musyx/tv/Musyx.kt (87%) create mode 100644 tv/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/Format.kt (94%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/MusyxApp.kt (99%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/components/Controls.kt (100%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/components/Media.kt (100%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/components/Status.kt (97%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/components/Tracks.kt (97%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/Common.kt (96%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/Detail.kt (96%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/HomeWave.kt (97%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/Library.kt (97%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/Player.kt (98%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/ScreenSaver.kt (98%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/Search.kt (98%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt (99%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt (97%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/screens/Sheets.kt (98%) rename {app => tv}/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt (93%) rename {app => tv}/src/main/res/drawable-xhdpi/banner.png (100%) rename {app => tv}/src/main/res/drawable/ic_audio_lines.xml (100%) rename {app => tv}/src/main/res/drawable/ic_ban.xml (100%) rename {app => tv}/src/main/res/drawable/ic_check.xml (100%) rename {app => tv}/src/main/res/drawable/ic_chevron_left.xml (100%) rename {app => tv}/src/main/res/drawable/ic_chevron_right.xml (100%) rename {app => tv}/src/main/res/drawable/ic_clock_3.xml (100%) rename {app => tv}/src/main/res/drawable/ic_copy.xml (100%) rename {app => tv}/src/main/res/drawable/ic_disc_3.xml (100%) rename {app => tv}/src/main/res/drawable/ic_ellipsis.xml (100%) rename {app => tv}/src/main/res/drawable/ic_globe.xml (100%) rename {app => tv}/src/main/res/drawable/ic_grip_vertical.xml (100%) rename {app => tv}/src/main/res/drawable/ic_heart.xml (100%) rename {app => tv}/src/main/res/drawable/ic_heart_fill.xml (100%) rename {app => tv}/src/main/res/drawable/ic_house.xml (100%) rename {app => tv}/src/main/res/drawable/ic_library.xml (100%) rename {app => tv}/src/main/res/drawable/ic_list_music.xml (100%) rename {app => tv}/src/main/res/drawable/ic_lock.xml (100%) rename {app => tv}/src/main/res/drawable/ic_log_out.xml (100%) rename {app => tv}/src/main/res/drawable/ic_mic_vocal.xml (100%) rename {app => tv}/src/main/res/drawable/ic_pause.xml (100%) rename {app => tv}/src/main/res/drawable/ic_pause_fill.xml (100%) rename {app => tv}/src/main/res/drawable/ic_pencil.xml (100%) rename {app => tv}/src/main/res/drawable/ic_play.xml (100%) rename {app => tv}/src/main/res/drawable/ic_play_fill.xml (100%) rename {app => tv}/src/main/res/drawable/ic_plus.xml (100%) rename {app => tv}/src/main/res/drawable/ic_podcast.xml (100%) rename {app => tv}/src/main/res/drawable/ic_repeat.xml (100%) rename {app => tv}/src/main/res/drawable/ic_repeat_1.xml (100%) rename {app => tv}/src/main/res/drawable/ic_search.xml (100%) rename {app => tv}/src/main/res/drawable/ic_settings.xml (100%) rename {app => tv}/src/main/res/drawable/ic_shuffle.xml (100%) rename {app => tv}/src/main/res/drawable/ic_skip_back.xml (100%) rename {app => tv}/src/main/res/drawable/ic_skip_forward.xml (100%) rename {app => tv}/src/main/res/drawable/ic_sliders_horizontal.xml (100%) rename {app => tv}/src/main/res/drawable/ic_trash_2.xml (100%) rename {app => tv}/src/main/res/drawable/ic_trending_up.xml (100%) rename {app => tv}/src/main/res/drawable/ic_volume_2.xml (100%) rename {app => tv}/src/main/res/drawable/ic_volume_x.xml (100%) rename {app => tv}/src/main/res/drawable/ic_x.xml (100%) rename {app => tv}/src/main/res/font/onest_medium.ttf (100%) rename {app => tv}/src/main/res/font/onest_regular.ttf (100%) rename {app => tv}/src/main/res/font/onest_semibold.ttf (100%) rename {app => tv}/src/main/res/font/unbounded_semibold.ttf (100%) rename {app => tv}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {app => tv}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {app => tv}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {app => tv}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {app => tv}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {app => tv}/src/main/res/values-notnight/colors.xml (100%) rename {app => tv}/src/main/res/values-ru/strings.xml (78%) rename {app => tv}/src/main/res/values/colors.xml (100%) rename {app => tv}/src/main/res/values/strings.xml (79%) rename {app => tv}/src/main/res/values/themes.xml (100%) rename {app => tv}/src/main/res/xml/backup_rules.xml (100%) rename {app => tv}/src/main/res/xml/data_extraction_rules.xml (100%) rename {app => tv}/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt (69%) diff --git a/README.md b/README.md index 41444bc..2f81238 100644 --- a/README.md +++ b/README.md @@ -46,16 +46,16 @@ writes it) or `ANDROID_HOME`. The Gradle wrapper fetches everything else. ./gradlew assembleDebug ``` -The APK lands in `app/build/outputs/apk/debug/app-debug.apk`. `./gradlew testDebugUnitTest` +The APK lands in `tv/build/outputs/apk/debug/tv-debug.apk`. `./gradlew testDebugUnitTest` runs the JVM tests (the queue and player rules, API parsing and request signing, lyrics, decryption and theme parity, mostly ported from the desktop tests), and `./gradlew lint` runs Android -Lint, with the report in `app/build/reports/lint-results-debug.html`. +Lint, with a report in each module's `build/reports/lint-results-debug.html`. To run it, start an Android TV or Google TV emulator (Device Manager in Android Studio, TV category) or connect a TV with ADB debugging on, then: ```bash -./gradlew installDebug +./gradlew :tv:installDebug ``` ```bash @@ -67,7 +67,7 @@ tablets, since neither Leanback nor a touchscreen is required. ### Generated resources -The icons, banner and fonts in `app/src/main/res` come from `assets/`. Regenerate them after +The icons, banner and fonts in `tv/src/main/res` come from `assets/`. Regenerate them after changing the sources: - `python3 tool/svg_to_vector.py` turns `assets/icons/*.svg` into `res/drawable/ic_.xml`. @@ -79,15 +79,19 @@ changing the sources: ## Layout -- `app/`: the Android TV app (`it.panov.musyx.tv`), under `app/src/main/java/it/panov/musyx/tv`: +- `core/`: what the apps share (`it.panov.musyx`), under `core/src/main/java/it/panov/musyx`: - `api/`: the Yandex Music client, ported from `reference/ym-api` with the `yamuse` wire details inlined (`Transport.kt` headers and errors, `Auth.kt` device flow, `Signing.kt`). - `player/`: `PlayerCore` (queue, repeat, waves, reports; a pure port of the desktop player), `ExoEngine` (one ExoPlayer, with `AesCtrDataSource` for encrypted FLAC), - `PlaybackController` (runs the core's effects) and `PlaybackService` (the media session). + `PlaybackController` (runs the core's effects) and `SessionPlayer` (the player the media + session wraps). - `state/`: `AppState`, the port of the desktop `app.rs` and `app/edit.rs`, plus search, sign-in and navigation state. - `data/`: settings and the Keystore-encrypted credentials. + - `res/`: the strings the state layer shows (toasts, sign-in errors, quality names). +- `tv/`: the Android TV app (`it.panov.musyx.tv`), under `tv/src/main/java/it/panov/musyx/tv`: + - `player/PlaybackService.kt`: the media session. - `ui/`: the shell (drawer, mini player, dialogs, toasts), `screens/` and `components/`. The theme is `ui/theme/Theme.kt`, a 1:1 port of `DESIGN.md`. - `gradle/libs.versions.toml`: dependency versions. diff --git a/build.gradle.kts b/build.gradle.kts index 86acfea..46b69fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.android.application) apply false + alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.serialization) apply false } diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 0000000..6d6bf22 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,36 @@ +// What the TV and phone apps share: the Yandex Music client, the player, the app state and +// the stores. No UI beyond Compose runtime state. +plugins { + alias(libs.plugins.android.library) + // For stability inference on the models and state the UIs read. + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.serialization) +} + +android { + namespace = "it.panov.musyx" + compileSdk = 37 + + defaultConfig { + minSdk = 23 + consumerProguardFiles("consumer-rules.pro") + } + + testOptions { + // PlayerCore logs through android.util.Log; JVM tests get no-op stubs. + unitTests.isReturnDefaultValues = true + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + api(platform(libs.compose.bom)) + api(libs.compose.runtime) + api(libs.media3.exoplayer) + api(libs.media3.session) + implementation(libs.okhttp) + implementation(libs.kotlinx.serialization.json) + + testImplementation(libs.junit) + testImplementation(libs.kotlinx.coroutines.test) +} diff --git a/core/consumer-rules.pro b/core/consumer-rules.pro new file mode 100644 index 0000000..5875c32 --- /dev/null +++ b/core/consumer-rules.pro @@ -0,0 +1 @@ +# R8 rules for apps that use core. The libraries in use ship their own consumer rules. diff --git a/app/src/main/java/it/panov/musyx/tv/api/Auth.kt b/core/src/main/java/it/panov/musyx/api/Auth.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/api/Auth.kt rename to core/src/main/java/it/panov/musyx/api/Auth.kt index b626c16..28f7d96 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Auth.kt +++ b/core/src/main/java/it/panov/musyx/api/Auth.kt @@ -1,7 +1,7 @@ // Yandex OAuth device flow: show a code, the user confirms it on Yandex's page (or scans // the QR), poll until a token arrives. Uses the official Android app's public client id, // because third parties can't register an app for the music API. -package it.panov.musyx.tv.api +package it.panov.musyx.api import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/core/src/main/java/it/panov/musyx/api/CoverHues.kt b/core/src/main/java/it/panov/musyx/api/CoverHues.kt new file mode 100644 index 0000000..d1e81f0 --- /dev/null +++ b/core/src/main/java/it/panov/musyx/api/CoverHues.kt @@ -0,0 +1,19 @@ +// Placeholder art seeds: every item without a cover gets two stable hues, as on the desktop. +package it.panov.musyx.api + +/** Two stable hues for placeholder art; equal seeds give equal art. Port of ym-api `hues_for`. */ +fun huesFor(seed: ULong): Pair = + (seed * 47uL % 360uL).toFloat() to ((seed * 131uL + 90uL) % 360uL).toFloat() + +/** Seeds per item kind, as in ym-api, so an item gets the same art as on the desktop. */ +object CoverHues { + fun album(id: Long) = huesFor(id.toULong()) + fun artist(id: Long) = huesFor(id.toULong() xor 0x5bd1_e995uL) + fun playlist(owner: Long, kind: Long) = huesFor(owner.toULong() * 1_000_003uL xor kind.toULong()) + fun clip(id: Long) = huesFor(id.toULong() xor 0x2c1b_3c6duL) + + /** A track borrows its album's art, or hashes its own (string) id. */ + fun track(id: String, albumId: Long?): Pair = huesFor( + albumId?.toULong() ?: id.encodeToByteArray().fold(7uL) { h, b -> h * 31uL + b.toUByte().toULong() }, + ) +} diff --git a/app/src/main/java/it/panov/musyx/tv/api/Credentials.kt b/core/src/main/java/it/panov/musyx/api/Credentials.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/api/Credentials.kt rename to core/src/main/java/it/panov/musyx/api/Credentials.kt index 5eb260d..b003fca 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Credentials.kt +++ b/core/src/main/java/it/panov/musyx/api/Credentials.kt @@ -1,5 +1,5 @@ // What the credential store keeps. `toString` never prints the tokens. -package it.panov.musyx.tv.api +package it.panov.musyx.api import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive diff --git a/app/src/main/java/it/panov/musyx/tv/api/Json.kt b/core/src/main/java/it/panov/musyx/api/Json.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/api/Json.kt rename to core/src/main/java/it/panov/musyx/api/Json.kt index d67068b..61bd91a 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Json.kt +++ b/core/src/main/java/it/panov/musyx/api/Json.kt @@ -1,6 +1,6 @@ // Tolerant readers over kotlinx JSON trees. The API sends ids as numbers or strings and // drops fields freely, so every model is read field by field instead of through a schema. -package it.panov.musyx.tv.api +package it.panov.musyx.api import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray diff --git a/app/src/main/java/it/panov/musyx/tv/api/Lrclib.kt b/core/src/main/java/it/panov/musyx/api/Lrclib.kt similarity index 96% rename from app/src/main/java/it/panov/musyx/tv/api/Lrclib.kt rename to core/src/main/java/it/panov/musyx/api/Lrclib.kt index 2650648..a097d5c 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Lrclib.kt +++ b/core/src/main/java/it/panov/musyx/api/Lrclib.kt @@ -1,8 +1,7 @@ // LRCLIB (lrclib.net): an open lyrics database, asked when Yandex has no lyrics for a track. // No key; it asks clients to name themselves in the User-Agent. -package it.panov.musyx.tv.api +package it.panov.musyx.api -import it.panov.musyx.tv.BuildConfig import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext @@ -14,9 +13,11 @@ import kotlin.math.abs import kotlin.math.roundToLong private const val LRCLIB_BASE = "https://lrclib.net/api" -private val LRCLIB_AGENT = "Musyx-TV/${BuildConfig.VERSION_NAME} (https://git.panov.it/panov/musyz-mobile)" object Lrclib { + /** How this app names itself to LRCLIB; each app sets its own name and version at startup. */ + var agent = "Musyx (https://git.panov.it/panov/musyz-mobile)" + /** How far a search result's length may be from the track's and still be the same recording. */ internal const val DURATION_SLACK_S = 3.0 @@ -90,7 +91,7 @@ object Lrclib { val url = (LRCLIB_BASE + path).toHttpUrl().newBuilder().apply { params.pairs.forEach { (k, v) -> addQueryParameter(k, v) } }.build() - val request = Request.Builder().url(url).header("User-Agent", LRCLIB_AGENT).get().build() + val request = Request.Builder().url(url).header("User-Agent", agent).get().build() var attempt = 0 while (true) { val (status, retryAfter, body) = withContext(Dispatchers.IO) { diff --git a/app/src/main/java/it/panov/musyx/tv/api/Lyrics.kt b/core/src/main/java/it/panov/musyx/api/Lyrics.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/api/Lyrics.kt rename to core/src/main/java/it/panov/musyx/api/Lyrics.kt index 53c459c..2757d3c 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Lyrics.kt +++ b/core/src/main/java/it/panov/musyx/api/Lyrics.kt @@ -1,5 +1,5 @@ // Lyrics: synced (LRC) or plain text. Port of ym-api edit.rs. -package it.panov.musyx.tv.api +package it.panov.musyx.api /** One line of lyrics; synced lyrics carry the moment it's sung. */ data class LyricLine(val atMs: Long?, val text: String) diff --git a/app/src/main/java/it/panov/musyx/tv/api/Models.kt b/core/src/main/java/it/panov/musyx/api/Models.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/api/Models.kt rename to core/src/main/java/it/panov/musyx/api/Models.kt index 1fbf28f..bff4484 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Models.kt +++ b/core/src/main/java/it/panov/musyx/api/Models.kt @@ -1,8 +1,7 @@ // The app-facing shapes of API objects, keeping only what the UI uses and resolving every // missing field once, here. Port of ym-api's models.rs, library.rs, discover.rs and clips.rs. -package it.panov.musyx.tv.api +package it.panov.musyx.api -import it.panov.musyx.tv.ui.theme.CoverHues import kotlinx.serialization.json.JsonElement /** Absolute URL for a `%%`-templated image uri at `size`×`size` pixels. */ diff --git a/app/src/main/java/it/panov/musyx/tv/api/Signing.kt b/core/src/main/java/it/panov/musyx/api/Signing.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/api/Signing.kt rename to core/src/main/java/it/panov/musyx/api/Signing.kt index 0926c36..7eca340 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Signing.kt +++ b/core/src/main/java/it/panov/musyx/api/Signing.kt @@ -1,5 +1,5 @@ // Request signatures the API checks: the MP3 link, `/get-file-info` and lyrics. -package it.panov.musyx.tv.api +package it.panov.musyx.api import java.security.MessageDigest import javax.crypto.Mac diff --git a/app/src/main/java/it/panov/musyx/tv/api/Transport.kt b/core/src/main/java/it/panov/musyx/api/Transport.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/api/Transport.kt rename to core/src/main/java/it/panov/musyx/api/Transport.kt index ebbdc49..12316f1 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Transport.kt +++ b/core/src/main/java/it/panov/musyx/api/Transport.kt @@ -1,5 +1,5 @@ // The HTTP layer: identity headers, the `result` envelope, error mapping and retries. -package it.panov.musyx.tv.api +package it.panov.musyx.api import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay diff --git a/app/src/main/java/it/panov/musyx/tv/api/Wave.kt b/core/src/main/java/it/panov/musyx/api/Wave.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/api/Wave.kt rename to core/src/main/java/it/panov/musyx/api/Wave.kt index 2bc9aaa..c7d50f5 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/Wave.kt +++ b/core/src/main/java/it/panov/musyx/api/Wave.kt @@ -1,5 +1,5 @@ // My Wave and other radio stations ("rotor"), plus listening reports. Port of ym-api wave.rs. -package it.panov.musyx.tv.api +package it.panov.musyx.api import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonObject diff --git a/app/src/main/java/it/panov/musyx/tv/api/YmClient.kt b/core/src/main/java/it/panov/musyx/api/YmClient.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/api/YmClient.kt rename to core/src/main/java/it/panov/musyx/api/YmClient.kt index f2c19c9..40a31ba 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/YmClient.kt +++ b/core/src/main/java/it/panov/musyx/api/YmClient.kt @@ -1,6 +1,6 @@ // An authenticated Yandex Music client. Port of ym-api's client.rs, with yamuse's wire // behaviour inlined. -package it.panov.musyx.tv.api +package it.panov.musyx.api import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope diff --git a/app/src/main/java/it/panov/musyx/tv/api/YmError.kt b/core/src/main/java/it/panov/musyx/api/YmError.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/api/YmError.kt rename to core/src/main/java/it/panov/musyx/api/YmError.kt index b5afdc8..76222d9 100644 --- a/app/src/main/java/it/panov/musyx/tv/api/YmError.kt +++ b/core/src/main/java/it/panov/musyx/api/YmError.kt @@ -1,5 +1,5 @@ // Errors the app can act on. Messages are for logs, not for display. -package it.panov.musyx.tv.api +package it.panov.musyx.api sealed class YmError(message: String) : Exception(message) { /** The token is missing, revoked or expired. Sign in again. */ diff --git a/app/src/main/java/it/panov/musyx/tv/data/CredentialStore.kt b/core/src/main/java/it/panov/musyx/data/CredentialStore.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/data/CredentialStore.kt rename to core/src/main/java/it/panov/musyx/data/CredentialStore.kt index 9e713ae..3e27ff9 100644 --- a/app/src/main/java/it/panov/musyx/tv/data/CredentialStore.kt +++ b/core/src/main/java/it/panov/musyx/data/CredentialStore.kt @@ -1,13 +1,13 @@ // Keeping the user signed in: credentials are encrypted with a key that lives in the Android // Keystore and never leaves it, and the ciphertext sits in private preferences. -package it.panov.musyx.tv.data +package it.panov.musyx.data import android.content.Context import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties import android.util.Base64 import androidx.core.content.edit -import it.panov.musyx.tv.api.Credentials +import it.panov.musyx.api.Credentials import java.security.KeyStore import javax.crypto.Cipher import javax.crypto.KeyGenerator diff --git a/app/src/main/java/it/panov/musyx/tv/data/SettingsStore.kt b/core/src/main/java/it/panov/musyx/data/SettingsStore.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/data/SettingsStore.kt rename to core/src/main/java/it/panov/musyx/data/SettingsStore.kt index d17e0e2..4c95263 100644 --- a/app/src/main/java/it/panov/musyx/tv/data/SettingsStore.kt +++ b/core/src/main/java/it/panov/musyx/data/SettingsStore.kt @@ -1,5 +1,5 @@ // Preferences kept between launches. Port of the desktop store.rs. -package it.panov.musyx.tv.data +package it.panov.musyx.data import android.content.Context import androidx.core.content.edit diff --git a/app/src/main/java/it/panov/musyx/tv/player/AesCtrDataSource.kt b/core/src/main/java/it/panov/musyx/player/AesCtrDataSource.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/player/AesCtrDataSource.kt rename to core/src/main/java/it/panov/musyx/player/AesCtrDataSource.kt index 7ab1bf1..c91f48a 100644 --- a/app/src/main/java/it/panov/musyx/tv/player/AesCtrDataSource.kt +++ b/core/src/main/java/it/panov/musyx/player/AesCtrDataSource.kt @@ -1,7 +1,7 @@ // Decrypts `encraw` lossless files as ExoPlayer reads them. AES-CTR is a stream cipher // over a 128-bit big-endian block counter starting at zero, so any byte offset can be // decrypted on its own and seeking keeps working. -package it.panov.musyx.tv.player +package it.panov.musyx.player import android.net.Uri import androidx.media3.common.C diff --git a/app/src/main/java/it/panov/musyx/tv/player/ExoEngine.kt b/core/src/main/java/it/panov/musyx/player/ExoEngine.kt similarity index 96% rename from app/src/main/java/it/panov/musyx/tv/player/ExoEngine.kt rename to core/src/main/java/it/panov/musyx/player/ExoEngine.kt index c8445e9..d8adb44 100644 --- a/app/src/main/java/it/panov/musyx/tv/player/ExoEngine.kt +++ b/core/src/main/java/it/panov/musyx/player/ExoEngine.kt @@ -1,7 +1,7 @@ // The audio engine: one ExoPlayer that plays one track at a time. The queue lives in // PlayerCore; this only loads what it's told and reports back, tagged with the generation // of the load so late events from a previous track are ignored. -package it.panov.musyx.tv.player +package it.panov.musyx.player import android.content.Context import android.net.Uri @@ -19,10 +19,10 @@ import androidx.media3.datasource.DefaultHttpDataSource import androidx.media3.datasource.ResolvingDataSource import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.source.DefaultMediaSourceFactory -import it.panov.musyx.tv.api.CLIENT_HEADER -import it.panov.musyx.tv.api.Stream -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.api.isYandexHost +import it.panov.musyx.api.CLIENT_HEADER +import it.panov.musyx.api.Stream +import it.panov.musyx.api.Track +import it.panov.musyx.api.isYandexHost import java.util.concurrent.ConcurrentHashMap interface EngineEvents { diff --git a/app/src/main/java/it/panov/musyx/tv/player/PlaybackController.kt b/core/src/main/java/it/panov/musyx/player/PlaybackController.kt similarity index 96% rename from app/src/main/java/it/panov/musyx/tv/player/PlaybackController.kt rename to core/src/main/java/it/panov/musyx/player/PlaybackController.kt index c258dea..6c0c872 100644 --- a/app/src/main/java/it/panov/musyx/tv/player/PlaybackController.kt +++ b/core/src/main/java/it/panov/musyx/player/PlaybackController.kt @@ -1,6 +1,6 @@ // Runs PlayerCore on the main thread: forwards engine events and user commands to it, // carries out the effects it asks for against the API, and publishes what the UI shows. -package it.panov.musyx.tv.player +package it.panov.musyx.player import android.content.Context import android.util.Log @@ -11,12 +11,12 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.annotation.OptIn import androidx.media3.common.util.UnstableApi -import it.panov.musyx.tv.api.MY_WAVE -import it.panov.musyx.tv.api.Stream -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.api.WaveSettings -import it.panov.musyx.tv.api.YmClient -import it.panov.musyx.tv.data.Quality +import it.panov.musyx.api.MY_WAVE +import it.panov.musyx.api.Stream +import it.panov.musyx.api.Track +import it.panov.musyx.api.WaveSettings +import it.panov.musyx.api.YmClient +import it.panov.musyx.data.Quality import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/it/panov/musyx/tv/player/PlayerCore.kt b/core/src/main/java/it/panov/musyx/player/PlayerCore.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/player/PlayerCore.kt rename to core/src/main/java/it/panov/musyx/player/PlayerCore.kt index b27f5c4..097017f 100644 --- a/app/src/main/java/it/panov/musyx/tv/player/PlayerCore.kt +++ b/core/src/main/java/it/panov/musyx/player/PlayerCore.kt @@ -1,14 +1,14 @@ // Playback state: the queue, what's loaded, and the rules for moving between tracks. // Network work is described as [Effect]s for the app to run, so this class stays free of // the API client and can be tested on its own. Port of the desktop `player/mod.rs`. -package it.panov.musyx.tv.player +package it.panov.musyx.player -import it.panov.musyx.tv.api.PlayReport -import it.panov.musyx.tv.api.Stream -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.api.WaveBatch -import it.panov.musyx.tv.api.WaveEvent -import it.panov.musyx.tv.api.YmError +import it.panov.musyx.api.PlayReport +import it.panov.musyx.api.Stream +import it.panov.musyx.api.Track +import it.panov.musyx.api.WaveBatch +import it.panov.musyx.api.WaveEvent +import it.panov.musyx.api.YmError import kotlin.random.Random /** Give up after this many unplayable tracks in a row instead of skipping forever. */ diff --git a/app/src/main/java/it/panov/musyx/tv/player/Queue.kt b/core/src/main/java/it/panov/musyx/player/Queue.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/player/Queue.kt rename to core/src/main/java/it/panov/musyx/player/Queue.kt index dcfa85e..5375406 100644 --- a/app/src/main/java/it/panov/musyx/tv/player/Queue.kt +++ b/core/src/main/java/it/panov/musyx/player/Queue.kt @@ -1,6 +1,6 @@ // Play order over a fixed list of items: shuffle, repeat, next/previous. Port of the // desktop `player/queue.rs`; generic so the rules can be tested with plain numbers. -package it.panov.musyx.tv.player +package it.panov.musyx.player import kotlin.random.Random diff --git a/app/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt b/core/src/main/java/it/panov/musyx/player/SessionPlayer.kt similarity index 58% rename from app/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt rename to core/src/main/java/it/panov/musyx/player/SessionPlayer.kt index f5cc683..656db23 100644 --- a/app/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt +++ b/core/src/main/java/it/panov/musyx/player/SessionPlayer.kt @@ -1,50 +1,12 @@ -// Background audio and remote control: the media session that the TV's Now Playing card, -// the remote's media keys and Google Assistant talk to. -package it.panov.musyx.tv.player +// The player that each app's media session wraps. +package it.panov.musyx.player -import android.app.PendingIntent -import android.content.Intent -import androidx.media3.common.Player import androidx.annotation.OptIn +import androidx.media3.common.ForwardingSimpleBasePlayer +import androidx.media3.common.Player import androidx.media3.common.util.UnstableApi -import androidx.media3.session.MediaSession -import androidx.media3.session.MediaSessionService import com.google.common.util.concurrent.Futures import com.google.common.util.concurrent.ListenableFuture -import it.panov.musyx.tv.MainActivity -import it.panov.musyx.tv.Musyx - -@OptIn(UnstableApi::class) -class PlaybackService : MediaSessionService() { - private var session: MediaSession? = null - - override fun onCreate() { - super.onCreate() - val open = PendingIntent.getActivity( - this, - 0, - Intent(this, MainActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), - PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT, - ) - session = MediaSession.Builder(this, Musyx.graph(this).state.playback.sessionPlayer) - .setSessionActivity(open) - .build() - } - - override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? = session - - override fun onTaskRemoved(rootIntent: Intent?) { - val player = session?.player - if (player == null || !player.playWhenReady || player.mediaItemCount == 0) stopSelf() - } - - override fun onDestroy() { - // The player belongs to the app and outlives the service. - session?.release() - session = null - super.onDestroy() - } -} /** * The ExoPlayer as the media session sees it. ExoPlayer only ever holds the current @@ -53,7 +15,7 @@ class PlaybackService : MediaSessionService() { */ @OptIn(UnstableApi::class) class SessionPlayer(player: Player, private val controller: PlaybackController) : - androidx.media3.common.ForwardingSimpleBasePlayer(player) { + ForwardingSimpleBasePlayer(player) { override fun getState(): State { val state = super.getState() diff --git a/app/src/main/java/it/panov/musyx/tv/state/AppState.kt b/core/src/main/java/it/panov/musyx/state/AppState.kt similarity index 95% rename from app/src/main/java/it/panov/musyx/tv/state/AppState.kt rename to core/src/main/java/it/panov/musyx/state/AppState.kt index 818de0e..32a1d00 100644 --- a/app/src/main/java/it/panov/musyx/tv/state/AppState.kt +++ b/core/src/main/java/it/panov/musyx/state/AppState.kt @@ -1,7 +1,7 @@ // Application state and everything that changes it. Port of the desktop app.rs and // app/edit.rs: screens read these fields and call these methods; all of it runs on the // main thread, with network calls in coroutines that write their results back. -package it.panov.musyx.tv.state +package it.panov.musyx.state import android.content.Context import android.util.Log @@ -9,39 +9,39 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.Account -import it.panov.musyx.tv.api.AlbumPage -import it.panov.musyx.tv.api.AlbumSummary -import it.panov.musyx.tv.api.ArtistPage -import it.panov.musyx.tv.api.ArtistSummary -import it.panov.musyx.tv.api.Auth -import it.panov.musyx.tv.api.Clip -import it.panov.musyx.tv.api.ContentLanguage -import it.panov.musyx.tv.api.Credentials -import it.panov.musyx.tv.api.Genre -import it.panov.musyx.tv.api.Home -import it.panov.musyx.tv.api.LibraryPlaylists -import it.panov.musyx.tv.api.LikedIds -import it.panov.musyx.tv.api.Lrclib -import it.panov.musyx.tv.api.Lyrics -import it.panov.musyx.tv.api.MY_WAVE -import it.panov.musyx.tv.api.PlaylistId -import it.panov.musyx.tv.api.PlaylistPage -import it.panov.musyx.tv.api.PlaylistSummary -import it.panov.musyx.tv.api.Station -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.api.WaveSettings -import it.panov.musyx.tv.api.YmClient -import it.panov.musyx.tv.api.YmError -import it.panov.musyx.tv.data.Appearance -import it.panov.musyx.tv.data.FontSize -import it.panov.musyx.tv.data.CredentialStore -import it.panov.musyx.tv.data.Locale -import it.panov.musyx.tv.data.Quality -import it.panov.musyx.tv.data.Settings -import it.panov.musyx.tv.data.SettingsStore -import it.panov.musyx.tv.player.PlaybackController +import it.panov.musyx.R +import it.panov.musyx.api.Account +import it.panov.musyx.api.AlbumPage +import it.panov.musyx.api.AlbumSummary +import it.panov.musyx.api.ArtistPage +import it.panov.musyx.api.ArtistSummary +import it.panov.musyx.api.Auth +import it.panov.musyx.api.Clip +import it.panov.musyx.api.ContentLanguage +import it.panov.musyx.api.Credentials +import it.panov.musyx.api.Genre +import it.panov.musyx.api.Home +import it.panov.musyx.api.LibraryPlaylists +import it.panov.musyx.api.LikedIds +import it.panov.musyx.api.Lrclib +import it.panov.musyx.api.Lyrics +import it.panov.musyx.api.MY_WAVE +import it.panov.musyx.api.PlaylistId +import it.panov.musyx.api.PlaylistPage +import it.panov.musyx.api.PlaylistSummary +import it.panov.musyx.api.Station +import it.panov.musyx.api.Track +import it.panov.musyx.api.WaveSettings +import it.panov.musyx.api.YmClient +import it.panov.musyx.api.YmError +import it.panov.musyx.data.Appearance +import it.panov.musyx.data.FontSize +import it.panov.musyx.data.CredentialStore +import it.panov.musyx.data.Locale +import it.panov.musyx.data.Quality +import it.panov.musyx.data.Settings +import it.panov.musyx.data.SettingsStore +import it.panov.musyx.player.PlaybackController import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/it/panov/musyx/tv/state/Common.kt b/core/src/main/java/it/panov/musyx/state/Common.kt similarity index 95% rename from app/src/main/java/it/panov/musyx/tv/state/Common.kt rename to core/src/main/java/it/panov/musyx/state/Common.kt index 816bed8..0112a1a 100644 --- a/app/src/main/java/it/panov/musyx/tv/state/Common.kt +++ b/core/src/main/java/it/panov/musyx/state/Common.kt @@ -1,12 +1,12 @@ // Small state types shared by every screen. -package it.panov.musyx.tv.state +package it.panov.musyx.state import androidx.annotation.PluralsRes import androidx.annotation.StringRes import androidx.compose.runtime.Immutable -import it.panov.musyx.tv.api.PlaylistId -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.api.YmError +import it.panov.musyx.api.PlaylistId +import it.panov.musyx.api.Track +import it.panov.musyx.api.YmError /** Something fetched from the API: not asked for yet, on its way, here, or failed. */ sealed interface Loadable { diff --git a/app/src/main/java/it/panov/musyx/tv/state/Route.kt b/core/src/main/java/it/panov/musyx/state/Route.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/state/Route.kt rename to core/src/main/java/it/panov/musyx/state/Route.kt index d96ae9e..93d3961 100644 --- a/app/src/main/java/it/panov/musyx/tv/state/Route.kt +++ b/core/src/main/java/it/panov/musyx/state/Route.kt @@ -1,10 +1,10 @@ // Every place the content area can show, and the back stack between them. -package it.panov.musyx.tv.state +package it.panov.musyx.state import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import it.panov.musyx.tv.api.PlaylistId +import it.panov.musyx.api.PlaylistId sealed interface Route { data object Home : Route diff --git a/app/src/main/java/it/panov/musyx/tv/state/SearchState.kt b/core/src/main/java/it/panov/musyx/state/SearchState.kt similarity index 95% rename from app/src/main/java/it/panov/musyx/tv/state/SearchState.kt rename to core/src/main/java/it/panov/musyx/state/SearchState.kt index 3217a18..b74c28e 100644 --- a/app/src/main/java/it/panov/musyx/tv/state/SearchState.kt +++ b/core/src/main/java/it/panov/musyx/state/SearchState.kt @@ -1,13 +1,13 @@ // Search: suggestions while typing, results by kind, more pages on request. -package it.panov.musyx.tv.state +package it.panov.musyx.state import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import it.panov.musyx.tv.api.SearchKind -import it.panov.musyx.tv.api.SearchResults -import it.panov.musyx.tv.api.YmClient -import it.panov.musyx.tv.api.YmError +import it.panov.musyx.api.SearchKind +import it.panov.musyx.api.SearchResults +import it.panov.musyx.api.YmClient +import it.panov.musyx.api.YmError import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.delay diff --git a/app/src/main/java/it/panov/musyx/tv/state/SignInState.kt b/core/src/main/java/it/panov/musyx/state/SignInState.kt similarity index 94% rename from app/src/main/java/it/panov/musyx/tv/state/SignInState.kt rename to core/src/main/java/it/panov/musyx/state/SignInState.kt index b79a87b..ecad154 100644 --- a/app/src/main/java/it/panov/musyx/tv/state/SignInState.kt +++ b/core/src/main/java/it/panov/musyx/state/SignInState.kt @@ -1,17 +1,17 @@ // Device-code sign-in: get a code, the user confirms it on Yandex's page (or scans the // QR with their phone), we poll until a token arrives. A pasted token is the fallback. -package it.panov.musyx.tv.state +package it.panov.musyx.state import android.os.SystemClock import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.Auth -import it.panov.musyx.tv.api.Credentials -import it.panov.musyx.tv.api.DeviceCode -import it.panov.musyx.tv.api.Poll -import it.panov.musyx.tv.api.YmError +import it.panov.musyx.R +import it.panov.musyx.api.Auth +import it.panov.musyx.api.Credentials +import it.panov.musyx.api.DeviceCode +import it.panov.musyx.api.Poll +import it.panov.musyx.api.YmError import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml new file mode 100644 index 0000000..6b36eac --- /dev/null +++ b/core/src/main/res/values-ru/strings.xml @@ -0,0 +1,61 @@ + + + + Яндекс не принял этот токен. Проверьте его и вставьте ещё раз. + Срок действия кода истёк до подтверждения. Получите новый код и попробуйте снова. + Доступ отклонён на странице Яндекса. Если это ошибка, получите новый код. + Яндекс недоступен. Проверьте подключение и попробуйте ещё раз. + Яндекс не принял вход. Получите новый код и попробуйте снова. + Яндекс прислал неожиданный ответ. Попробуйте чуть позже. + Без потерь + Лучшее + Оптимальное + Экономия трафика + «%1$s» уже играет + «%1$s» зазвучит следующим + «%1$s» добавлен в очередь + Ищем треки в духе «%1$s»… + У Яндекса нет похожих треков для «%1$s» + Не удалось найти похожие треки. Попробуйте ещё раз. + Добавлено в «Мне нравится» + Убрано из «Мне нравится» + Не удалось изменить отметку. Попробуйте ещё раз. + Этот трек больше не будет попадаться в рекомендациях + Трек снова может попадаться в рекомендациях + Не удалось это изменить. Попробуйте ещё раз. + Альбом добавлен в коллекцию + Альбом убран из коллекции + Исполнитель добавлен в коллекцию + Исполнитель убран из коллекции + Плейлист добавлен в коллекцию + Плейлист убран из коллекции + Клип добавлен в коллекцию + Клип убран из коллекции + Добавлено в «%1$s» + Добавлено в плейлист + Не удалось добавить в «%1$s». Попробуйте ещё раз. + Не удалось добавить в плейлист. Попробуйте ещё раз. + Плейлист «%1$s» создан + Плейлист «%1$s» создан, трек добавлен + Не удалось создать плейлист. Попробуйте ещё раз. + Плейлист переименован в «%1$s» + Не удалось переименовать плейлист. Попробуйте ещё раз. + Теперь плейлист видят все, у кого есть ссылка + Теперь плейлист видите только вы + Не удалось изменить доступ. Попробуйте ещё раз. + Плейлист «%1$s» удалён + Не удалось удалить «%1$s». Попробуйте ещё раз. + Удалено из плейлиста + Не удалось удалить трек. Попробуйте ещё раз. + Перемещено + Не удалось переместить трек. Попробуйте ещё раз. + Качество звука: %1$s. Применится со следующего трека. + Кеш обложек очищен + Не удалось очистить кеш обложек. + + Играем %1$d трек в духе «%2$s» + Играем %1$d трека в духе «%2$s» + Играем %1$d треков в духе «%2$s» + Играем %1$d трека в духе «%2$s» + + diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml new file mode 100644 index 0000000..1462d4c --- /dev/null +++ b/core/src/main/res/values/strings.xml @@ -0,0 +1,59 @@ + + + + Yandex didn\'t accept that token. Check it and paste it again. + The code expired before it was confirmed. Get a new code to try again. + Access was declined on Yandex\'s page. Get a new code if that was a mistake. + Can\'t reach Yandex. Check your connection and try again. + Yandex didn\'t accept the sign-in. Get a new code to try again. + Yandex sent an unexpected answer. Try again in a moment. + Lossless + Best + Balanced + Data saver + “%1$s” is already playing + “%1$s” plays next + Added “%1$s” to the queue + Finding tracks like “%1$s”… + Yandex has no similar tracks for “%1$s” + Couldn\'t find similar tracks. Try again. + Added to Liked tracks + Removed from Liked tracks + Couldn\'t change the like. Try again. + You won\'t be recommended this track + Recommendations for this track restored + Couldn\'t change that. Try again. + Album added to your collection + Album removed from your collection + Artist added to your collection + Artist removed from your collection + Playlist added to your collection + Playlist removed from your collection + Clip added to your collection + Clip removed from your collection + Added to “%1$s” + Added to the playlist + Couldn\'t add to “%1$s”. Try again. + Couldn\'t add to the playlist. Try again. + Created “%1$s” + Created “%1$s” with the track + Couldn\'t create the playlist. Try again. + Renamed to “%1$s” + Couldn\'t rename the playlist. Try again. + Anyone with the link can now see this playlist + Only you can see this playlist now + Couldn\'t change who can see it. Try again. + Deleted “%1$s” + Couldn\'t delete “%1$s”. Try again. + Removed from the playlist + Couldn\'t remove the track. Try again. + Moved + Couldn\'t move the track. Try again. + Streaming quality: %1$s. Applies from the next track. + Cover cache cleared + Couldn\'t clear the cover cache. + + Playing %1$d track like “%2$s” + Playing %1$d tracks like “%2$s” + + diff --git a/app/src/test/java/it/panov/musyx/tv/api/ApiTest.kt b/core/src/test/java/it/panov/musyx/api/ApiTest.kt similarity index 99% rename from app/src/test/java/it/panov/musyx/tv/api/ApiTest.kt rename to core/src/test/java/it/panov/musyx/api/ApiTest.kt index efaceb1..514da12 100644 --- a/app/src/test/java/it/panov/musyx/tv/api/ApiTest.kt +++ b/core/src/test/java/it/panov/musyx/api/ApiTest.kt @@ -1,7 +1,7 @@ -package it.panov.musyx.tv.api +package it.panov.musyx.api -import it.panov.musyx.tv.player.ctrCipher -import it.panov.musyx.tv.player.hexKey +import it.panov.musyx.player.ctrCipher +import it.panov.musyx.player.hexKey import kotlinx.serialization.json.JsonPrimitive import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals diff --git a/core/src/test/java/it/panov/musyx/api/CoverHuesTest.kt b/core/src/test/java/it/panov/musyx/api/CoverHuesTest.kt new file mode 100644 index 0000000..d5151a4 --- /dev/null +++ b/core/src/test/java/it/panov/musyx/api/CoverHuesTest.kt @@ -0,0 +1,18 @@ +package it.panov.musyx.api + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** Parity with the desktop's placeholder hues. */ +class CoverHuesTest { + // Expected values come from ym-api's `hues_for` and its per-kind seeds (u64 wrapping maths). + @Test + fun huesMatchTheDesktop() { + assertEquals(47f to 221f, CoverHues.album(1)) + assertEquals(329f to 335f, CoverHues.album(-1)) + assertEquals(233f to 119f, CoverHues.artist(42)) + assertEquals(2f to 356f, CoverHues.playlist(owner = 503_646_255, kind = 3)) + assertEquals(295f to 85f, CoverHues.track("12345:678", albumId = null)) + assertEquals(CoverHues.album(7), CoverHues.track("12345:678", albumId = 7)) + } +} diff --git a/app/src/test/java/it/panov/musyx/tv/player/PlayerCoreTest.kt b/core/src/test/java/it/panov/musyx/player/PlayerCoreTest.kt similarity index 98% rename from app/src/test/java/it/panov/musyx/tv/player/PlayerCoreTest.kt rename to core/src/test/java/it/panov/musyx/player/PlayerCoreTest.kt index 2d581aa..d2ae319 100644 --- a/app/src/test/java/it/panov/musyx/tv/player/PlayerCoreTest.kt +++ b/core/src/test/java/it/panov/musyx/player/PlayerCoreTest.kt @@ -1,10 +1,10 @@ -package it.panov.musyx.tv.player +package it.panov.musyx.player -import it.panov.musyx.tv.api.Stream -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.api.WaveBatch -import it.panov.musyx.tv.api.WaveEvent -import it.panov.musyx.tv.api.YmError +import it.panov.musyx.api.Stream +import it.panov.musyx.api.Track +import it.panov.musyx.api.WaveBatch +import it.panov.musyx.api.WaveEvent +import it.panov.musyx.api.YmError import org.junit.Assert.assertEquals import org.junit.Assert.assertNull import org.junit.Assert.assertTrue diff --git a/app/src/test/java/it/panov/musyx/tv/player/QueueTest.kt b/core/src/test/java/it/panov/musyx/player/QueueTest.kt similarity index 99% rename from app/src/test/java/it/panov/musyx/tv/player/QueueTest.kt rename to core/src/test/java/it/panov/musyx/player/QueueTest.kt index 849a587..ab9ea04 100644 --- a/app/src/test/java/it/panov/musyx/tv/player/QueueTest.kt +++ b/core/src/test/java/it/panov/musyx/player/QueueTest.kt @@ -1,4 +1,4 @@ -package it.panov.musyx.tv.player +package it.panov.musyx.player import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse diff --git a/app/src/test/java/it/panov/musyx/tv/state/StateTest.kt b/core/src/test/java/it/panov/musyx/state/StateTest.kt similarity index 95% rename from app/src/test/java/it/panov/musyx/tv/state/StateTest.kt rename to core/src/test/java/it/panov/musyx/state/StateTest.kt index bc4654a..16f862a 100644 --- a/app/src/test/java/it/panov/musyx/tv/state/StateTest.kt +++ b/core/src/test/java/it/panov/musyx/state/StateTest.kt @@ -1,7 +1,7 @@ -package it.panov.musyx.tv.state +package it.panov.musyx.state -import it.panov.musyx.tv.api.PlaylistId -import it.panov.musyx.tv.api.Track +import it.panov.musyx.api.PlaylistId +import it.panov.musyx.api.Track import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertSame diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 944a97b..ed68c98 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } compose-foundation = { module = "androidx.compose.foundation:foundation" } +compose-runtime = { module = "androidx.compose.runtime:runtime" } tv-material = { module = "androidx.tv:tv-material", version.ref = "tv-material" } media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" } media3-session = { module = "androidx.media3:media3-session", version.ref = "media3" } @@ -38,5 +39,6 @@ androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", [plugins] android-application = { id = "com.android.application", version.ref = "agp" } +android-library = { id = "com.android.library", version.ref = "agp" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 54b6b2c..0bfb773 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -21,4 +21,4 @@ dependencyResolutionManagement { } rootProject.name = "musyx-mobile" -include(":app") +include(":core", ":tv") diff --git a/tool/make_tv_assets.py b/tool/make_tv_assets.py index 657fe22..d414ef9 100644 --- a/tool/make_tv_assets.py +++ b/tool/make_tv_assets.py @@ -7,7 +7,7 @@ (run tool/make_icon.py first if it changes). Needs Pillow (pip install Pillow), unlike make_icon.py, because it sets type. -Usage: python3 tool/make_tv_assets.py [app/src/main/res] +Usage: python3 tool/make_tv_assets.py [tv/src/main/res] """ import sys from pathlib import Path @@ -87,4 +87,4 @@ def main(res): if __name__ == "__main__": - main(sys.argv[1] if len(sys.argv) > 1 else ROOT / "app/src/main/res") + main(sys.argv[1] if len(sys.argv) > 1 else ROOT / "tv/src/main/res") diff --git a/tool/svg_to_vector.py b/tool/svg_to_vector.py index 4adbfeb..9fb84e8 100644 --- a/tool/svg_to_vector.py +++ b/tool/svg_to_vector.py @@ -5,7 +5,7 @@ Lucide draws everything in `currentColor`. The drawables keep that idea: every s is plain white, which Compose's `Icon(tint = ...)` replaces with a theme token, so no design colour is baked in. Path data is re-tokenised so arc flags and packed numbers are unambiguous. -Usage: python3 tool/svg_to_vector.py [assets/icons] [app/src/main/res/drawable] +Usage: python3 tool/svg_to_vector.py [assets/icons] [tv/src/main/res/drawable] """ import re import sys @@ -130,5 +130,5 @@ def main(src, dst): if __name__ == "__main__": main( sys.argv[1] if len(sys.argv) > 1 else ROOT / "assets/icons", - sys.argv[2] if len(sys.argv) > 2 else ROOT / "app/src/main/res/drawable", + sys.argv[2] if len(sys.argv) > 2 else ROOT / "tv/src/main/res/drawable", ) diff --git a/app/build.gradle.kts b/tv/build.gradle.kts similarity index 89% rename from app/build.gradle.kts rename to tv/build.gradle.kts index 4d66769..9ffc50b 100644 --- a/app/build.gradle.kts +++ b/tv/build.gradle.kts @@ -3,7 +3,6 @@ import java.util.Properties plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.compose) - alias(libs.plugins.kotlin.serialization) } android { @@ -48,14 +47,11 @@ android { compose = true buildConfig = true } - - testOptions { - // PlayerCore logs through android.util.Log; JVM tests get no-op stubs. - unitTests.isReturnDefaultValues = true - } } dependencies { + implementation(project(":core")) + implementation(libs.androidx.core.ktx) implementation(libs.androidx.activity.compose) implementation(libs.androidx.lifecycle.runtime.compose) @@ -70,8 +66,6 @@ dependencies { implementation(libs.media3.exoplayer) implementation(libs.media3.session) - implementation(libs.okhttp) - implementation(libs.kotlinx.serialization.json) implementation(libs.coil.compose) implementation(libs.coil.network.okhttp) implementation(libs.zxing.core) diff --git a/app/lint.xml b/tv/lint.xml similarity index 100% rename from app/lint.xml rename to tv/lint.xml diff --git a/app/proguard-rules.pro b/tv/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to tv/proguard-rules.pro diff --git a/app/src/main/AndroidManifest.xml b/tv/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to tv/src/main/AndroidManifest.xml diff --git a/app/src/main/java/it/panov/musyx/tv/MainActivity.kt b/tv/src/main/java/it/panov/musyx/tv/MainActivity.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/MainActivity.kt rename to tv/src/main/java/it/panov/musyx/tv/MainActivity.kt index eb04bd1..a847bce 100644 --- a/app/src/main/java/it/panov/musyx/tv/MainActivity.kt +++ b/tv/src/main/java/it/panov/musyx/tv/MainActivity.kt @@ -14,10 +14,10 @@ import androidx.compose.runtime.snapshotFlow import androidx.media3.session.MediaController import androidx.media3.session.SessionToken import com.google.common.util.concurrent.ListenableFuture -import it.panov.musyx.tv.data.Appearance -import it.panov.musyx.tv.data.SettingsStore +import it.panov.musyx.data.Appearance +import it.panov.musyx.data.SettingsStore import it.panov.musyx.tv.player.PlaybackService -import it.panov.musyx.tv.player.Status +import it.panov.musyx.player.Status import it.panov.musyx.tv.ui.MusyxApp import it.panov.musyx.tv.ui.screens.ScreenSaverState import it.panov.musyx.tv.ui.theme.MusyxTheme diff --git a/app/src/main/java/it/panov/musyx/tv/Musyx.kt b/tv/src/main/java/it/panov/musyx/tv/Musyx.kt similarity index 87% rename from app/src/main/java/it/panov/musyx/tv/Musyx.kt rename to tv/src/main/java/it/panov/musyx/tv/Musyx.kt index 065259d..64a2723 100644 --- a/app/src/main/java/it/panov/musyx/tv/Musyx.kt +++ b/tv/src/main/java/it/panov/musyx/tv/Musyx.kt @@ -13,9 +13,10 @@ import coil3.disk.directory import coil3.memory.MemoryCache import coil3.network.okhttp.OkHttpNetworkFetcherFactory import coil3.request.crossfade -import it.panov.musyx.tv.data.CredentialStore -import it.panov.musyx.tv.data.SettingsStore -import it.panov.musyx.tv.state.AppState +import it.panov.musyx.api.Lrclib +import it.panov.musyx.data.CredentialStore +import it.panov.musyx.data.SettingsStore +import it.panov.musyx.state.AppState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob @@ -25,6 +26,11 @@ class Musyx : Application(), SingletonImageLoader.Factory { /** Lives as long as the process; everything in it runs on the main thread. */ val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) + override fun onCreate() { + super.onCreate() + Lrclib.agent = "Musyx-TV/${BuildConfig.VERSION_NAME} (https://git.panov.it/panov/musyz-mobile)" + } + val state: AppState by lazy { AppState( context = this, diff --git a/tv/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt b/tv/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt new file mode 100644 index 0000000..3ac802c --- /dev/null +++ b/tv/src/main/java/it/panov/musyx/tv/player/PlaybackService.kt @@ -0,0 +1,44 @@ +// Background audio and remote control: the media session that the TV's Now Playing card, +// the remote's media keys and Google Assistant talk to. +package it.panov.musyx.tv.player + +import android.app.PendingIntent +import android.content.Intent +import androidx.annotation.OptIn +import androidx.media3.common.util.UnstableApi +import androidx.media3.session.MediaSession +import androidx.media3.session.MediaSessionService +import it.panov.musyx.tv.MainActivity +import it.panov.musyx.tv.Musyx + +@OptIn(UnstableApi::class) +class PlaybackService : MediaSessionService() { + private var session: MediaSession? = null + + override fun onCreate() { + super.onCreate() + val open = PendingIntent.getActivity( + this, + 0, + Intent(this, MainActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT, + ) + session = MediaSession.Builder(this, Musyx.graph(this).state.playback.sessionPlayer) + .setSessionActivity(open) + .build() + } + + override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaSession? = session + + override fun onTaskRemoved(rootIntent: Intent?) { + val player = session?.player + if (player == null || !player.playWhenReady || player.mediaItemCount == 0) stopSelf() + } + + override fun onDestroy() { + // The player belongs to the app and outlives the service. + session?.release() + session = null + super.onDestroy() + } +} diff --git a/app/src/main/java/it/panov/musyx/tv/ui/Format.kt b/tv/src/main/java/it/panov/musyx/tv/ui/Format.kt similarity index 94% rename from app/src/main/java/it/panov/musyx/tv/ui/Format.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/Format.kt index 6b2bae7..39e5571 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/Format.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/Format.kt @@ -7,12 +7,12 @@ import androidx.compose.ui.platform.LocalResources import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.AlbumKind -import it.panov.musyx.tv.api.AlbumSummary -import it.panov.musyx.tv.api.Clip -import it.panov.musyx.tv.api.PlaylistSummary -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.state.UiText +import it.panov.musyx.api.AlbumKind +import it.panov.musyx.api.AlbumSummary +import it.panov.musyx.api.Clip +import it.panov.musyx.api.PlaylistSummary +import it.panov.musyx.api.Track +import it.panov.musyx.state.UiText @Composable fun text(ui: UiText): String { diff --git a/app/src/main/java/it/panov/musyx/tv/ui/MusyxApp.kt b/tv/src/main/java/it/panov/musyx/tv/ui/MusyxApp.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/ui/MusyxApp.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/MusyxApp.kt index 06ee24d..8fd265b 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/MusyxApp.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/MusyxApp.kt @@ -55,9 +55,9 @@ import androidx.tv.material3.LocalContentColor import androidx.tv.material3.NavigationDrawerItemDefaults import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Route -import it.panov.musyx.tv.state.Session +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Route +import it.panov.musyx.state.Session import it.panov.musyx.tv.ui.components.onInk import it.panov.musyx.tv.ui.components.FocusEntry import it.panov.musyx.tv.ui.components.Focusable diff --git a/app/src/main/java/it/panov/musyx/tv/ui/components/Controls.kt b/tv/src/main/java/it/panov/musyx/tv/ui/components/Controls.kt similarity index 100% rename from app/src/main/java/it/panov/musyx/tv/ui/components/Controls.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/components/Controls.kt diff --git a/app/src/main/java/it/panov/musyx/tv/ui/components/Media.kt b/tv/src/main/java/it/panov/musyx/tv/ui/components/Media.kt similarity index 100% rename from app/src/main/java/it/panov/musyx/tv/ui/components/Media.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/components/Media.kt diff --git a/app/src/main/java/it/panov/musyx/tv/ui/components/Status.kt b/tv/src/main/java/it/panov/musyx/tv/ui/components/Status.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/ui/components/Status.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/components/Status.kt index adc4c23..1fddd3a 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/components/Status.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/components/Status.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.YmError +import it.panov.musyx.api.YmError import it.panov.musyx.tv.ui.theme.MusyxTheme /** Muted running text inside the safe margin. */ diff --git a/app/src/main/java/it/panov/musyx/tv/ui/components/Tracks.kt b/tv/src/main/java/it/panov/musyx/tv/ui/components/Tracks.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/ui/components/Tracks.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/components/Tracks.kt index a57476d..367d235 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/components/Tracks.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/components/Tracks.kt @@ -27,11 +27,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.PlaylistId -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.PlaylistSlot -import it.panov.musyx.tv.state.Sheet +import it.panov.musyx.api.PlaylistId +import it.panov.musyx.api.Track +import it.panov.musyx.state.AppState +import it.panov.musyx.state.PlaylistSlot +import it.panov.musyx.state.Sheet import it.panov.musyx.tv.ui.artistsOrUnknown import it.panov.musyx.tv.ui.clock import it.panov.musyx.tv.ui.theme.MusyxTheme diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Common.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Common.kt similarity index 96% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/Common.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/Common.kt index b3e5969..d7ace37 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Common.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Common.kt @@ -44,17 +44,17 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.AlbumSummary -import it.panov.musyx.tv.api.ArtistSummary -import it.panov.musyx.tv.api.Clip -import it.panov.musyx.tv.api.Genre -import it.panov.musyx.tv.api.PlaylistSummary -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Loadable -import it.panov.musyx.tv.state.Route -import it.panov.musyx.tv.state.Sheet -import it.panov.musyx.tv.state.UiText +import it.panov.musyx.api.AlbumSummary +import it.panov.musyx.api.ArtistSummary +import it.panov.musyx.api.Clip +import it.panov.musyx.api.Genre +import it.panov.musyx.api.PlaylistSummary +import it.panov.musyx.api.Track +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Loadable +import it.panov.musyx.state.Route +import it.panov.musyx.state.Sheet +import it.panov.musyx.state.UiText import it.panov.musyx.tv.ui.artistsOrUnknown import it.panov.musyx.tv.ui.clock import it.panov.musyx.tv.ui.components.COVER_LARGE diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Detail.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Detail.kt similarity index 96% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/Detail.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/Detail.kt index 79930e1..31e08fd 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Detail.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Detail.kt @@ -19,16 +19,16 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.AlbumPage -import it.panov.musyx.tv.api.ArtistPage -import it.panov.musyx.tv.api.PlaylistPage -import it.panov.musyx.tv.api.PlaylistSummary -import it.panov.musyx.tv.api.YmError -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Loadable -import it.panov.musyx.tv.state.Page -import it.panov.musyx.tv.state.Route -import it.panov.musyx.tv.state.Sheet +import it.panov.musyx.api.AlbumPage +import it.panov.musyx.api.ArtistPage +import it.panov.musyx.api.PlaylistPage +import it.panov.musyx.api.PlaylistSummary +import it.panov.musyx.api.YmError +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Loadable +import it.panov.musyx.state.Page +import it.panov.musyx.state.Route +import it.panov.musyx.state.Sheet import it.panov.musyx.tv.ui.components.COVER_LARGE import it.panov.musyx.tv.ui.components.Columns import it.panov.musyx.tv.ui.components.Cover diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/HomeWave.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/HomeWave.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/HomeWave.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/HomeWave.kt index aa5bb4e..65d65fb 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/HomeWave.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/HomeWave.kt @@ -36,15 +36,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.Character -import it.panov.musyx.tv.api.Language -import it.panov.musyx.tv.api.MY_WAVE -import it.panov.musyx.tv.api.Mood -import it.panov.musyx.tv.api.Station -import it.panov.musyx.tv.api.WaveSettings -import it.panov.musyx.tv.player.Status -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Route +import it.panov.musyx.api.Character +import it.panov.musyx.api.Language +import it.panov.musyx.api.MY_WAVE +import it.panov.musyx.api.Mood +import it.panov.musyx.api.Station +import it.panov.musyx.api.WaveSettings +import it.panov.musyx.player.Status +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Route import it.panov.musyx.tv.ui.components.CardWidth import it.panov.musyx.tv.ui.components.Chip import it.panov.musyx.tv.ui.components.PlayingBadge diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Library.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Library.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/Library.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/Library.kt index 110d6b0..8622470 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Library.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Library.kt @@ -12,11 +12,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import it.panov.musyx.tv.R -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.CollectionTab -import it.panov.musyx.tv.state.Liked -import it.panov.musyx.tv.state.Loadable -import it.panov.musyx.tv.state.Route +import it.panov.musyx.state.AppState +import it.panov.musyx.state.CollectionTab +import it.panov.musyx.state.Liked +import it.panov.musyx.state.Loadable +import it.panov.musyx.state.Route import it.panov.musyx.tv.ui.components.CardGrid import it.panov.musyx.tv.ui.components.Chip import it.panov.musyx.tv.ui.components.Failure @@ -119,7 +119,7 @@ fun CollectionScreen(state: AppState, entry: FocusEntry) { ) { p -> item(key = "new") { Box(Modifier.padding(horizontal = space.safeX)) { - Chip(stringResource(R.string.action_new_playlist), false, { state.openSheet(it.panov.musyx.tv.state.Sheet.NewPlaylist(null)) }) + Chip(stringResource(R.string.action_new_playlist), false, { state.openSheet(it.panov.musyx.state.Sheet.NewPlaylist(null)) }) } } if (p.own.isEmpty() && p.liked.isEmpty()) { diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Player.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Player.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/Player.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/Player.kt index d526ce9..c11aca5 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Player.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Player.kt @@ -70,17 +70,17 @@ import androidx.compose.ui.unit.dp import androidx.tv.material3.Text import it.panov.musyx.tv.MainActivity import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.Lyrics -import it.panov.musyx.tv.api.LyricsSource -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.player.Notice -import it.panov.musyx.tv.player.PlaybackState -import it.panov.musyx.tv.player.Repeat -import it.panov.musyx.tv.player.Status -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Loadable -import it.panov.musyx.tv.state.Route -import it.panov.musyx.tv.state.Sheet +import it.panov.musyx.api.Lyrics +import it.panov.musyx.api.LyricsSource +import it.panov.musyx.api.Track +import it.panov.musyx.player.Notice +import it.panov.musyx.player.PlaybackState +import it.panov.musyx.player.Repeat +import it.panov.musyx.player.Status +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Loadable +import it.panov.musyx.state.Route +import it.panov.musyx.state.Sheet import it.panov.musyx.tv.ui.artistsOrUnknown import it.panov.musyx.tv.ui.clock import it.panov.musyx.tv.ui.components.subtle diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/ScreenSaver.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/ScreenSaver.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/ScreenSaver.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/ScreenSaver.kt index f55aa02..e71817d 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/ScreenSaver.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/ScreenSaver.kt @@ -55,11 +55,11 @@ import androidx.tv.material3.Text import coil3.SingletonImageLoader import coil3.compose.AsyncImage import coil3.request.ImageRequest -import it.panov.musyx.tv.api.Lyrics -import it.panov.musyx.tv.api.Track -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Loadable -import it.panov.musyx.tv.player.Status +import it.panov.musyx.api.Lyrics +import it.panov.musyx.api.Track +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Loadable +import it.panov.musyx.player.Status import it.panov.musyx.tv.ui.artistsOrUnknown import it.panov.musyx.tv.ui.theme.CoverPlaceholder import it.panov.musyx.tv.ui.theme.MusyxTheme diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Search.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Search.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/Search.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/Search.kt index c431470..c66ec22 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Search.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Search.kt @@ -20,11 +20,11 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.api.BestMatch -import it.panov.musyx.tv.api.SearchKind -import it.panov.musyx.tv.state.ALL_TAB_TRACKS -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Route +import it.panov.musyx.api.BestMatch +import it.panov.musyx.api.SearchKind +import it.panov.musyx.state.ALL_TAB_TRACKS +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Route import it.panov.musyx.tv.ui.artistsOrUnknown import it.panov.musyx.tv.ui.compact import it.panov.musyx.tv.ui.components.subtle diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt similarity index 99% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt index 99a8e1d..7ffc9cd 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/SessionScreens.kt @@ -67,8 +67,8 @@ import com.google.zxing.BarcodeFormat import com.google.zxing.EncodeHintType import com.google.zxing.qrcode.QRCodeWriter import it.panov.musyx.tv.R -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.SignInState +import it.panov.musyx.state.AppState +import it.panov.musyx.state.SignInState import it.panov.musyx.tv.ui.Wordmark import it.panov.musyx.tv.ui.components.Focusable import it.panov.musyx.tv.ui.components.GhostButton diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt similarity index 97% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt index 3ab8850..926d716 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Settings.kt @@ -20,12 +20,12 @@ import androidx.compose.ui.unit.dp import androidx.tv.material3.Text import it.panov.musyx.tv.BuildConfig import it.panov.musyx.tv.R -import it.panov.musyx.tv.data.Appearance -import it.panov.musyx.tv.data.FontSize -import it.panov.musyx.tv.data.Locale -import it.panov.musyx.tv.data.Quality -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.qualityLabel +import it.panov.musyx.data.Appearance +import it.panov.musyx.data.FontSize +import it.panov.musyx.data.Locale +import it.panov.musyx.data.Quality +import it.panov.musyx.state.AppState +import it.panov.musyx.state.qualityLabel import it.panov.musyx.tv.ui.components.Chip import it.panov.musyx.tv.ui.components.ChoiceRow import it.panov.musyx.tv.ui.components.FocusEntry diff --git a/app/src/main/java/it/panov/musyx/tv/ui/screens/Sheets.kt b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Sheets.kt similarity index 98% rename from app/src/main/java/it/panov/musyx/tv/ui/screens/Sheets.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/screens/Sheets.kt index 86fb82d..3cd5aea 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/screens/Sheets.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/screens/Sheets.kt @@ -34,9 +34,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.tv.material3.Text import it.panov.musyx.tv.R -import it.panov.musyx.tv.state.AppState -import it.panov.musyx.tv.state.Route -import it.panov.musyx.tv.state.Sheet +import it.panov.musyx.state.AppState +import it.panov.musyx.state.Route +import it.panov.musyx.state.Sheet import it.panov.musyx.tv.ui.artistsOrUnknown import it.panov.musyx.tv.ui.components.subtle import it.panov.musyx.tv.ui.components.Divider @@ -162,7 +162,7 @@ private fun TrackMenu(state: AppState, sheet: Sheet.TrackMenu) { track.album?.takeIf { here != Route.Album(it.id) }?.let { album -> item { Item(R.drawable.ic_disc_3, stringResource(R.string.menu_go_to_album)) { state.navigate(Route.Album(album.id)) } } } - track.artists.filter { it.id != null && here != Route.Artist(it.id) }.take(3).forEach { artist -> + track.artists.filter { a -> a.id?.let { here != Route.Artist(it) } == true }.take(3).forEach { artist -> item { Item(R.drawable.ic_mic_vocal, stringResource(R.string.menu_go_to_artist_named, artist.name)) { state.navigate(Route.Artist(artist.id!!)) diff --git a/app/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt b/tv/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt similarity index 93% rename from app/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt rename to tv/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt index ab0c6a5..6276b2f 100644 --- a/app/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt +++ b/tv/src/main/java/it/panov/musyx/tv/ui/theme/Theme.kt @@ -276,23 +276,6 @@ private fun MusyxRadius.toShapes() = Shapes( // ---- Cover placeholder ---- -/** Two stable hues for placeholder art; equal seeds give equal art. Port of ym-api `hues_for`. */ -fun huesFor(seed: ULong): Pair = - (seed * 47uL % 360uL).toFloat() to ((seed * 131uL + 90uL) % 360uL).toFloat() - -/** Seeds per item kind, as in ym-api, so an item gets the same art as on the desktop. */ -object CoverHues { - fun album(id: Long) = huesFor(id.toULong()) - fun artist(id: Long) = huesFor(id.toULong() xor 0x5bd1_e995uL) - fun playlist(owner: Long, kind: Long) = huesFor(owner.toULong() * 1_000_003uL xor kind.toULong()) - fun clip(id: Long) = huesFor(id.toULong() xor 0x2c1b_3c6duL) - - /** A track borrows its album's art, or hashes its own (string) id. */ - fun track(id: String, albumId: Long?): Pair = huesFor( - albumId?.toULong() ?: id.encodeToByteArray().fold(7uL) { h, b -> h * 31uL + b.toUByte().toULong() }, - ) -} - /** Placeholder art for an item without a cover yet: two hues on a 135° diagonal. */ fun coverBrush(h1: Float, h2: Float): Brush = Brush.linearGradient( 0f to hsl(h1, 0.70f, 0.60f), diff --git a/app/src/main/res/drawable-xhdpi/banner.png b/tv/src/main/res/drawable-xhdpi/banner.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/banner.png rename to tv/src/main/res/drawable-xhdpi/banner.png diff --git a/app/src/main/res/drawable/ic_audio_lines.xml b/tv/src/main/res/drawable/ic_audio_lines.xml similarity index 100% rename from app/src/main/res/drawable/ic_audio_lines.xml rename to tv/src/main/res/drawable/ic_audio_lines.xml diff --git a/app/src/main/res/drawable/ic_ban.xml b/tv/src/main/res/drawable/ic_ban.xml similarity index 100% rename from app/src/main/res/drawable/ic_ban.xml rename to tv/src/main/res/drawable/ic_ban.xml diff --git a/app/src/main/res/drawable/ic_check.xml b/tv/src/main/res/drawable/ic_check.xml similarity index 100% rename from app/src/main/res/drawable/ic_check.xml rename to tv/src/main/res/drawable/ic_check.xml diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/tv/src/main/res/drawable/ic_chevron_left.xml similarity index 100% rename from app/src/main/res/drawable/ic_chevron_left.xml rename to tv/src/main/res/drawable/ic_chevron_left.xml diff --git a/app/src/main/res/drawable/ic_chevron_right.xml b/tv/src/main/res/drawable/ic_chevron_right.xml similarity index 100% rename from app/src/main/res/drawable/ic_chevron_right.xml rename to tv/src/main/res/drawable/ic_chevron_right.xml diff --git a/app/src/main/res/drawable/ic_clock_3.xml b/tv/src/main/res/drawable/ic_clock_3.xml similarity index 100% rename from app/src/main/res/drawable/ic_clock_3.xml rename to tv/src/main/res/drawable/ic_clock_3.xml diff --git a/app/src/main/res/drawable/ic_copy.xml b/tv/src/main/res/drawable/ic_copy.xml similarity index 100% rename from app/src/main/res/drawable/ic_copy.xml rename to tv/src/main/res/drawable/ic_copy.xml diff --git a/app/src/main/res/drawable/ic_disc_3.xml b/tv/src/main/res/drawable/ic_disc_3.xml similarity index 100% rename from app/src/main/res/drawable/ic_disc_3.xml rename to tv/src/main/res/drawable/ic_disc_3.xml diff --git a/app/src/main/res/drawable/ic_ellipsis.xml b/tv/src/main/res/drawable/ic_ellipsis.xml similarity index 100% rename from app/src/main/res/drawable/ic_ellipsis.xml rename to tv/src/main/res/drawable/ic_ellipsis.xml diff --git a/app/src/main/res/drawable/ic_globe.xml b/tv/src/main/res/drawable/ic_globe.xml similarity index 100% rename from app/src/main/res/drawable/ic_globe.xml rename to tv/src/main/res/drawable/ic_globe.xml diff --git a/app/src/main/res/drawable/ic_grip_vertical.xml b/tv/src/main/res/drawable/ic_grip_vertical.xml similarity index 100% rename from app/src/main/res/drawable/ic_grip_vertical.xml rename to tv/src/main/res/drawable/ic_grip_vertical.xml diff --git a/app/src/main/res/drawable/ic_heart.xml b/tv/src/main/res/drawable/ic_heart.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart.xml rename to tv/src/main/res/drawable/ic_heart.xml diff --git a/app/src/main/res/drawable/ic_heart_fill.xml b/tv/src/main/res/drawable/ic_heart_fill.xml similarity index 100% rename from app/src/main/res/drawable/ic_heart_fill.xml rename to tv/src/main/res/drawable/ic_heart_fill.xml diff --git a/app/src/main/res/drawable/ic_house.xml b/tv/src/main/res/drawable/ic_house.xml similarity index 100% rename from app/src/main/res/drawable/ic_house.xml rename to tv/src/main/res/drawable/ic_house.xml diff --git a/app/src/main/res/drawable/ic_library.xml b/tv/src/main/res/drawable/ic_library.xml similarity index 100% rename from app/src/main/res/drawable/ic_library.xml rename to tv/src/main/res/drawable/ic_library.xml diff --git a/app/src/main/res/drawable/ic_list_music.xml b/tv/src/main/res/drawable/ic_list_music.xml similarity index 100% rename from app/src/main/res/drawable/ic_list_music.xml rename to tv/src/main/res/drawable/ic_list_music.xml diff --git a/app/src/main/res/drawable/ic_lock.xml b/tv/src/main/res/drawable/ic_lock.xml similarity index 100% rename from app/src/main/res/drawable/ic_lock.xml rename to tv/src/main/res/drawable/ic_lock.xml diff --git a/app/src/main/res/drawable/ic_log_out.xml b/tv/src/main/res/drawable/ic_log_out.xml similarity index 100% rename from app/src/main/res/drawable/ic_log_out.xml rename to tv/src/main/res/drawable/ic_log_out.xml diff --git a/app/src/main/res/drawable/ic_mic_vocal.xml b/tv/src/main/res/drawable/ic_mic_vocal.xml similarity index 100% rename from app/src/main/res/drawable/ic_mic_vocal.xml rename to tv/src/main/res/drawable/ic_mic_vocal.xml diff --git a/app/src/main/res/drawable/ic_pause.xml b/tv/src/main/res/drawable/ic_pause.xml similarity index 100% rename from app/src/main/res/drawable/ic_pause.xml rename to tv/src/main/res/drawable/ic_pause.xml diff --git a/app/src/main/res/drawable/ic_pause_fill.xml b/tv/src/main/res/drawable/ic_pause_fill.xml similarity index 100% rename from app/src/main/res/drawable/ic_pause_fill.xml rename to tv/src/main/res/drawable/ic_pause_fill.xml diff --git a/app/src/main/res/drawable/ic_pencil.xml b/tv/src/main/res/drawable/ic_pencil.xml similarity index 100% rename from app/src/main/res/drawable/ic_pencil.xml rename to tv/src/main/res/drawable/ic_pencil.xml diff --git a/app/src/main/res/drawable/ic_play.xml b/tv/src/main/res/drawable/ic_play.xml similarity index 100% rename from app/src/main/res/drawable/ic_play.xml rename to tv/src/main/res/drawable/ic_play.xml diff --git a/app/src/main/res/drawable/ic_play_fill.xml b/tv/src/main/res/drawable/ic_play_fill.xml similarity index 100% rename from app/src/main/res/drawable/ic_play_fill.xml rename to tv/src/main/res/drawable/ic_play_fill.xml diff --git a/app/src/main/res/drawable/ic_plus.xml b/tv/src/main/res/drawable/ic_plus.xml similarity index 100% rename from app/src/main/res/drawable/ic_plus.xml rename to tv/src/main/res/drawable/ic_plus.xml diff --git a/app/src/main/res/drawable/ic_podcast.xml b/tv/src/main/res/drawable/ic_podcast.xml similarity index 100% rename from app/src/main/res/drawable/ic_podcast.xml rename to tv/src/main/res/drawable/ic_podcast.xml diff --git a/app/src/main/res/drawable/ic_repeat.xml b/tv/src/main/res/drawable/ic_repeat.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat.xml rename to tv/src/main/res/drawable/ic_repeat.xml diff --git a/app/src/main/res/drawable/ic_repeat_1.xml b/tv/src/main/res/drawable/ic_repeat_1.xml similarity index 100% rename from app/src/main/res/drawable/ic_repeat_1.xml rename to tv/src/main/res/drawable/ic_repeat_1.xml diff --git a/app/src/main/res/drawable/ic_search.xml b/tv/src/main/res/drawable/ic_search.xml similarity index 100% rename from app/src/main/res/drawable/ic_search.xml rename to tv/src/main/res/drawable/ic_search.xml diff --git a/app/src/main/res/drawable/ic_settings.xml b/tv/src/main/res/drawable/ic_settings.xml similarity index 100% rename from app/src/main/res/drawable/ic_settings.xml rename to tv/src/main/res/drawable/ic_settings.xml diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/tv/src/main/res/drawable/ic_shuffle.xml similarity index 100% rename from app/src/main/res/drawable/ic_shuffle.xml rename to tv/src/main/res/drawable/ic_shuffle.xml diff --git a/app/src/main/res/drawable/ic_skip_back.xml b/tv/src/main/res/drawable/ic_skip_back.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_back.xml rename to tv/src/main/res/drawable/ic_skip_back.xml diff --git a/app/src/main/res/drawable/ic_skip_forward.xml b/tv/src/main/res/drawable/ic_skip_forward.xml similarity index 100% rename from app/src/main/res/drawable/ic_skip_forward.xml rename to tv/src/main/res/drawable/ic_skip_forward.xml diff --git a/app/src/main/res/drawable/ic_sliders_horizontal.xml b/tv/src/main/res/drawable/ic_sliders_horizontal.xml similarity index 100% rename from app/src/main/res/drawable/ic_sliders_horizontal.xml rename to tv/src/main/res/drawable/ic_sliders_horizontal.xml diff --git a/app/src/main/res/drawable/ic_trash_2.xml b/tv/src/main/res/drawable/ic_trash_2.xml similarity index 100% rename from app/src/main/res/drawable/ic_trash_2.xml rename to tv/src/main/res/drawable/ic_trash_2.xml diff --git a/app/src/main/res/drawable/ic_trending_up.xml b/tv/src/main/res/drawable/ic_trending_up.xml similarity index 100% rename from app/src/main/res/drawable/ic_trending_up.xml rename to tv/src/main/res/drawable/ic_trending_up.xml diff --git a/app/src/main/res/drawable/ic_volume_2.xml b/tv/src/main/res/drawable/ic_volume_2.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_2.xml rename to tv/src/main/res/drawable/ic_volume_2.xml diff --git a/app/src/main/res/drawable/ic_volume_x.xml b/tv/src/main/res/drawable/ic_volume_x.xml similarity index 100% rename from app/src/main/res/drawable/ic_volume_x.xml rename to tv/src/main/res/drawable/ic_volume_x.xml diff --git a/app/src/main/res/drawable/ic_x.xml b/tv/src/main/res/drawable/ic_x.xml similarity index 100% rename from app/src/main/res/drawable/ic_x.xml rename to tv/src/main/res/drawable/ic_x.xml diff --git a/app/src/main/res/font/onest_medium.ttf b/tv/src/main/res/font/onest_medium.ttf similarity index 100% rename from app/src/main/res/font/onest_medium.ttf rename to tv/src/main/res/font/onest_medium.ttf diff --git a/app/src/main/res/font/onest_regular.ttf b/tv/src/main/res/font/onest_regular.ttf similarity index 100% rename from app/src/main/res/font/onest_regular.ttf rename to tv/src/main/res/font/onest_regular.ttf diff --git a/app/src/main/res/font/onest_semibold.ttf b/tv/src/main/res/font/onest_semibold.ttf similarity index 100% rename from app/src/main/res/font/onest_semibold.ttf rename to tv/src/main/res/font/onest_semibold.ttf diff --git a/app/src/main/res/font/unbounded_semibold.ttf b/tv/src/main/res/font/unbounded_semibold.ttf similarity index 100% rename from app/src/main/res/font/unbounded_semibold.ttf rename to tv/src/main/res/font/unbounded_semibold.ttf diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/tv/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_launcher.png rename to tv/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/tv/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_launcher.png rename to tv/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/tv/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to tv/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tv/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to tv/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tv/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to tv/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/values-notnight/colors.xml b/tv/src/main/res/values-notnight/colors.xml similarity index 100% rename from app/src/main/res/values-notnight/colors.xml rename to tv/src/main/res/values-notnight/colors.xml diff --git a/app/src/main/res/values-ru/strings.xml b/tv/src/main/res/values-ru/strings.xml similarity index 78% rename from app/src/main/res/values-ru/strings.xml rename to tv/src/main/res/values-ru/strings.xml index 3144524..c3dd315 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/tv/src/main/res/values-ru/strings.xml @@ -33,12 +33,6 @@ Вставьте OAuth-токен Отсканируйте, чтобы открыть страницу входа QR-код появится вместе с кодом для входа - Яндекс не принял этот токен. Проверьте его и вставьте ещё раз. - Срок действия кода истёк до подтверждения. Получите новый код и попробуйте снова. - Доступ отклонён на странице Яндекса. Если это ошибка, получите новый код. - Яндекс недоступен. Проверьте подключение и попробуйте ещё раз. - Яндекс не принял вход. Получите новый код и попробуйте снова. - Яндекс прислал неожиданный ответ. Попробуйте чуть позже. Слушать Вперемешку @@ -174,10 +168,6 @@ Других станций сейчас не предлагается. Качество звука - Без потерь - Лучшее - Оптимальное - Экономия трафика FLAC, если Яндекс даёт его для вашей подписки и региона, иначе лучшее из доступного. Трафика в 3–5 раз больше, чем у MP3, и треки дольше запускаются. Самый высокий битрейт MP3, который даёт Яндекс, до 320 кбит/с. До 192 кбит/с. Примерно на 40% меньше трафика. @@ -246,49 +236,8 @@ Удалить «%1$s»? Плейлист и порядок треков удалятся навсегда. Сами треки останутся в Яндекс Музыке. - «%1$s» уже играет - «%1$s» зазвучит следующим - «%1$s» добавлен в очередь - Ищем треки в духе «%1$s»… - У Яндекса нет похожих треков для «%1$s» - Не удалось найти похожие треки. Попробуйте ещё раз. Открываем «%1$s» в браузере На этом телевизоре нет браузера, чтобы открыть клип. - Добавлено в «Мне нравится» - Убрано из «Мне нравится» - Не удалось изменить отметку. Попробуйте ещё раз. - Этот трек больше не будет попадаться в рекомендациях - Трек снова может попадаться в рекомендациях - Не удалось это изменить. Попробуйте ещё раз. - Альбом добавлен в коллекцию - Альбом убран из коллекции - Исполнитель добавлен в коллекцию - Исполнитель убран из коллекции - Плейлист добавлен в коллекцию - Плейлист убран из коллекции - Клип добавлен в коллекцию - Клип убран из коллекции - Добавлено в «%1$s» - Добавлено в плейлист - Не удалось добавить в «%1$s». Попробуйте ещё раз. - Не удалось добавить в плейлист. Попробуйте ещё раз. - Плейлист «%1$s» создан - Плейлист «%1$s» создан, трек добавлен - Не удалось создать плейлист. Попробуйте ещё раз. - Плейлист переименован в «%1$s» - Не удалось переименовать плейлист. Попробуйте ещё раз. - Теперь плейлист видят все, у кого есть ссылка - Теперь плейлист видите только вы - Не удалось изменить доступ. Попробуйте ещё раз. - Плейлист «%1$s» удалён - Не удалось удалить «%1$s». Попробуйте ещё раз. - Удалено из плейлиста - Не удалось удалить трек. Попробуйте ещё раз. - Перемещено - Не удалось переместить трек. Попробуйте ещё раз. - Качество звука: %1$s. Применится со следующего трека. - Кеш обложек очищен - Не удалось очистить кеш обложек. %1$d мин %1$d ч %2$d мин @@ -317,12 +266,6 @@ %1$s лайков %1$s лайка - - Играем %1$d трек в духе «%2$s» - Играем %1$d трека в духе «%2$s» - Играем %1$d треков в духе «%2$s» - Играем %1$d трека в духе «%2$s» - января diff --git a/app/src/main/res/values/colors.xml b/tv/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to tv/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/strings.xml b/tv/src/main/res/values/strings.xml similarity index 79% rename from app/src/main/res/values/strings.xml rename to tv/src/main/res/values/strings.xml index 5ec41a7..42ca440 100644 --- a/app/src/main/res/values/strings.xml +++ b/tv/src/main/res/values/strings.xml @@ -37,12 +37,6 @@ Paste OAuth token Scan to open the sign-in page A QR code appears with your sign-in code - Yandex didn\'t accept that token. Check it and paste it again. - The code expired before it was confirmed. Get a new code to try again. - Access was declined on Yandex\'s page. Get a new code if that was a mistake. - Can\'t reach Yandex. Check your connection and try again. - Yandex didn\'t accept the sign-in. Get a new code to try again. - Yandex sent an unexpected answer. Try again in a moment. Play @@ -187,10 +181,6 @@ Streaming quality - Lossless - Best - Balanced - Data saver FLAC when Yandex offers it for your subscription and region, otherwise the best it allows. About 3–5 times the data of MP3, and tracks take longer to start. Highest MP3 bitrate Yandex offers, up to 320 kbps. Up to 192 kbps. About 40% less data. @@ -262,49 +252,8 @@ The playlist and its track order go away for good. The tracks stay in Yandex Music. - “%1$s” is already playing - “%1$s” plays next - Added “%1$s” to the queue - Finding tracks like “%1$s”… - Yandex has no similar tracks for “%1$s” - Couldn\'t find similar tracks. Try again. Opening “%1$s” in the browser There\'s no browser on this TV to play clips in. - Added to Liked tracks - Removed from Liked tracks - Couldn\'t change the like. Try again. - You won\'t be recommended this track - Recommendations for this track restored - Couldn\'t change that. Try again. - Album added to your collection - Album removed from your collection - Artist added to your collection - Artist removed from your collection - Playlist added to your collection - Playlist removed from your collection - Clip added to your collection - Clip removed from your collection - Added to “%1$s” - Added to the playlist - Couldn\'t add to “%1$s”. Try again. - Couldn\'t add to the playlist. Try again. - Created “%1$s” - Created “%1$s” with the track - Couldn\'t create the playlist. Try again. - Renamed to “%1$s” - Couldn\'t rename the playlist. Try again. - Anyone with the link can now see this playlist - Only you can see this playlist now - Couldn\'t change who can see it. Try again. - Deleted “%1$s” - Couldn\'t delete “%1$s”. Try again. - Removed from the playlist - Couldn\'t remove the track. Try again. - Moved - Couldn\'t move the track. Try again. - Streaming quality: %1$s. Applies from the next track. - Cover cache cleared - Couldn\'t clear the cover cache. %1$d min @@ -326,10 +275,6 @@ %1$s like %1$s likes - - Playing %1$d track like “%2$s” - Playing %1$d tracks like “%2$s” - January diff --git a/app/src/main/res/values/themes.xml b/tv/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to tv/src/main/res/values/themes.xml diff --git a/app/src/main/res/xml/backup_rules.xml b/tv/src/main/res/xml/backup_rules.xml similarity index 100% rename from app/src/main/res/xml/backup_rules.xml rename to tv/src/main/res/xml/backup_rules.xml diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/tv/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from app/src/main/res/xml/data_extraction_rules.xml rename to tv/src/main/res/xml/data_extraction_rules.xml diff --git a/app/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt b/tv/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt similarity index 69% rename from app/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt rename to tv/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt index 0859577..175ea36 100644 --- a/app/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt +++ b/tv/src/test/java/it/panov/musyx/tv/ui/theme/ThemeTest.kt @@ -2,7 +2,7 @@ package it.panov.musyx.tv.ui.theme import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.sp -import it.panov.musyx.tv.data.FontSize +import it.panov.musyx.data.FontSize import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test @@ -26,17 +26,6 @@ class ThemeTest { assertEquals(0f, blue.red, 1e-5f) } - // Expected values come from ym-api's `hues_for` and its per-kind seeds (u64 wrapping maths). - @Test - fun huesMatchTheDesktop() { - assertEquals(47f to 221f, CoverHues.album(1)) - assertEquals(329f to 335f, CoverHues.album(-1)) - assertEquals(233f to 119f, CoverHues.artist(42)) - assertEquals(2f to 356f, CoverHues.playlist(owner = 503_646_255, kind = 3)) - assertEquals(295f to 85f, CoverHues.track("12345:678", albumId = null)) - assertEquals(CoverHues.album(7), CoverHues.track("12345:678", albumId = 7)) - } - // Every size scales the desktop sizes, and all of them stay under the original TV scale. @Test fun fontSizeScalesType() {