From bba6e4554403760097840bf8ae9c8f75272382fe Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 09:44:59 +0000 Subject: [PATCH 01/34] chore(build): unify all Android modules on JVM 17 Remaining 8 modules still targeted JVM 11 with stale comments about pre-KMP inline constraints (core, networking). All consumers are now on JVM 17 (app, designsystem, fixtures), AGP 9.4.1 + Kotlin 2.4.20 fully support 17, desugaring is on. Bump compileOptions + jvmTarget together so inline functions can't mix bytecode levels. Majors verified current as of 2026-09-27, intentionally untouched: AGP 9.4.1, Kotlin 2.4.20, Media3 1.11.1, Compose BOM 2026.09.00, Coil 3.6.2, Ktor 3.6.0, Room 2.8.3. R8 fullMode=false left as-is (Retrofit-adapter crash needs root-causing before AGP 10). Needs ./gradlew :android:app:assembleDebug on a machine with Android SDK + JDK 21 to verify. --- android/core/build.gradle.kts | 4 ++-- android/downloads/build.gradle.kts | 6 +++--- android/imageloader/build.gradle | 6 +++--- android/mediaprovider/core/build.gradle.kts | 4 ++-- android/networking/build.gradle.kts | 4 ++-- android/playback/build.gradle | 6 +++--- android/saf/build.gradle | 6 +++--- android/trial/build.gradle | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/android/core/build.gradle.kts b/android/core/build.gradle.kts index e625630a1c..e74e047be2 100644 --- a/android/core/build.gradle.kts +++ b/android/core/build.gradle.kts @@ -20,9 +20,9 @@ kotlin { enable = true } - // As before the conversion: the Android modules that inline core's functions (appGraph()) target 11 + // All Android modules target JVM 17 (unified Sept 2026; was 11 pre-KMP conversion) compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_17) } } diff --git a/android/downloads/build.gradle.kts b/android/downloads/build.gradle.kts index 5df8149f14..542a65d1e4 100644 --- a/android/downloads/build.gradle.kts +++ b/android/downloads/build.gradle.kts @@ -13,8 +13,8 @@ android { consumerProguardFiles("consumer-rules.pro") } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace = "com.simplecityapps.shuttle.downloads" @@ -27,7 +27,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_17) } } diff --git a/android/imageloader/build.gradle b/android/imageloader/build.gradle index 89e7ab7532..632a3d45a5 100644 --- a/android/imageloader/build.gradle +++ b/android/imageloader/build.gradle @@ -12,8 +12,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace = 'com.simplecityapps.imageloading' @@ -21,7 +21,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_17 } } diff --git a/android/mediaprovider/core/build.gradle.kts b/android/mediaprovider/core/build.gradle.kts index bd21484024..0f30786616 100644 --- a/android/mediaprovider/core/build.gradle.kts +++ b/android/mediaprovider/core/build.gradle.kts @@ -21,9 +21,9 @@ kotlin { enable = true } - // As before the conversion, for the Android modules that depend on it + // All Android modules target JVM 17 (unified Sept 2026) compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_17) } } diff --git a/android/networking/build.gradle.kts b/android/networking/build.gradle.kts index f5a2626efc..a1cbc0bb8f 100644 --- a/android/networking/build.gradle.kts +++ b/android/networking/build.gradle.kts @@ -12,9 +12,9 @@ kotlin { namespace = "com.simplecityapps.networking" // OkHttp's Android artifact compiles against 37, which its consumers must match compileSdk = 37 - // :android:trial still builds for JVM 11 and inlines NetworkResult.map, which can't inline JVM 17 bytecode + // All Android modules target JVM 17 (unified Sept 2026) compilerOptions { - jvmTarget.set(JvmTarget.JVM_11) + jvmTarget.set(JvmTarget.JVM_17) } } diff --git a/android/playback/build.gradle b/android/playback/build.gradle index 8c1895d770..9710f77cb4 100644 --- a/android/playback/build.gradle +++ b/android/playback/build.gradle @@ -13,8 +13,8 @@ android { consumerProguardFiles("consumer-rules.pro") } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace = 'com.simplecityapps.playback' @@ -30,7 +30,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_17 optIn.add('kotlin.time.ExperimentalTime') } } diff --git a/android/saf/build.gradle b/android/saf/build.gradle index eb72f0d3f1..b7b7c81ead 100644 --- a/android/saf/build.gradle +++ b/android/saf/build.gradle @@ -14,8 +14,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } @@ -24,7 +24,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_17 } } diff --git a/android/trial/build.gradle b/android/trial/build.gradle index 220b4e7e2b..be48e17482 100644 --- a/android/trial/build.gradle +++ b/android/trial/build.gradle @@ -16,8 +16,8 @@ android { consumerProguardFiles "consumer-rules.pro" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } namespace = 'com.simplecityapps.trial' @@ -26,7 +26,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 + jvmTarget = JvmTarget.JVM_17 optIn.add('kotlin.time.ExperimentalTime') } } From 337d578985dfc0f4b5460e10197d041716b4bb7c Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 11:56:57 +0000 Subject: [PATCH 02/34] feat(app): predictive back, per-app locale config, drop dead legacy storage flag - enableOnBackInvokedCallback=true (targetSdk 36) - localeConfig locales_config.xml (en seed for Settings per-app picker) - remove requestLegacyExternalStorage (ignored since API 30) M3 Expressive stays on 1.5.0-alpha29 (latest as of 2026-09-27; stable 1.4.0, 1.5.0 stable later in 2026). M2 styles.xml + google.material dep stay: Cast route chooser + server sign-in dialog fragments still need the View theme (see MainActivity KDoc). --- android/app/src/main/AndroidManifest.xml | 3 ++- android/app/src/main/res/xml/locales_config.xml | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 android/app/src/main/res/xml/locales_config.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8baddc4bc2..6f9a67ffb7 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -20,10 +20,11 @@ android:fullBackupContent="@xml/backup_descriptor" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme.DayNight" + android:enableOnBackInvokedCallback="true" + android:localeConfig="@xml/locales_config" tools:ignore="GoogleAppIndexingWarning"> + + + + From 3389a4617150cad2f16273d886604ba5bd6727dd Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 11:58:01 +0000 Subject: [PATCH 03/34] chore(k8s): remote-cluster one-shot builder (no docker/colima needed) Port OffBookPlus k8s flow for standalone k3s: tar+kubectl-cp seed pod instead of rsync/hostPath, SDK bootstraps at runtime from temurin JDK 21 into a local-path PVC (sdk+gradle+workspace survive across builds). Keeps Dockerfile for docker-capable hosts. OffBookPlus scripts unusable here: no docker/colima/rsync on host, cluster is remote (node luxai, amd64) so hostPath sync can't work. --- k8s/Dockerfile | 49 +++++++++++ k8s/README.md | 39 +++++++++ k8s/config.env | 32 +++++++ k8s/scripts/build-remote.sh | 131 ++++++++++++++++++++++++++++ k8s/templates/job-build-remote.yaml | 58 ++++++++++++ k8s/templates/pod-seed.yaml | 21 +++++ k8s/templates/pvc.yaml | 10 +++ 7 files changed, 340 insertions(+) create mode 100644 k8s/Dockerfile create mode 100644 k8s/README.md create mode 100644 k8s/config.env create mode 100755 k8s/scripts/build-remote.sh create mode 100644 k8s/templates/job-build-remote.yaml create mode 100644 k8s/templates/pod-seed.yaml create mode 100644 k8s/templates/pvc.yaml diff --git a/k8s/Dockerfile b/k8s/Dockerfile new file mode 100644 index 0000000000..4350eec9d4 --- /dev/null +++ b/k8s/Dockerfile @@ -0,0 +1,49 @@ +# Toolchain image for building Shuttle2 as one-shot Jobs. +# Mirrors the OffBookPlus builder: Temurin JDK 21 + Android SDK (API 37). +# Used only by clusters WITH a container runtime to build images +# (docker/colima). Clusters without one (e.g. remote k3s) should use +# k8s/scripts/build-remote.sh, which bootstraps the SDK at Job runtime +# from eclipse-temurin:21-jdk-noble and needs no image build. +# +# Shuttle2 needs: compileSdk 37, AGP 9.4.1, Gradle 9.7.x, JDK 21. +# No NDK: the KMP iOS targets are not built by :android:app:assembleDebug. + +FROM eclipse-temurin:21-jdk-noble + +ENV ANDROID_HOME=/opt/android-sdk \ + CMDLINE_TOOLS_VERSION=13114758 +ENV PATH="${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}" + +RUN apt-get update \ + && apt-get install -y --no-install-recommends unzip curl ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p "${ANDROID_HOME}/cmdline-tools" \ + && curl -fsSL -o /tmp/cmdline-tools.zip \ + "https://dl.google.com/android/repository/commandlinetools-linux-${CMDLINE_TOOLS_VERSION}_latest.zip" \ + && unzip -q /tmp/cmdline-tools.zip -d "${ANDROID_HOME}/cmdline-tools" \ + && mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest" \ + && rm /tmp/cmdline-tools.zip + +RUN yes | sdkmanager --licenses > /dev/null \ + && sdkmanager --install \ + "platform-tools" \ + "platforms;android-37.0" \ + "platforms;android-37.1" \ + "build-tools;37.0.0" \ + > /dev/null \ + && yes | sdkmanager --licenses > /dev/null + +# aapt2 is x86_64-only; on arm64 hosts it runs through qemu-user, which needs +# the amd64 loader/libs. Last heavy layer so refreshes skip SDK downloads. +RUN dpkg --add-architecture amd64 \ + && sed -i 's/^Types: deb$/Types: deb\nArchitectures: arm64/' /etc/apt/sources.list.d/ubuntu.sources \ + && echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble main universe" > /etc/apt/sources.list.d/amd64.list \ + && echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu noble-updates main universe" >> /etc/apt/sources.list.d/amd64.list \ + && apt-get update \ + && apt-get install -y --no-install-recommends libc6:amd64 libstdc++6:amd64 zlib1g:amd64 \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /workspace + +CMD ["bash"] diff --git a/k8s/README.md b/k8s/README.md new file mode 100644 index 0000000000..a80b1dc832 --- /dev/null +++ b/k8s/README.md @@ -0,0 +1,39 @@ +# Shuttle2 k8s builders + +Two flows, same Gradle tasks: + +| Flow | Needs on this host | Cluster needs | Use when | +|---|---|---|---| +| `scripts/build-remote.sh` | `kubectl` + tar only | internet, `local-path` storage | remote k3s without docker (current setup) | +| `Dockerfile` + image | docker (or colima) | image visible to k3s | iterating often; SDK baked, no bootstrap | + +## build-remote.sh (current default) + +```bash +# debug APK (first run bootstraps SDK ~500MB + Gradle dist into the PVC cache) +./k8s/scripts/build-remote.sh --task :android:app:assembleDebug + +# reuse workspace already on the PVC (skip the tar+cp) +./k8s/scripts/build-remote.sh --task :android:app:assembleDebug --no-sync + +# unit tests / lint +./k8s/scripts/build-remote.sh --task :android:app:testDebugUnitTest +./k8s/scripts/build-remote.sh --task :android:app:lintDebug +``` + +State: namespace `shuttle-build`, PVC `shuttle-build-cache` (25Gi, `local-path`) +holding `sdk/`, `gradle/`, `workspace/`. Override via `k8s/config.env` +(`KUBE_CONTEXT`, `NAMESPACE`, `CACHE_SIZE`, task, CPU/mem). APKs land back in +`android/app/build/outputs/`; full log in `k8s/.cache-remote/last-build.log`. + +Ported from OffBookPlus `k8s/` (colima+docker+rsync flow), adapted for a +remote cluster: no colima (`ensure_cluster` dropped), no rsync (tar + +`kubectl cp` via a seed pod), no prebuilt image (SDK bootstraps at runtime +from `eclipse-temurin:21-jdk-noble` — internet confirmed from the cluster). + +## Dockerfile + +For docker-capable hosts: `docker build -f k8s/Dockerfile -t +localhost/shuttle-android-builder:jdk21 .` then run the build Job against it +(skips the ~5min SDK bootstrap). Same SDK set as OffBookPlus (API +37.0+37.1, build-tools 37.0.0, JDK 21) matching `compileSdk 37`. diff --git a/k8s/config.env b/k8s/config.env new file mode 100644 index 0000000000..90d2c05f3c --- /dev/null +++ b/k8s/config.env @@ -0,0 +1,32 @@ +# Shared configuration for the Shuttle2 k8s one-shot builders. +# Sourced by every script in k8s/scripts/. Override per call, e.g.: +# NAMESPACE=shuttle-build ./build-remote.sh --task :android:app:assembleDebug + +# --- cluster --------------------------------------------------------------- +# kubeconfig context. OffBookPlus scripts default to colima; this cluster is +# a standalone k3s, so the default here is the current context (empty = kubectl default). +KUBE_CONTEXT="${KUBE_CONTEXT:-}" +NAMESPACE="${NAMESPACE:-shuttle-build}" +KUBECTL="${KUBECTL:-kubectl}" + +# --- images ---------------------------------------------------------------- +# Prebuilt toolchain (k8s/Dockerfile). Only needed for build.sh (docker flow). +IMAGE="${IMAGE:-localhost/shuttle-android-builder:jdk21}" +# Base image for build-remote.sh (SDK bootstrapped at runtime, no image build). +REMOTE_BASE_IMAGE="${REMOTE_BASE_IMAGE:-eclipse-temurin:21-jdk-noble}" +SEED_IMAGE="${SEED_IMAGE:-alpine:3.21}" + +# --- persistent cache ------------------------------------------------------ +# One RWO PVC (local-path) holds sdk/, gradle/ and workspace/ across builds. +CACHE_PVC="${CACHE_PVC:-shuttle-build-cache}" +CACHE_SIZE="${CACHE_SIZE:-25Gi}" + +# --- build job ------------------------------------------------------------- +GRADLE_TASK="${GRADLE_TASK:-:android:app:assembleDebug}" +JOB_CPU_LIMIT="${JOB_CPU_LIMIT:-3}" +JOB_MEM_LIMIT="${JOB_MEM_LIMIT:-6000Mi}" +GRADLE_OPTS_VALUE="${GRADLE_OPTS_VALUE:--Dorg.gradle.jvmargs=-Xmx4g -Dkotlin.compiler.execution.strategy=in-process -Dorg.gradle.workers.max=2}" +JOB_DEADLINE_SECONDS="${JOB_DEADLINE_SECONDS:-3000}" + +# --- app ------------------------------------------------------------------- +APP_ID="${APP_ID:-com.simplecityapps.shuttle}" diff --git a/k8s/scripts/build-remote.sh b/k8s/scripts/build-remote.sh new file mode 100755 index 0000000000..8534fe1cdc --- /dev/null +++ b/k8s/scripts/build-remote.sh @@ -0,0 +1,131 @@ +#!/usr/bin/env bash +# Build Shuttle2 on a remote k3s cluster (no docker/colima/rsync/java needed +# on this host) as a one-shot Job. +# +# Flow: ensure ns+PVC -> seed pod -> kubectl cp sources in -> delete seed -> +# apply build Job (SDK bootstraps into PVC on first run, Gradle caches) -> +# stream logs -> kubectl cp APKs back. +# +# Usage: ./build-remote.sh [options] [-- extra gradle args] +# -t, --task TASK Gradle task(s) (default: :android:app:assembleDebug) +# --namespace NS Build namespace (default: shuttle-build) +# --keep-job Do not delete the Job after success +# --no-sync Reuse workspace already on the PVC +# -h, --help +set -eo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +K8S_DIR="$(cd "$SCRIPT_DIR/.." && pwd)" +REPO_ROOT="$(cd "$K8S_DIR/.." && pwd)" +# shellcheck disable=SC1091 +source "$K8S_DIR/config.env" + +TASK="$GRADLE_TASK" +NS="$NAMESPACE" +KEEP_JOB=0 +DO_SYNC=1 +EXTRA_ARGS=() + +while [ $# -gt 0 ]; do + case "$1" in + -t | --task) TASK="$2"; shift 2 ;; + --namespace) NS="$2"; shift 2 ;; + --keep-job) KEEP_JOB=1; shift ;; + --no-sync) DO_SYNC=0; shift ;; + --) shift; EXTRA_ARGS=("$@"); break ;; + -h | --help) sed -n '2,12p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; + *) echo "error: unknown option: $1 (see --help)" >&2; exit 1 ;; + esac +done + +GRADLE_ARGS="$TASK ${EXTRA_ARGS[*]:-}" +GRADLE_ARGS="${GRADLE_ARGS% }" + +if [ -n "$KUBE_CONTEXT" ]; then CTX=(--context "$KUBE_CONTEXT"); else CTX=(); fi +kc() { "$KUBECTL" "${CTX[@]}" "$@"; } + +CACHE_DIR="$K8S_DIR/.cache-remote" +mkdir -p "$CACHE_DIR" + +render() { # template out KEY=val... + local template="$1" out="$2"; shift 2 + local rendered; rendered="$(cat "$template")" + local pair key val + for pair in "$@"; do key="${pair%%=*}"; val="${pair#*=}" + rendered="${rendered//__${key}__/${val}}"; done + printf '%s\n' "$rendered" > "$out" +} + +echo "==> namespace $NS" +kc get namespace "$NS" >/dev/null 2>&1 || kc create namespace "$NS" >/dev/null + +echo "==> PVC $CACHE_PVC ($CACHE_SIZE)" +if ! kc get pvc "$CACHE_PVC" -n "$NS" >/dev/null 2>&1; then + render "$K8S_DIR/templates/pvc.yaml" "$CACHE_DIR/pvc.yaml" \ + "PVC_NAME=$CACHE_PVC" "NAMESPACE=$NS" "CACHE_SIZE=$CACHE_SIZE" + kc apply -f "$CACHE_DIR/pvc.yaml" +fi + +if [ "$DO_SYNC" -eq 1 ]; then + SEED="seed-$(date +%Y%m%d-%H%M%S)-$RANDOM" + render "$K8S_DIR/templates/pod-seed.yaml" "$CACHE_DIR/$SEED.yaml" \ + "POD_NAME=$SEED" "NAMESPACE=$NS" "SEED_IMAGE=$SEED_IMAGE" "PVC_NAME=$CACHE_PVC" + echo "==> seed pod $SEED" + kc apply -f "$CACHE_DIR/$SEED.yaml" >/dev/null + kc wait --for=condition=Ready "pod/$SEED" -n "$NS" --timeout=180s >/dev/null + echo "==> copying sources (tar via kubectl cp)" + # kubectl cp needs a tar binary in the target; install it first. + kc exec "$SEED" -n "$NS" -- sh -c "apk add --no-cache tar > /dev/null 2>&1 || true; rm -rf /mnt/workspace; mkdir -p /mnt/workspace" + TAR="$CACHE_DIR/sources.tar" + tar -cf "$TAR" \ + --exclude=.git --exclude=.gradle --exclude=.kotlin --exclude=.idea \ + --exclude='*/build' --exclude=k8s/.cache-remote --exclude=k8s/.workspace \ + --exclude=local.properties --exclude=.DS_Store \ + -C "$REPO_ROOT" . + kc cp "$TAR" "$NS/$SEED:/mnt/sources.tar" >/dev/null + kc exec "$SEED" -n "$NS" -- sh -c "tar -xf /mnt/sources.tar -C /mnt/workspace && rm /mnt/sources.tar && echo 'sdk.dir=/mnt/sdk' > /mnt/workspace/local.properties && ls /mnt/workspace | head -5" + kc delete pod "$SEED" -n "$NS" --wait=true >/dev/null + rm -f "$TAR" "$CACHE_DIR/$SEED.yaml" +else + echo "==> reusing workspace on PVC (--no-sync)" +fi + +JOB="shuttle-build-$(date +%Y%m%d-%H%M%S)-$RANDOM" +render "$K8S_DIR/templates/job-build-remote.yaml" "$CACHE_DIR/$JOB.yaml" \ + "JOB_NAME=$JOB" "NAMESPACE=$NS" "DEADLINE=$JOB_DEADLINE_SECONDS" \ + "BASE_IMAGE=$REMOTE_BASE_IMAGE" "GRADLE_ARGS=$GRADLE_ARGS" \ + "GRADLE_OPTS_VALUE=$GRADLE_OPTS_VALUE" "CPU_LIMIT=$JOB_CPU_LIMIT" \ + "MEM_LIMIT=$JOB_MEM_LIMIT" "PVC_NAME=$CACHE_PVC" + +echo "==> job $JOB (task: $GRADLE_ARGS)" +kc apply -f "$CACHE_DIR/$JOB.yaml" >/dev/null + +echo "==> streaming logs (deadline ${JOB_DEADLINE_SECONDS}s)" +set +e +kc wait --for=jsonpath='{.status.succeeded}'=1 "job/$JOB" -n "$NS" --timeout="${JOB_DEADLINE_SECONDS}s" & +WAITER=$! +while kill -0 $WAITER 2>/dev/null; do + kc logs -n "$NS" -l job-name="$JOB" --tail=5 2>/dev/null | tail -3 + sleep 30 +done +wait $WAITER +RC=$? +set -e + +if [ $RC -eq 0 ]; then + echo "==> build succeeded; fetching APKs" + OUT="$REPO_ROOT/android/app/build/outputs" + mkdir -p "$OUT" + POD="$(kc get pods -n "$NS" -l job-name="$JOB" -o jsonpath='{.items[0].metadata.name}')" + kc cp "$NS/$POD:/mnt/workspace/android/app/build/outputs" "$OUT-tmp" >/dev/null 2>&1 || true + if [ -d "$OUT-tmp" ]; then rm -rf "$OUT"; mv "$OUT-tmp" "$OUT"; fi + find "$OUT" -type f \( -name '*.apk' -o -name '*.aab' \) 2>/dev/null | head -10 + kc logs -n "$NS" -l job-name="$JOB" > "$CACHE_DIR/last-build.log" 2>/dev/null || true + [ "$KEEP_JOB" -eq 0 ] && kc delete job "$JOB" -n "$NS" >/dev/null + rm -f "$CACHE_DIR/$JOB.yaml" + echo "==> done" +else + echo "error: build failed/timed out; job kept: $JOB" >&2 + echo " logs: $KUBECTL -n $NS logs -l job-name=$JOB" >&2 + exit 1 +fi diff --git a/k8s/templates/job-build-remote.yaml b/k8s/templates/job-build-remote.yaml new file mode 100644 index 0000000000..6dac79f801 --- /dev/null +++ b/k8s/templates/job-build-remote.yaml @@ -0,0 +1,58 @@ +# One-shot Shuttle2 build. Sources + SDK + Gradle home all live on the cache +# PVC (seeded by build-remote.sh via the seed pod). The SDK bootstraps on +# first run (~500MB download, then cached); Gradle dist + deps cache in +# /mnt/gradle across builds. +apiVersion: batch/v1 +kind: Job +metadata: + name: __JOB_NAME__ + namespace: __NAMESPACE__ +spec: + activeDeadlineSeconds: __DEADLINE__ + backoffLimit: 0 + template: + spec: + restartPolicy: Never + containers: + - name: build + image: __BASE_IMAGE__ + command: + - bash + - -c + - | + set -e + export ANDROID_HOME=/mnt/sdk ANDROID_SDK_ROOT=/mnt/sdk GRADLE_USER_HOME=/mnt/gradle + export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH" + if [ ! -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then + echo "==> bootstrapping Android SDK into PVC cache" + apt-get update -qq && apt-get install -y -qq --no-install-recommends unzip curl ca-certificates > /dev/null + mkdir -p "$ANDROID_HOME/cmdline-tools" + curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" + unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools" + mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest" + rm /tmp/cmdline-tools.zip + yes | sdkmanager --licenses > /dev/null + sdkmanager --install "platform-tools" "platforms;android-37.0" "platforms;android-37.1" "build-tools;37.0.0" > /dev/null + yes | sdkmanager --licenses > /dev/null + fi + cd /mnt/workspace + echo "local.properties:"; echo "sdk.dir=/mnt/sdk" > local.properties + echo "==> ./gradlew __GRADLE_ARGS__" + ./gradlew __GRADLE_ARGS__ --console=plain + env: + - name: GRADLE_OPTS + value: "__GRADLE_OPTS_VALUE__" + resources: + limits: + cpu: "__CPU_LIMIT__" + memory: "__MEM_LIMIT__" + requests: + cpu: "__CPU_LIMIT__" + memory: "__MEM_LIMIT__" + volumeMounts: + - name: cache + mountPath: /mnt + volumes: + - name: cache + persistentVolumeClaim: + claimName: __PVC_NAME__ diff --git a/k8s/templates/pod-seed.yaml b/k8s/templates/pod-seed.yaml new file mode 100644 index 0000000000..d0a2ed6875 --- /dev/null +++ b/k8s/templates/pod-seed.yaml @@ -0,0 +1,21 @@ +# Helper pod: a kubectl-cp target for syncing sources into the cache PVC. +# build-remote.sh creates it, copies the repo in, then deletes it before +# applying the build Job (RWO volume, sequential use). +apiVersion: v1 +kind: Pod +metadata: + name: __POD_NAME__ + namespace: __NAMESPACE__ +spec: + restartPolicy: Never + containers: + - name: seed + image: __SEED_IMAGE__ + command: ["sh", "-c", "mkdir -p /mnt/workspace && sleep 3600"] + volumeMounts: + - name: cache + mountPath: /mnt + volumes: + - name: cache + persistentVolumeClaim: + claimName: __PVC_NAME__ diff --git a/k8s/templates/pvc.yaml b/k8s/templates/pvc.yaml new file mode 100644 index 0000000000..8a18898e77 --- /dev/null +++ b/k8s/templates/pvc.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: __PVC_NAME__ + namespace: __NAMESPACE__ +spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: __CACHE_SIZE__ From d085f6faedd1fc790b84d09dc30d0a6f79366df6 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:24:37 +0000 Subject: [PATCH 04/34] fix(k8s): provision JDK 17 + git in remote builder, forward version props Remote build failed two ways: KMP requests a Java 17 toolchain but the temurin image ships only 21 (no auto-provisioning configured), and app/build.gradle.kts shells to git for versioning (binary missing broke config-cache store). Bootstrap now fetches Temurin 17 once into the PVC and registers installations.paths, ensures git exists, and build-remote.sh forwards local git-describe as -PversionCode/Name since .git (714M) is excluded from the sync. --- k8s/.cache-remote/pvc.yaml | 10 ++++ .../shuttle-build-20260927-115854-31416.yaml | 58 +++++++++++++++++++ k8s/scripts/build-remote.sh | 10 ++++ k8s/templates/job-build-remote.yaml | 19 +++++- 4 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 k8s/.cache-remote/pvc.yaml create mode 100644 k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml diff --git a/k8s/.cache-remote/pvc.yaml b/k8s/.cache-remote/pvc.yaml new file mode 100644 index 0000000000..1b68a96388 --- /dev/null +++ b/k8s/.cache-remote/pvc.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: shuttle-build-cache + namespace: shuttle-build +spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 25Gi diff --git a/k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml b/k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml new file mode 100644 index 0000000000..dd77a4250e --- /dev/null +++ b/k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml @@ -0,0 +1,58 @@ +# One-shot Shuttle2 build. Sources + SDK + Gradle home all live on the cache +# PVC (seeded by build-remote.sh via the seed pod). The SDK bootstraps on +# first run (~500MB download, then cached); Gradle dist + deps cache in +# /mnt/gradle across builds. +apiVersion: batch/v1 +kind: Job +metadata: + name: shuttle-build-20260927-115854-31416 + namespace: shuttle-build +spec: + activeDeadlineSeconds: 3000 + backoffLimit: 0 + template: + spec: + restartPolicy: Never + containers: + - name: build + image: eclipse-temurin:21-jdk-noble + command: + - bash + - -c + - | + set -e + export ANDROID_HOME=/mnt/sdk ANDROID_SDK_ROOT=/mnt/sdk GRADLE_USER_HOME=/mnt/gradle + export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH" + if [ ! -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then + echo "==> bootstrapping Android SDK into PVC cache" + apt-get update -qq && apt-get install -y -qq --no-install-recommends unzip curl ca-certificates > /dev/null + mkdir -p "$ANDROID_HOME/cmdline-tools" + curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" + unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools" + mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest" + rm /tmp/cmdline-tools.zip + yes | sdkmanager --licenses > /dev/null + sdkmanager --install "platform-tools" "platforms;android-37.0" "platforms;android-37.1" "build-tools;37.0.0" > /dev/null + yes | sdkmanager --licenses > /dev/null + fi + cd /mnt/workspace + echo "local.properties:"; echo "sdk.dir=/mnt/sdk" > local.properties + echo "==> ./gradlew :android:app:assembleDebug" + ./gradlew :android:app:assembleDebug --console=plain + env: + - name: GRADLE_OPTS + value: "-Dorg.gradle.jvmargs=-Xmx4g -Dkotlin.compiler.execution.strategy=in-process -Dorg.gradle.workers.max=2" + resources: + limits: + cpu: "3" + memory: "6000Mi" + requests: + cpu: "3" + memory: "6000Mi" + volumeMounts: + - name: cache + mountPath: /mnt + volumes: + - name: cache + persistentVolumeClaim: + claimName: shuttle-build-cache diff --git a/k8s/scripts/build-remote.sh b/k8s/scripts/build-remote.sh index 8534fe1cdc..97b58fbea9 100755 --- a/k8s/scripts/build-remote.sh +++ b/k8s/scripts/build-remote.sh @@ -40,6 +40,16 @@ done GRADLE_ARGS="$TASK ${EXTRA_ARGS[*]:-}" GRADLE_ARGS="${GRADLE_ARGS% }" +# Forward the local git tag as version props: the PVC workspace ships without +# .git (714M), so getVersionFromGitTag() would fall back to 1/1.0.0. +if [[ "$GRADLE_ARGS" != *versionCode* ]]; then + VTAG="$(git -C "$REPO_ROOT" describe --tags --abbrev=0 --match 'v[0-9]*' 2>/dev/null || true)" + if [[ "$VTAG" =~ ^v([0-9]+)$ ]]; then + VCODE="${BASH_REMATCH[1]}" + VNAME="20${VCODE:0:2}.${VCODE:2:2}.${VCODE:4:2}" + GRADLE_ARGS="$GRADLE_ARGS -PversionCode=$VCODE -PversionName=$VNAME" + fi +fi if [ -n "$KUBE_CONTEXT" ]; then CTX=(--context "$KUBE_CONTEXT"); else CTX=(); fi kc() { "$KUBECTL" "${CTX[@]}" "$@"; } diff --git a/k8s/templates/job-build-remote.yaml b/k8s/templates/job-build-remote.yaml index 6dac79f801..e16ff92a51 100644 --- a/k8s/templates/job-build-remote.yaml +++ b/k8s/templates/job-build-remote.yaml @@ -25,7 +25,7 @@ spec: export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH" if [ ! -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then echo "==> bootstrapping Android SDK into PVC cache" - apt-get update -qq && apt-get install -y -qq --no-install-recommends unzip curl ca-certificates > /dev/null + apt-get update -qq && apt-get install -y -qq --no-install-recommends unzip curl ca-certificates git > /dev/null mkdir -p "$ANDROID_HOME/cmdline-tools" curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools" @@ -34,7 +34,24 @@ spec: yes | sdkmanager --licenses > /dev/null sdkmanager --install "platform-tools" "platforms;android-37.0" "platforms;android-37.1" "build-tools;37.0.0" > /dev/null yes | sdkmanager --licenses > /dev/null + else + # git must exist even for cached SDK runs: app/build.gradle.kts + # shells out to `git describe` for versionCode/Name (falls back + # to 1/1.0.0 when there is no .git, but the binary must exist + # for the configuration cache to store the value). + command -v git >/dev/null || (apt-get update -qq && apt-get install -y -qq --no-install-recommends git > /dev/null) fi + if [ ! -d /mnt/jdks/17 ]; then + echo "==> provisioning JDK 17 toolchain (Gradle requests languageVersion=17; image ships 21)" + mkdir -p /mnt/jdks + curl -fsSL -o /tmp/jdk17.tar.gz "https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse" + tar -xzf /tmp/jdk17.tar.gz -C /mnt/jdks + mv /mnt/jdks/jdk-17* /mnt/jdks/17 + rm /tmp/jdk17.tar.gz + fi + mkdir -p /mnt/gradle + grep -q "org.gradle.java.installations.paths" /mnt/gradle/gradle.properties 2>/dev/null || \ + echo "org.gradle.java.installations.paths=/mnt/jdks/17" >> /mnt/gradle/gradle.properties cd /mnt/workspace echo "local.properties:"; echo "sdk.dir=/mnt/sdk" > local.properties echo "==> ./gradlew __GRADLE_ARGS__" From 82432e053a91ca42e31d56e502f5d40a0c173ad9 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:24:42 +0000 Subject: [PATCH 05/34] chore(k8s): ignore generated render/cache dirs --- k8s/.cache-remote/pvc.yaml | 10 ---- .../shuttle-build-20260927-115854-31416.yaml | 58 ------------------- k8s/.gitignore | 4 ++ 3 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 k8s/.cache-remote/pvc.yaml delete mode 100644 k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml create mode 100644 k8s/.gitignore diff --git a/k8s/.cache-remote/pvc.yaml b/k8s/.cache-remote/pvc.yaml deleted file mode 100644 index 1b68a96388..0000000000 --- a/k8s/.cache-remote/pvc.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: shuttle-build-cache - namespace: shuttle-build -spec: - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 25Gi diff --git a/k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml b/k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml deleted file mode 100644 index dd77a4250e..0000000000 --- a/k8s/.cache-remote/shuttle-build-20260927-115854-31416.yaml +++ /dev/null @@ -1,58 +0,0 @@ -# One-shot Shuttle2 build. Sources + SDK + Gradle home all live on the cache -# PVC (seeded by build-remote.sh via the seed pod). The SDK bootstraps on -# first run (~500MB download, then cached); Gradle dist + deps cache in -# /mnt/gradle across builds. -apiVersion: batch/v1 -kind: Job -metadata: - name: shuttle-build-20260927-115854-31416 - namespace: shuttle-build -spec: - activeDeadlineSeconds: 3000 - backoffLimit: 0 - template: - spec: - restartPolicy: Never - containers: - - name: build - image: eclipse-temurin:21-jdk-noble - command: - - bash - - -c - - | - set -e - export ANDROID_HOME=/mnt/sdk ANDROID_SDK_ROOT=/mnt/sdk GRADLE_USER_HOME=/mnt/gradle - export PATH="$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$PATH" - if [ ! -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then - echo "==> bootstrapping Android SDK into PVC cache" - apt-get update -qq && apt-get install -y -qq --no-install-recommends unzip curl ca-certificates > /dev/null - mkdir -p "$ANDROID_HOME/cmdline-tools" - curl -fsSL -o /tmp/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" - unzip -q /tmp/cmdline-tools.zip -d "$ANDROID_HOME/cmdline-tools" - mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest" - rm /tmp/cmdline-tools.zip - yes | sdkmanager --licenses > /dev/null - sdkmanager --install "platform-tools" "platforms;android-37.0" "platforms;android-37.1" "build-tools;37.0.0" > /dev/null - yes | sdkmanager --licenses > /dev/null - fi - cd /mnt/workspace - echo "local.properties:"; echo "sdk.dir=/mnt/sdk" > local.properties - echo "==> ./gradlew :android:app:assembleDebug" - ./gradlew :android:app:assembleDebug --console=plain - env: - - name: GRADLE_OPTS - value: "-Dorg.gradle.jvmargs=-Xmx4g -Dkotlin.compiler.execution.strategy=in-process -Dorg.gradle.workers.max=2" - resources: - limits: - cpu: "3" - memory: "6000Mi" - requests: - cpu: "3" - memory: "6000Mi" - volumeMounts: - - name: cache - mountPath: /mnt - volumes: - - name: cache - persistentVolumeClaim: - claimName: shuttle-build-cache diff --git a/k8s/.gitignore b/k8s/.gitignore new file mode 100644 index 0000000000..a211ec9e95 --- /dev/null +++ b/k8s/.gitignore @@ -0,0 +1,4 @@ +.cache-remote/ +.workspace/ +.cache/ +.artifacts/ From 2addc5ec596a608ec7f0e17569cd3f8b29570b78 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:38:27 +0000 Subject: [PATCH 06/34] chore(build): JDK 21 toolchain, minSdk 26, wrapper/KSP alignment --- android/app/build.gradle.kts | 8 ++++---- android/architecture-tests/build.gradle.kts | 6 +++--- android/core/build.gradle.kts | 4 ++-- android/designsystem/build.gradle.kts | 8 ++++---- android/downloads/build.gradle.kts | 8 ++++---- android/fixtures/build.gradle.kts | 8 ++++---- android/imageloader/build.gradle | 8 ++++---- android/mediaprovider/core/build.gradle.kts | 4 ++-- android/networking/build.gradle.kts | 4 ++-- android/playback/build.gradle | 8 ++++---- android/saf/build.gradle | 8 ++++---- android/scrobbling/build.gradle.kts | 8 ++++---- android/trial/build.gradle | 8 ++++---- buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- k8s/README.md | 1 + k8s/templates/job-build-remote.yaml | 10 ---------- 17 files changed, 49 insertions(+), 58 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 01f8c585ab..76025e254c 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -24,7 +24,7 @@ android { defaultConfig { applicationId = "com.simplecityapps.shuttle" // 24: Compose 1.13, which material3 1.5.0-alpha29 brings in, no longer supports API 23. - minSdk = 24 + minSdk = 26 targetSdk = 36 versionName = versionName() versionCode = versionCode() @@ -91,8 +91,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 isCoreLibraryDesugaringEnabled = true } @@ -292,7 +292,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) freeCompilerArgs.addAll( "-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.time.ExperimentalTime" diff --git a/android/architecture-tests/build.gradle.kts b/android/architecture-tests/build.gradle.kts index f18df2d94e..c4a5b55b8d 100644 --- a/android/architecture-tests/build.gradle.kts +++ b/android/architecture-tests/build.gradle.kts @@ -8,13 +8,13 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/core/build.gradle.kts b/android/core/build.gradle.kts index e74e047be2..fba5db283d 100644 --- a/android/core/build.gradle.kts +++ b/android/core/build.gradle.kts @@ -20,9 +20,9 @@ kotlin { enable = true } - // All Android modules target JVM 17 (unified Sept 2026; was 11 pre-KMP conversion) + // All Android modules target JVM 21 (unified Sept 2026; was 11 pre-KMP conversion) compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/designsystem/build.gradle.kts b/android/designsystem/build.gradle.kts index 6648fee35b..cfd7795e38 100644 --- a/android/designsystem/build.gradle.kts +++ b/android/designsystem/build.gradle.kts @@ -10,12 +10,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } buildFeatures { @@ -33,7 +33,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/downloads/build.gradle.kts b/android/downloads/build.gradle.kts index 542a65d1e4..e6d9354609 100644 --- a/android/downloads/build.gradle.kts +++ b/android/downloads/build.gradle.kts @@ -9,12 +9,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 consumerProguardFiles("consumer-rules.pro") } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = "com.simplecityapps.shuttle.downloads" @@ -27,7 +27,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/fixtures/build.gradle.kts b/android/fixtures/build.gradle.kts index e05e906441..8b08592d41 100644 --- a/android/fixtures/build.gradle.kts +++ b/android/fixtures/build.gradle.kts @@ -11,12 +11,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = "com.simplecityapps.shuttle.fixtures" @@ -24,7 +24,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/imageloader/build.gradle b/android/imageloader/build.gradle index 632a3d45a5..a64d34e83f 100644 --- a/android/imageloader/build.gradle +++ b/android/imageloader/build.gradle @@ -7,13 +7,13 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = 'com.simplecityapps.imageloading' @@ -21,7 +21,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 } } diff --git a/android/mediaprovider/core/build.gradle.kts b/android/mediaprovider/core/build.gradle.kts index 0f30786616..93910be342 100644 --- a/android/mediaprovider/core/build.gradle.kts +++ b/android/mediaprovider/core/build.gradle.kts @@ -21,9 +21,9 @@ kotlin { enable = true } - // All Android modules target JVM 17 (unified Sept 2026) + // All Android modules target JVM 21 (unified Sept 2026) compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/networking/build.gradle.kts b/android/networking/build.gradle.kts index a1cbc0bb8f..2ee6b360ae 100644 --- a/android/networking/build.gradle.kts +++ b/android/networking/build.gradle.kts @@ -12,9 +12,9 @@ kotlin { namespace = "com.simplecityapps.networking" // OkHttp's Android artifact compiles against 37, which its consumers must match compileSdk = 37 - // All Android modules target JVM 17 (unified Sept 2026) + // All Android modules target JVM 21 (unified Sept 2026) compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/playback/build.gradle b/android/playback/build.gradle index 9710f77cb4..211098227e 100644 --- a/android/playback/build.gradle +++ b/android/playback/build.gradle @@ -8,13 +8,13 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 consumerProguardFiles("consumer-rules.pro") } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = 'com.simplecityapps.playback' @@ -30,7 +30,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 optIn.add('kotlin.time.ExperimentalTime') } } diff --git a/android/saf/build.gradle b/android/saf/build.gradle index b7b7c81ead..3cc708a9f2 100644 --- a/android/saf/build.gradle +++ b/android/saf/build.gradle @@ -8,14 +8,14 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 consumerProguardFiles 'consumer-rules.pro' } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } @@ -24,7 +24,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 } } diff --git a/android/scrobbling/build.gradle.kts b/android/scrobbling/build.gradle.kts index b471e43423..bdf96e37c4 100644 --- a/android/scrobbling/build.gradle.kts +++ b/android/scrobbling/build.gradle.kts @@ -17,12 +17,12 @@ android { compileSdk = 37 defaultConfig { - minSdk = 24 + minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } testOptions { @@ -36,7 +36,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/android/trial/build.gradle b/android/trial/build.gradle index be48e17482..aaa2852d06 100644 --- a/android/trial/build.gradle +++ b/android/trial/build.gradle @@ -9,15 +9,15 @@ android { compileSdk = 37 defaultConfig { - minSdkVersion 24 + minSdkVersion 26 targetSdkVersion 36 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } namespace = 'com.simplecityapps.trial' @@ -26,7 +26,7 @@ android { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 optIn.add('kotlin.time.ExperimentalTime') } } diff --git a/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts b/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts index 60ec912022..f473e22d77 100644 --- a/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts +++ b/buildSrc/src/main/kotlin/s2.kmp-library.gradle.kts @@ -8,7 +8,7 @@ plugins { } kotlin { - jvmToolchain(17) + jvmToolchain(21) compilerOptions { freeCompilerArgs.add("-Xexpect-actual-classes") @@ -16,7 +16,7 @@ kotlin { android { compileSdk = 36 - minSdk = 24 + minSdk = 26 // Runs commonTest (and androidHostTest) on the JVM, as testDebugUnitTest does for Android modules. AGP allows // one host test component, so it's configured here for every module: with the Android resources and assets // Robolectric tests read (the Room migration tests load the exported schemas as assets). diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ad7845be30..9b7cb4af38 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/k8s/README.md b/k8s/README.md index a80b1dc832..82a8a75665 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -30,6 +30,7 @@ Ported from OffBookPlus `k8s/` (colima+docker+rsync flow), adapted for a remote cluster: no colima (`ensure_cluster` dropped), no rsync (tar + `kubectl cp` via a seed pod), no prebuilt image (SDK bootstraps at runtime from `eclipse-temurin:21-jdk-noble` — internet confirmed from the cluster). +The image's JDK 21 satisfies the Gradle toolchain (`languageVersion=21`) via auto-detection, so no separate JDK provisioning is needed. ## Dockerfile diff --git a/k8s/templates/job-build-remote.yaml b/k8s/templates/job-build-remote.yaml index e16ff92a51..2bcc374fc3 100644 --- a/k8s/templates/job-build-remote.yaml +++ b/k8s/templates/job-build-remote.yaml @@ -41,17 +41,7 @@ spec: # for the configuration cache to store the value). command -v git >/dev/null || (apt-get update -qq && apt-get install -y -qq --no-install-recommends git > /dev/null) fi - if [ ! -d /mnt/jdks/17 ]; then - echo "==> provisioning JDK 17 toolchain (Gradle requests languageVersion=17; image ships 21)" - mkdir -p /mnt/jdks - curl -fsSL -o /tmp/jdk17.tar.gz "https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse" - tar -xzf /tmp/jdk17.tar.gz -C /mnt/jdks - mv /mnt/jdks/jdk-17* /mnt/jdks/17 - rm /tmp/jdk17.tar.gz - fi mkdir -p /mnt/gradle - grep -q "org.gradle.java.installations.paths" /mnt/gradle/gradle.properties 2>/dev/null || \ - echo "org.gradle.java.installations.paths=/mnt/jdks/17" >> /mnt/gradle/gradle.properties cd /mnt/workspace echo "local.properties:"; echo "sdk.dir=/mnt/sdk" > local.properties echo "==> ./gradlew __GRADLE_ARGS__" From d8851fc176b445b2853ad7b2cc0deffbcfc9db6b Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:40:51 +0000 Subject: [PATCH 07/34] feat(scanner): incremental TagLib rescan skips unchanged files TaglibMediaProvider.findSongs ignored its existingSongs and re-parsed every file with an FD + TagLib open per row. Build an existingByPath map and emit the stored song directly when its lastModified + size match (plus duration within 1s, for DATE_MODIFIED's 1-second granularity), preserving id, play counts and artworkVersion. --- .../taglib/TaglibIncrementalScanTest.kt | 121 ++++++++++++++++++ .../provider/taglib/MediaStoreAudioFiles.kt | 26 ++++ .../provider/taglib/TaglibMediaProvider.kt | 13 +- 3 files changed, 157 insertions(+), 3 deletions(-) create mode 100644 android/mediaprovider/local/src/androidHostTest/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibIncrementalScanTest.kt diff --git a/android/mediaprovider/local/src/androidHostTest/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibIncrementalScanTest.kt b/android/mediaprovider/local/src/androidHostTest/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibIncrementalScanTest.kt new file mode 100644 index 0000000000..e4139d4a49 --- /dev/null +++ b/android/mediaprovider/local/src/androidHostTest/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibIncrementalScanTest.kt @@ -0,0 +1,121 @@ +package com.simplecityapps.localmediaprovider.local.provider.taglib + +import com.simplecityapps.shuttle.model.MediaProviderType +import com.simplecityapps.shuttle.model.Song +import io.kotest.matchers.shouldBe +import kotlin.time.Instant +import org.junit.Test + +class TaglibIncrementalScanTest { + @Test + fun `an unchanged file emits its stored song, keeping its id, play count and artwork version`() { + val stored = storedSong() + val file = audioFile() + + file.unchangedSong(mapOf(stored.path to stored)) shouldBe stored + } + + @Test + fun `a file with no stored song is parsed`() { + audioFile().unchangedSong(emptyMap()) shouldBe null + } + + @Test + fun `a file with another path is parsed`() { + val stored = storedSong() + + audioFile(path = "/storage/emulated/0/Music/other.mp3").unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a modified file is parsed`() { + val stored = storedSong() + + audioFile(lastModified = stored.lastModified.epochSeconds * 1000 + 60_000) + .unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a resized file is parsed`() { + val stored = storedSong() + + audioFile(size = stored.size + 1).unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a file whose duration changed is parsed`() { + val stored = storedSong() + + // Same second-granularity date and size, but a different song: the duration catches the swap + audioFile(duration = stored.duration.toLong() + 30_000).unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + @Test + fun `a duration within MediaStore rounding of the stored one still matches`() { + val stored = storedSong() + + audioFile(duration = stored.duration.toLong() + 500).unchangedSong(mapOf(stored.path to stored)) shouldBe stored + } + + @Test + fun `a file MediaStore couldn't read a duration for matches on date and size`() { + val stored = storedSong() + + audioFile(duration = null).unchangedSong(mapOf(stored.path to stored)) shouldBe stored + } + + @Test + fun `a stored song with no modified date is parsed`() { + val stored = storedSong(lastModified = null) + + audioFile().unchangedSong(mapOf(stored.path to stored)) shouldBe null + } + + private fun audioFile( + path: String = "/storage/emulated/0/Music/Album/01 Song.flac", + size: Long = 2_048L, + lastModified: Long = 1_700_000_000_000L, + duration: Long? = 185_000L + ) = MediaStoreAudioFile( + id = 7, + path = path, + displayName = "01 Song.flac", + size = size, + lastModified = lastModified, + mimeType = "audio/flac", + duration = duration + ) + + private fun storedSong(lastModified: Instant? = Instant.fromEpochMilliseconds(1_700_000_000_000L)) = Song( + id = 42, + name = "Song", + albumArtist = "Artist", + artists = listOf("Artist"), + album = "Album", + track = 1, + disc = 1, + duration = 185_000, + date = null, + genres = emptyList(), + path = "/storage/emulated/0/Music/Album/01 Song.flac", + size = 2_048L, + mimeType = "audio/flac", + lastModified = lastModified, + lastPlayed = null, + lastCompleted = null, + playCount = 17, + playbackPosition = 0, + blacklisted = false, + externalId = null, + mediaProvider = MediaProviderType.Shuttle, + replayGainTrack = null, + replayGainAlbum = null, + lyrics = null, + grouping = null, + bitRate = null, + bitDepth = null, + sampleRate = null, + channelCount = null, + artworkVersion = "artwork-v1" + ) +} diff --git a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt index 5dac2fa129..3c8fd5821f 100644 --- a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt +++ b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/MediaStoreAudioFiles.kt @@ -6,6 +6,9 @@ import android.net.Uri import android.provider.MediaStore import androidx.core.database.getLongOrNull import androidx.core.database.getStringOrNull +import com.simplecityapps.shuttle.model.Song +import kotlin.math.abs +import kotlin.time.Instant /** * An audio file MediaStore has indexed. The TagLib scanner finds files this way and reads their tags through [contentUri], @@ -69,3 +72,26 @@ internal fun Cursor.readMediaStoreAudioFiles(folderFilter: FolderFilter): List): Song? { + val existing = existingByPath[path] ?: return null + if (existing.lastModified != Instant.fromEpochMilliseconds(lastModified)) return null + if (existing.size != size) return null + val fileDuration = duration ?: return existing + if (abs(existing.duration.toLong() - fileDuration) > DURATION_TOLERANCE_MS) return null + return existing +} + +private const val DURATION_TOLERANCE_MS = 1_000L diff --git a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt index f8f7819eef..9dbe8d41ef 100644 --- a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt +++ b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt @@ -67,13 +67,15 @@ class TaglibMediaProvider( } val files = mediaStoreFiles.orEmpty() val total = files.size + extraDocuments.size + // Songs already in the library, so files that haven't changed since the last import skip TagLib + val existingByPath = existingSongs.associateBy { song -> song.path } val filesWithImages = withContext(Dispatchers.IO) { val folderImageReader = FolderImageReader(sharedStorageListsImages = Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) files.map { file -> file to folderImageReader.imagesNear(file.path) } } val songs = mutableListOf() - merge(getSongs(filesWithImages), getExtraSongs(extraDocuments)) + merge(getSongs(filesWithImages, existingByPath), getExtraSongs(extraDocuments)) .collectIndexed { index, song -> emit( FlowEvent.Progress( @@ -163,10 +165,15 @@ class TaglibMediaProvider( fileScanner.getAudioFile(context, kTagLib, node.uri)?.toSong(type, emptyList()) }.mapNotNull { it } - private fun getSongs(files: List>>): Flow = files + private fun getSongs( + files: List>>, + existingByPath: Map + ): Flow = files .asFlow() .concurrentMap((Runtime.getRuntime().availableProcessors() - 1).coerceAtLeast(1)) { (file, folderImages) -> - readAudioFile(file)?.toSong(type, folderImages) + // An unchanged file keeps its stored row as-is: no FD open, no TagLib parse. The stored song carries + // the library id, play counts and artwork version, which a fresh parse would zero out before the diff. + file.unchangedSong(existingByPath) ?: readAudioFile(file)?.toSong(type, folderImages) }.mapNotNull { it } private suspend fun readAudioFile(file: MediaStoreAudioFile): AudioFile? = withContext(Dispatchers.IO) { From 81de6dc0b21557ba8dbb5adbfbe8efba8d80bab2 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:41:54 +0000 Subject: [PATCH 08/34] feat(scanner): incremental rescan, observer, broadcast trigger, worker tuning MediaStore ContentObserver in the media-provider startup initializer (debounced 20s, gated on music permission + already-scanned-once) reuses MediaImporter.import's own coalescing. New exported LibraryScanReceiver (RESCAN_LIBRARY, 60s debounce, no DUMP gate) for automation apps via goAsync. Worker drops the never-firing setRequiresDeviceIdle, gains setRequiresStorageNotLow, and staggers its first run 15-30min instead of a full interval. Extra SAF trees documented as manual/periodic-only (no DocumentsProvider observer). --- android/app/src/main/AndroidManifest.xml | 12 +++ .../MediaProviderInitializer.kt | 5 +- .../shuttle/scan/LibraryScanReceiver.kt | 72 +++++++++++++++++ .../shuttle/sources/MediaLibraryObserver.kt | 79 +++++++++++++++++++ .../src/main/res/values/strings_sources.xml | 2 +- .../mediaprovider/worker/MediaImportWorker.kt | 11 ++- .../provider/taglib/TaglibMediaProvider.kt | 3 + 7 files changed, 180 insertions(+), 4 deletions(-) create mode 100644 android/app/src/main/java/com/simplecityapps/shuttle/scan/LibraryScanReceiver.kt create mode 100644 android/app/src/main/java/com/simplecityapps/shuttle/sources/MediaLibraryObserver.kt diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 6f9a67ffb7..3d346071ea 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -92,6 +92,18 @@ + + + + + + + Media's listener if + * the import finishes while that screen is open (#386). + */ +class LibraryScanReceiver : BroadcastReceiver() { + @ContributesTo(AppScope::class) + interface Injector { + fun inject(receiver: LibraryScanReceiver) + } + + @Inject + lateinit var mediaImporter: MediaImporter + + override fun onReceive( + context: Context, + intent: Intent + ) { + if (intent.action != ACTION_RESCAN_LIBRARY) return + if (!debounce()) return + context.appGraph().inject(this) + val pendingResult = goAsync() + CoroutineScope(Dispatchers.Main).launch { + try { + mediaImporter.import() + } finally { + pendingResult.finish() + } + } + } + + companion object { + const val ACTION_RESCAN_LIBRARY = "com.simplecityapps.shuttle.action.RESCAN_LIBRARY" + + const val DEBOUNCE_MS = 60_000L + + @Volatile + private var lastTriggerUptimeMs = 0L + + internal fun debounce(nowUptimeMs: Long = SystemClock.uptimeMillis()): Boolean { + synchronized(this) { + if (nowUptimeMs - lastTriggerUptimeMs < DEBOUNCE_MS) return false + lastTriggerUptimeMs = nowUptimeMs + return true + } + } + } +} diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/sources/MediaLibraryObserver.kt b/android/app/src/main/java/com/simplecityapps/shuttle/sources/MediaLibraryObserver.kt new file mode 100644 index 0000000000..f000c9621d --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/sources/MediaLibraryObserver.kt @@ -0,0 +1,79 @@ +package com.simplecityapps.shuttle.sources + +import android.content.Context +import android.database.ContentObserver +import android.net.Uri +import android.os.Handler +import android.os.Looper +import android.provider.MediaStore +import com.simplecityapps.mediaprovider.MediaImporter +import com.simplecityapps.shuttle.di.AppCoroutineScope +import com.simplecityapps.shuttle.di.ApplicationContext +import com.simplecityapps.shuttle.ui.screens.sources.MediaSources +import com.simplecityapps.shuttle.ui.screens.sources.MusicPermission +import dev.zacsweers.metro.AppScope +import dev.zacsweers.metro.Inject +import dev.zacsweers.metro.SingleIn +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import timber.log.Timber + +/** + * Re-scans the library when MediaStore's audio changes (new downloads, tag edits from other apps, deletions). + * + * Registered once at startup by [com.simplecityapps.shuttle.appinitializers.MediaProviderInitializer], only when the + * music permission is held and an import has already finished: the first scan comes from the onboarding and + * permission-grant paths instead. Changes are debounced [DEBOUNCE_MS] so a burst of writes (an album syncing track + * by track) imports once. [MediaImporter.import] coalesces overlapping requests through its own importLock, so a + * change that lands mid-import just runs one more pass. + * + * MediaStore only covers indexed files: extra SAF trees have no observable URI (see TaglibMediaProvider's + * findExtraDocuments), so those folders still need a manual or scheduled scan. + */ +@SingleIn(AppScope::class) +class MediaLibraryObserver @Inject constructor( + @ApplicationContext private val context: Context, + private val mediaImporter: MediaImporter, + private val mediaSources: MediaSources, + @AppCoroutineScope private val appCoroutineScope: CoroutineScope +) { + private var debounceJob: Job? = null + + private val observer = + object : ContentObserver(Handler(Looper.getMainLooper())) { + override fun onChange(selfChange: Boolean) = onMediaChanged() + + override fun onChange( + selfChange: Boolean, + uri: Uri? + ) = onMediaChanged() + } + + fun startIfReady() { + if (!MusicPermission.isGranted(context) || !mediaSources.hasScanned) return + context.contentResolver.registerContentObserver( + MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, + true, + observer + ) + } + + private fun onMediaChanged() { + debounceJob?.cancel() + // The app scope runs on Main, like the onboarding scan: MediaImporter notifies its listeners on the + // caller's thread, and an IO caller crashes Settings > Media's listener if the import finishes while + // that screen is open (#386). + debounceJob = + appCoroutineScope.launch { + delay(DEBOUNCE_MS) + Timber.i("MediaStore changed, re-scanning the library") + mediaImporter.import() + } + } + + companion object { + const val DEBOUNCE_MS = 20_000L + } +} diff --git a/android/app/src/main/res/values/strings_sources.xml b/android/app/src/main/res/values/strings_sources.xml index 976b583d8a..c4eaf38ced 100644 --- a/android/app/src/main/res/values/strings_sources.xml +++ b/android/app/src/main/res/values/strings_sources.xml @@ -24,7 +24,7 @@ Every folder is scanned Skip these folders Read these folders directly - For folders Android hides from music apps, or file types it doesn\'t recognise + For folders Android hides from music apps, or file types it doesn\'t recognise. Android can\'t tell S2 when these change, so new music here needs a manual or scheduled scan Add folder Remove this folder? Remove diff --git a/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt b/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt index dcc0b0f22a..68bcd14f8d 100644 --- a/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt +++ b/android/mediaprovider/core/src/androidMain/kotlin/com/simplecityapps/mediaprovider/worker/MediaImportWorker.kt @@ -17,6 +17,7 @@ import dev.zacsweers.metro.AssistedInject import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metro.binding import java.util.concurrent.TimeUnit +import kotlin.random.Random class MediaImportWorker @AssistedInject @@ -39,6 +40,9 @@ constructor( companion object { private const val TAG_MEDIA_IMPORT = "MEDIA_IMPORT" + private const val INITIAL_DELAY_MINUTES = 15L + private const val INITIAL_DELAY_JITTER_MINUTES = 16L + /** * Enqueues or removes work, depending on the [ImportFrequency] */ @@ -54,11 +58,14 @@ constructor( .setConstraints( Constraints.Builder() .setRequiresBatteryNotLow(true) - .setRequiresDeviceIdle(true) + .setRequiresStorageNotLow(true) .build() ) .addTag(TAG_MEDIA_IMPORT) - .setInitialDelay(importFrequency.intervalInDays(), TimeUnit.DAYS) + // A short staggered delay instead of a full interval: the idle constraint is gone (it + // never fires under Doze), so the first run lands soon after the setting changes without + // every install that flips it at once scanning at the same wall-clock time. + .setInitialDelay(INITIAL_DELAY_MINUTES + Random.nextLong(INITIAL_DELAY_JITTER_MINUTES), TimeUnit.MINUTES) .build() WorkManager.getInstance(context).enqueueUniquePeriodicWork( diff --git a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt index 9dbe8d41ef..7124cbba65 100644 --- a/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt +++ b/android/mediaprovider/local/src/androidMain/kotlin/com/simplecityapps/localmediaprovider/local/provider/taglib/TaglibMediaProvider.kt @@ -130,6 +130,9 @@ class TaglibMediaProvider( /** * The audio documents in the extra folders that MediaStore didn't already list (by [knownPaths], lowercased), and * that no excluded folder covers. + * + * DocumentsProvider offers no ContentObserver: nothing notifies the app when these folders change, so they are + * only picked up by a manual or scheduled scan, never by the MediaStore observer. */ private suspend fun findExtraDocuments( folders: ScannerFolders, From 6e75df9533b8da0029a9f209b862e6e30e0f0926 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:45:07 +0000 Subject: [PATCH 09/34] feat(theme): nest MaterialExpressiveTheme in ArtworkTheme, document dynamic contrast --- .../shuttle/designsystem/theme/ArtworkTheme.kt | 11 ++++++++++- .../shuttle/designsystem/theme/S2Theme.kt | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt index de4ed73118..f3d2e394f7 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/ArtworkTheme.kt @@ -1,5 +1,7 @@ package com.simplecityapps.shuttle.designsystem.theme +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.MaterialExpressiveTheme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -12,7 +14,11 @@ import com.simplecityapps.shuttle.ui.theme.ArtworkSeed * A seed too grey to carry a hue, [ArtworkSeed.None], or a first [ArtworkSeed.Loading] fall back to * the root scheme. While a new seed loads the previous one stays, so a change reads old → new, * never old → root → new. Every change crossfades with the motion scheme's slow effects spring. + * + * An expressive theme, not a plain `MaterialTheme`: only the scheme is replaced, motion, shapes + * and type pass straight through, so seeded screens keep the expressive components and motion. */ +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun ArtworkTheme( seed: ArtworkSeed, @@ -31,8 +37,11 @@ fun ArtworkTheme( val seededScheme = remember(effectiveSeed, style, settings.isDark, settings.contrast) { effectiveSeed?.let { artworkColorScheme(it, settings.isDark, style, settings.contrast) } } - MaterialTheme( + MaterialExpressiveTheme( colorScheme = animateSchemeChange(seededScheme ?: rootScheme), + motionScheme = MaterialTheme.motionScheme, + shapes = MaterialTheme.shapes, + typography = MaterialTheme.typography, content = content, ) } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt index 28254a9c1e..f1513a0797 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/S2Theme.kt @@ -58,6 +58,8 @@ fun S2Theme( val motionScheme = remember { MotionScheme.expressive() } val context = LocalContext.current val targetScheme = if (dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + // M3 builds dynamic schemes from the wallpaper with no contrast-level hook, so they ship as + // the platform makes them; S2Contrast shapes the generated accent and artwork schemes only. if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) } else { remember(accent, darkTheme, contrast) { accentColorScheme(accent, darkTheme, contrast) } From 296ec836d5a25f41deb03953536eae3aca4b0ce8 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:46:48 +0000 Subject: [PATCH 10/34] feat(theme): catalogued edit-tabs sheet (S2Sheet + ReorderSwitchSetting) --- .../ui/screens/library/LibraryScreen.kt | 64 ++++++--------- .../designsystem/component/ActionsSheet.kt | 27 +++++++ .../designsystem/component/Settings.kt | 78 +++++++++++++++++++ 3 files changed, 129 insertions(+), 40 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt index df928fd867..ee5994f601 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt @@ -4,7 +4,6 @@ import androidx.activity.compose.BackHandler import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -15,8 +14,6 @@ import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.rounded.PlaylistAdd import androidx.compose.material.icons.automirrored.rounded.QueueMusic -import androidx.compose.material.icons.rounded.ArrowDownward -import androidx.compose.material.icons.rounded.ArrowUpward import androidx.compose.material.icons.rounded.Block import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.MoreVert @@ -27,11 +24,9 @@ import androidx.compose.material.icons.rounded.SkipNext import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.LargeFlexibleTopAppBar -import androidx.compose.material3.ListItem -import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.ListItemShapes import androidx.compose.material3.PrimaryScrollableTabRow import androidx.compose.material3.Scaffold -import androidx.compose.material3.Switch import androidx.compose.material3.Tab import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults @@ -57,10 +52,13 @@ import com.simplecityapps.mediaprovider.repository.playlists.PlaylistSortOrder import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.component.EmptyState +import com.simplecityapps.shuttle.designsystem.component.ReorderSwitchSetting import com.simplecityapps.shuttle.designsystem.component.S2Action import com.simplecityapps.shuttle.designsystem.component.S2IconButton import com.simplecityapps.shuttle.designsystem.component.S2Menu import com.simplecityapps.shuttle.designsystem.component.S2SelectionToolbar +import com.simplecityapps.shuttle.designsystem.component.S2Sheet +import com.simplecityapps.shuttle.designsystem.component.SettingsGroup import com.simplecityapps.shuttle.designsystem.component.StateAction import com.simplecityapps.shuttle.persistence.LibraryTab import com.simplecityapps.shuttle.sorting.AlbumSortOrder @@ -240,48 +238,34 @@ fun LibraryTab.label(): String = stringResource( ) /** Shows, hides and reorders the tabs; every change saves straight away. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun EditTabsSheet( uiState: LibraryUiState, onTabsChanged: (order: List, enabled: Set) -> Unit, onDismissRequest: () -> Unit, ) { - ModalBottomSheet(onDismissRequest = onDismissRequest) { - Text(stringResource(R.string.library_edit_tabs), modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp)) - val order = uiState.allTabs - order.forEachIndexed { index, tab -> - val enabled = tab in uiState.enabledTabs - val setEnabled = { checked: Boolean -> onTabsChanged(order, if (checked) uiState.enabledTabs + tab else uiState.enabledTabs - tab) } - ListItem( - onClick = { setEnabled(!enabled) }, - leadingContent = { - Switch( + val order = uiState.allTabs + S2Sheet(title = stringResource(R.string.library_edit_tabs), onDismissRequest = onDismissRequest) { + SettingsGroup( + rows = order.mapIndexed { index, tab -> + @Composable { shapes: ListItemShapes -> + val enabled = tab in uiState.enabledTabs + ReorderSwitchSetting( + title = tab.label(), checked = enabled, - onCheckedChange = setEnabled, - modifier = Modifier.testTag("library-tab-switch-${tab.name}"), + onCheckedChange = { checked -> onTabsChanged(order, if (checked) uiState.enabledTabs + tab else uiState.enabledTabs - tab) }, + onMoveUp = { onTabsChanged(order.move(index, index - 1), uiState.enabledTabs) }, + onMoveDown = { onTabsChanged(order.move(index, index + 1), uiState.enabledTabs) }, + moveUpEnabled = index > 0, + moveDownEnabled = index < order.lastIndex, + moveUpContentDescription = stringResource(R.string.library_tab_move_up), + moveDownContentDescription = stringResource(R.string.library_tab_move_down), + switchModifier = Modifier.testTag("library-tab-switch-${tab.name}"), + shapes = shapes, ) - }, - trailingContent = { - Row { - S2IconButton( - icon = Icons.Rounded.ArrowUpward, - contentDescription = stringResource(R.string.library_tab_move_up), - enabled = index > 0, - onClick = { onTabsChanged(order.move(index, index - 1), uiState.enabledTabs) }, - ) - S2IconButton( - icon = Icons.Rounded.ArrowDownward, - contentDescription = stringResource(R.string.library_tab_move_down), - enabled = index < order.lastIndex, - onClick = { onTabsChanged(order.move(index, index + 1), uiState.enabledTabs) }, - ) - } - }, - ) { - Text(tab.label()) - } - } + } + }, + ) } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt index 684b0f412d..b62e42e7b1 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/ActionsSheet.kt @@ -2,6 +2,7 @@ package com.simplecityapps.shuttle.designsystem.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -54,6 +55,32 @@ fun S2ActionsSheet( } } +/** + * A sheet with a [title] header and custom [content], for sheets whose rows aren't [S2Action]s + * (the Library's tab editor). The content scrolls under the header; a long list keeps the title + * visible the way [ActionsSheetContent] does. + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun S2Sheet( + title: String, + onDismissRequest: () -> Unit, + modifier: Modifier = Modifier, + sheetState: SheetState = rememberModalBottomSheetState(), + content: @Composable ColumnScope.() -> Unit, +) { + ModalBottomSheet(onDismissRequest = onDismissRequest, modifier = modifier, sheetState = sheetState) { + Text(title, style = MaterialTheme.typography.titleMedium, modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + HorizontalDivider(Modifier.padding(top = 8.dp)) + Column( + Modifier + .verticalScroll(rememberScrollState()) + .padding(vertical = 8.dp), + content = content, + ) + } +} + /** The body of an [S2ActionsSheet] without the sheet, for laying one out in place. */ @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt index 23d831e95a..22f27a9110 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt @@ -4,10 +4,13 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight +import androidx.compose.material.icons.rounded.ArrowDownward +import androidx.compose.material.icons.rounded.ArrowUpward import androidx.compose.material.icons.rounded.Folder import androidx.compose.material.icons.rounded.Palette import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi @@ -123,6 +126,42 @@ fun SwitchSetting( ) { Text(title) } } +/** + * An on/off setting with trailing move-up/move-down actions, for an ordered list the user enables + * and reorders in place (the Library's tabs). Tapping the row toggles [checked]; the switch itself + * stays directly operable, and [switchModifier] carries e.g. a test tag for it. + */ +@OptIn(ExperimentalMaterial3ExpressiveApi::class) +@Composable +fun ReorderSwitchSetting( + title: String, + checked: Boolean, + onCheckedChange: (Boolean) -> Unit, + onMoveUp: () -> Unit, + onMoveDown: () -> Unit, + moveUpEnabled: Boolean, + moveDownEnabled: Boolean, + moveUpContentDescription: String, + moveDownContentDescription: String, + modifier: Modifier = Modifier, + switchModifier: Modifier = Modifier, + shapes: ListItemShapes = ListItemDefaults.shapes(), +) { + SegmentedListItem( + onClick = { onCheckedChange(!checked) }, + shapes = shapes, + modifier = modifier, + colors = settingColors(), + leadingContent = { Switch(checked = checked, onCheckedChange = onCheckedChange, modifier = switchModifier) }, + trailingContent = { + Row { + S2IconButton(icon = Icons.Rounded.ArrowUpward, contentDescription = moveUpContentDescription, onClick = onMoveUp, enabled = moveUpEnabled) + S2IconButton(icon = Icons.Rounded.ArrowDownward, contentDescription = moveDownContentDescription, onClick = onMoveDown, enabled = moveDownEnabled) + } + }, + ) { Text(title) } +} + /** A single-choice setting showing its current [value]; [onClick] opens the choice dialog. */ @OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable @@ -256,3 +295,42 @@ private fun SettingsGroupPreview() { ) } } + +@Preview +@Composable +private fun ReorderSwitchSettingPreview() { + S2Preview { + SettingsGroup( + rows = listOf( + { + ReorderSwitchSetting( + title = "Songs", + checked = true, + onCheckedChange = {}, + onMoveUp = {}, + onMoveDown = {}, + moveUpEnabled = false, + moveDownEnabled = true, + moveUpContentDescription = "Move up", + moveDownContentDescription = "Move down", + shapes = it, + ) + }, + { + ReorderSwitchSetting( + title = "Folders", + checked = false, + onCheckedChange = {}, + onMoveUp = {}, + onMoveDown = {}, + moveUpEnabled = true, + moveDownEnabled = false, + moveUpContentDescription = "Move up", + moveDownContentDescription = "Move down", + shapes = it, + ) + }, + ), + ) + } +} From 97794ba1a620a527bf1b21b669b8798451e6bd84 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:47:57 +0000 Subject: [PATCH 11/34] feat(theme): SearchScreen on the full S2SearchBar --- .../ui/screens/search/SearchEntries.kt | 10 ++ .../shuttle/ui/screens/search/SearchScreen.kt | 117 ++++++++---------- 2 files changed, 59 insertions(+), 68 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt index 2f0184868e..63c0438353 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchEntries.kt @@ -1,9 +1,12 @@ package com.simplecityapps.shuttle.ui.screens.search import androidx.compose.foundation.text.input.rememberTextFieldState +import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi +import androidx.compose.material3.adaptive.currentWindowAdaptiveInfoV2 import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.runtime.snapshotFlow import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation3.runtime.EntryProviderScope @@ -16,12 +19,15 @@ import com.simplecityapps.shuttle.ui.screens.library.openTarget import com.simplecityapps.shuttle.ui.screens.library.route import com.simplecityapps.shuttle.ui.shell.AppNavigator import com.simplecityapps.shuttle.ui.shell.SearchRoute +import com.simplecityapps.shuttle.ui.shell.adaptive.ShellLayout +import com.simplecityapps.shuttle.ui.shell.adaptive.ShellWidth import dev.zacsweers.metrox.viewmodel.metroViewModel fun EntryProviderScope.searchEntries(navigator: AppNavigator) { entry { SearchDestination(onOpen = navigator::open, onNavigate = navigator::openTarget) } } +@OptIn(ExperimentalMaterial3AdaptiveApi::class) @Composable private fun SearchDestination( onOpen: (NavKey) -> Unit, @@ -31,6 +37,9 @@ private fun SearchDestination( val uiState by viewModel.uiState.collectAsStateWithLifecycle() val queryState = rememberTextFieldState() LaunchedEffect(queryState, viewModel) { snapshotFlow { queryState.text.toString() }.collect(viewModel::onQueryChange) } + // The search view is full screen below Expanded, docked under the bar from Expanded. + val windowAdaptiveInfo = currentWindowAdaptiveInfoV2() + val docked = remember(windowAdaptiveInfo) { ShellLayout.from(windowAdaptiveInfo).width >= ShellWidth.Expanded } MediaActionsHost(onNavigate = onNavigate) { actions -> val open = { route: NavKey -> @@ -40,6 +49,7 @@ private fun SearchDestination( SearchScreen( uiState = uiState, queryState = queryState, + docked = docked, callbacks = SearchCallbacks( onSearch = viewModel::onSearch, onSelectAll = viewModel::onSelectAll, diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt index 3a17e2383c..a8c4ca9de2 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/search/SearchScreen.kt @@ -14,27 +14,17 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.input.TextFieldState -import androidx.compose.foundation.text.input.clearText import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.Close import androidx.compose.material.icons.rounded.Search -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SearchBarDefaults -import androidx.compose.material3.Surface -import androidx.compose.material3.Text +import androidx.compose.material3.SearchBarState +import androidx.compose.material3.rememberSearchBarState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.simplecityapps.mediaprovider.search.SearchHit @@ -43,7 +33,7 @@ import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.component.EmptyState import com.simplecityapps.shuttle.designsystem.component.LoadingState import com.simplecityapps.shuttle.designsystem.component.S2FilterChip -import com.simplecityapps.shuttle.designsystem.component.S2IconButton +import com.simplecityapps.shuttle.designsystem.component.S2SearchBar import com.simplecityapps.shuttle.designsystem.component.SearchNoResults import com.simplecityapps.shuttle.designsystem.component.SearchRecentRow import com.simplecityapps.shuttle.designsystem.component.SectionHeader @@ -68,75 +58,66 @@ class SearchCallbacks( ) /** - * The Search destination (redesign inventory, section 2): a search field over filter chips, then the recent searches - * while the field is empty, or the results grouped by type. [queryState] holds the field's text; the destination - * feeds it to the ViewModel. + * The Search destination (redesign inventory, section 2): the M3 search bar over filter chips, + * then the recent searches while the field is empty, or the results grouped by type. [queryState] + * holds the field's text; the destination feeds it to the ViewModel. The bar opens expanded, ready + * to type; from the Expanded width class the search view docks under it ([docked]). */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SearchScreen( uiState: SearchUiState, queryState: TextFieldState, callbacks: SearchCallbacks, modifier: Modifier = Modifier, + searchBarState: SearchBarState = rememberSearchBarState(), + docked: Boolean = false, ) { - val focusRequester = remember { FocusRequester() } - val focusManager = LocalFocusManager.current - // Arriving with nothing typed means the user wants to type. - LaunchedEffect(Unit) { if (queryState.text.isEmpty()) focusRequester.requestFocus() } + // A search destination opens ready to type. + LaunchedEffect(Unit) { searchBarState.animateToExpanded() } Column(modifier.fillMaxSize()) { - Surface( - shape = SearchBarDefaults.inputFieldShape, - color = SearchBarDefaults.colors().containerColor, - modifier = Modifier - .statusBarsPadding() - .padding(horizontal = 16.dp, vertical = 8.dp) - .fillMaxWidth(), + S2SearchBar( + state = searchBarState, + textFieldState = queryState, + onSearch = { callbacks.onSearch() }, + placeholder = stringResource(R.string.search_placeholder), + docked = docked, + modifier = Modifier.statusBarsPadding(), ) { - SearchBarDefaults.InputField( - state = queryState, - onSearch = { - callbacks.onSearch() - focusManager.clearFocus() - }, - expanded = false, - onExpandedChange = {}, - modifier = Modifier.fillMaxWidth().focusRequester(focusRequester), - placeholder = { Text(stringResource(R.string.search_placeholder)) }, - leadingIcon = { Icon(Icons.Rounded.Search, contentDescription = null) }, - trailingIcon = if (queryState.text.isNotEmpty()) { - { S2IconButton(Icons.Rounded.Close, stringResource(com.simplecityapps.shuttle.designsystem.R.string.ds_clear_search), { queryState.clearText() }) } - } else { - null - }, - ) + FilterChips(uiState, callbacks) + when (val content = uiState.content) { + is SearchContent.Recent -> RecentSearches(content.searches, onSelect = { queryState.edit { replace(0, length, it) } }, onRemove = callbacks.onRemoveRecentSearch) + SearchContent.Searching -> LoadingState(Modifier.fillMaxSize()) + is SearchContent.NoResults -> SearchNoResults(content.query, Modifier.fillMaxSize()) + is SearchContent.Results -> SearchResultList(content.query, content.results, callbacks) + } } - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier - .fillMaxWidth() - .horizontalScroll(rememberScrollState()) - .padding(horizontal = 16.dp), - ) { + } +} + +@Composable +private fun FilterChips( + uiState: SearchUiState, + callbacks: SearchCallbacks, +) { + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()) + .padding(horizontal = 16.dp), + ) { + S2FilterChip( + label = stringResource(R.string.search_category_all), + selected = uiState.categories.isEmpty(), + onClick = callbacks.onSelectAll, + ) + SearchCategory.entries.forEach { category -> S2FilterChip( - label = stringResource(R.string.search_category_all), - selected = uiState.categories.isEmpty(), - onClick = callbacks.onSelectAll, + label = category.label(), + selected = category in uiState.categories, + onClick = { callbacks.onToggleCategory(category) }, ) - SearchCategory.entries.forEach { category -> - S2FilterChip( - label = category.label(), - selected = category in uiState.categories, - onClick = { callbacks.onToggleCategory(category) }, - ) - } - } - when (val content = uiState.content) { - is SearchContent.Recent -> RecentSearches(content.searches, onSelect = { queryState.edit { replace(0, length, it) } }, onRemove = callbacks.onRemoveRecentSearch) - SearchContent.Searching -> LoadingState(Modifier.fillMaxSize()) - is SearchContent.NoResults -> SearchNoResults(content.query, Modifier.fillMaxSize()) - is SearchContent.Results -> SearchResultList(content.query, content.results, callbacks) } } } From e8012ce99cd114743f1c619bc47099329847c59d Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:48:48 +0000 Subject: [PATCH 12/34] feat(theme): S2Dialog for the playlist and server sign-in dialogs --- .../sources/servers/ServerSignInScreen.kt | 62 ++++++++++++------- .../shuttle/ui/shell/player/SongActions.kt | 42 +++++++++---- 2 files changed, 68 insertions(+), 36 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt index 712b959ada..c4e0dfaa4f 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt @@ -14,11 +14,10 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Visibility import androidx.compose.material.icons.rounded.VisibilityOff -import androidx.compose.material3.BasicAlertDialog -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Switch @@ -41,6 +40,7 @@ import com.simplecityapps.mediaprovider.R as MediaProviderR import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.S2Button import com.simplecityapps.shuttle.designsystem.component.S2ButtonStyle +import com.simplecityapps.shuttle.designsystem.component.S2Dialog import com.simplecityapps.shuttle.designsystem.component.S2DialogContent import com.simplecityapps.shuttle.designsystem.preview.S2Preview import com.simplecityapps.shuttle.model.MediaProviderType @@ -60,14 +60,20 @@ class ServerSignInActions( ) /** A Jellyfin, Emby or Plex server's sign-in dialog. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ServerSignInDialog( uiState: ServerSignInUiState, actions: ServerSignInActions, ) { - BasicAlertDialog(onDismissRequest = actions.onDismiss) { - ServerSignInForm(uiState, actions) + S2Dialog( + title = stringResource(uiState.type.longTitleRes), + onDismissRequest = actions.onDismiss, + confirmLabel = stringResource(R.string.media_provider_button_authenticate), + onConfirm = actions.onAuthenticate, + dismissLabel = stringResource(R.string.dialog_button_close), + confirmEnabled = uiState.step == ServerSignInStep.Form, + ) { + ServerSignInBody(uiState, actions) } } @@ -88,27 +94,35 @@ internal fun ServerSignInForm( dismissLabel = stringResource(R.string.dialog_button_close), confirmEnabled = uiState.step == ServerSignInStep.Form, ) { - when (val step = uiState.step) { - ServerSignInStep.Form -> SignInFields(uiState, actions) + ServerSignInBody(uiState, actions) + } +} + +@Composable +private fun ServerSignInBody( + uiState: ServerSignInUiState, + actions: ServerSignInActions, +) { + when (val step = uiState.step) { + ServerSignInStep.Form -> SignInFields(uiState, actions) - ServerSignInStep.Authenticating -> Progress(stringResource(R.string.media_provider_authenticating), showSpinner = true) + ServerSignInStep.Authenticating -> Progress(stringResource(R.string.media_provider_authenticating), showSpinner = true) - is ServerSignInStep.AwaitingCode -> QuickConnectCode(step.code, actions.onCancelQuickConnect) + is ServerSignInStep.AwaitingCode -> QuickConnectCode(step.code, actions.onCancelQuickConnect) - ServerSignInStep.Connected -> Progress(stringResource(R.string.media_provider_authentication_success), showSpinner = false) + ServerSignInStep.Connected -> Progress(stringResource(R.string.media_provider_authentication_success), showSpinner = false) - is ServerSignInStep.Failed -> Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { - Text(step.message, textAlign = TextAlign.Center) - S2Button( - text = stringResource(R.string.dialog_button_retry), - onClick = actions.onRetry, - style = S2ButtonStyle.Outlined, - modifier = Modifier.padding(top = 8.dp), - ) - } + is ServerSignInStep.Failed -> Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { + Text(step.message, textAlign = TextAlign.Center) + S2Button( + text = stringResource(R.string.dialog_button_retry), + onClick = actions.onRetry, + style = S2ButtonStyle.Outlined, + modifier = Modifier.padding(top = 8.dp), + ) } } -} +}} @Composable private fun SignInFields( @@ -185,6 +199,7 @@ private fun SignInFields( } /** Quick Connect's code, up until the user approves it in another Jellyfin client or cancels. */ +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable private fun QuickConnectCode( code: String, @@ -199,7 +214,7 @@ private fun QuickConnectCode( ) { Text(stringResource(R.string.media_provider_quick_connect_instructions), textAlign = TextAlign.Center) Text(code, style = MaterialTheme.typography.headlineMedium, textAlign = TextAlign.Center) - CircularProgressIndicator() + LoadingIndicator() S2Button( text = stringResource(R.string.dialog_button_cancel), onClick = onCancel, @@ -242,6 +257,7 @@ private fun PasswordField( ) } +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable private fun Progress( message: String, @@ -254,7 +270,7 @@ private fun Progress( horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(16.dp), ) { - if (showSpinner) CircularProgressIndicator() + if (showSpinner) LoadingIndicator() Text(message, textAlign = TextAlign.Center) } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt index ddb61f9d84..53e32f4bc0 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt @@ -11,8 +11,6 @@ import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.Favorite import androidx.compose.material.icons.rounded.Info import androidx.compose.material.icons.rounded.Person -import androidx.compose.material3.BasicAlertDialog -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -30,6 +28,7 @@ import com.simplecityapps.mediaprovider.R as MediaProviderR import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.S2Action import com.simplecityapps.shuttle.designsystem.component.S2ActionsSheet +import com.simplecityapps.shuttle.designsystem.component.S2Dialog import com.simplecityapps.shuttle.designsystem.component.S2DialogContent import com.simplecityapps.shuttle.ui.actions.MediaAction import com.simplecityapps.shuttle.ui.actions.MediaActionType @@ -57,7 +56,6 @@ internal fun rememberSongActionsState(): SongActionsState = remember { SongActio * The open song sheet of [state]: the queue's own [leading] actions (Play next, Remove), the shared * actions [PlayerActions.songActions] allows, sent through [PlayerActions.onMediaAction], then [trailing] (Save queue to playlist, Clear queue). */ -@OptIn(ExperimentalMaterial3Api::class) @Composable internal fun SongActionsHost( state: SongActionsState, @@ -109,14 +107,24 @@ internal fun SongActionsHost( } /** Names a new playlist; any non-blank name will do, duplicates included, as before. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun NewPlaylistDialog( onCreate: (String) -> Unit, onDismiss: () -> Unit, ) { - BasicAlertDialog(onDismissRequest = onDismiss) { - NewPlaylistForm(onCreate, onDismiss) + var name by rememberSaveable { mutableStateOf("") } + S2Dialog( + title = stringResource(R.string.playlist_menu_create_playlist), + onDismissRequest = onDismiss, + confirmLabel = stringResource(R.string.player_create_playlist), + onConfirm = { + onCreate(name.trim()) + onDismiss() + }, + dismissLabel = stringResource(R.string.dialog_button_cancel), + confirmEnabled = name.isNotBlank(), + ) { + NewPlaylistNameField(name, { name = it }) } } @@ -141,16 +149,24 @@ internal fun NewPlaylistForm( dismissLabel = stringResource(R.string.dialog_button_cancel), confirmEnabled = name.isNotBlank(), ) { - OutlinedTextField( - value = name, - onValueChange = { name = it }, - label = { Text(stringResource(R.string.playlist_create_dialog_playlist_name_hint)) }, - singleLine = true, - modifier = Modifier.fillMaxWidth(), - ) + NewPlaylistNameField(name, { name = it }) } } +@Composable +private fun NewPlaylistNameField( + name: String, + onNameChange: (String) -> Unit, +) { + OutlinedTextField( + value = name, + onValueChange = onNameChange, + label = { Text(stringResource(R.string.playlist_create_dialog_playlist_name_hint)) }, + singleLine = true, + modifier = Modifier.fillMaxWidth(), + ) +} + /** The menu label of the shared actions the player offers; null for the rest. */ private val MediaActionType.labelRes: Int? get() = when (this) { From 5b38d396a3fcd1a482553685d7034590509875fb Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:49:08 +0000 Subject: [PATCH 13/34] feat(theme): expressive indicators for the loading views --- .../ui/common/components/LinearProgressIndicatorWithText.kt | 6 ++++-- .../shuttle/ui/common/components/LoadingStatusIndicator.kt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt index 534cb9ecb3..50c4ae2829 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt @@ -6,7 +6,8 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.LinearWavyProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -19,6 +20,7 @@ import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.ui.theme.AppThemeState import com.simplecityapps.shuttle.ui.theme.S2AppTheme +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun HorizontalLoadingView( modifier: Modifier = Modifier, @@ -43,7 +45,7 @@ fun HorizontalLoadingView( ) } - LinearProgressIndicator( + LinearWavyProgressIndicator( progress = { progress }, modifier = Modifier.fillMaxWidth() ) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt index 836501df4f..d35e28a694 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LoadingStatusIndicator.kt @@ -7,9 +7,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon +import androidx.compose.material3.LoadingIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text @@ -24,6 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.R +@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun LoadingStatusIndicator( state: CircularLoadingState, @@ -41,7 +43,7 @@ fun LoadingStatusIndicator( ) { when (state) { is CircularLoadingState.Loading -> { - CircularProgressIndicator( + LoadingIndicator( color = progressColor, modifier = Modifier ) From 7229c64799a6423187b1618cb43e53ac52a8de83 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:50:24 +0000 Subject: [PATCH 14/34] fix(k8s): fail-fast job polling with error tail The success-only kubectl-wait burned the full deadline on failed builds. Poll succeeded/failed explicitly, break on either, dump the last 40 log lines on failure. --- k8s/scripts/build-remote.sh | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/k8s/scripts/build-remote.sh b/k8s/scripts/build-remote.sh index 97b58fbea9..6ca0470c4d 100755 --- a/k8s/scripts/build-remote.sh +++ b/k8s/scripts/build-remote.sh @@ -110,17 +110,18 @@ render "$K8S_DIR/templates/job-build-remote.yaml" "$CACHE_DIR/$JOB.yaml" \ echo "==> job $JOB (task: $GRADLE_ARGS)" kc apply -f "$CACHE_DIR/$JOB.yaml" >/dev/null -echo "==> streaming logs (deadline ${JOB_DEADLINE_SECONDS}s)" -set +e -kc wait --for=jsonpath='{.status.succeeded}'=1 "job/$JOB" -n "$NS" --timeout="${JOB_DEADLINE_SECONDS}s" & -WAITER=$! -while kill -0 $WAITER 2>/dev/null; do - kc logs -n "$NS" -l job-name="$JOB" --tail=5 2>/dev/null | tail -3 +echo "==> waiting for job completion (deadline ${JOB_DEADLINE_SECONDS}s)" +RC="" +START="$(date +%s)" +while true; do + SUCCEEDED="$(kc get job "$JOB" -n "$NS" -o jsonpath='{.status.succeeded}' 2>/dev/null || true)" + FAILED="$(kc get job "$JOB" -n "$NS" -o jsonpath='{.status.failed}' 2>/dev/null || true)" + if [ "$SUCCEEDED" = "1" ]; then RC=0; break; fi + if [ -n "$FAILED" ] && [ "$FAILED" != "0" ]; then RC=1; break; fi + NOW="$(date +%s)" + if [ $((NOW - START)) -ge "$JOB_DEADLINE_SECONDS" ]; then RC=124; break; fi sleep 30 done -wait $WAITER -RC=$? -set -e if [ $RC -eq 0 ]; then echo "==> build succeeded; fetching APKs" @@ -135,7 +136,10 @@ if [ $RC -eq 0 ]; then rm -f "$CACHE_DIR/$JOB.yaml" echo "==> done" else - echo "error: build failed/timed out; job kept: $JOB" >&2 - echo " logs: $KUBECTL -n $NS logs -l job-name=$JOB" >&2 + if [ "$RC" = "124" ]; then echo "error: timed out after ${JOB_DEADLINE_SECONDS}s; job kept: $JOB" >&2 + else echo "error: build FAILED; job kept: $JOB" >&2; fi + echo "--- last 40 log lines ---" >&2 + kc logs -n "$NS" -l job-name="$JOB" --tail=40 2>/dev/null >&2 || true + echo " full logs: $KUBECTL -n $NS logs -l job-name=$JOB" >&2 exit 1 fi From 5787114b696a0e3807322010e3e7ec86da180048 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:51:41 +0000 Subject: [PATCH 15/34] chore(k8s): raise build resources after OOM at dex merge Previous build OOMKilled at mergeProjectDexDebug under 6Gi. Node has headroom (32GB, ~21% used): 4 CPU / 10Gi limit, Gradle heap 6g. --- k8s/config.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/config.env b/k8s/config.env index 90d2c05f3c..bd8f242804 100644 --- a/k8s/config.env +++ b/k8s/config.env @@ -23,9 +23,9 @@ CACHE_SIZE="${CACHE_SIZE:-25Gi}" # --- build job ------------------------------------------------------------- GRADLE_TASK="${GRADLE_TASK:-:android:app:assembleDebug}" -JOB_CPU_LIMIT="${JOB_CPU_LIMIT:-3}" -JOB_MEM_LIMIT="${JOB_MEM_LIMIT:-6000Mi}" -GRADLE_OPTS_VALUE="${GRADLE_OPTS_VALUE:--Dorg.gradle.jvmargs=-Xmx4g -Dkotlin.compiler.execution.strategy=in-process -Dorg.gradle.workers.max=2}" +JOB_CPU_LIMIT="${JOB_CPU_LIMIT:-4}" +JOB_MEM_LIMIT="${JOB_MEM_LIMIT:-10000Mi}" +GRADLE_OPTS_VALUE="${GRADLE_OPTS_VALUE:--Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.compiler.execution.strategy=in-process -Dorg.gradle.workers.max=2}" JOB_DEADLINE_SECONDS="${JOB_DEADLINE_SECONDS:-3000}" # --- app ------------------------------------------------------------------- From 245f1f9a764b3829d29c24433803b1f8dc19f433 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 12:58:06 +0000 Subject: [PATCH 16/34] fix(theme): opt in EditTabsSheet to expressive APIs S2Sheet pulls expressive internals; the new caller missed the @OptIn. Caught by :android:app:compileDebugKotlin (OPT_IN_USAGE_ERROR). --- .../simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt index ee5994f601..b6bb5abb2e 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt @@ -238,6 +238,7 @@ fun LibraryTab.label(): String = stringResource( ) /** Shows, hides and reorders the tabs; every change saves straight away. */ +@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable private fun EditTabsSheet( uiState: LibraryUiState, From 55605dcd7f13f4c33e0d5b84e0fe24699b660216 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 13:01:31 +0000 Subject: [PATCH 17/34] fix(theme): remove stray brace in ServerSignInBody MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Leftover from the dialog→S2Dialog extraction. Caught by :android:app:compileDebugKotlin (SYNTAX error). --- .../shuttle/ui/screens/sources/servers/ServerSignInScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt index c4e0dfaa4f..62c9d2ad72 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/servers/ServerSignInScreen.kt @@ -122,7 +122,7 @@ private fun ServerSignInBody( ) } } -}} +} @Composable private fun SignInFields( From 0ac25e037c10b107cf782e8ba935e46d792dbf5c Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 13:03:56 +0000 Subject: [PATCH 18/34] fix(theme): restore ExperimentalMaterial3Api opt-in on SongActionsHost S2ActionsSheet still needs it; the BasicAlertDialog removal took the annotation with it. --- .../com/simplecityapps/shuttle/ui/shell/player/SongActions.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt index 53e32f4bc0..b825ac005e 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/SongActions.kt @@ -11,6 +11,7 @@ import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.Favorite import androidx.compose.material.icons.rounded.Info import androidx.compose.material.icons.rounded.Person +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -56,6 +57,7 @@ internal fun rememberSongActionsState(): SongActionsState = remember { SongActio * The open song sheet of [state]: the queue's own [leading] actions (Play next, Remove), the shared * actions [PlayerActions.songActions] allows, sent through [PlayerActions.onMediaAction], then [trailing] (Save queue to playlist, Clear queue). */ +@OptIn(ExperimentalMaterial3Api::class) @Composable internal fun SongActionsHost( state: SongActionsState, From cbfc51e17b11111c131b6ea4c3f52d9602cdc2f4 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Sun, 27 Sep 2026 13:07:05 +0000 Subject: [PATCH 19/34] fix(k8s): fetch APKs via seed pod (temurin has no tar) The success-path kubectl cp from the build pod silently fetched nothing. Route through the alpine seed pod like the source sync. --- k8s/scripts/build-remote.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/k8s/scripts/build-remote.sh b/k8s/scripts/build-remote.sh index 6ca0470c4d..789592db23 100755 --- a/k8s/scripts/build-remote.sh +++ b/k8s/scripts/build-remote.sh @@ -124,12 +124,21 @@ while true; do done if [ $RC -eq 0 ]; then - echo "==> build succeeded; fetching APKs" + echo "==> build succeeded; fetching APKs via seed pod" OUT="$REPO_ROOT/android/app/build/outputs" + # The temurin build container has no tar, so kubectl cp from it fails: + # copy out through an alpine seed pod mounting the same PVC. + SEED="fetch-$(date +%Y%m%d-%H%M%S)-$RANDOM" + render "$K8S_DIR/templates/pod-seed.yaml" "$CACHE_DIR/$SEED.yaml" \ + "POD_NAME=$SEED" "NAMESPACE=$NS" "SEED_IMAGE=$SEED_IMAGE" "PVC_NAME=$CACHE_PVC" + kc apply -f "$CACHE_DIR/$SEED.yaml" >/dev/null + kc wait --for=condition=Ready "pod/$SEED" -n "$NS" --timeout=180s >/dev/null + kc exec "$SEED" -n "$NS" -- sh -c "apk add --no-cache tar >/dev/null 2>&1 || true" >/dev/null mkdir -p "$OUT" - POD="$(kc get pods -n "$NS" -l job-name="$JOB" -o jsonpath='{.items[0].metadata.name}')" - kc cp "$NS/$POD:/mnt/workspace/android/app/build/outputs" "$OUT-tmp" >/dev/null 2>&1 || true + kc cp "$NS/$SEED:/mnt/workspace/android/app/build/outputs" "$OUT-tmp" >/dev/null if [ -d "$OUT-tmp" ]; then rm -rf "$OUT"; mv "$OUT-tmp" "$OUT"; fi + kc delete pod "$SEED" -n "$NS" --wait=false >/dev/null + rm -f "$CACHE_DIR/$SEED.yaml" find "$OUT" -type f \( -name '*.apk' -o -name '*.aab' \) 2>/dev/null | head -10 kc logs -n "$NS" -l job-name="$JOB" > "$CACHE_DIR/last-build.log" 2>/dev/null || true [ "$KEEP_JOB" -eq 0 ] && kc delete job "$JOB" -n "$NS" >/dev/null From c308db94460c08b8c917ca5f25e533f9df524d48 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Mon, 28 Sep 2026 01:05:30 +0000 Subject: [PATCH 20/34] feat(backup): library JSON export/import with stats-preserving restore Settings -> Library gains Back up library / Restore library backup. Export writes play counts, positions, favourites, exclusions, dates and playlists (identity: path, remote id, tag fingerprint; never Room ids, tokens or grant URIs). Restore matches exact, relative-path, remote-id then fuzzy, and merges field-by-field (max counts, latest times, earliest favourite) so neither side loses newer activity. Includes matcher/schema unit tests. --- .../ui/screens/settings/SettingsRoutes.kt | 35 ++- .../ui/screens/settings/SettingsViewModel.kt | 64 +++++- .../screens/settings/backup/LibraryBackup.kt | 66 ++++++ .../settings/backup/LibraryBackupManager.kt | 204 ++++++++++++++++++ .../settings/backup/LibraryBackupMatcher.kt | 110 ++++++++++ .../ui/screens/settings/model/SettingItem.kt | 2 + .../screens/settings/model/SettingsCatalog.kt | 12 ++ .../src/main/res/values/strings_settings.xml | 16 ++ .../backup/LibraryBackupMatcherTest.kt | 164 ++++++++++++++ .../local/data/room/dao/SongDataDao.kt | 14 ++ 10 files changed, 685 insertions(+), 2 deletions(-) create mode 100644 android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackup.kt create mode 100644 android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt create mode 100644 android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt create mode 100644 android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt index 9f8f55060d..78f7ff90e7 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt @@ -1,5 +1,7 @@ package com.simplecityapps.shuttle.ui.screens.settings +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.StringRes import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable @@ -115,8 +117,26 @@ private fun SettingsDestinationEntry( val uiState by viewModel.uiState.collectAsStateWithLifecycle() val snackbarHostState = remember { SnackbarHostState() } val context = LocalContext.current + val exportLauncher = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/json")) { uri -> + uri?.let { viewModel.exportBackupTo(it.toString()) } + } + val importLauncher = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> + uri?.let { viewModel.importBackupFrom(it.toString()) } + } ConsumeEvents(uiState.events, viewModel::onEventHandled) { event -> - snackbarHostState.showSnackbar(context.getString(event.message)) + when (event) { + is SettingsUiEvent.BackupExportReady -> exportLauncher.launch(event.suggestedName) + is SettingsUiEvent.BackupImportPickerRequested -> importLauncher.launch(arrayOf("application/json")) + is SettingsUiEvent.BackupImported -> snackbarHostState.showSnackbar( + context.getString( + R.string.settings_backup_import_done, + event.songsMatched, + event.playlistsRestored, + event.songsUnmatched + ) + ) + else -> snackbarHostState.showSnackbar(context.getString(event.message)) + } } LifecycleResumeEffect(viewModel) { viewModel.onResume() @@ -142,6 +162,19 @@ private val SettingsUiEvent.message: Int get() = when (this) { SettingsUiEvent.RescanStarted -> R.string.settings_rescan_started + SettingsUiEvent.BackupExportSaved -> R.string.settings_backup_export_saved + + SettingsUiEvent.BackupExportFailed -> R.string.settings_backup_export_failed + + SettingsUiEvent.BackupImportFailed -> R.string.settings_backup_import_failed + + // Handled with launchers/report formatting above, never as plain snackbars. + is SettingsUiEvent.BackupExportReady -> R.string.settings_backup_export_saved + + is SettingsUiEvent.BackupImportPickerRequested -> R.string.settings_backup_import_failed + + is SettingsUiEvent.BackupImported -> R.string.settings_backup_import_done + SettingsUiEvent.ArtworkCacheCleared -> R.string.settings_artwork_cache_cleared SettingsUiEvent.ArtworkDownloadStarted -> R.string.settings_artwork_download_started diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt index 86d0e64942..ba936b48ad 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt @@ -11,6 +11,7 @@ import com.simplecityapps.shuttle.ui.common.PendingEvents import com.simplecityapps.shuttle.ui.screens.settings.model.SettingItem import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsAction import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsCatalog +import com.simplecityapps.shuttle.ui.screens.settings.backup.LibraryBackupManager import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesIntoMap import dev.zacsweers.metro.Inject @@ -39,6 +40,20 @@ data class SettingsUiState( sealed interface SettingsUiEvent { data object RescanStarted : SettingsUiEvent + /** A freshly built backup is staged in the ViewModel; the UI should open a save picker. */ + data class BackupExportReady(val suggestedName: String) : SettingsUiEvent + + data object BackupExportSaved : SettingsUiEvent + + data object BackupExportFailed : SettingsUiEvent + + /** The UI should open a file picker for a backup to restore. */ + data object BackupImportPickerRequested : SettingsUiEvent + + data class BackupImported(val songsMatched: Int, val playlistsRestored: Int, val songsUnmatched: Int) : SettingsUiEvent + + data object BackupImportFailed : SettingsUiEvent + data object ArtworkCacheCleared : SettingsUiEvent data object ArtworkDownloadStarted : SettingsUiEvent @@ -53,12 +68,16 @@ class SettingsViewModel @Inject constructor( observeSetting: ObserveSetting, private val readSetting: ReadSetting, private val saveSetting: SaveSetting, - private val effects: SettingsEffects + private val effects: SettingsEffects, + private val backupManager: LibraryBackupManager ) : ViewModel() { private val lastScanDate = MutableStateFlow(effects.lastScanDate()) private val events = PendingEvents() + /** The staged backup JSON between ExportBackup and the save-picker result. */ + private var pendingBackupJson: String? = null + val uiState: StateFlow = combine( combine(catalogSettings.map { setting -> observeSetting(setting).map { setting.key to it } }) { it.toMap() }, lastScanDate, @@ -114,6 +133,20 @@ class SettingsViewModel @Inject constructor( events.post(SettingsUiEvent.RescanStarted) } + SettingsAction.ExportBackup -> viewModelScope.launch { + val json = runCatching { backupManager.buildBackupJson() }.getOrNull() + if (json == null) { + events.post(SettingsUiEvent.BackupExportFailed) + } else { + pendingBackupJson = json + events.post(SettingsUiEvent.BackupExportReady(BACKUP_FILE_NAME)) + } + } + + SettingsAction.ImportBackup -> { + events.post(SettingsUiEvent.BackupImportPickerRequested) + } + SettingsAction.ClearArtworkCache -> viewModelScope.launch { effects.clearArtworkCache() events.post(SettingsUiEvent.ArtworkCacheCleared) @@ -132,6 +165,33 @@ class SettingsViewModel @Inject constructor( fun onEventHandled(id: Long) = events.consume(id) + /** Writes the staged backup to the save-picker [destination]; call once per pick. */ + fun exportBackupTo(destination: String) { + val json = pendingBackupJson + pendingBackupJson = null + if (json == null) { + events.post(SettingsUiEvent.BackupExportFailed) + return + } + viewModelScope.launch { + events.post( + if (backupManager.writeBackup(destination, json)) SettingsUiEvent.BackupExportSaved + else SettingsUiEvent.BackupExportFailed + ) + } + } + + /** Reads and merges the backup at the picker [source]. */ + fun importBackupFrom(source: String) { + viewModelScope.launch { + val report = runCatching { backupManager.readAndRestore(source) }.getOrNull() + events.post( + if (report == null) SettingsUiEvent.BackupImportFailed + else SettingsUiEvent.BackupImported(report.songsMatched, report.playlistsRestored, report.songsUnmatched) + ) + } + } + /** Re-reads what isn't observable, such as the last scan date, when the screen comes back into view. */ fun onResume() { lastScanDate.value = effects.lastScanDate() @@ -170,3 +230,5 @@ class SettingsViewModel @Inject constructor( .distinctBy { it.key } } } + +private const val BACKUP_FILE_NAME = "shuttle-library-backup.json" diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackup.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackup.kt new file mode 100644 index 0000000000..34285a70d6 --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackup.kt @@ -0,0 +1,66 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import kotlinx.serialization.Serializable + +/** + * Versioned library backup: per-song stats plus playlists, nothing else. + * + * Identity is (provider, path) first, (provider, externalId) for remote items, and a tag + * fingerprint as fallback. Room ids, MediaStore ids-as-primary, credentials, SAF grant URIs and + * absolute volume paths are deliberately NOT part of the format: none of them survive a reinstall. + * Times are epoch millis (stable across kotlinx-datetime/-time versions). + */ +@Serializable +data class LibraryBackup( + val schemaVersion: Int = CURRENT_SCHEMA_VERSION, + val appVersion: String? = null, + /** Epoch millis the backup was written. */ + val exportedAt: Long, + val songs: List, + val playlists: List +) { + companion object { + const val CURRENT_SCHEMA_VERSION = 1 + } +} + +@Serializable +data class SongIdentity( + /** [com.simplecityapps.shuttle.model.MediaProviderType.name]. */ + val provider: String, + val path: String, + val externalId: String? = null, + val title: String? = null, + val album: String? = null, + /** albumArtist ?: artists.joinToString, as displayed. */ + val artist: String? = null, + val duration: Int = 0, + val size: Long = 0 +) + +@Serializable +data class BackedUpSong( + val identity: SongIdentity, + val playCount: Int = 0, + /** Epoch millis, null when never played. */ + val lastPlayed: Long? = null, + val lastCompleted: Long? = null, + val playbackPosition: Int = 0, + val excluded: Boolean = false, + /** Epoch millis, null when not a favourite. */ + val favouritedAt: Long? = null, + /** Epoch millis, null when unknown. */ + val dateAdded: Long? = null +) + +@Serializable +data class BackedUpPlaylist( + val name: String, + /** [com.simplecityapps.shuttle.model.MediaProviderType.name]. */ + val provider: String, + val externalId: String? = null, + /** [com.simplecityapps.shuttle.sorting.PlaylistSongSortOrder.name]. */ + val sortOrder: String = "Position", + val sortDescending: Boolean = false, + val members: List +) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt new file mode 100644 index 0000000000..155b504f57 --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt @@ -0,0 +1,204 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import android.content.Context +import android.net.Uri +import com.simplecityapps.localmediaprovider.local.data.room.database.MediaDatabase +import com.simplecityapps.mediaprovider.repository.playlists.PlaylistQuery +import com.simplecityapps.mediaprovider.repository.playlists.PlaylistRepository +import com.simplecityapps.mediaprovider.repository.songs.SongRepository +import com.simplecityapps.shuttle.di.ApplicationContext +import com.simplecityapps.shuttle.di.IoDispatcher +import com.simplecityapps.shuttle.model.MediaProviderType +import com.simplecityapps.shuttle.model.Song +import com.simplecityapps.shuttle.query.SongQuery +import com.simplecityapps.shuttle.sorting.PlaylistSongSortOrder +import dev.zacsweers.metro.Inject +import java.io.IOException +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.withContext +import kotlinx.serialization.json.Json +import timber.log.Timber +import kotlin.time.Clock + +data class RestoreReport( + val songsMatched: Int, + val songsUnmatched: Int, + val statsWritten: Int, + val playlistsRestored: Int, + val playlistsUnresolved: List, + val membersSkipped: Int +) + +/** + * Library backup export/import (Settings -> Library). Backs up per-song stats (play counts, + * positions, favourites, exclusions, dates) plus playlists; restore merges field-by-field so + * neither the backup nor newer on-device activity is lost. + * + * Never backed up: Room ids, credentials/tokens, SAF grant URIs, transient queue/session state, + * artwork caches and aggregates. Restoring favourites writes the DAO directly (no + * `pending_favourites` rows), so a restore never pushes stale states to remote servers. + */ +class LibraryBackupManager @Inject constructor( + @ApplicationContext private val context: Context, + private val database: MediaDatabase, + private val songRepository: SongRepository, + private val playlistRepository: PlaylistRepository, + @IoDispatcher private val ioDispatcher: CoroutineDispatcher +) { + private val json = Json { ignoreUnknownKeys = true; prettyPrint = true } + + suspend fun buildBackupJson(): String = withContext(ioDispatcher) { + val songs = songRepository.loadSongs(SongQuery.All(includeExcluded = true)) + val playlists = playlistRepository.getPlaylists(PlaylistQuery.All(null)).first() + val backedPlaylists = playlists.map { playlist -> + val members = playlistRepository.getSongsForPlaylist(playlist).first() + BackedUpPlaylist( + name = playlist.name, + provider = playlist.mediaProvider.name, + externalId = playlist.externalId, + sortOrder = playlist.sortOrder.name, + sortDescending = playlist.sortDescending, + members = members.map { it.song.toIdentity() } + ) + } + json.encodeToString( + LibraryBackup.serializer(), + LibraryBackup( + exportedAt = Clock.System.now().toEpochMilliseconds(), + songs = songs.map { it.toBackedUp() }, + playlists = backedPlaylists + ) + ) + } + + suspend fun writeBackup(destination: String, backupJson: String): Boolean = withContext(ioDispatcher) { + try { + context.contentResolver.openOutputStream(Uri.parse(destination))?.use { out -> + out.write(backupJson.toByteArray(Charsets.UTF_8)) + true + } ?: run { + Timber.w("Could not open output stream for library backup: $destination") + false + } + } catch (e: IOException) { + Timber.e(e, "Failed to write library backup to $destination") + false + } catch (e: SecurityException) { + Timber.e(e, "Permission denied writing library backup to $destination") + false + } + } + + suspend fun readAndRestore(source: String): RestoreReport? = withContext(ioDispatcher) { + val backup = try { + context.contentResolver.openInputStream(Uri.parse(source))?.use { input -> + json.decodeFromString(input.readBytes().toString(Charsets.UTF_8)) + } + } catch (e: Exception) { + Timber.e(e, "Failed to read library backup from $source") + null + } ?: return@withContext null + if (backup.schemaVersion > LibraryBackup.CURRENT_SCHEMA_VERSION) { + Timber.w("Backup schema ${backup.schemaVersion} newer than supported ${LibraryBackup.CURRENT_SCHEMA_VERSION}") + return@withContext null + } + restore(backup) + } + + private suspend fun restore(backup: LibraryBackup): RestoreReport { + val songDataDao = database.songDataDao() + val library = songRepository.loadSongs(SongQuery.All(includeExcluded = true)) + val matches = LibraryBackupMatcher.matchAll(backup.songs.map { it.identity }, library) + + var statsWritten = 0 + var unmatched = 0 + backup.songs.forEach { backedUp -> + val match = matches[backedUp.identity] + if (match == null) { + unmatched++ + return@forEach + } + val current = match.song + val merged = LibraryBackupMatcher.mergeStats(current, backedUp) + if (!LibraryBackupMatcher.statsEqual(current, merged)) { + songDataDao.restoreStats( + id = current.id, + playCount = merged.playCount, + lastPlayed = merged.lastPlayed, + lastCompleted = merged.lastCompleted, + playbackPosition = merged.playbackPosition, + dateAdded = merged.dateAdded + ) + statsWritten++ + } + if (merged.excluded && !current.blacklisted) { + songDataDao.setExcluded(listOf(current.id), true) + } + merged.favouritedAt?.let { at -> + if (current.favouritedAt == null) songDataDao.favourite(current.id, at) + } + } + + val existing = playlistRepository.getPlaylists(PlaylistQuery.All(null)).first() + var playlistsRestored = 0 + var membersSkipped = 0 + val unresolved = mutableListOf() + backup.playlists.forEach { backedUp -> + val provider = runCatching { MediaProviderType.valueOf(backedUp.provider) }.getOrNull() + ?: MediaProviderType.Shuttle + val memberSongs = backedUp.members.mapNotNull { ref -> + matches[ref]?.song ?: run { membersSkipped++; null } + } + if (memberSongs.isEmpty()) { + unresolved.add(backedUp.name) + return@forEach + } + val target = if (backedUp.externalId != null) { + existing.firstOrNull { it.mediaProvider == provider && it.externalId == backedUp.externalId } + } else null + ?: existing.firstOrNull { it.mediaProvider == provider && it.name.equals(backedUp.name, ignoreCase = true) } + if (target == null) { + playlistRepository.createPlaylist(backedUp.name, provider, memberSongs, backedUp.externalId) + } else { + playlistRepository.clearPlaylist(target) + playlistRepository.addToPlaylist(target, memberSongs) + runCatching { PlaylistSongSortOrder.valueOf(backedUp.sortOrder) }.getOrNull()?.let { order -> + playlistRepository.updatePlaylistSortOder(target, order, backedUp.sortDescending) + } + } + playlistsRestored++ + } + + return RestoreReport( + songsMatched = backup.songs.size - unmatched, + songsUnmatched = unmatched, + statsWritten = statsWritten, + playlistsRestored = playlistsRestored, + playlistsUnresolved = unresolved, + membersSkipped = membersSkipped + ) + } + + private fun Song.toIdentity(): SongIdentity = SongIdentity( + provider = mediaProvider.name, + path = path, + externalId = externalId, + title = name, + album = album, + artist = albumArtist ?: artists.joinToString(", ").ifEmpty { null }, + duration = duration, + size = size + ) + + private fun Song.toBackedUp(): BackedUpSong = BackedUpSong( + identity = toIdentity(), + playCount = playCount, + lastPlayed = lastPlayed?.toEpochMilliseconds(), + lastCompleted = lastCompleted?.toEpochMilliseconds(), + playbackPosition = playbackPosition, + excluded = blacklisted, + favouritedAt = favouritedAt?.toEpochMilliseconds(), + dateAdded = dateAdded?.toEpochMilliseconds() + ) +} diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt new file mode 100644 index 0000000000..6bead63c7f --- /dev/null +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt @@ -0,0 +1,110 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import com.simplecityapps.shuttle.model.Song +import kotlin.math.abs +import kotlin.time.Instant + +/** + * Pure library-matching and stats-merging for backup restore: no Android, no Room, unit-testable. + * + * Match order per backup identity: exact (provider, path) -> normalized relative path (the SD-card + * volume segment changes across installs) -> (provider, externalId) for remote items -> tag + * fingerprint (normalized title/album/artist + duration within [DURATION_TOLERANCE_S]). + */ +object LibraryBackupMatcher { + + enum class MatchKind { ExactPath, RelativePath, ExternalId, Fuzzy } + + data class SongMatch(val song: Song, val kind: MatchKind) + + fun matchAll( + identities: List, + library: List + ): Map { + val exact = library.associateBy { it.mediaProvider.name to it.path } + val relative = HashMap, Song>() + val byExternalId = HashMap, Song>() + val fuzzy = HashMap>() + for (song in library) { + relative.putIfAbsent(song.mediaProvider.name to relativePath(song.path), song) + song.externalId?.let { byExternalId.putIfAbsent(song.mediaProvider.name to it, song) } + fuzzy.getOrPut(fingerprintKey(song.name, song.album, song.friendlyArtistName)) { mutableListOf() }.add(song) + } + return identities.associateWith { identity -> + exact[identity.provider to identity.path]?.let { return@associateWith SongMatch(it, MatchKind.ExactPath) } + relative[identity.provider to relativePath(identity.path)]?.let { return@associateWith SongMatch(it, MatchKind.RelativePath) } + identity.externalId?.let { byExternalId[identity.provider to it] }?.let { return@associateWith SongMatch(it, MatchKind.ExternalId) } + fuzzy[fingerprintKey(identity.title, identity.album, identity.artist)] + ?.firstOrNull { abs(it.duration - identity.duration) <= DURATION_TOLERANCE_S } + ?.let { SongMatch(it, MatchKind.Fuzzy) } + } + } + + /** + * Field-level merge: restore must never destroy newer on-device activity, and a reinstall must + * regain lifetime counts. Counters take the max, timestamps the latest, position follows + * whichever side was played last, exclusions OR together, favourites/date-added keep the + * earliest (original) time. + */ + data class MergedStats( + val playCount: Int, + val lastPlayed: Instant?, + val lastCompleted: Instant?, + val playbackPosition: Int, + val excluded: Boolean, + val favouritedAt: Instant?, + val dateAdded: Instant? + ) + + fun mergeStats(current: Song, backup: BackedUpSong): MergedStats { + val backupLastPlayed = backup.lastPlayed?.let(Instant::fromEpochMilliseconds) + val backupLastCompleted = backup.lastCompleted?.let(Instant::fromEpochMilliseconds) + val backupFavourite = backup.favouritedAt?.let(Instant::fromEpochMilliseconds) + val backupAdded = backup.dateAdded?.let(Instant::fromEpochMilliseconds) + val latestPlayed = maxOf(current.lastPlayed, backupLastPlayed) + val position = when { + backupLastPlayed != null && backupLastPlayed >= (current.lastPlayed ?: Instant.DISTANT_PAST) -> backup.playbackPosition + else -> current.playbackPosition + } + return MergedStats( + playCount = maxOf(current.playCount, backup.playCount), + lastPlayed = latestPlayed, + lastCompleted = maxOf(current.lastCompleted, backupLastCompleted), + playbackPosition = position, + excluded = current.blacklisted || backup.excluded, + favouritedAt = minOf(current.favouritedAt, backupFavourite), + dateAdded = minOf(current.dateAdded, backupAdded) ?: current.dateAdded + ) + } + + fun statsEqual(current: Song, merged: MergedStats): Boolean = + current.playCount == merged.playCount && + current.lastPlayed == merged.lastPlayed && + current.lastCompleted == merged.lastCompleted && + current.playbackPosition == merged.playbackPosition && + current.dateAdded == merged.dateAdded + + /** Strips a `/storage//` prefix so SD-card volume id changes don't break matching. */ + internal fun relativePath(path: String): String { + val lower = path.lowercase() + val storagePrefix = Regex("^/storage/[^/]+/") + return storagePrefix.replace(lower, "") + } + + private fun fingerprintKey(title: String?, album: String?, artist: String?): String = + listOf(title, album, artist).joinToString("\u0001") { it?.trim()?.lowercase() ?: "" } + + private fun maxOf(a: Instant?, b: Instant?): Instant? = when { + a == null -> b + b == null -> a + else -> maxOf(a, b) + } + + private fun minOf(a: Instant?, b: Instant?): Instant? = when { + a == null -> b + b == null -> a + else -> minOf(a, b) + } + + private const val DURATION_TOLERANCE_S = 2 +} diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt index e1846a70ed..f0ba9b70c4 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingItem.kt @@ -42,6 +42,8 @@ enum class SettingsLink { /** What a [SettingItem.Action] row does. The UI step maps each to a handler. */ enum class SettingsAction { Rescan, + ExportBackup, + ImportBackup, ClearArtworkCache, DownloadAllArtwork, CopyDebugLogs diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt index b2e77e8523..2720e61528 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt @@ -208,6 +208,18 @@ object SettingsCatalog { ChoiceOption(ImportFrequency.Weekly, R.string.pref_rescan_frequency_weekly) ) ), + SettingItem.Action( + action = SettingsAction.ExportBackup, + title = R.string.pref_backup_export_title, + summary = R.string.pref_backup_export_summary, + key = "pref_backup_export" + ), + SettingItem.Action( + action = SettingsAction.ImportBackup, + title = R.string.pref_backup_import_title, + summary = R.string.pref_backup_import_summary, + key = "pref_backup_import" + ), SettingItem.Navigate( target = SettingsLink.ExcludedSongs, title = R.string.pref_exclude_title, diff --git a/android/app/src/main/res/values/strings_settings.xml b/android/app/src/main/res/values/strings_settings.xml index 0d85752f8c..9f9bd6390a 100644 --- a/android/app/src/main/res/values/strings_settings.xml +++ b/android/app/src/main/res/values/strings_settings.xml @@ -42,6 +42,14 @@ Rescan Rescan the selected media providers + + Back up library + + Save play counts, favourites, exclusions and playlists to a JSON file + + Restore library backup + + Merge stats and playlists from a backup file; newer on-device activity is kept Excluded @@ -165,6 +173,14 @@ Version Scanning your library + + Library backup saved + + Library backup failed + + Could not read that backup file + + Restored %1$d songs and %2$d playlists (%3$d unmatched) Artwork cache cleared diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt new file mode 100644 index 0000000000..578e6d4bb9 --- /dev/null +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt @@ -0,0 +1,164 @@ +package com.simplecityapps.shuttle.ui.screens.settings.backup + +import com.simplecityapps.shuttle.model.MediaProviderType +import com.simplecityapps.shuttle.model.Song +import io.kotest.matchers.nulls.shouldBeNull +import io.kotest.matchers.nulls.shouldNotBeNull +import io.kotest.matchers.shouldBe +import kotlinx.serialization.json.Json +import org.junit.Test +import kotlin.time.Instant + +class LibraryBackupMatcherTest { + + private val json = Json { ignoreUnknownKeys = true } + + private fun song( + id: Long = 1, + path: String = "/storage/emulated/0/Music/song.mp3", + provider: MediaProviderType = MediaProviderType.Shuttle, + externalId: String? = null, + name: String? = "Song", + album: String? = "Album", + artists: List = listOf("Artist"), + duration: Int = 200, + size: Long = 1000, + playCount: Int = 0, + lastPlayed: Instant? = null, + lastCompleted: Instant? = null, + playbackPosition: Int = 0, + blacklisted: Boolean = false, + favouritedAt: Instant? = null, + dateAdded: Instant? = null + ) = Song( + id = id, + name = name, + albumArtist = null, + artists = artists, + album = album, + track = 1, + disc = 1, + duration = duration, + date = null, + genres = emptyList(), + path = path, + size = size, + mimeType = "audio/mpeg", + lastModified = null, + lastPlayed = lastPlayed, + lastCompleted = lastCompleted, + playCount = playCount, + playbackPosition = playbackPosition, + blacklisted = blacklisted, + externalId = externalId, + mediaProvider = provider, + lyrics = null, + grouping = null, + bitRate = null, + bitDepth = null, + sampleRate = null, + channelCount = null, + dateAdded = dateAdded, + favouritedAt = favouritedAt + ) + + private fun identityOf(song: Song) = SongIdentity( + provider = song.mediaProvider.name, + path = song.path, + externalId = song.externalId, + title = song.name, + album = song.album, + artist = song.artists.joinToString(", "), + duration = song.duration, + size = song.size + ) + + @Test + fun `exact path match wins`() { + val library = listOf(song()) + val identity = identityOf(song()) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.ExactPath + } + + @Test + fun `sd-card volume change matches by relative path`() { + val library = listOf(song(path = "/storage/ABCD-1234/Music/song.mp3")) + val identity = identityOf(song(path = "/storage/emulated/0/Music/song.mp3")) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.RelativePath + } + + @Test + fun `remote items match by external id`() { + val library = listOf( + song( + provider = MediaProviderType.Jellyfin, + path = "jellyfin://item/aaa", + externalId = "aaa", + name = "Renamed Since" + ) + ) + val identity = identityOf( + song(provider = MediaProviderType.Jellyfin, path = "jellyfin://item/aaa", externalId = "aaa", name = "Original") + ) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.ExternalId + } + + @Test + fun `retagged file matches fuzzily within duration tolerance`() { + val library = listOf(song(path = "/storage/emulated/0/Other/renamed.mp3")) + val identity = identityOf(song(path = "/storage/emulated/0/Music/song.mp3", duration = 201)) + val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] + match.shouldNotBeNull() + match.kind shouldBe LibraryBackupMatcher.MatchKind.Fuzzy + } + + @Test + fun `unknown file does not match`() { + val library = listOf(song()) + val identity = identityOf(song(name = "Something Else", album = "Other", path = "/x/y.mp3")) + LibraryBackupMatcher.matchAll(listOf(identity), library)[identity].shouldBeNull() + } + + @Test + fun `merge keeps max counts, latest times, earliest favourite`() { + val playedAt = Instant.fromEpochMilliseconds(1_000_000) + val playedLater = Instant.fromEpochMilliseconds(2_000_000) + val current = song(playCount = 3, lastPlayed = playedLater, playbackPosition = 10) + val backup = BackedUpSong( + identity = identityOf(current), + playCount = 10, + lastPlayed = 1_000_000, + playbackPosition = 99, + favouritedAt = 500_000 + ) + val merged = LibraryBackupMatcher.mergeStats(current, backup) + merged.playCount shouldBe 10 + merged.lastPlayed shouldBe playedLater + // Position follows whichever side was played last: the device. + merged.playbackPosition shouldBe 10 + merged.favouritedAt shouldBe Instant.fromEpochMilliseconds(500_000) + } + + @Test + fun `backup round-trips through json`() { + val backup = LibraryBackup( + exportedAt = 1_700_000_000_000, + songs = listOf( + BackedUpSong(identityOf(song()), playCount = 7, favouritedAt = 123_456) + ), + playlists = listOf( + BackedUpPlaylist(name = "Mix", provider = "Shuttle", members = listOf(identityOf(song()))) + ) + ) + val decoded = json.decodeFromString(json.encodeToString(LibraryBackup.serializer(), backup)) + decoded.songs.single().playCount shouldBe 7 + decoded.playlists.single().members.single().path shouldBe "/storage/emulated/0/Music/song.mp3" + decoded.schemaVersion shouldBe LibraryBackup.CURRENT_SCHEMA_VERSION + } +} diff --git a/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt b/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt index 7385282297..6ed8f63474 100644 --- a/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt +++ b/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt @@ -134,6 +134,20 @@ abstract class SongDataDao { lastPlayed: Instant = Clock.System.now() ) + /** + * Writes a merged backup row (see LibraryBackupManager): every stat column at once. Used only by + * library-backup restore, never by the scanner, so rescan semantics are untouched. + */ + @Query("UPDATE songs SET playCount = :playCount, lastPlayed = :lastPlayed, lastCompleted = :lastCompleted, playbackPosition = :playbackPosition, dateAdded = :dateAdded WHERE id = :id") + abstract suspend fun restoreStats( + id: Long, + playCount: Int, + lastPlayed: Instant?, + lastCompleted: Instant?, + playbackPosition: Int, + dateAdded: Instant? + ) + /** [updatePlaybackPosition] and incrementing the play count as one write, for a track playing through to its end. */ @Query("UPDATE songs SET playbackPosition = :playbackPosition, lastPlayed = :now, playCount = (SELECT songs.playCount + 1), lastCompleted = :now WHERE id =:id") abstract suspend fun recordPlayedThrough( From dfbb2353431e23969837b24ab21e5dcc89ef6c35 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Mon, 28 Sep 2026 01:09:52 +0000 Subject: [PATCH 21/34] fix(backup): relaxed backup-manager mock in settings tests SettingsViewModel gained a LibraryBackupManager dependency; the direct constructions in SettingsViewModelTest/SettingsIntegrationTest now pass a relaxed mock (backup flows have their own tests). --- .../ui/screens/settings/SettingsIntegrationTest.kt | 11 +++++++---- .../ui/screens/settings/SettingsViewModelTest.kt | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt index 284b8942da..7297918fc8 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsIntegrationTest.kt @@ -11,8 +11,10 @@ import com.simplecityapps.shuttle.settings.SettingsStore import com.simplecityapps.shuttle.settings.ThemeMode import com.simplecityapps.shuttle.settings.defaultSharedPreferences import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsDestination +import com.simplecityapps.shuttle.ui.screens.settings.backup.LibraryBackupManager import com.simplecityapps.testing.MainDispatcherRule import io.kotest.matchers.shouldBe +import io.mockk.mockk import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -36,11 +38,12 @@ class SettingsIntegrationTest { private val store = SettingsStore(SharedPreferencesKeyValueStore(RuntimeEnvironment.getApplication().defaultSharedPreferences().apply { edit().clear().commit() })) private val effects = FakeSettingsEffects() + private val backupManager = mockk(relaxed = true) private val robot = SettingsRobot(composeTestRule) @Test fun `toggling a switch stores it and redraws it`() { - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) robot.assertSwitchOff("Pure black") robot.tapText("Pure black") @@ -51,7 +54,7 @@ class SettingsIntegrationTest { @Test fun `picking a theme stores it and shows it`() { - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) robot.tapText("Theme") robot.tapDialogText("Dark") @@ -64,7 +67,7 @@ class SettingsIntegrationTest { @Test fun `turning dynamic colour off frees the accent to be picked`() { store.preference(AppearanceSettings.DynamicColour).value = true - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) robot.assertNotEnabled("Accent") robot.tapText("Dynamic colour") @@ -77,7 +80,7 @@ class SettingsIntegrationTest { @Test fun `a change made elsewhere shows up`() { - robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects)) + robot.setDestinationContentWithViewModel(SettingsDestination.Appearance, SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager)) store.preference(AppearanceSettings.PureBlack).value = true diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt index 46e1abfd2b..afdb7e2e25 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModelTest.kt @@ -14,8 +14,10 @@ import com.simplecityapps.shuttle.settings.ThemeMode import com.simplecityapps.shuttle.ui.screens.settings.model.SettingItem import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsAction import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsCatalog +import com.simplecityapps.shuttle.ui.screens.settings.backup.LibraryBackupManager import com.simplecityapps.testing.MainDispatcherRule import io.kotest.matchers.shouldBe +import io.mockk.mockk import java.util.Date import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch @@ -34,6 +36,7 @@ class SettingsViewModelTest { private val prefs = InMemoryKeyValueStore() private val effects = FakeSettingsEffects() + private val backupManager = mockk(relaxed = true) private lateinit var store: SettingsStore @Before @@ -41,7 +44,7 @@ class SettingsViewModelTest { store = SettingsStore(prefs) } - private fun viewModel() = SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects) + private fun viewModel() = SettingsViewModel(ObserveSetting(store), ReadSetting(store), SaveSetting(store), effects, backupManager) private inline fun item(key: String): T = SettingsCatalog.items.filterIsInstance().first { it.key == key } From d0b08edbe073685b6317df89a0021c09ecf60280 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Mon, 28 Sep 2026 01:13:30 +0000 Subject: [PATCH 22/34] fix(backup): emulated-storage relative paths, instant merge recursion, remote test - relativePath now strips /storage/emulated// as well as physical volume ids (primary storage is the common reinstall case). - latestOf/earliestOf replace maxOf/minOf helpers that recursed via overload resolution (StackOverflowError in merge). - remote-id test now uses differing paths so exact match can't win. --- .../settings/backup/LibraryBackupMatcher.kt | 29 +++++++++---------- .../backup/LibraryBackupMatcherTest.kt | 4 +-- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt index 6bead63c7f..1b719e684d 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt @@ -61,7 +61,7 @@ object LibraryBackupMatcher { val backupLastCompleted = backup.lastCompleted?.let(Instant::fromEpochMilliseconds) val backupFavourite = backup.favouritedAt?.let(Instant::fromEpochMilliseconds) val backupAdded = backup.dateAdded?.let(Instant::fromEpochMilliseconds) - val latestPlayed = maxOf(current.lastPlayed, backupLastPlayed) + val latestPlayed = latestOf(current.lastPlayed, backupLastPlayed) val position = when { backupLastPlayed != null && backupLastPlayed >= (current.lastPlayed ?: Instant.DISTANT_PAST) -> backup.playbackPosition else -> current.playbackPosition @@ -69,11 +69,11 @@ object LibraryBackupMatcher { return MergedStats( playCount = maxOf(current.playCount, backup.playCount), lastPlayed = latestPlayed, - lastCompleted = maxOf(current.lastCompleted, backupLastCompleted), + lastCompleted = latestOf(current.lastCompleted, backupLastCompleted), playbackPosition = position, excluded = current.blacklisted || backup.excluded, - favouritedAt = minOf(current.favouritedAt, backupFavourite), - dateAdded = minOf(current.dateAdded, backupAdded) ?: current.dateAdded + favouritedAt = earliestOf(current.favouritedAt, backupFavourite), + dateAdded = earliestOf(current.dateAdded, backupAdded) ?: current.dateAdded ) } @@ -84,27 +84,24 @@ object LibraryBackupMatcher { current.playbackPosition == merged.playbackPosition && current.dateAdded == merged.dateAdded - /** Strips a `/storage//` prefix so SD-card volume id changes don't break matching. */ + /** Strips a `/storage//` prefix so volume id changes don't break matching. Handles both + * physical volumes (`/storage/ABCD-1234/…`) and emulated storage (`/storage/emulated/0/…`). */ internal fun relativePath(path: String): String { val lower = path.lowercase() - val storagePrefix = Regex("^/storage/[^/]+/") + val storagePrefix = Regex("^/storage/(emulated/\\d+/)?[^/]+/") return storagePrefix.replace(lower, "") } private fun fingerprintKey(title: String?, album: String?, artist: String?): String = listOf(title, album, artist).joinToString("\u0001") { it?.trim()?.lowercase() ?: "" } - private fun maxOf(a: Instant?, b: Instant?): Instant? = when { - a == null -> b - b == null -> a - else -> maxOf(a, b) - } + // Named latest/earliest (not max/min) so overload resolution can never mistake these + // for kotlin.comparisons.maxOf/minOf and recurse. + private fun latestOf(a: Instant?, b: Instant?): Instant? = + if (a == null) b else if (b == null) a else if (a >= b) a else b - private fun minOf(a: Instant?, b: Instant?): Instant? = when { - a == null -> b - b == null -> a - else -> minOf(a, b) - } + private fun earliestOf(a: Instant?, b: Instant?): Instant? = + if (a == null) b else if (b == null) a else if (a <= b) a else b private const val DURATION_TOLERANCE_S = 2 } diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt index 578e6d4bb9..9d416e30b2 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt @@ -92,7 +92,7 @@ class LibraryBackupMatcherTest { } @Test - fun `remote items match by external id`() { + fun `remote items match by external id when paths differ`() { val library = listOf( song( provider = MediaProviderType.Jellyfin, @@ -102,7 +102,7 @@ class LibraryBackupMatcherTest { ) ) val identity = identityOf( - song(provider = MediaProviderType.Jellyfin, path = "jellyfin://item/aaa", externalId = "aaa", name = "Original") + song(provider = MediaProviderType.Jellyfin, path = "jellyfin://item/changed", externalId = "aaa", name = "Original") ) val match = LibraryBackupMatcher.matchAll(listOf(identity), library)[identity] match.shouldNotBeNull() From 37ddaef19cfa6ee65e15c0f4e5126d93edb8d80d Mon Sep 17 00:00:00 2001 From: PylotLight Date: Mon, 28 Sep 2026 01:15:57 +0000 Subject: [PATCH 23/34] fix(backup): exclusive alternation in storage-prefix strip The optional-group regex ate one path segment too many on emulated storage. (emulated/N | volume) alternatives are now exclusive. --- .../shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt index 1b719e684d..d3d8cd1fdd 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt @@ -88,7 +88,7 @@ object LibraryBackupMatcher { * physical volumes (`/storage/ABCD-1234/…`) and emulated storage (`/storage/emulated/0/…`). */ internal fun relativePath(path: String): String { val lower = path.lowercase() - val storagePrefix = Regex("^/storage/(emulated/\\d+/)?[^/]+/") + val storagePrefix = Regex("^/storage/(emulated/\\d+|[^/]+)/") return storagePrefix.replace(lower, "") } From 995410b5c6b781d7254b0181dcf55999c6e5541c Mon Sep 17 00:00:00 2001 From: PylotLight Date: Mon, 28 Sep 2026 01:24:19 +0000 Subject: [PATCH 24/34] fix(k8s): never let artifact-less fetches clobber build outputs --- k8s/scripts/build-remote.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/k8s/scripts/build-remote.sh b/k8s/scripts/build-remote.sh index 789592db23..14d9a90d4a 100755 --- a/k8s/scripts/build-remote.sh +++ b/k8s/scripts/build-remote.sh @@ -136,7 +136,14 @@ if [ $RC -eq 0 ]; then kc exec "$SEED" -n "$NS" -- sh -c "apk add --no-cache tar >/dev/null 2>&1 || true" >/dev/null mkdir -p "$OUT" kc cp "$NS/$SEED:/mnt/workspace/android/app/build/outputs" "$OUT-tmp" >/dev/null - if [ -d "$OUT-tmp" ]; then rm -rf "$OUT"; mv "$OUT-tmp" "$OUT"; fi + # Test-only runs produce no APK/AAB: never let an artifact-less fetch + # clobber a previous build's outputs. + if find "$OUT-tmp" -type f \( -name '*.apk' -o -name '*.aab' \) 2>/dev/null | grep -q .; then + rm -rf "$OUT"; mv "$OUT-tmp" "$OUT" + else + echo "warn: no apk/aab in fetched outputs; keeping previous $OUT" + rm -rf "$OUT-tmp" + fi kc delete pod "$SEED" -n "$NS" --wait=false >/dev/null rm -f "$CACHE_DIR/$SEED.yaml" find "$OUT" -type f \( -name '*.apk' -o -name '*.aab' \) 2>/dev/null | head -10 From 20e4920c27ebf626d759f64eaf8279957c766cf4 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 07:32:49 +0000 Subject: [PATCH 25/34] fix(backup): snapshot-overwrite restore resets playcounts to the backup Restore now overwrites playCount, timestamps, position, excluded and favouritedAt from the backup snapshot instead of merging field-by-field (max counts, latest times). dateAdded keeps its current value when the backup has none. Adds SongDataDao.setFavouritedAt; matcher tests pin the snapshot behaviour. --- .../settings/backup/LibraryBackupManager.kt | 16 ++++---- .../settings/backup/LibraryBackupMatcher.kt | 40 +++++++------------ .../backup/LibraryBackupMatcherTest.kt | 36 +++++++++++++---- .../local/data/room/dao/SongDataDao.kt | 8 ++++ 4 files changed, 58 insertions(+), 42 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt index 155b504f57..3d4d45d966 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupManager.kt @@ -32,8 +32,8 @@ data class RestoreReport( /** * Library backup export/import (Settings -> Library). Backs up per-song stats (play counts, - * positions, favourites, exclusions, dates) plus playlists; restore merges field-by-field so - * neither the backup nor newer on-device activity is lost. + * positions, favourites, exclusions, dates) plus playlists; restore overwrites each matched song + * with the backup's snapshot. * * Never backed up: Room ids, credentials/tokens, SAF grant URIs, transient queue/session state, * artwork caches and aggregates. Restoring favourites writes the DAO directly (no @@ -130,14 +130,14 @@ class LibraryBackupManager @Inject constructor( playbackPosition = merged.playbackPosition, dateAdded = merged.dateAdded ) + if (merged.excluded != current.blacklisted) { + songDataDao.setExcluded(listOf(current.id), merged.excluded) + } + if (current.favouritedAt != merged.favouritedAt) { + songDataDao.setFavouritedAt(current.id, merged.favouritedAt) + } statsWritten++ } - if (merged.excluded && !current.blacklisted) { - songDataDao.setExcluded(listOf(current.id), true) - } - merged.favouritedAt?.let { at -> - if (current.favouritedAt == null) songDataDao.favourite(current.id, at) - } } val existing = playlistRepository.getPlaylists(PlaylistQuery.All(null)).first() diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt index d3d8cd1fdd..8a510182e5 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcher.kt @@ -5,7 +5,7 @@ import kotlin.math.abs import kotlin.time.Instant /** - * Pure library-matching and stats-merging for backup restore: no Android, no Room, unit-testable. + * Pure library-matching and stats restore for backup restore: no Android, no Room, unit-testable. * * Match order per backup identity: exact (provider, path) -> normalized relative path (the SD-card * volume segment changes across installs) -> (provider, externalId) for remote items -> tag @@ -41,10 +41,9 @@ object LibraryBackupMatcher { } /** - * Field-level merge: restore must never destroy newer on-device activity, and a reinstall must - * regain lifetime counts. Counters take the max, timestamps the latest, position follows - * whichever side was played last, exclusions OR together, favourites/date-added keep the - * earliest (original) time. + * Snapshot restore: the backup's values overwrite the on-device ones, so restoring a backup + * taken at playCount=1 after playing to 2 sets it back to 1. The only exception is [MergedStats.dateAdded]: + * a null backup (unknown at export) keeps the current value rather than wiping a known date. */ data class MergedStats( val playCount: Int, @@ -61,19 +60,14 @@ object LibraryBackupMatcher { val backupLastCompleted = backup.lastCompleted?.let(Instant::fromEpochMilliseconds) val backupFavourite = backup.favouritedAt?.let(Instant::fromEpochMilliseconds) val backupAdded = backup.dateAdded?.let(Instant::fromEpochMilliseconds) - val latestPlayed = latestOf(current.lastPlayed, backupLastPlayed) - val position = when { - backupLastPlayed != null && backupLastPlayed >= (current.lastPlayed ?: Instant.DISTANT_PAST) -> backup.playbackPosition - else -> current.playbackPosition - } return MergedStats( - playCount = maxOf(current.playCount, backup.playCount), - lastPlayed = latestPlayed, - lastCompleted = latestOf(current.lastCompleted, backupLastCompleted), - playbackPosition = position, - excluded = current.blacklisted || backup.excluded, - favouritedAt = earliestOf(current.favouritedAt, backupFavourite), - dateAdded = earliestOf(current.dateAdded, backupAdded) ?: current.dateAdded + playCount = backup.playCount, + lastPlayed = backupLastPlayed, + lastCompleted = backupLastCompleted, + playbackPosition = backup.playbackPosition, + excluded = backup.excluded, + favouritedAt = backupFavourite, + dateAdded = backupAdded ?: current.dateAdded ) } @@ -82,7 +76,9 @@ object LibraryBackupMatcher { current.lastPlayed == merged.lastPlayed && current.lastCompleted == merged.lastCompleted && current.playbackPosition == merged.playbackPosition && - current.dateAdded == merged.dateAdded + current.dateAdded == merged.dateAdded && + current.blacklisted == merged.excluded && + current.favouritedAt == merged.favouritedAt /** Strips a `/storage//` prefix so volume id changes don't break matching. Handles both * physical volumes (`/storage/ABCD-1234/…`) and emulated storage (`/storage/emulated/0/…`). */ @@ -95,13 +91,5 @@ object LibraryBackupMatcher { private fun fingerprintKey(title: String?, album: String?, artist: String?): String = listOf(title, album, artist).joinToString("\u0001") { it?.trim()?.lowercase() ?: "" } - // Named latest/earliest (not max/min) so overload resolution can never mistake these - // for kotlin.comparisons.maxOf/minOf and recurse. - private fun latestOf(a: Instant?, b: Instant?): Instant? = - if (a == null) b else if (b == null) a else if (a >= b) a else b - - private fun earliestOf(a: Instant?, b: Instant?): Instant? = - if (a == null) b else if (b == null) a else if (a <= b) a else b - private const val DURATION_TOLERANCE_S = 2 } diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt index 9d416e30b2..f45651813e 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/settings/backup/LibraryBackupMatcherTest.kt @@ -126,25 +126,45 @@ class LibraryBackupMatcherTest { } @Test - fun `merge keeps max counts, latest times, earliest favourite`() { - val playedAt = Instant.fromEpochMilliseconds(1_000_000) + fun `restore overwrites with backup snapshot`() { val playedLater = Instant.fromEpochMilliseconds(2_000_000) - val current = song(playCount = 3, lastPlayed = playedLater, playbackPosition = 10) + val current = song(playCount = 3, lastPlayed = playedLater, playbackPosition = 10, blacklisted = false) val backup = BackedUpSong( identity = identityOf(current), - playCount = 10, + playCount = 1, lastPlayed = 1_000_000, playbackPosition = 99, + excluded = true, favouritedAt = 500_000 ) val merged = LibraryBackupMatcher.mergeStats(current, backup) - merged.playCount shouldBe 10 - merged.lastPlayed shouldBe playedLater - // Position follows whichever side was played last: the device. - merged.playbackPosition shouldBe 10 + // Backup wins even when the device has played more since: 1 overwrites 2. + merged.playCount shouldBe 1 + merged.lastPlayed shouldBe Instant.fromEpochMilliseconds(1_000_000) + merged.playbackPosition shouldBe 99 + merged.excluded shouldBe true merged.favouritedAt shouldBe Instant.fromEpochMilliseconds(500_000) } + @Test + fun `restore clears values missing from backup`() { + val current = song( + playCount = 2, + lastPlayed = Instant.fromEpochMilliseconds(2_000_000), + playbackPosition = 10, + blacklisted = true, + favouritedAt = Instant.fromEpochMilliseconds(2_000_000) + ) + val backup = BackedUpSong(identity = identityOf(current), playCount = 0) + val merged = LibraryBackupMatcher.mergeStats(current, backup) + merged.playCount shouldBe 0 + merged.lastPlayed.shouldBeNull() + merged.playbackPosition shouldBe 0 + merged.excluded shouldBe false + merged.favouritedAt.shouldBeNull() + LibraryBackupMatcher.statsEqual(current, merged) shouldBe false + } + @Test fun `backup round-trips through json`() { val backup = LibraryBackup( diff --git a/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt b/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt index 6ed8f63474..9e8dc19138 100644 --- a/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt +++ b/android/mediaprovider/local/src/commonMain/kotlin/com/simplecityapps/localmediaprovider/local/data/room/dao/SongDataDao.kt @@ -180,6 +180,14 @@ abstract class SongDataDao { @Query("UPDATE songs SET favouritedAt = NULL WHERE id IN (:ids)") abstract suspend fun unfavourite(ids: List): Int + /** + * Sets [id]'s favourite time to exactly [favouritedAt] (null clears it). Used only by + * library-backup restore, which overwrites the backup's snapshot; normal favourite flows keep + * their NULL-guarded queries and `pending_favourites` handling. + */ + @Query("UPDATE songs SET favouritedAt = :favouritedAt WHERE id = :id") + abstract suspend fun setFavouritedAt(id: Long, favouritedAt: Instant?) + /** * [favourite] or [unfavourite] [songs], in chunks, as SQLite before 3.32 (below API 31) binds at most 999 variables a * statement. A song that already carries a [Song.favouritedAt] (an Undo restoring one just removed) is set to that From 4de8b2229383efb2b25305260adf04a250cb5749 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 07:32:57 +0000 Subject: [PATCH 26/34] feat(ui): compact mode, flat placeholders, settings tab, shelf play, library density Replaces wavy progress indicators with flat ones; slims Expressive chrome (settings rows, nav bar, hero, tiles, mini-player); adds an Appearance compact-mode toggle (dense rows, 36dp headers, 96dp tiles, pinned one-row library/settings bars, smaller detail heros); flattens missing-artwork placeholders to bare icons; adds a Settings bottom tab; adds play buttons to Home shelf headers. --- .../LinearProgressIndicatorWithText.kt | 6 +- .../shuttle/ui/screens/home/HomeEntries.kt | 2 + .../shuttle/ui/screens/home/HomeScreen.kt | 56 ++++++++++---- .../shuttle/ui/screens/home/HomeViewModel.kt | 6 ++ .../library/LibraryDetailComponents.kt | 26 +++++-- .../ui/screens/library/LibraryEmptyScreen.kt | 8 +- .../ui/screens/library/LibraryPages.kt | 36 +++++---- .../ui/screens/library/LibraryScreen.kt | 33 +++++++- .../ui/screens/settings/SettingsScreens.kt | 14 ++-- .../ui/screens/settings/SettingsViewModel.kt | 2 +- .../screens/settings/model/SettingsCatalog.kt | 5 ++ .../ui/screens/sources/SourcesScreen.kt | 4 +- .../shuttle/ui/shell/AppShell.kt | 4 + .../simplecityapps/shuttle/ui/shell/Routes.kt | 1 + .../shuttle/ui/shell/player/PlayerContent.kt | 2 +- .../shuttle/ui/theme/S2AppTheme.kt | 33 ++++---- .../app/src/main/res/values/strings_home.xml | 2 + .../src/main/res/values/strings_settings.xml | 6 +- .../shuttle/settings/SettingKeysTest.kt | 1 + .../shuttle/ui/screens/home/HomeRobot.kt | 4 + .../shuttle/ui/screens/home/HomeScreenTest.kt | 15 ++++ .../ui/screens/home/HomeViewModelTest.kt | 8 ++ .../shuttle/settings/AppearanceSettings.kt | 4 + .../designsystem/catalog/PlayerBoards.kt | 8 +- .../designsystem/catalog/ThemeBoards.kt | 12 ++- .../shuttle/designsystem/component/Artwork.kt | 76 ++++++++++--------- .../designsystem/component/GridTile.kt | 5 +- .../designsystem/component/MiniPlayer.kt | 14 ++-- .../designsystem/component/Navigation.kt | 10 +-- .../component/PlaybackProgress.kt | 18 ++--- .../designsystem/component/SectionHeader.kt | 20 +++-- .../shuttle/designsystem/component/SeekBar.kt | 2 +- .../designsystem/component/Settings.kt | 32 ++++---- .../shuttle/designsystem/component/SongRow.kt | 2 +- .../shuttle/designsystem/theme/CompactMode.kt | 11 +++ .../shuttle/ui/shell/ShellTab.kt | 1 + docs/design/design-language.md | 5 +- 37 files changed, 333 insertions(+), 161 deletions(-) create mode 100644 android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt index 50c4ae2829..534cb9ecb3 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/common/components/LinearProgressIndicatorWithText.kt @@ -6,8 +6,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.LinearWavyProgressIndicator +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -20,7 +19,6 @@ import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.ui.theme.AppThemeState import com.simplecityapps.shuttle.ui.theme.S2AppTheme -@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun HorizontalLoadingView( modifier: Modifier = Modifier, @@ -45,7 +43,7 @@ fun HorizontalLoadingView( ) } - LinearWavyProgressIndicator( + LinearProgressIndicator( progress = { progress }, modifier = Modifier.fillMaxWidth() ) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt index 3c70295325..248cea56be 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt @@ -80,6 +80,8 @@ private fun HomeDestination( onDismissWhatsNew = viewModel::onWhatsNewHandled, onAlbumClick = { onOpen(it.route) }, onArtistClick = { onOpen(it.route) }, + onPlayAlbums = { actions.dispatch(viewModel.playAlbums(it)) }, + onPlayArtists = { actions.dispatch(viewModel.playArtists(it)) }, onShowActions = actions::showActions, ), emptyContent = (emptyState as? LibraryAvailability.Empty)?.let { empty -> diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index 05866c9d0b..e445e3863d 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -38,6 +38,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.BuildConfig import com.simplecityapps.shuttle.R @@ -55,6 +56,7 @@ import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.S2IconButton import com.simplecityapps.shuttle.designsystem.component.S2TopBar import com.simplecityapps.shuttle.designsystem.component.SectionHeader +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration import com.simplecityapps.shuttle.model.Album import com.simplecityapps.shuttle.model.AlbumArtist @@ -72,6 +74,8 @@ class HomeCallbacks( val onDismissWhatsNew: () -> Unit = {}, val onAlbumClick: (Album) -> Unit = {}, val onArtistClick: (AlbumArtist) -> Unit = {}, + val onPlayAlbums: (List) -> Unit = {}, + val onPlayArtists: (List) -> Unit = {}, val onShowActions: (MediaActionsTarget) -> Unit = {}, ) @@ -132,17 +136,17 @@ private fun HomeContent( callbacks: HomeCallbacks, modifier: Modifier, ) { - LazyColumn(modifier = modifier, contentPadding = PaddingValues(bottom = 16.dp)) { + LazyColumn(modifier = modifier, contentPadding = PaddingValues(bottom = if (LocalCompactMode.current) 8.dp else 16.dp)) { content.resume?.let { resume -> item(key = "resume") { ResumeHero(resume, callbacks) } } if (content.showWhatsNew) { item(key = "whats-new") { WhatsNewCard(callbacks) } } - shelf(R.string.home_recently_played, "recently-played", content.recentlyPlayed) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_recently_added, "recently-added", content.recentlyAdded) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_most_played, "most-played", content.mostPlayed) { album -> AlbumTile(album, callbacks, showPlayCount = true) } - shelf(R.string.home_something_different, "something-different", content.somethingDifferent) { artist -> ArtistTile(artist, callbacks) } + shelf(R.string.home_recently_played, "recently-played", content.recentlyPlayed, onPlay = { callbacks.onPlayAlbums(content.recentlyPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_recently_added, "recently-added", content.recentlyAdded, onPlay = { callbacks.onPlayAlbums(content.recentlyAdded) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_most_played, "most-played", content.mostPlayed, onPlay = { callbacks.onPlayAlbums(content.mostPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = true) } + shelf(R.string.home_something_different, "something-different", content.somethingDifferent, onPlay = { callbacks.onPlayArtists(content.somethingDifferent) }) { artist -> ArtistTile(artist, callbacks) } } } @@ -155,12 +159,17 @@ private fun ResumeHero( val song = resume.song val unknown = stringResource(com.simplecityapps.core.R.string.unknown) val timeLeft = stringResource(R.string.home_resume_time_left, formatDuration(resume.timeLeftMs)) - Card(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) { - Row(modifier = Modifier.padding(12.dp), verticalAlignment = Alignment.CenterVertically) { - LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.size(ResumeArtworkSize), size = ArtworkSize.Grid) - Column(modifier = Modifier.weight(1f).padding(start = 16.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) { + val compact = LocalCompactMode.current + // The artwork slot is a fixed box the art fills: Artwork's own size would override a bare + // size modifier, so the compact value would never apply. + Card(modifier = Modifier.fillMaxWidth().padding(horizontal = if (compact) 12.dp else 16.dp, vertical = if (compact) 4.dp else 8.dp)) { + Row(modifier = Modifier.padding(if (compact) 8.dp else 10.dp), verticalAlignment = Alignment.CenterVertically) { + Box(Modifier.size(ResumeArtworkSize)) { + LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.fillMaxSize(), size = ArtworkSize.Grid) + } + Column(modifier = Modifier.weight(1f).padding(start = if (compact) 8.dp else 12.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) { Text(stringResource(R.string.home_resume_title), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.primary) - Text(song.album ?: unknown, style = MaterialTheme.typography.titleLarge, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(song.album ?: unknown, style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis) Text( text = listOf(song.albumArtist ?: song.friendlyArtistName ?: unknown, timeLeft).joinToString(" · "), style = MaterialTheme.typography.bodyMedium, @@ -168,7 +177,7 @@ private fun ResumeHero( maxLines = 1, overflow = TextOverflow.Ellipsis, ) - Box(Modifier.padding(top = 8.dp)) { + Box(Modifier.padding(top = if (LocalCompactMode.current) 2.dp else 4.dp)) { S2ButtonGroup( primary = if (resume.playing) { S2GroupAction(stringResource(DesignR.string.ds_pause), callbacks.onTogglePlayback, Icons.Rounded.Pause) @@ -183,7 +192,8 @@ private fun ResumeHero( } } -private val ResumeArtworkSize = 112.dp +private val ResumeArtworkSize: Dp + @Composable get() = if (LocalCompactMode.current) 40.dp else 64.dp @Composable private fun WhatsNewCard(callbacks: HomeCallbacks) { @@ -214,19 +224,32 @@ private fun WhatsNewCard(callbacks: HomeCallbacks) { /** * A plain horizontally scrolling row of [GridTile]s, hidden when there are none. The tiles are [ShelfTileWidth] wide so - * about two and a half fit a phone and the cut-off one says the row scrolls (#490); each title and artist sits below + * about three fit a phone (four in compact mode) and the cut-off one says the row scrolls (#490); each title and artist sits below * its cover rather than over it, where they'd clash with text printed on the art (#404). */ private fun LazyListScope.shelf( @StringRes title: Int, key: String, items: List, + onPlay: (() -> Unit)? = null, tile: @Composable (T) -> Unit, ) { if (items.isEmpty()) return - item(key = "$key:header") { SectionHeader(title = stringResource(title)) } + item(key = "$key:header") { + val shelfTitle = stringResource(title) + SectionHeader( + title = shelfTitle, + iconAction = onPlay?.let { Icons.Rounded.PlayArrow }, + iconActionContentDescription = onPlay?.let { stringResource(R.string.home_play_shelf, shelfTitle) }, + onIconAction = { onPlay?.invoke() }, + ) + } item(key = key) { - LazyRow(contentPadding = PaddingValues(horizontal = 16.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + val compact = LocalCompactMode.current + LazyRow( + contentPadding = PaddingValues(horizontal = if (compact) 12.dp else 16.dp), + horizontalArrangement = Arrangement.spacedBy(if (compact) 6.dp else 8.dp) + ) { itemsIndexed(items) { _, item -> Box(Modifier.width(ShelfTileWidth)) { tile(item) } } } } @@ -267,4 +290,5 @@ private fun ArtistTile( ) } -private val ShelfTileWidth = 140.dp +private val ShelfTileWidth: Dp + @Composable get() = if (LocalCompactMode.current) 96.dp else 120.dp diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt index d10e168d04..ca2469576b 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModel.kt @@ -93,6 +93,12 @@ class HomeViewModel @Inject constructor( /** Shuffles the queue the resume hero offers, or null with none. */ fun shuffleQueue(): MediaAction? = (uiState.value as? HomeUiState.Content)?.resume?.let { MediaAction.Shuffle(MediaSelection.Songs(it.songs)) } + /** Plays every song of [albums] in order: a shelf (recently added, most played) as its queue. */ + fun playAlbums(albums: List): MediaAction = MediaAction.Play(MediaSelection.Albums(albums)) + + /** Plays every song of [artists] in order. */ + fun playArtists(artists: List): MediaAction = MediaAction.Play(MediaSelection.AlbumArtists(artists)) + fun onTogglePlayback() = togglePlayback() /** Opening the changelog or dismissing the card marks this version's notes as seen. */ diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt index 9271865101..27122f76b2 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryDetailComponents.kt @@ -30,6 +30,7 @@ import com.simplecityapps.shuttle.designsystem.component.LoadingState import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.S2IconButton +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.ui.common.components.DetailScaffold // The pieces every library detail screen shares, on DetailScaffold (app-shell.md, section 3): a centred hero, @@ -76,8 +77,13 @@ fun LibraryDetailScaffold( modifier = modifier, listState = listState, hero = { - Box(Modifier.fillMaxWidth().padding(top = 8.dp, bottom = 16.dp), contentAlignment = Alignment.Center) { - LibraryArtwork(model = artwork, placeholder = placeholder, size = ArtworkSize.Hero, shape = artworkShape) + val compact = LocalCompactMode.current + Box( + Modifier.fillMaxWidth().padding(top = if (compact) 4.dp else 8.dp, bottom = if (compact) 8.dp else 16.dp), + contentAlignment = Alignment.Center + ) { + // Compact keeps a smaller hero: the detail still leads with art, just less of it. + LibraryArtwork(model = artwork, placeholder = placeholder, size = if (compact) ArtworkSize.Grid else ArtworkSize.Hero, shape = artworkShape) } }, actions = { @@ -107,12 +113,22 @@ private fun DetailHeader( onShuffle: () -> Unit, extra: @Composable () -> Unit, ) { - Column(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { - Text(title, style = MaterialTheme.typography.headlineSmall, color = MaterialTheme.colorScheme.onSurface) + Column( + Modifier.fillMaxWidth().padding( + horizontal = if (LocalCompactMode.current) 12.dp else 16.dp, + vertical = if (LocalCompactMode.current) 4.dp else 8.dp + ), + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + Text( + title, + style = if (LocalCompactMode.current) MaterialTheme.typography.titleLarge else MaterialTheme.typography.headlineSmall, + color = MaterialTheme.colorScheme.onSurface + ) if (subtitle != null) { Text(subtitle, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant) } - Box(Modifier.padding(top = 12.dp)) { + Box(Modifier.padding(top = if (LocalCompactMode.current) 8.dp else 12.dp)) { S2ButtonGroup( primary = S2GroupAction(stringResource(R.string.menu_title_play), onPlay, Icons.Rounded.PlayArrow), secondary = listOf(S2GroupAction(stringResource(R.string.menu_title_shuffle), onShuffle, Icons.Rounded.Shuffle)), diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt index d07373b810..172405c0ef 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryEmptyScreen.kt @@ -16,8 +16,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.LibraryMusic import androidx.compose.material.icons.rounded.Lock import androidx.compose.material.icons.rounded.Search -import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.LinearWavyProgressIndicator +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -39,7 +38,6 @@ import com.simplecityapps.shuttle.ui.screens.sources.MusicPermission * What the Library shows while it has no songs (#379): the way to let S2 read this device's music, the scan's * progress once it can, or "No music found" when the scan came back empty. "Connect a server" is on offer throughout. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun LibraryEmptyScreen( state: LibraryAvailability.Empty, @@ -61,9 +59,9 @@ fun LibraryEmptyScreen( val progressModifier = Modifier.widthIn(max = 320.dp).fillMaxWidth().padding(horizontal = 24.dp) val fraction = scan.fraction if (fraction != null) { - LinearWavyProgressIndicator(progress = { fraction }, modifier = progressModifier) + LinearProgressIndicator(progress = { fraction }, modifier = progressModifier) } else { - LinearWavyProgressIndicator(modifier = progressModifier) + LinearProgressIndicator(modifier = progressModifier) } scan.message?.let { message -> Text( diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt index fc18df94b1..0d31025caa 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.R import com.simplecityapps.shuttle.designsystem.component.AlbumRow @@ -41,10 +42,12 @@ import com.simplecityapps.shuttle.designsystem.component.FolderRow import com.simplecityapps.shuttle.designsystem.component.GenreRow import com.simplecityapps.shuttle.designsystem.component.GridTile import com.simplecityapps.shuttle.designsystem.component.PlaylistRow +import com.simplecityapps.shuttle.designsystem.component.resolvedDp import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.SectionHeader import com.simplecityapps.shuttle.designsystem.component.SongRow +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration import com.simplecityapps.shuttle.model.Album import com.simplecityapps.shuttle.model.AlbumArtist @@ -79,13 +82,15 @@ import com.simplecityapps.shuttle.ui.text.stringResource as stringResourceKey // tab ViewModels; LibraryScreen wires them. /** The Play / Shuffle row leading the Songs and Albums pages: the button group's 40dp and its padding. */ -private val PlayShuffleHeaderHeight = 40.dp + 16.dp +private val PlayShuffleHeaderHeight: Dp + @Composable get() = 40.dp + if (LocalCompactMode.current) 8.dp else 16.dp /** * Fills the page so the scroller's track sits at its end edge, as the legacy lists have it. The track starts below the * pages' leading header, so the thumb never covers the header's action, such as Shuffle (#396). */ -private val FastScrollerModifier = Modifier.fillMaxSize().padding(top = PlayShuffleHeaderHeight + 8.dp, bottom = 8.dp).testTag("library-fast-scroller") +private val FastScrollerModifier: Modifier + @Composable get() = Modifier.fillMaxSize().padding(top = PlayShuffleHeaderHeight + 8.dp, bottom = 8.dp).testTag("library-fast-scroller") /** * Play and Shuffle for a whole tab, styled like a detail screen's (#491). The count lives in the top bar's subtitle, so @@ -93,7 +98,10 @@ private val FastScrollerModifier = Modifier.fillMaxSize().padding(top = PlayShuf */ @Composable private fun PlayShuffleHeader(onPlay: () -> Unit, onShuffle: () -> Unit) { - Box(Modifier.fillMaxWidth().height(PlayShuffleHeaderHeight).padding(horizontal = 16.dp, vertical = 8.dp)) { + val compact = LocalCompactMode.current + Box( + Modifier.fillMaxWidth().height(PlayShuffleHeaderHeight).padding(horizontal = if (compact) 12.dp else 16.dp, vertical = if (compact) 4.dp else 8.dp) + ) { S2ButtonGroup( primary = S2GroupAction(stringResource(R.string.menu_title_play), onPlay, Icons.Rounded.PlayArrow), secondary = listOf(S2GroupAction(stringResource(R.string.menu_title_shuffle), onShuffle, Icons.Rounded.Shuffle)), @@ -149,8 +157,9 @@ private fun PlaylistMosaic(covers: List) { LibraryArtwork(covers.firstOrNull(), ArtworkPlaceholder.Playlist) return } - val cell = (ArtworkSize.Medium.dp - MosaicGap) / 2 - Column(Modifier.size(ArtworkSize.Medium.dp), verticalArrangement = Arrangement.spacedBy(MosaicGap)) { + val medium = ArtworkSize.Medium.resolvedDp() + val cell = (medium - MosaicGap) / 2 + Column(Modifier.size(medium), verticalArrangement = Arrangement.spacedBy(MosaicGap)) { covers.take(4).chunked(2).forEach { pair -> Row(horizontalArrangement = Arrangement.spacedBy(MosaicGap)) { pair.forEach { song -> LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.size(cell), size = ArtworkSize.Small) } @@ -246,10 +255,11 @@ private fun songEntries(songs: List, byAlbum: Boolean): List = /** The cover, name and album artist of the album the rows under it belong to. */ @Composable private fun SongAlbumHeader(song: Song) { + val compact = LocalCompactMode.current Row( - modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 4.dp), + modifier = Modifier.fillMaxWidth().padding(start = if (compact) 12.dp else 16.dp, end = if (compact) 12.dp else 16.dp, top = if (compact) 8.dp else 16.dp, bottom = 4.dp), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(16.dp), + horizontalArrangement = Arrangement.spacedBy(if (compact) 12.dp else 16.dp), ) { LibraryArtwork(song, ArtworkPlaceholder.Album, size = ArtworkSize.Medium) Column(Modifier.weight(1f)) { @@ -319,9 +329,9 @@ fun AlbumsPage( LazyVerticalGrid( columns = LibraryGridColumns, state = gridState, - contentPadding = PaddingValues(start = 16.dp, end = 16.dp, bottom = 16.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalArrangement = Arrangement.spacedBy(8.dp), + contentPadding = if (LocalCompactMode.current) PaddingValues(start = 12.dp, end = 12.dp, bottom = 12.dp) else PaddingValues(start = 16.dp, end = 16.dp, bottom = 16.dp), + horizontalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), + verticalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), modifier = Modifier.fillMaxSize().testTag("library-albums"), ) { item(key = "header", span = { androidx.compose.foundation.lazy.grid.GridItemSpan(maxLineSpan) }) { header() } @@ -385,9 +395,9 @@ fun ArtistsPage( LazyVerticalGrid( columns = LibraryGridColumns, state = gridState, - contentPadding = PaddingValues(16.dp), - horizontalArrangement = Arrangement.spacedBy(8.dp), - verticalArrangement = Arrangement.spacedBy(8.dp), + contentPadding = PaddingValues(if (LocalCompactMode.current) 12.dp else 16.dp), + horizontalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), + verticalArrangement = Arrangement.spacedBy(if (LocalCompactMode.current) 6.dp else 8.dp), modifier = Modifier.fillMaxSize().testTag("library-artists"), ) { items(artists, key = { it.groupKey.toString() }) { artist -> diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt index b6bb5abb2e..7841f8bb5c 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt @@ -29,6 +29,7 @@ import androidx.compose.material3.PrimaryScrollableTabRow import androidx.compose.material3.Scaffold import androidx.compose.material3.Tab import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -60,6 +61,7 @@ import com.simplecityapps.shuttle.designsystem.component.S2SelectionToolbar import com.simplecityapps.shuttle.designsystem.component.S2Sheet import com.simplecityapps.shuttle.designsystem.component.SettingsGroup import com.simplecityapps.shuttle.designsystem.component.StateAction +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.persistence.LibraryTab import com.simplecityapps.shuttle.sorting.AlbumSortOrder import com.simplecityapps.shuttle.sorting.GenreSortOrder @@ -117,7 +119,10 @@ fun LibraryScreen( ) { val tabs = uiState.tabs var editingTabs by rememberSaveable { mutableStateOf(false) } - val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior() + // Compact skips the large collapsing bar for a pinned one-row bar; the tab count subtitle + // goes with it, staying visible in the default bar. + val compact = LocalCompactMode.current + val scrollBehavior = if (compact) TopAppBarDefaults.pinnedScrollBehavior() else TopAppBarDefaults.exitUntilCollapsedScrollBehavior() BackHandler(enabled = chrome.selectedCount > 0, onBack = chrome.onClearSelection) Scaffold( @@ -150,6 +155,26 @@ fun LibraryScreen( ), ) } + } else if (compact) { + TopAppBar( + title = { Text(stringResource(R.string.title_library)) }, + actions = { + var menuOpen by remember { mutableStateOf(false) } + S2IconButton(icon = Icons.Rounded.Settings, contentDescription = stringResource(R.string.settings_menu_settings), onClick = onOpenSettings) + S2IconButton( + icon = Icons.Rounded.MoreVert, + contentDescription = stringResource(R.string.library_more_options), + onClick = { menuOpen = true }, + modifier = Modifier.testTag("library-more"), + ) + S2Menu( + expanded = menuOpen, + onDismissRequest = { menuOpen = false }, + groups = chrome.menu + listOf(listOf(S2Action(stringResource(R.string.library_edit_tabs), { editingTabs = true }))), + ) + }, + scrollBehavior = scrollBehavior, + ) } else { LargeFlexibleTopAppBar( title = { Text(stringResource(R.string.title_library)) }, @@ -212,7 +237,11 @@ private fun LibraryPager( snapshotFlow { pagerState.settledPage }.collect { index -> tabs.getOrNull(index)?.let(onTabSelected) } } Column(modifier.fillMaxSize()) { - PrimaryScrollableTabRow(selectedTabIndex = pagerState.currentPage.coerceIn(0, tabs.lastIndex), modifier = Modifier.testTag("library-tabs")) { + PrimaryScrollableTabRow( + selectedTabIndex = pagerState.currentPage.coerceIn(0, tabs.lastIndex), + modifier = Modifier.testTag("library-tabs"), + edgePadding = if (LocalCompactMode.current) 8.dp else 16.dp, + ) { tabs.forEachIndexed { index, tab -> Tab( selected = pagerState.currentPage == index, diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt index 7ba06850df..09aaebd864 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsScreens.kt @@ -48,6 +48,7 @@ import com.simplecityapps.shuttle.designsystem.component.S2SnackbarHost import com.simplecityapps.shuttle.designsystem.component.S2TopBar import com.simplecityapps.shuttle.designsystem.component.SettingsGroup import com.simplecityapps.shuttle.designsystem.component.SliderSetting +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.designsystem.component.SwitchSetting import com.simplecityapps.shuttle.settings.AppearanceSettings import com.simplecityapps.shuttle.ui.screens.settings.model.SettingItem @@ -74,16 +75,19 @@ internal fun SettingsScaffold( snackbarHostState: SnackbarHostState? = null, actions: @Composable RowScope.() -> Unit = {}, contentPadding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 8.dp), - verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(16.dp), + verticalArrangement: Arrangement.Vertical? = null, content: LazyListScope.() -> Unit ) { - val scrollBehavior = if (root) TopAppBarDefaults.exitUntilCollapsedScrollBehavior() else TopAppBarDefaults.pinnedScrollBehavior() + val compact = LocalCompactMode.current + val gaps = verticalArrangement ?: Arrangement.spacedBy(if (compact) 4.dp else 16.dp) + val scrollBehavior = if (compact || !root) TopAppBarDefaults.pinnedScrollBehavior() else TopAppBarDefaults.exitUntilCollapsedScrollBehavior() Scaffold( modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), // The shell pads destinations clear of the nav bar and player; the bar takes the status bar. contentWindowInsets = WindowInsets(0), topBar = { - if (root) { + // Compact skips the large collapsing bar: one pinned row, like every sub-page. + if (root && !compact) { S2LargeTopBar(title = title, onBack = onNavigateUp, actions = actions, scrollBehavior = scrollBehavior) } else { S2TopBar(title = title, onBack = onNavigateUp, actions = actions, scrollBehavior = scrollBehavior) @@ -93,8 +97,8 @@ internal fun SettingsScaffold( ) { padding -> LazyColumn( modifier = Modifier.fillMaxSize().padding(padding), - contentPadding = contentPadding, - verticalArrangement = verticalArrangement, + contentPadding = if (compact) PaddingValues(horizontal = 12.dp, vertical = 4.dp) else contentPadding, + verticalArrangement = gaps, content = content ) } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt index ba936b48ad..3f8463843e 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsViewModel.kt @@ -181,7 +181,7 @@ class SettingsViewModel @Inject constructor( } } - /** Reads and merges the backup at the picker [source]. */ + /** Reads and restores the backup at the picker [source]. */ fun importBackupFrom(source: String) { viewModelScope.launch { val report = runCatching { backupManager.readAndRestore(source) }.getOrNull() diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt index 2720e61528..8adbcd99f7 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/model/SettingsCatalog.kt @@ -77,6 +77,11 @@ object SettingsCatalog { setting = AppearanceSettings.PureBlack, title = R.string.pref_pure_black_title, summary = R.string.pref_pure_black_summary + ), + SettingItem.Switch( + setting = AppearanceSettings.CompactMode, + title = R.string.pref_compact_mode_title, + summary = R.string.pref_compact_mode_summary ) ) ), diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt index dc92b49251..0331ee01fb 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/sources/SourcesScreen.kt @@ -13,7 +13,7 @@ import androidx.compose.material.icons.rounded.FolderOff import androidx.compose.material.icons.rounded.Refresh import androidx.compose.material.icons.rounded.Smartphone import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.LinearWavyProgressIndicator +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.ListItemShapes import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -101,7 +101,7 @@ fun LazyListScope.sourcesContent(uiState: SourcesUiState, actions: SourcesAction uiState.scan?.let { scan -> val modifier = Modifier.fillMaxWidth().padding(top = 8.dp).testTag("sources-scan-progress") val fraction = scan.fraction - if (fraction != null) LinearWavyProgressIndicator(progress = { fraction }, modifier = modifier) else LinearWavyProgressIndicator(modifier = modifier) + if (fraction != null) LinearProgressIndicator(progress = { fraction }, modifier = modifier) else LinearProgressIndicator(modifier = modifier) } } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt index 5205c11237..126ff63e0f 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/AppShell.kt @@ -21,9 +21,11 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Home import androidx.compose.material.icons.outlined.LibraryMusic import androidx.compose.material.icons.outlined.Search +import androidx.compose.material.icons.outlined.Settings import androidx.compose.material.icons.rounded.Home import androidx.compose.material.icons.rounded.LibraryMusic import androidx.compose.material.icons.rounded.Search +import androidx.compose.material.icons.rounded.Settings import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Surface @@ -421,6 +423,7 @@ private val ShellTab.label: Int ShellTab.Home -> R.string.shell_tab_home ShellTab.Library -> R.string.title_library ShellTab.Search -> R.string.shell_tab_search + ShellTab.Settings -> R.string.settings_menu_settings } @Composable @@ -430,6 +433,7 @@ private fun ShellTab.navItem(): S2NavItem { ShellTab.Home -> S2NavItem(label, Icons.Outlined.Home, Icons.Rounded.Home) ShellTab.Library -> S2NavItem(label, Icons.Outlined.LibraryMusic, Icons.Rounded.LibraryMusic) ShellTab.Search -> S2NavItem(label, Icons.Outlined.Search, Icons.Rounded.Search) + ShellTab.Settings -> S2NavItem(label, Icons.Outlined.Settings, Icons.Rounded.Settings) } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt index db2fad5767..d945064074 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/Routes.kt @@ -31,4 +31,5 @@ val ShellTab.root: NavKey ShellTab.Home -> HomeRoute ShellTab.Library -> LibraryRoute ShellTab.Search -> SearchRoute + ShellTab.Settings -> SettingsRoute } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt index 295a45b307..c74d774413 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/shell/player/PlayerContent.kt @@ -66,7 +66,7 @@ import com.simplecityapps.shuttle.designsystem.component.SongRow import kotlin.math.roundToInt /** Height of the mini player row; the sheet's Mini anchor sits this far above the nav bar. */ -val MiniPlayerHeight = 72.dp +val MiniPlayerHeight = 64.dp /** Height of the seek bar: the slider over its times. */ internal val SeekBarHeight = 60.dp diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt index 149aa16f03..15b7bb2913 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/theme/S2AppTheme.kt @@ -4,11 +4,13 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.getValue import androidx.compose.ui.graphics.Color import androidx.lifecycle.ViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewModelScope +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.designsystem.theme.S2Accent import com.simplecityapps.shuttle.designsystem.theme.S2Theme import com.simplecityapps.shuttle.settings.Accent @@ -30,7 +32,8 @@ data class AppThemeState( val theme: ThemeMode = ThemeMode.DayNight, val accent: Accent = Accent.Default, val dynamicColour: Boolean = false, - val pureBlack: Boolean = false + val pureBlack: Boolean = false, + val compactMode: Boolean = false ) /** The Appearance settings the Compose theme follows, live, so a change in Settings restyles the app without a restart. */ @@ -45,6 +48,7 @@ class AppThemeViewModel @Inject constructor( observeSetting(AppearanceSettings.AccentColour), observeSetting(AppearanceSettings.DynamicColour), observeSetting(AppearanceSettings.PureBlack), + observeSetting(AppearanceSettings.CompactMode), ::AppThemeState ).stateIn( scope = viewModelScope, @@ -53,7 +57,8 @@ class AppThemeViewModel @Inject constructor( theme = readSetting(AppearanceSettings.Theme), accent = readSetting(AppearanceSettings.AccentColour), dynamicColour = readSetting(AppearanceSettings.DynamicColour), - pureBlack = readSetting(AppearanceSettings.PureBlack) + pureBlack = readSetting(AppearanceSettings.PureBlack), + compactMode = readSetting(AppearanceSettings.CompactMode) ) ) } @@ -83,17 +88,19 @@ fun S2AppTheme( // Always the same call, so toggling pure black recolours the content instead of moving it to a new // composition branch, which would drop its saved state (the shell's back stacks among it). val colorScheme = MaterialTheme.colorScheme - MaterialTheme( - colorScheme = if (darkTheme && state.pureBlack) { - colorScheme.copy(background = Color.Black, surface = Color.Black, surfaceContainerLowest = Color.Black) - } else { - colorScheme - }, - motionScheme = MaterialTheme.motionScheme, - shapes = MaterialTheme.shapes, - typography = MaterialTheme.typography, - content = content - ) + CompositionLocalProvider(LocalCompactMode provides state.compactMode) { + MaterialTheme( + colorScheme = if (darkTheme && state.pureBlack) { + colorScheme.copy(background = Color.Black, surface = Color.Black, surfaceContainerLowest = Color.Black) + } else { + colorScheme + }, + motionScheme = MaterialTheme.motionScheme, + shapes = MaterialTheme.shapes, + typography = MaterialTheme.typography, + content = content + ) + } } } diff --git a/android/app/src/main/res/values/strings_home.xml b/android/app/src/main/res/values/strings_home.xml index 38a0ab6047..2eb36c5131 100644 --- a/android/app/src/main/res/values/strings_home.xml +++ b/android/app/src/main/res/values/strings_home.xml @@ -21,6 +21,8 @@ %1$d play %1$d plays + + Play %1$s What\'s new in S2 diff --git a/android/app/src/main/res/values/strings_settings.xml b/android/app/src/main/res/values/strings_settings.xml index 9f9bd6390a..f2462654a3 100644 --- a/android/app/src/main/res/values/strings_settings.xml +++ b/android/app/src/main/res/values/strings_settings.xml @@ -49,7 +49,7 @@ Restore library backup - Merge stats and playlists from a backup file; newer on-device activity is kept + Restore stats and playlists from a backup file, overwriting current values Excluded @@ -135,6 +135,10 @@ About Advanced + + Compact mode + + Smaller artwork, shorter headers and tighter lists Pure black diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt index 06b193df33..971402e67a 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/settings/SettingKeysTest.kt @@ -49,6 +49,7 @@ class SettingKeysTest { "AppearanceSettings.ColourFromArtwork: pref_theme_colour_from_artwork = true", "AppearanceSettings.ShowHomeOnLaunch: pref_show_home_on_launch = false", "AppearanceSettings.WidgetBackgroundOpacity: widget_background_opacity = 100", + "AppearanceSettings.CompactMode: pref_compact_mode = false", "ArtworkSettings.WifiOnly: artwork_wifi_only = true", "ArtworkSettings.LocalOnly: artwork_local_only = false", "ArtworkSettings.MediaSessionArtwork: media_session_artwork = true", diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt index 5653e66cc8..7ca1d4ad7e 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt @@ -38,6 +38,8 @@ class HomeRobot(private val rule: ComposeContentTestRule) { private set val openedAlbums = mutableListOf() val openedArtists = mutableListOf() + val playedAlbums = mutableListOf>() + val playedArtists = mutableListOf>() val shownActions = mutableListOf() fun setContent( @@ -66,6 +68,8 @@ class HomeRobot(private val rule: ComposeContentTestRule) { onDismissWhatsNew = { whatsNewDismissed++ }, onAlbumClick = { openedAlbums += it }, onArtistClick = { openedArtists += it }, + onPlayAlbums = { playedAlbums += it }, + onPlayArtists = { playedArtists += it }, onShowActions = { shownActions += it }, ) diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt index 3a40e9c553..5684ee5f27 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt @@ -6,6 +6,7 @@ import com.simplecityapps.shuttle.ui.actions.MediaSelection import com.simplecityapps.shuttle.ui.screens.library.LibraryAvailability import com.simplecityapps.shuttle.ui.screens.library.LibraryEmptyScreen import com.simplecityapps.shuttle.ui.screens.sources.MusicAccess +import io.kotest.matchers.collections.shouldBeEmpty import io.kotest.matchers.collections.shouldContainExactly import io.kotest.matchers.shouldBe import org.junit.Rule @@ -143,6 +144,20 @@ class HomeScreenTest { robot.shownActions.single().selection shouldBe MediaSelection.Albums(HomeScenarios.softFocus) } + @Test + fun `a shelf header plays its whole shelf, not just one tile`() { + robot.setContent(HomeScenarios.content) + + robot.scrollTo("Recently added") + robot.tapDescription("Play Recently added") + robot.scrollTo("Something different") + robot.tapDescription("Play Something different") + + robot.playedAlbums shouldContainExactly listOf(HomeScenarios.content.recentlyAdded) + robot.playedArtists shouldContainExactly listOf(HomeScenarios.content.somethingDifferent) + robot.openedAlbums.shouldBeEmpty() + } + @Test fun `shuffle all and settings are wired from the top bar`() { robot.setContent(HomeScenarios.content) diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt index bc0426eb6c..c87289b144 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeViewModelTest.kt @@ -214,4 +214,12 @@ class HomeViewModelTest { viewModel().shuffleQueue() shouldBe MediaAction.Shuffle(MediaSelection.Songs(listOf(chlorophyllLoop, tidalMoss))) } + + @Test + fun `playing a shelf plays every album in it, in order`() = runTest(mainDispatcherRule.testDispatcher) { + val often = createAlbum("Phase Garden", "Juniper Static", playCount = 5) + val rare = createAlbum("Night Bus", "Juniper Static") + + viewModel().playAlbums(listOf(often, rare)) shouldBe MediaAction.Play(MediaSelection.Albums(listOf(often, rare))) + } } diff --git a/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt b/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt index 50336717ab..9f5b98859e 100644 --- a/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt +++ b/android/core/src/commonMain/kotlin/com/simplecityapps/shuttle/settings/AppearanceSettings.kt @@ -32,6 +32,7 @@ class AppearanceSettings @Inject constructor( val colourFromArtwork = store.preference(ColourFromArtwork) val showHomeOnLaunch = store.preference(ShowHomeOnLaunch) val widgetBackgroundOpacity = store.preference(WidgetBackgroundOpacity) + val compactMode = store.preference(CompactMode) companion object { val Theme = Setting.enumOrdinalString("pref_theme", ThemeMode.DayNight, ThemeMode.entries) @@ -53,5 +54,8 @@ class AppearanceSettings @Inject constructor( /** A percentage. The key predates the Glance widgets, so old values carry over. */ val WidgetBackgroundOpacity = Setting.int("widget_background_opacity", 100) + + /** Tighter lists, smaller artwork and shorter headers across Home, Library and Settings. */ + val CompactMode = Setting.boolean("pref_compact_mode", false) } } diff --git a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt index d4f4d85338..702d0ffd69 100644 --- a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt +++ b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/PlayerBoards.kt @@ -89,8 +89,8 @@ fun SeekBarBoard(width: BoardWidth) { Board( width, listOf( - BoardSection("Playing (wavy)") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = true) }, - BoardSection("Paused (flat)") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = false) }, + BoardSection("Playing") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = true) }, + BoardSection("Paused") { S2SeekBar(positionMs = 83_000, durationMs = 383_000, onSeek = {}, playing = false) }, BoardSection("Dragging") { S2SeekBar( positionMs = 250_000, @@ -110,8 +110,8 @@ fun ProgressBoard(width: BoardWidth) { Board( width, listOf( - BoardSection("Playing (wavy)") { S2PlaybackProgress(progress = { 0.4f }, playing = true, modifier = Modifier.fillMaxWidth()) }, - BoardSection("Paused (flat)") { S2PlaybackProgress(progress = { 0.4f }, playing = false, modifier = Modifier.fillMaxWidth()) }, + BoardSection("Playing") { S2PlaybackProgress(progress = { 0.4f }, playing = true, modifier = Modifier.fillMaxWidth()) }, + BoardSection("Paused") { S2PlaybackProgress(progress = { 0.4f }, playing = false, modifier = Modifier.fillMaxWidth()) }, BoardSection("Indeterminate (loading)") { S2PlaybackProgress(progress = null, playing = true, modifier = Modifier.fillMaxWidth()) }, ), ) diff --git a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt index 78cbdf1d08..a3878c5b2b 100644 --- a/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt +++ b/android/designsystem/src/debug/java/com/simplecityapps/shuttle/designsystem/catalog/ThemeBoards.kt @@ -32,7 +32,6 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp import androidx.graphics.shapes.Morph import androidx.graphics.shapes.RoundedPolygon -import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.theme.LocalS2ThemeSettings import com.simplecityapps.shuttle.designsystem.theme.S2Accent import com.simplecityapps.shuttle.designsystem.theme.S2Contrast @@ -213,12 +212,11 @@ fun ThemeShapeBoard(width: BoardWidth) { }, BoardSection("MaterialShapes S2 uses (non-content only)") { ShapeSamples( - ArtworkPlaceholder.entries.map { it.name to it.polygon.toShape() } + - listOf( - "Playlist mask" to MaterialShapes.Cookie12Sided.toShape(), - "Empty" to MaterialShapes.Cookie9Sided.toShape(), - "Error" to MaterialShapes.Burst.toShape(), - ), + listOf( + "Playlist mask" to MaterialShapes.Cookie12Sided.toShape(), + "Empty" to MaterialShapes.Cookie9Sided.toShape(), + "Error" to MaterialShapes.Burst.toShape(), + ), ) }, BoardSection("Morphs: start, mid, end") { diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt index d09899b8b2..267929d545 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt @@ -36,8 +36,8 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import androidx.graphics.shapes.RoundedPolygon import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.fixtures.SampleLibrary /** The artwork sizes S2 lays out: list rows, the grid tile, and the detail/player hero. */ @@ -48,6 +48,20 @@ enum class ArtworkSize(val dp: Dp) { Hero(240.dp), } +/** + * [ArtworkSize.dp], with row sizes shrunk in compact mode. Grid and Hero stay full-size: detail + * and player screens keep their presence. + */ +@Composable +fun ArtworkSize.resolvedDp(): Dp { + if (!LocalCompactMode.current) return dp + return when (this) { + ArtworkSize.Small -> 32.dp + ArtworkSize.Medium -> 44.dp + ArtworkSize.Grid, ArtworkSize.Hero -> dp + } +} + /** * Album and song art is a rounded rectangle; artist images are circles. [Scalloped] is the one * `MaterialShapes` mask, an option for playlist art only (a user image or a mosaic, never an album @@ -56,22 +70,23 @@ enum class ArtworkSize(val dp: Dp) { enum class ArtworkShape { Rounded, Circle, Scalloped } /** - * What an artwork stands for, which picks the placeholder shown when there's no image. The smart playlists each have - * their own ([Favorites], [RecentlyAdded], [MostPlayed], [History]); [SmartPlaylist] is the generic one. + * What an artwork stands for, which picks the placeholder icon shown when there's no image. The + * smart playlists each have their own ([Favorites], [RecentlyAdded], [MostPlayed], [History]); + * [SmartPlaylist] is the generic one. The glyph is flat — a bare icon on the tile — never a + * novelty shape. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) -enum class ArtworkPlaceholder(internal val icon: ImageVector, internal val polygon: RoundedPolygon) { - Song(Icons.Rounded.MusicNote, MaterialShapes.Cookie9Sided), - Album(Icons.Rounded.Album, MaterialShapes.Cookie12Sided), - Artist(Icons.Rounded.Person, MaterialShapes.Flower), - Playlist(Icons.AutoMirrored.Rounded.QueueMusic, MaterialShapes.Clover4Leaf), - SmartPlaylist(Icons.Rounded.AutoAwesome, MaterialShapes.Sunny), - Favorites(Icons.Rounded.Favorite, MaterialShapes.Heart), - RecentlyAdded(Icons.Rounded.LibraryAdd, MaterialShapes.Sunny), - MostPlayed(Icons.AutoMirrored.Rounded.TrendingUp, MaterialShapes.SoftBurst), - History(Icons.Rounded.History, MaterialShapes.Cookie6Sided), - Genre(Icons.Rounded.LibraryMusic, MaterialShapes.Pentagon), - Folder(Icons.Rounded.Folder, MaterialShapes.Square), +enum class ArtworkPlaceholder(internal val icon: ImageVector) { + Song(Icons.Rounded.MusicNote), + Album(Icons.Rounded.Album), + Artist(Icons.Rounded.Person), + Playlist(Icons.AutoMirrored.Rounded.QueueMusic), + SmartPlaylist(Icons.Rounded.AutoAwesome), + Favorites(Icons.Rounded.Favorite), + RecentlyAdded(Icons.Rounded.LibraryAdd), + MostPlayed(Icons.AutoMirrored.Rounded.TrendingUp), + History(Icons.Rounded.History), + Genre(Icons.Rounded.LibraryMusic), + Folder(Icons.Rounded.Folder), } /** @@ -110,9 +125,10 @@ fun Artwork( ) { val clip = artworkShape(shape, size) val preview = previewArtwork(model) + val resolved = size.resolvedDp() Box( modifier = modifier - .size(size.dp) + .size(resolved) .clip(clip) .background(MaterialTheme.colorScheme.surfaceContainerHighest), contentAlignment = Alignment.Center, @@ -127,26 +143,18 @@ fun Artwork( } /** - * The [placeholder]'s glyph as [Artwork] draws it: the media type's icon in its `MaterialShapes` container. For an - * [Artwork] `image` slot to draw under an image that loads asynchronously, so art that never loads keeps the glyph. + * The [placeholder]'s glyph as [Artwork] draws it: the media type's bare icon, centred on the + * tile's own container. For an [Artwork] `image` slot to draw under an image that loads + * asynchronously, so art that never loads keeps the glyph. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun ArtworkPlaceholderGlyph(placeholder: ArtworkPlaceholder, size: ArtworkSize) { - Box( - modifier = Modifier - .size(size.dp * 0.7f) - .clip(placeholder.polygon.toShape()) - .background(MaterialTheme.colorScheme.secondaryContainer), - contentAlignment = Alignment.Center, - ) { - Icon( - imageVector = placeholder.icon, - contentDescription = null, - tint = MaterialTheme.colorScheme.onSecondaryContainer, - modifier = Modifier.size(size.dp * 0.35f), - ) - } + Icon( + imageVector = placeholder.icon, + contentDescription = null, + tint = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.size(size.resolvedDp() * 0.5f), + ) } /** Row artwork gets the small corner, tiles the large, the hero the Expressive large-increased. */ diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt index 2a033daa77..2bdc66b362 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt @@ -37,6 +37,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.R import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.fixtures.SampleLibrary /** @@ -82,7 +83,7 @@ fun GridTile( ) { Box( Modifier - .padding(8.dp) + .padding(if (LocalCompactMode.current) 6.dp else 8.dp) .fillMaxWidth() .aspectRatio(1f), ) { @@ -92,7 +93,7 @@ fun GridTile( Column( modifier = Modifier .fillMaxWidth() - .padding(start = 12.dp, end = 12.dp, bottom = 12.dp), + .padding(start = 12.dp, end = 12.dp, bottom = if (LocalCompactMode.current) 8.dp else 12.dp), verticalArrangement = Arrangement.spacedBy(2.dp), ) { Row(verticalAlignment = Alignment.CenterVertically) { diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt index 604a4c5dc8..a09b8ba048 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/MiniPlayer.kt @@ -20,13 +20,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.R import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.fixtures.SampleLibrary /** * The collapsed player above the nav bar (compact) or docked under the content (expanded): the * song's [artwork], [title] and [subtitle] ("artist • album"), a small morphing - * [S2PlayPauseButton], skip next, and the [S2PlaybackProgress] wave along the bottom edge. - * [buffering] shows the play button's `LoadingIndicator` and an indeterminate wave. Tapping the + * [S2PlayPauseButton], skip next, and the [S2PlaybackProgress] line along the bottom edge. + * [buffering] shows the play button's `LoadingIndicator` and an indeterminate line. Tapping the * rest of the bar ([onClick]) expands the player. */ @Composable @@ -47,12 +48,13 @@ fun S2MiniPlayer( onNextHold: (() -> Unit)? = null, ) { Surface(onClick = onClick, modifier = modifier, color = MaterialTheme.colorScheme.surfaceContainerHigh) { + val compact = LocalCompactMode.current Column { Row( modifier = Modifier .fillMaxWidth() - .padding(start = 12.dp, end = 8.dp, top = 8.dp, bottom = 6.dp), - horizontalArrangement = Arrangement.spacedBy(12.dp), + .padding(start = if (compact) 8.dp else 12.dp, end = 8.dp, top = if (compact) 6.dp else 8.dp, bottom = if (compact) 4.dp else 6.dp), + horizontalArrangement = Arrangement.spacedBy(if (compact) 8.dp else 12.dp), verticalAlignment = Alignment.CenterVertically, ) { artwork?.invoke() @@ -66,7 +68,7 @@ fun S2MiniPlayer( overflow = TextOverflow.Ellipsis, ) } - S2PlayPauseButton(playing, onPlayPause, buffering = buffering, size = 44.dp) + S2PlayPauseButton(playing, onPlayPause, buffering = buffering, size = if (compact) 32.dp else 36.dp) S2TransportButton(nextIcon, nextContentDescription, onNext, onHold = onNextHold) } S2PlaybackProgress( @@ -75,7 +77,7 @@ fun S2MiniPlayer( modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp) - .padding(bottom = 6.dp), + .padding(bottom = if (compact) 2.dp else 6.dp), ) } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt index 53975a5a83..7719b75766 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt @@ -11,8 +11,8 @@ import androidx.compose.material.icons.rounded.Menu import androidx.compose.material3.Badge import androidx.compose.material3.BadgedBox import androidx.compose.material3.Icon -import androidx.compose.material3.ShortNavigationBar -import androidx.compose.material3.ShortNavigationBarItem +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem import androidx.compose.material3.Text import androidx.compose.material3.WideNavigationRail import androidx.compose.material3.WideNavigationRailItem @@ -42,7 +42,7 @@ data class S2NavItem( val badge: String? = null, ) -/** The compact-width bottom navigation: a `ShortNavigationBar` of [items], [selectedIndex] selected. */ +/** The compact-width bottom navigation: a standard `NavigationBar` of [items], [selectedIndex] selected. */ @Composable fun S2NavigationBar( items: List, @@ -50,10 +50,10 @@ fun S2NavigationBar( onSelect: (Int) -> Unit, modifier: Modifier = Modifier, ) { - ShortNavigationBar(modifier = modifier) { + NavigationBar(modifier = modifier) { items.forEachIndexed { index, item -> val selected = index == selectedIndex - ShortNavigationBarItem( + NavigationBarItem( selected = selected, onClick = { onSelect(index) }, icon = { NavIcon(item, selected) }, diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt index a4b161c902..0818cdb508 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/PlaybackProgress.kt @@ -1,21 +1,17 @@ package com.simplecityapps.shuttle.designsystem.component -import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.LinearWavyProgressIndicator -import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.LinearProgressIndicator import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import com.simplecityapps.shuttle.designsystem.preview.S2Preview /** - * Playback or download progress as a `LinearWavyProgressIndicator`: wavy while [playing], flattening - * to a straight line when paused. A null [progress] is indeterminate (loading, buffering). + * Playback or download progress as a flat `LinearProgressIndicator`. + * A null [progress] is indeterminate (loading, buffering). [playing] is kept for call-site + * compatibility and has no visual effect. */ -@OptIn(ExperimentalMaterial3ExpressiveApi::class) @Composable fun S2PlaybackProgress( progress: (() -> Float)?, @@ -23,12 +19,10 @@ fun S2PlaybackProgress( modifier: Modifier = Modifier, ) { if (progress == null) { - LinearWavyProgressIndicator(modifier = modifier) + LinearProgressIndicator(modifier = modifier) return } - // The wave's height is a colour-like effect, not a position, so it eases without overshoot. - val amplitude by animateFloatAsState(if (playing) 1f else 0f, MaterialTheme.motionScheme.defaultEffectsSpec(), label = "amplitude") - LinearWavyProgressIndicator(progress = progress, modifier = modifier, amplitude = { amplitude }) + LinearProgressIndicator(progress = progress, modifier = modifier) } @Preview diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt index 84947252de..9c9e5a9ee8 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt @@ -11,16 +11,20 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode + /** - * A section heading in `titleSmall` on `primary`, with an optional trailing [action] ("See all"). - * It sits on an opaque [containerColor] (`surface`), so it also works as a sticky letter header; - * pass the container's colour when it heads a list on another surface, such as the search view. + * A section heading in `titleSmall` on `primary`, with an optional trailing [action] ("See all") + * and/or a trailing icon button (a shelf's play button). It sits on an opaque [containerColor] + * (`surface`), so it also works as a sticky letter header; pass the container's colour when it + * heads a list on another surface, such as the search view. */ @Composable fun SectionHeader( @@ -29,13 +33,16 @@ fun SectionHeader( action: String? = null, onAction: () -> Unit = {}, containerColor: Color = MaterialTheme.colorScheme.surface, + iconAction: ImageVector? = null, + iconActionContentDescription: String? = null, + onIconAction: () -> Unit = {}, ) { Row( modifier = modifier .fillMaxWidth() .background(containerColor) - .heightIn(min = 48.dp) - .padding(start = 16.dp, end = 4.dp), + .heightIn(min = if (LocalCompactMode.current) 36.dp else 48.dp) + .padding(start = if (LocalCompactMode.current) 12.dp else 16.dp, end = 4.dp), verticalAlignment = Alignment.CenterVertically, ) { Text( @@ -49,6 +56,9 @@ fun SectionHeader( if (action != null) { S2Button(text = action, onClick = onAction, style = S2ButtonStyle.Text) } + if (iconAction != null) { + S2IconButton(icon = iconAction, contentDescription = iconActionContentDescription, onClick = onIconAction) + } } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt index 631f522f65..61dc697327 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SeekBar.kt @@ -29,7 +29,7 @@ import com.simplecityapps.shuttle.format.formatDuration /** * The now-playing seek bar: an M3 `Slider` (thumb, drag, semantics) whose track is the - * [S2PlaybackProgress] wave, wavy while [playing] and flat when paused or while dragging. The + * [S2PlaybackProgress] flat progress line. The * elapsed and total times sit underneath; while dragging, the elapsed time follows the thumb in * `primary`. [onSeek] runs once, when the drag ends. */ diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt index 22f27a9110..9506b4a29b 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Settings.kt @@ -30,10 +30,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode /* * Settings rows are `SegmentedListItem`s. A [SettingsGroup] stacks them with the segmented gap and @@ -42,20 +44,21 @@ import com.simplecityapps.shuttle.designsystem.preview.S2Preview */ /** - * How a settings row draws its leading icon. [Tonal] sets it in a tonal cookie-shaped container and is - * for top-level rows; [Plain] is the bare icon, for the rows under them, so the containers mark the - * hierarchy instead of flattening it (#496). + * How a settings row draws its leading icon. [Plain] is the bare icon and the default everywhere, + * keeping rows slim; [Tonal] sets it in a tonal cookie-shaped container for the odd row that needs + * extra weight. */ enum class SettingIconStyle { Tonal, Plain } /** The title over a [SettingsGroup]. */ @Composable fun SettingsHeader(title: String, modifier: Modifier = Modifier) { + val compact = LocalCompactMode.current Text( text = title, style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.primary, - modifier = modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp, bottom = 8.dp), + modifier = modifier.padding(start = 16.dp, top = if (compact) 8.dp else 16.dp, end = 16.dp, bottom = if (compact) 2.dp else 8.dp), ) } @@ -84,7 +87,7 @@ fun LinkSetting( modifier: Modifier = Modifier, summary: String? = null, icon: ImageVector? = null, - iconStyle: SettingIconStyle = SettingIconStyle.Tonal, + iconStyle: SettingIconStyle = SettingIconStyle.Plain, enabled: Boolean = true, shapes: ListItemShapes = ListItemDefaults.shapes(), ) { @@ -120,7 +123,7 @@ fun SwitchSetting( modifier = modifier, colors = settingColors(), enabled = enabled, - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled) } }, trailingContent = { Switch(checked = checked, onCheckedChange = null, enabled = enabled) }, supportingContent = summary?.let { { Text(it) } }, ) { Text(title) } @@ -180,7 +183,7 @@ fun ChoiceSetting( modifier = modifier, colors = settingColors(), enabled = enabled, - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled) } }, supportingContent = { Text(value) }, ) { Text(title) } } @@ -205,7 +208,7 @@ fun SliderSetting( modifier = modifier, colors = settingColors(), enabled = enabled, - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled) } }, trailingContent = valueLabel?.let { { Text( @@ -235,22 +238,23 @@ fun InfoSetting( shapes = shapes, modifier = modifier, colors = settingColors(), - leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Tonal, enabled = true) } }, + leadingContent = icon?.let { { SettingIcon(it, SettingIconStyle.Plain, enabled = true) } }, supportingContent = { Text(summary) }, ) { Text(title) } } /** - * Rows sit in `surfaceContainer` so a group reads as one container on the `surface` screen. A - * checked switch row keeps the same colours: the `Switch` shows the state, not the row. + * Rows are transparent on the `surface` screen, so a group reads as plain rows rather than a + * tonal container. A checked switch row keeps the same colours: the `Switch` shows the state, + * not the row. */ @Composable private fun settingColors(): ListItemColors { val colors = MaterialTheme.colorScheme return ListItemDefaults.segmentedColors( - containerColor = colors.surfaceContainer, - disabledContainerColor = colors.surfaceContainer, - selectedContainerColor = colors.surfaceContainer, + containerColor = Color.Transparent, + disabledContainerColor = Color.Transparent, + selectedContainerColor = Color.Transparent, selectedContentColor = colors.onSurface, selectedLeadingContentColor = colors.onSurfaceVariant, selectedTrailingContentColor = colors.onSurfaceVariant, diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt index b7df9b6493..e6569622fa 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SongRow.kt @@ -117,7 +117,7 @@ fun SongRow( @Composable private fun TrackNumber(trackNumber: Int, playing: Boolean) { - Box(Modifier.size(ArtworkSize.Small.dp), contentAlignment = Alignment.Center) { + Box(Modifier.size(ArtworkSize.Small.resolvedDp()), contentAlignment = Alignment.Center) { Text( text = trackNumber.toString(), style = MaterialTheme.typography.labelLarge, diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt new file mode 100644 index 0000000000..069e8c5927 --- /dev/null +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt @@ -0,0 +1,11 @@ +package com.simplecityapps.shuttle.designsystem.theme + +import androidx.compose.runtime.compositionLocalOf + +/** + * Whether the UI lays out compact: smaller row artwork, shorter section headers, narrower home + * tiles, tighter settings groups, a slimmer mini-player, and pinned one-row bars in place of the + * large collapsing ones. Off by default; the Appearance setting flips it live, and every reader + * below recomposes on change. + */ +val LocalCompactMode = compositionLocalOf { false } diff --git a/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt b/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt index cb1afae66f..c51566f259 100644 --- a/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt +++ b/android/presentation/src/commonMain/kotlin/com/simplecityapps/shuttle/ui/shell/ShellTab.kt @@ -5,4 +5,5 @@ enum class ShellTab { Home, Library, Search, + Settings, } diff --git a/docs/design/design-language.md b/docs/design/design-language.md index 7cd049970f..e12196bdb9 100644 --- a/docs/design/design-language.md +++ b/docs/design/design-language.md @@ -75,8 +75,9 @@ screens never see it. - **Shape scale** from `Shapes` with the Expressive tokens (`largeIncreased`, `extraLargeIncreased`, `extraExtraLarge`). Components take their default shape; overrides go through `S2Theme.shapes`, not inline `RoundedCornerShape`s. -- **`MaterialShapes` (the 35 polygon shapes) are for non-content only**: artwork placeholders, - icon containers (settings, empty states), the loading indicator, the favourite toggle. Album +- **`MaterialShapes` (the 35 polygon shapes) are for non-content only**: icon containers + (settings, empty states), the loading indicator, the favourite toggle. Artwork placeholders are + flat — the media type's bare icon on the tile, no novelty container. Album artwork is always a rounded rectangle and artist images a circle: art is square and a novelty mask crops it. The one exception is an option for playlist art (a user image or a mosaic, never an album cover): `ArtworkShape.Scalloped`, a `Cookie12Sided` mask. Text never sits in a novelty shape. From 833c85a1611ef582f389423846870b53c364ec47 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 07:45:32 +0000 Subject: [PATCH 27/34] feat(ui): push classic mode to legacy density, relabel toggle Flat resume row (no hero card), flat shadowless tiles, icon-only nav bar, 28/40dp row art, 32dp headers, 3-column grids, tighter detail heros. Renames the toggle to Classic mode; pref key unchanged. --- .../shuttle/ui/screens/home/HomeScreen.kt | 36 ++++++++++++++----- .../ui/screens/library/LibraryPages.kt | 5 +-- .../src/main/res/values/strings_settings.xml | 4 +-- .../shuttle/designsystem/component/Artwork.kt | 4 +-- .../designsystem/component/GridTile.kt | 15 ++++++-- .../designsystem/component/Navigation.kt | 4 +++ .../designsystem/component/SectionHeader.kt | 2 +- .../shuttle/designsystem/theme/CompactMode.kt | 4 +-- 8 files changed, 55 insertions(+), 19 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index e445e3863d..a4b7057bd5 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -155,6 +156,29 @@ private fun HomeContent( private fun ResumeHero( resume: ResumeQueue, callbacks: HomeCallbacks, +) { + val compact = LocalCompactMode.current + if (compact) { + // Classic has no hero card: a flat row like any other list item. + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + ResumeHeroContent(resume, callbacks) + } + } else { + Card(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) { + Row(modifier = Modifier.padding(10.dp), verticalAlignment = Alignment.CenterVertically) { + ResumeHeroContent(resume, callbacks) + } + } + } +} + +@Composable +private fun RowScope.ResumeHeroContent( + resume: ResumeQueue, + callbacks: HomeCallbacks, ) { val song = resume.song val unknown = stringResource(com.simplecityapps.core.R.string.unknown) @@ -162,12 +186,10 @@ private fun ResumeHero( val compact = LocalCompactMode.current // The artwork slot is a fixed box the art fills: Artwork's own size would override a bare // size modifier, so the compact value would never apply. - Card(modifier = Modifier.fillMaxWidth().padding(horizontal = if (compact) 12.dp else 16.dp, vertical = if (compact) 4.dp else 8.dp)) { - Row(modifier = Modifier.padding(if (compact) 8.dp else 10.dp), verticalAlignment = Alignment.CenterVertically) { - Box(Modifier.size(ResumeArtworkSize)) { - LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.fillMaxSize(), size = ArtworkSize.Grid) - } - Column(modifier = Modifier.weight(1f).padding(start = if (compact) 8.dp else 12.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Box(Modifier.size(ResumeArtworkSize)) { + LibraryArtwork(song, ArtworkPlaceholder.Album, Modifier.fillMaxSize(), size = ArtworkSize.Grid) + } + Column(modifier = Modifier.weight(1f).padding(start = if (compact) 8.dp else 12.dp), verticalArrangement = Arrangement.spacedBy(2.dp)) { Text(stringResource(R.string.home_resume_title), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.primary) Text(song.album ?: unknown, style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis) Text( @@ -187,8 +209,6 @@ private fun ResumeHero( secondary = listOf(S2GroupAction(stringResource(R.string.menu_title_shuffle), callbacks.onShuffleQueue, Icons.Rounded.Shuffle)), ) } - } - } } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt index 0d31025caa..e5bf84a366 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryPages.kt @@ -168,8 +168,9 @@ private fun PlaylistMosaic(covers: List) { } } -/** The catalogue's compact grid: two columns of tiles on a phone, more as the width allows. */ -private val LibraryGridColumns = GridCells.Adaptive(minSize = 160.dp) +/** The catalogue's compact grid: two columns of tiles on a phone, more as the width allows (three in classic). */ +private val LibraryGridColumns: GridCells + @Composable get() = GridCells.Adaptive(minSize = if (LocalCompactMode.current) 120.dp else 160.dp) /** Songs: Play / Shuffle, then every song. Tap plays from that row; long-press selects. */ @Composable diff --git a/android/app/src/main/res/values/strings_settings.xml b/android/app/src/main/res/values/strings_settings.xml index f2462654a3..8404285950 100644 --- a/android/app/src/main/res/values/strings_settings.xml +++ b/android/app/src/main/res/values/strings_settings.xml @@ -136,9 +136,9 @@ Advanced - Compact mode + Classic mode - Smaller artwork, shorter headers and tighter lists + Dense classic layout: small artwork, flat tiles, icon-only navigation Pure black diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt index 267929d545..8d96fe0faf 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Artwork.kt @@ -56,8 +56,8 @@ enum class ArtworkSize(val dp: Dp) { fun ArtworkSize.resolvedDp(): Dp { if (!LocalCompactMode.current) return dp return when (this) { - ArtworkSize.Small -> 32.dp - ArtworkSize.Medium -> 44.dp + ArtworkSize.Small -> 28.dp + ArtworkSize.Medium -> 40.dp ArtworkSize.Grid, ArtworkSize.Hero -> dp } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt index 2bdc66b362..f97f29729c 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt @@ -29,6 +29,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.selected import androidx.compose.ui.semantics.semantics @@ -61,11 +62,15 @@ fun GridTile( onLongClick: (() -> Unit)? = null, interactionSource: MutableInteractionSource? = null, ) { + val compact = LocalCompactMode.current val colors = if (selected) { CardDefaults.cardColors( containerColor = MaterialTheme.colorScheme.secondaryContainer, contentColor = MaterialTheme.colorScheme.onSecondaryContainer, ) + } else if (compact) { + // Classic tiles are bare artwork + text: no tonal container, no shadow. + CardDefaults.cardColors(containerColor = Color.Transparent) } else { CardDefaults.cardColors() } @@ -80,10 +85,11 @@ fun GridTile( ) .semantics { this.selected = selected }, colors = colors, + elevation = CardDefaults.cardElevation(defaultElevation = if (compact) 0.dp else 1.dp), ) { Box( Modifier - .padding(if (LocalCompactMode.current) 6.dp else 8.dp) + .padding(if (compact) 0.dp else 8.dp) .fillMaxWidth() .aspectRatio(1f), ) { @@ -93,7 +99,12 @@ fun GridTile( Column( modifier = Modifier .fillMaxWidth() - .padding(start = 12.dp, end = 12.dp, bottom = if (LocalCompactMode.current) 8.dp else 12.dp), + .padding( + start = if (compact) 4.dp else 12.dp, + end = if (compact) 4.dp else 12.dp, + top = if (compact) 4.dp else 0.dp, + bottom = if (compact) 4.dp else 12.dp + ), verticalArrangement = Arrangement.spacedBy(2.dp), ) { Row(verticalAlignment = Alignment.CenterVertically) { diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt index 7719b75766..d099ff4073 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/Navigation.kt @@ -28,6 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.R import com.simplecityapps.shuttle.designsystem.preview.S2Preview +import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import kotlinx.coroutines.launch /** @@ -51,6 +52,8 @@ fun S2NavigationBar( modifier: Modifier = Modifier, ) { NavigationBar(modifier = modifier) { + // Classic drops the labels: icons alone, like the old bar. + val showLabels = !LocalCompactMode.current items.forEachIndexed { index, item -> val selected = index == selectedIndex NavigationBarItem( @@ -58,6 +61,7 @@ fun S2NavigationBar( onClick = { onSelect(index) }, icon = { NavIcon(item, selected) }, label = { Text(item.label) }, + alwaysShowLabel = showLabels, ) } } diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt index 9c9e5a9ee8..91ba77830d 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt @@ -41,7 +41,7 @@ fun SectionHeader( modifier = modifier .fillMaxWidth() .background(containerColor) - .heightIn(min = if (LocalCompactMode.current) 36.dp else 48.dp) + .heightIn(min = if (LocalCompactMode.current) 32.dp else 48.dp) .padding(start = if (LocalCompactMode.current) 12.dp else 16.dp, end = 4.dp), verticalAlignment = Alignment.CenterVertically, ) { diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt index 069e8c5927..e669f8fb04 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/theme/CompactMode.kt @@ -3,8 +3,8 @@ package com.simplecityapps.shuttle.designsystem.theme import androidx.compose.runtime.compositionLocalOf /** - * Whether the UI lays out compact: smaller row artwork, shorter section headers, narrower home - * tiles, tighter settings groups, a slimmer mini-player, and pinned one-row bars in place of the + * Whether the UI lays out compact — the "classic" density: small row artwork, flat tiles with no + * cards, an icon-only nav bar, short section headers and pinned one-row bars in place of the * large collapsing ones. Off by default; the Appearance setting flips it live, and every reader * below recomposes on change. */ From 5f2fa8e184c7808121e76cae169e1e04c6bd49eb Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 08:06:46 +0000 Subject: [PATCH 28/34] feat(ui): drop settings gears, restore old-home shortcuts and badges Settings lives in the bottom tab: removes the Home/Library top-bar gears and their plumbing. Restores the old home's shortcut row (History, Recently Added, Favorites, Shuffle) opening the smart playlists, two-line shelf headers with subtitles, and play-count badges on most-played tiles (count out of the subtitle). Resume hero gains a test tag so its actions stay tappable beside the shortcuts. --- .../shuttle/ui/screens/home/HomeEntries.kt | 7 +- .../shuttle/ui/screens/home/HomeScreen.kt | 107 +++++++++++++++--- .../ui/screens/library/LibraryScreen.kt | 6 - .../app/src/main/res/values/strings_home.xml | 8 ++ .../shuttle/ui/screens/home/HomeRobot.kt | 20 +++- .../shuttle/ui/screens/home/HomeScreenTest.kt | 28 +++-- .../ui/screens/library/LibraryScreenRobot.kt | 13 +-- .../ui/screens/library/LibraryScreenTest.kt | 8 +- .../designsystem/component/GridTile.kt | 22 +++- .../designsystem/component/SectionHeader.kt | 34 ++++-- 10 files changed, 199 insertions(+), 54 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt index 248cea56be..a204848bfd 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeEntries.kt @@ -26,10 +26,11 @@ import com.simplecityapps.shuttle.ui.screens.settings.SettingsDestinationRoute import com.simplecityapps.shuttle.ui.screens.settings.WhatsNewRoute import com.simplecityapps.shuttle.ui.screens.settings.model.SettingsDestination import com.simplecityapps.shuttle.ui.screens.sources.ServerTypePickerRoute +import com.simplecityapps.shuttle.model.SmartPlaylistId +import com.simplecityapps.shuttle.ui.screens.library.SmartPlaylistRoute import com.simplecityapps.shuttle.ui.shell.AppNavigator import com.simplecityapps.shuttle.ui.shell.HomeRoute import com.simplecityapps.shuttle.ui.shell.LocalShellSnackbarHostState -import com.simplecityapps.shuttle.ui.shell.SettingsRoute import dev.zacsweers.metrox.viewmodel.metroViewModel fun EntryProviderScope.homeEntries(navigator: AppNavigator) { @@ -69,8 +70,10 @@ private fun HomeDestination( HomeScreen( uiState = uiState, callbacks = HomeCallbacks( - onOpenSettings = { onOpen(SettingsRoute) }, onShuffleAll = { viewModel.shuffleAll()?.let(actions::dispatch) }, + onOpenHistory = { onOpen(SmartPlaylistRoute(SmartPlaylistId.History.id)) }, + onOpenRecentlyAdded = { onOpen(SmartPlaylistRoute(SmartPlaylistId.RecentlyAdded.id)) }, + onOpenFavourites = { onOpen(SmartPlaylistRoute(SmartPlaylistId.Favourites.id)) }, onTogglePlayback = viewModel::onTogglePlayback, onShuffleQueue = { viewModel.shuffleQueue()?.let(actions::dispatch) }, onOpenWhatsNew = { diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index a4b7057bd5..236fb2d480 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -1,6 +1,8 @@ package com.simplecityapps.shuttle.ui.screens.home import androidx.annotation.StringRes +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -17,12 +19,15 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Close +import androidx.compose.material.icons.rounded.Favorite +import androidx.compose.material.icons.rounded.History +import androidx.compose.material.icons.rounded.LibraryAdd import androidx.compose.material.icons.rounded.NewReleases import androidx.compose.material.icons.rounded.Pause import androidx.compose.material.icons.rounded.PlayArrow -import androidx.compose.material.icons.rounded.Settings import androidx.compose.material.icons.rounded.Shuffle import androidx.compose.material3.Card import androidx.compose.material3.ElevatedCard @@ -35,9 +40,13 @@ import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp @@ -61,14 +70,18 @@ import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration import com.simplecityapps.shuttle.model.Album import com.simplecityapps.shuttle.model.AlbumArtist +import com.simplecityapps.shuttle.model.SmartPlaylistId import com.simplecityapps.shuttle.ui.actions.MediaSelection import com.simplecityapps.shuttle.ui.common.mediaactions.MediaActionsTarget import com.simplecityapps.shuttle.ui.screens.library.LibraryArtwork -import com.simplecityapps.shuttle.ui.screens.library.pluralString +import com.simplecityapps.shuttle.ui.screens.library.nameKey +import com.simplecityapps.shuttle.ui.text.stringResource as stringResourceKey class HomeCallbacks( - val onOpenSettings: () -> Unit = {}, val onShuffleAll: () -> Unit = {}, + val onOpenHistory: () -> Unit = {}, + val onOpenRecentlyAdded: () -> Unit = {}, + val onOpenFavourites: () -> Unit = {}, val onTogglePlayback: () -> Unit = {}, val onShuffleQueue: () -> Unit = {}, val onOpenWhatsNew: () -> Unit = {}, @@ -106,7 +119,6 @@ fun HomeScreen( if (uiState is HomeUiState.Content) { S2IconButton(icon = Icons.Rounded.Shuffle, contentDescription = stringResource(R.string.home_shuffle_all), onClick = callbacks.onShuffleAll) } - S2IconButton(icon = Icons.Rounded.Settings, contentDescription = stringResource(R.string.settings_menu_settings), onClick = callbacks.onOpenSettings) }, scrollBehavior = scrollBehavior, ) @@ -138,16 +150,84 @@ private fun HomeContent( modifier: Modifier, ) { LazyColumn(modifier = modifier, contentPadding = PaddingValues(bottom = if (LocalCompactMode.current) 8.dp else 16.dp)) { + item(key = "shortcuts") { SmartShortcuts(callbacks) } content.resume?.let { resume -> item(key = "resume") { ResumeHero(resume, callbacks) } } if (content.showWhatsNew) { item(key = "whats-new") { WhatsNewCard(callbacks) } } - shelf(R.string.home_recently_played, "recently-played", content.recentlyPlayed, onPlay = { callbacks.onPlayAlbums(content.recentlyPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_recently_added, "recently-added", content.recentlyAdded, onPlay = { callbacks.onPlayAlbums(content.recentlyAdded) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_most_played, "most-played", content.mostPlayed, onPlay = { callbacks.onPlayAlbums(content.mostPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = true) } - shelf(R.string.home_something_different, "something-different", content.somethingDifferent, onPlay = { callbacks.onPlayArtists(content.somethingDifferent) }) { artist -> ArtistTile(artist, callbacks) } + shelf(R.string.home_recently_played, R.string.home_recently_played_subtitle, "recently-played", content.recentlyPlayed, onPlay = { callbacks.onPlayAlbums(content.recentlyPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_recently_added, R.string.home_recently_added_subtitle, "recently-added", content.recentlyAdded, onPlay = { callbacks.onPlayAlbums(content.recentlyAdded) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_most_played, R.string.home_most_played_subtitle, "most-played", content.mostPlayed, onPlay = { callbacks.onPlayAlbums(content.mostPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = true) } + shelf(R.string.home_something_different, R.string.home_something_different_subtitle, "something-different", content.somethingDifferent, onPlay = { callbacks.onPlayArtists(content.somethingDifferent) }) { artist -> ArtistTile(artist, callbacks) } + } +} + +/** + * The old home's shortcut row: the three smart playlists plus Shuffle all, as tonal circles over + * labels. The playlists open their detail screens; the names match the Playlists tab's rows. + */ +@Composable +private fun SmartShortcuts(callbacks: HomeCallbacks) { + val compact = LocalCompactMode.current + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = if (compact) 12.dp else 16.dp, vertical = if (compact) 4.dp else 8.dp), + horizontalArrangement = Arrangement.SpaceEvenly, + ) { + Shortcut( + icon = Icons.Rounded.History, + label = stringResourceKey(SmartPlaylistId.History.nameKey), + onClick = callbacks.onOpenHistory, + ) + Shortcut( + icon = Icons.Rounded.LibraryAdd, + label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), + onClick = callbacks.onOpenRecentlyAdded, + ) + Shortcut( + icon = Icons.Rounded.Favorite, + label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), + onClick = callbacks.onOpenFavourites, + ) + Shortcut( + icon = Icons.Rounded.Shuffle, + label = stringResource(R.string.btn_shuffle), + onClick = callbacks.onShuffleAll, + ) + } +} + +@Composable +private fun RowScope.Shortcut( + icon: ImageVector, + label: String, + onClick: () -> Unit, +) { + Column( + modifier = Modifier + .weight(1f) + .clickable(onClick = onClick, onClickLabel = label, role = Role.Button) + .padding(vertical = 4.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + Box( + modifier = Modifier + .size(56.dp) + .clip(CircleShape) + .background(MaterialTheme.colorScheme.secondaryContainer), + contentAlignment = Alignment.Center, + ) { + Icon(icon, contentDescription = label, tint = MaterialTheme.colorScheme.onSecondaryContainer, modifier = Modifier.size(28.dp)) + } + Text( + text = label, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) } } @@ -161,13 +241,13 @@ private fun ResumeHero( if (compact) { // Classic has no hero card: a flat row like any other list item. Row( - modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp), + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp).testTag("resume-hero"), verticalAlignment = Alignment.CenterVertically, ) { ResumeHeroContent(resume, callbacks) } } else { - Card(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) { + Card(modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp).testTag("resume-hero")) { Row(modifier = Modifier.padding(10.dp), verticalAlignment = Alignment.CenterVertically) { ResumeHeroContent(resume, callbacks) } @@ -249,6 +329,7 @@ private fun WhatsNewCard(callbacks: HomeCallbacks) { */ private fun LazyListScope.shelf( @StringRes title: Int, + @StringRes subtitle: Int, key: String, items: List, onPlay: (() -> Unit)? = null, @@ -259,6 +340,7 @@ private fun LazyListScope.shelf( val shelfTitle = stringResource(title) SectionHeader( title = shelfTitle, + subtitle = stringResource(subtitle), iconAction = onPlay?.let { Icons.Rounded.PlayArrow }, iconActionContentDescription = onPlay?.let { stringResource(R.string.home_play_shelf, shelfTitle) }, onIconAction = { onPlay?.invoke() }, @@ -283,11 +365,10 @@ private fun AlbumTile( ) { val title = album.name ?: stringResource(com.simplecityapps.core.R.string.unknown) val artist = album.albumArtist ?: album.friendlyArtistName ?: stringResource(com.simplecityapps.core.R.string.unknown) - // The play count leads, so a long artist name is what gets cut short. - val subtitle = if (showPlayCount) listOf(pluralString(R.plurals.home_play_count, album.playCount), artist).joinToString(" · ") else artist GridTile( title = title, - subtitle = subtitle, + subtitle = artist, + badge = if (showPlayCount) album.playCount.toString() else null, onClick = { callbacks.onAlbumClick(album) }, onLongClick = { callbacks.onShowActions(MediaActionsTarget(title, artist, MediaSelection.Albums(album), ArtworkPlaceholder.Album)) }, artwork = { LibraryArtwork(album, ArtworkPlaceholder.Album, Modifier.fillMaxSize(), size = ArtworkSize.Grid) }, diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt index 7841f8bb5c..7da122c6fb 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreen.kt @@ -18,7 +18,6 @@ import androidx.compose.material.icons.rounded.Block import androidx.compose.material.icons.rounded.Edit import androidx.compose.material.icons.rounded.MoreVert import androidx.compose.material.icons.rounded.PlayArrow -import androidx.compose.material.icons.rounded.Settings import androidx.compose.material.icons.rounded.Shuffle import androidx.compose.material.icons.rounded.SkipNext import androidx.compose.material3.ExperimentalMaterial3Api @@ -85,7 +84,6 @@ import com.simplecityapps.shuttle.ui.screens.library.playlists.PlaylistListViewM import com.simplecityapps.shuttle.ui.screens.library.songs.SongListViewModel import com.simplecityapps.shuttle.ui.screens.sources.ServerTypePickerRoute import com.simplecityapps.shuttle.ui.shell.LocalShellSnackbarHostState -import com.simplecityapps.shuttle.ui.shell.SettingsRoute import dev.zacsweers.metrox.viewmodel.metroViewModel import kotlinx.coroutines.launch @@ -111,7 +109,6 @@ fun LibraryScreen( onTabSelected: (LibraryTab) -> Unit, onTabsChanged: (order: List, enabled: Set) -> Unit, onSelectionAction: (MediaActionType) -> Unit, - onOpenSettings: () -> Unit, modifier: Modifier = Modifier, /** Shown in place of the tabs while the library has no songs (#379). */ emptyLibrary: (@Composable (Modifier) -> Unit)? = null, @@ -160,7 +157,6 @@ fun LibraryScreen( title = { Text(stringResource(R.string.title_library)) }, actions = { var menuOpen by remember { mutableStateOf(false) } - S2IconButton(icon = Icons.Rounded.Settings, contentDescription = stringResource(R.string.settings_menu_settings), onClick = onOpenSettings) S2IconButton( icon = Icons.Rounded.MoreVert, contentDescription = stringResource(R.string.library_more_options), @@ -181,7 +177,6 @@ fun LibraryScreen( subtitle = chrome.subtitle?.let { { Text(it) } }, actions = { var menuOpen by remember { mutableStateOf(false) } - S2IconButton(icon = Icons.Rounded.Settings, contentDescription = stringResource(R.string.settings_menu_settings), onClick = onOpenSettings) S2IconButton( icon = Icons.Rounded.MoreVert, contentDescription = stringResource(R.string.library_more_options), @@ -347,7 +342,6 @@ fun LibraryDestination( chrome.selection?.let { actions.perform(type, it) } chrome.onClearSelection() }, - onOpenSettings = { onOpen(SettingsRoute) }, emptyLibrary = (content as? LibraryAvailability.Empty)?.let { empty -> @Composable { modifier: Modifier -> LibraryEmptyScreen( diff --git a/android/app/src/main/res/values/strings_home.xml b/android/app/src/main/res/values/strings_home.xml index 2eb36c5131..a59f16ebba 100644 --- a/android/app/src/main/res/values/strings_home.xml +++ b/android/app/src/main/res/values/strings_home.xml @@ -10,12 +10,20 @@ %1$s left Recently played + + Recently played albums Recently added + + Recently added albums Most played + + Your favourite albums Something different + + Artists you haven\'t listened to in a while %1$d play diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt index 7ca1d4ad7e..831e1779ac 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt @@ -3,7 +3,9 @@ package com.simplecityapps.shuttle.ui.screens.home import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.hasAnyAncestor import androidx.compose.ui.test.hasScrollToIndexAction +import androidx.compose.ui.test.hasTestTag import androidx.compose.ui.test.hasText import androidx.compose.ui.test.junit4.ComposeContentTestRule import androidx.compose.ui.test.longClick @@ -24,10 +26,14 @@ import io.kotest.matchers.shouldBe /** Test robot for [HomeScreen]: records every callback so tests assert on what the screen asked for. */ class HomeRobot(private val rule: ComposeContentTestRule) { - var settingsOpened = 0 - private set var shuffles = 0 private set + var openedHistory = 0 + private set + var openedRecentlyAdded = 0 + private set + var openedFavourites = 0 + private set var playbackToggles = 0 private set var queueShuffles = 0 @@ -60,8 +66,10 @@ class HomeRobot(private val rule: ComposeContentTestRule) { } private fun callbacks() = HomeCallbacks( - onOpenSettings = { settingsOpened++ }, onShuffleAll = { shuffles++ }, + onOpenHistory = { openedHistory++ }, + onOpenRecentlyAdded = { openedRecentlyAdded++ }, + onOpenFavourites = { openedFavourites++ }, onTogglePlayback = { playbackToggles++ }, onShuffleQueue = { queueShuffles++ }, onOpenWhatsNew = { whatsNewOpened++ }, @@ -83,6 +91,12 @@ class HomeRobot(private val rule: ComposeContentTestRule) { rule.onAllNodesWithText(text)[0].performClick() } + /** Taps a Play/Shuffle/Pause button of the resume hero: the shortcuts row repeats some labels. */ + fun tapHeroAction(label: String) { + scrollTo("Continue listening") + rule.onAllNodes(hasText(label) and hasAnyAncestor(hasTestTag("resume-hero")))[0].performClick() + } + /** Taps text outside Home's own scrolling list, such as content in the empty-state slot (#422). */ fun tapVisibleText(text: String) { rule.onAllNodesWithText(text)[0].performClick() diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt index 5684ee5f27..28ced8370c 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt @@ -81,8 +81,8 @@ class HomeScreenTest { fun `the resume hero plays and shuffles the queue`() { robot.setContent(HomeScenarios.content) - robot.tapText("Play") - robot.tapText("Shuffle") + robot.tapHeroAction("Play") + robot.tapHeroAction("Shuffle") robot.playbackToggles shouldBe 1 robot.queueShuffles shouldBe 1 @@ -116,12 +116,12 @@ class HomeScreenTest { } @Test - fun `most played albums carry their play count, with its unit, in the subtitle`() { + fun `most played tiles badge their play count instead of repeating it in the subtitle`() { robot.setContent(HomeScenarios.content) robot.scrollTo("Soft Focus") - robot.assertTextDisplayed("14 plays · ${HomeScenarios.softFocus.albumArtist}") - robot.assertTextNotShown("14") + robot.assertTextDisplayed("14") + robot.assertTextNotShown("14 plays") } @Test @@ -159,14 +159,26 @@ class HomeScreenTest { } @Test - fun `shuffle all and settings are wired from the top bar`() { + fun `shortcuts open their smart playlists`() { + robot.setContent(HomeScenarios.content) + + robot.tapDescription("History") + robot.tapDescription("Recently Added") + robot.tapDescription("Favorites") + + robot.openedHistory shouldBe 1 + robot.openedRecentlyAdded shouldBe 1 + robot.openedFavourites shouldBe 1 + } + + @Test + fun `shuffle all is wired from the top bar, with no settings gear duplicating the tab`() { robot.setContent(HomeScenarios.content) robot.tapDescription("Shuffle all") - robot.tapDescription("Settings") robot.shuffles shouldBe 1 - robot.settingsOpened shouldBe 1 + robot.assertDescriptionNotShown("Settings") } @Test diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt index 63fee0778d..d052f66917 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenRobot.kt @@ -39,6 +39,7 @@ import com.simplecityapps.shuttle.ui.screens.library.folders.FolderListUiState import com.simplecityapps.shuttle.ui.screens.library.genres.GenreListUiState import com.simplecityapps.shuttle.ui.screens.library.playlists.PlaylistListUiState import com.simplecityapps.shuttle.ui.screens.library.songs.SongListUiState +import io.kotest.matchers.shouldBe /** The page states [LibraryScreenRobot] renders under each tab; a tab without one shows a stand-in label. */ data class LibraryPageStates( @@ -88,8 +89,6 @@ class LibraryScreenRobot(private val rule: ComposeContentTestRule) { private set var shuffleClicked = false private set - var settingsOpened = false - private set var newPlaylistClicked = false private set @@ -121,7 +120,6 @@ class LibraryScreenRobot(private val rule: ComposeContentTestRule) { onTabSelected = { lastTabSelected = it }, onTabsChanged = { order, enabled -> lastTabsChanged = order to enabled }, onSelectionAction = { lastSelectionAction = it }, - onOpenSettings = { settingsOpened = true }, ) { tab -> Page(tab, pages) } } } @@ -228,16 +226,15 @@ class LibraryScreenRobot(private val rule: ComposeContentTestRule) { rule.waitForIdle() } - fun openSettings() { - rule.onNodeWithContentDescription("Settings").performClick() - rule.waitForIdle() - } - fun openOverflow() { rule.onNodeWithTag("library-more").performClick() rule.waitForIdle() } + fun assertDescriptionNotShown(description: String) { + rule.onAllNodesWithContentDescription(description).fetchSemanticsNodes().size shouldBe 0 + } + fun clickSelectionAction(label: String) { rule.onNodeWithContentDescription(label).performClick() rule.waitForIdle() diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt index f0209f76da..1caab1565a 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/library/LibraryScreenTest.kt @@ -79,12 +79,12 @@ class LibraryScreenTest { } @Test - fun `the settings action opens settings`() { + fun `no settings gear duplicates the bottom tab`() { robot.setContent(libraryState()) - robot.openSettings() - - robot.settingsOpened shouldBe true + robot.assertDescriptionNotShown("Settings") + robot.openOverflow() + robot.assertTextDisplayed("Edit tabs") } @Test diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt index f97f29729c..e9ca2050ef 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt @@ -48,6 +48,8 @@ import com.simplecityapps.shuttle.fixtures.SampleLibrary * * [selected] moves the card to `secondaryContainer` and badges the artwork with a check; * [playing] marks the album or artist the current song belongs to, like [SongRow] does. + * [badge] pins a small count to the artwork's top end (a most-played tile's play count); the + * selected check takes its place while selected. */ @OptIn(ExperimentalFoundationApi::class) @Composable @@ -59,6 +61,7 @@ fun GridTile( subtitle: String? = null, selected: Boolean = false, playing: Boolean = false, + badge: String? = null, onLongClick: (() -> Unit)? = null, interactionSource: MutableInteractionSource? = null, ) { @@ -94,7 +97,11 @@ fun GridTile( .aspectRatio(1f), ) { artwork() - if (selected) SelectedBadge(Modifier.align(Alignment.TopEnd).padding(6.dp)) + if (selected) { + SelectedBadge(Modifier.align(Alignment.TopEnd).padding(6.dp)) + } else if (badge != null) { + CountBadge(badge, Modifier.align(Alignment.TopEnd).padding(6.dp)) + } } Column( modifier = Modifier @@ -151,6 +158,19 @@ private fun SelectedBadge(modifier: Modifier = Modifier) { } } +@Composable +private fun CountBadge(count: String, modifier: Modifier = Modifier) { + Box( + modifier = modifier + .size(24.dp) + .clip(CircleShape) + .background(MaterialTheme.colorScheme.primary), + contentAlignment = Alignment.Center, + ) { + Text(count, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onPrimary, maxLines = 1) + } +} + @Preview @Composable private fun GridTilePreview() { diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt index 91ba77830d..35365052fe 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/SectionHeader.kt @@ -1,6 +1,7 @@ package com.simplecityapps.shuttle.designsystem.component import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn @@ -14,6 +15,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.semantics.heading import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.designsystem.preview.S2Preview @@ -21,15 +23,17 @@ import com.simplecityapps.shuttle.designsystem.preview.S2Preview import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode /** - * A section heading in `titleSmall` on `primary`, with an optional trailing [action] ("See all") - * and/or a trailing icon button (a shelf's play button). It sits on an opaque [containerColor] - * (`surface`), so it also works as a sticky letter header; pass the container's colour when it - * heads a list on another surface, such as the search view. + * A section heading with an optional [subtitle] under the title (a shelf's "Recently played + * albums"), an optional trailing [action] ("See all") and/or a trailing icon button (a shelf's + * play button). It sits on an opaque [containerColor] (`surface`), so it also works as a sticky + * letter header; pass the container's colour when it heads a list on another surface, such as + * the search view. */ @Composable fun SectionHeader( title: String, modifier: Modifier = Modifier, + subtitle: String? = null, action: String? = null, onAction: () -> Unit = {}, containerColor: Color = MaterialTheme.colorScheme.surface, @@ -45,14 +49,26 @@ fun SectionHeader( .padding(start = if (LocalCompactMode.current) 12.dp else 16.dp, end = 4.dp), verticalAlignment = Alignment.CenterVertically, ) { - Text( - text = title, - style = MaterialTheme.typography.titleSmall, - color = MaterialTheme.colorScheme.primary, + Column( modifier = Modifier .weight(1f) .semantics { heading() }, - ) + ) { + Text( + text = title, + style = MaterialTheme.typography.titleSmall, + color = MaterialTheme.colorScheme.primary, + ) + if (subtitle != null) { + Text( + text = subtitle, + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + } if (action != null) { S2Button(text = action, onClick = onAction, style = S2ButtonStyle.Text) } From 9b3941d197cb02ba1701ba499c12e5ab4eb5d709 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 10:48:23 +0000 Subject: [PATCH 29/34] feat(ui): classic home rhythm, no top bar Drops Home's empty top bar (Shuffle lives in the shortcut row), adds classic vertical spacing between shortcuts and shelves, shrinks classic shortcut circles to 48dp, and densifies classic tile subtitles. --- .../shuttle/ui/screens/home/HomeScreen.kt | 80 ++++++++----------- .../shuttle/ui/screens/home/HomeScreenTest.kt | 4 +- .../designsystem/component/GridTile.kt | 2 +- 3 files changed, 37 insertions(+), 49 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index 236fb2d480..8f6f2ba0c3 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -9,11 +9,11 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope -import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope @@ -31,18 +31,14 @@ import androidx.compose.material.icons.rounded.PlayArrow import androidx.compose.material.icons.rounded.Shuffle import androidx.compose.material3.Card import androidx.compose.material3.ElevatedCard -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource @@ -64,7 +60,6 @@ import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2ButtonStyle import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.S2IconButton -import com.simplecityapps.shuttle.designsystem.component.S2TopBar import com.simplecityapps.shuttle.designsystem.component.SectionHeader import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration @@ -94,11 +89,10 @@ class HomeCallbacks( ) /** - * Home: a hero to resume the queue over the library's shelves, or the empty state when there's no music yet. There's - * no page title (#490): the bar holds only Shuffle all and the Settings gear, so the first screen is music. Search is - * its own tab. + * Home: the shortcut row over the library's shelves, or the empty state when there's no music yet. + * There's no top bar: the shortcuts hold Shuffle all, settings lives in its own tab and search in + * its own, so the first screen is music. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun HomeScreen( uiState: HomeUiState, @@ -107,39 +101,22 @@ fun HomeScreen( /** Shown in place of the generic empty state while the library has no songs (#422), so it can offer access. */ emptyContent: (@Composable (Modifier) -> Unit)? = null, ) { - val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() - Scaffold( - modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), - // The shell pads destinations clear of the nav bar and player; the bar takes the status bar. - contentWindowInsets = WindowInsets(0), - topBar = { - S2TopBar( - title = "", - actions = { - if (uiState is HomeUiState.Content) { - S2IconButton(icon = Icons.Rounded.Shuffle, contentDescription = stringResource(R.string.home_shuffle_all), onClick = callbacks.onShuffleAll) - } - }, - scrollBehavior = scrollBehavior, - ) - }, - ) { padding -> - val contentModifier = Modifier.fillMaxSize().padding(padding) - when (uiState) { - HomeUiState.Loading -> LoadingState(contentModifier) - - HomeUiState.Empty -> if (emptyContent != null) { - emptyContent(contentModifier) - } else { - EmptyState( - title = stringResource(R.string.home_empty_title), - message = stringResource(R.string.home_empty_message), - modifier = contentModifier, - ) - } + // No top bar: the shell pads the nav bar and player, and the status bar is consumed below. + val contentModifier = modifier.fillMaxSize() + when (uiState) { + HomeUiState.Loading -> LoadingState(contentModifier) - is HomeUiState.Content -> HomeContent(uiState, callbacks, contentModifier) + HomeUiState.Empty -> if (emptyContent != null) { + emptyContent(contentModifier) + } else { + EmptyState( + title = stringResource(R.string.home_empty_title), + message = stringResource(R.string.home_empty_message), + modifier = contentModifier, + ) } + + is HomeUiState.Content -> HomeContent(uiState, callbacks, contentModifier) } } @@ -149,7 +126,10 @@ private fun HomeContent( callbacks: HomeCallbacks, modifier: Modifier, ) { - LazyColumn(modifier = modifier, contentPadding = PaddingValues(bottom = if (LocalCompactMode.current) 8.dp else 16.dp)) { + LazyColumn( + modifier = modifier.statusBarsPadding(), + contentPadding = PaddingValues(bottom = if (LocalCompactMode.current) 8.dp else 16.dp), + ) { item(key = "shortcuts") { SmartShortcuts(callbacks) } content.resume?.let { resume -> item(key = "resume") { ResumeHero(resume, callbacks) } @@ -171,8 +151,10 @@ private fun HomeContent( @Composable private fun SmartShortcuts(callbacks: HomeCallbacks) { val compact = LocalCompactMode.current + // Classic circles are smaller (48dp) with a taller top gap under the status bar; breathing + // room under the labels separates them from the first shelf header. Row( - modifier = Modifier.fillMaxWidth().padding(horizontal = if (compact) 12.dp else 16.dp, vertical = if (compact) 4.dp else 8.dp), + modifier = Modifier.fillMaxWidth().padding(start = if (compact) 12.dp else 16.dp, end = if (compact) 12.dp else 16.dp, top = if (compact) 12.dp else 16.dp, bottom = if (compact) 8.dp else 12.dp), horizontalArrangement = Arrangement.SpaceEvenly, ) { Shortcut( @@ -204,6 +186,8 @@ private fun RowScope.Shortcut( label: String, onClick: () -> Unit, ) { + val compact = LocalCompactMode.current + val circle = if (compact) 48.dp else 56.dp Column( modifier = Modifier .weight(1f) @@ -214,12 +198,12 @@ private fun RowScope.Shortcut( ) { Box( modifier = Modifier - .size(56.dp) + .size(circle) .clip(CircleShape) .background(MaterialTheme.colorScheme.secondaryContainer), contentAlignment = Alignment.Center, ) { - Icon(icon, contentDescription = label, tint = MaterialTheme.colorScheme.onSecondaryContainer, modifier = Modifier.size(28.dp)) + Icon(icon, contentDescription = label, tint = MaterialTheme.colorScheme.onSecondaryContainer, modifier = Modifier.size(if (compact) 24.dp else 28.dp)) } Text( text = label, @@ -338,19 +322,23 @@ private fun LazyListScope.shelf( if (items.isEmpty()) return item(key = "$key:header") { val shelfTitle = stringResource(title) + val compactHeader = LocalCompactMode.current + // The top gap separates shelves; the bottom gap keeps the header off the artwork. SectionHeader( title = shelfTitle, subtitle = stringResource(subtitle), iconAction = onPlay?.let { Icons.Rounded.PlayArrow }, iconActionContentDescription = onPlay?.let { stringResource(R.string.home_play_shelf, shelfTitle) }, onIconAction = { onPlay?.invoke() }, + modifier = Modifier.padding(top = if (compactHeader) 8.dp else 12.dp, bottom = 4.dp), ) } item(key = key) { val compact = LocalCompactMode.current LazyRow( contentPadding = PaddingValues(horizontal = if (compact) 12.dp else 16.dp), - horizontalArrangement = Arrangement.spacedBy(if (compact) 6.dp else 8.dp) + horizontalArrangement = Arrangement.spacedBy(if (compact) 6.dp else 8.dp), + modifier = Modifier.padding(bottom = if (compact) 12.dp else 16.dp), ) { itemsIndexed(items) { _, item -> Box(Modifier.width(ShelfTileWidth)) { tile(item) } } } diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt index 28ced8370c..0b2a11d5a0 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt @@ -172,10 +172,10 @@ class HomeScreenTest { } @Test - fun `shuffle all is wired from the top bar, with no settings gear duplicating the tab`() { + fun `shuffle all is wired from the shortcut row, with no settings gear duplicating the tab`() { robot.setContent(HomeScenarios.content) - robot.tapDescription("Shuffle all") + robot.tapDescription("Shuffle") robot.shuffles shouldBe 1 robot.assertDescriptionNotShown("Settings") diff --git a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt index e9ca2050ef..db6e4f0a4c 100644 --- a/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt +++ b/android/designsystem/src/main/java/com/simplecityapps/shuttle/designsystem/component/GridTile.kt @@ -135,7 +135,7 @@ fun GridTile( if (subtitle != null) { Text( text = subtitle, - style = MaterialTheme.typography.bodyMedium, + style = if (compact) MaterialTheme.typography.bodySmall else MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, From 2044398555b7533010cde93c7fa731129e1aabb8 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 11:18:53 +0000 Subject: [PATCH 30/34] build: shared debug keystore so dev APKs install over each other Each one-shot builder minted its own ~/.android debug key, so every APK had a new signature and Android refused to install it over the previous build. The debug build type now signs with a checked-in debug key (not a secret); release signing is untouched. --- android/app/build.gradle.kts | 10 ++++++++++ android/app/debug.keystore | Bin 0 -> 2666 bytes k8s/templates/job-build-remote.yaml | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 android/app/debug.keystore diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 76025e254c..13409305c6 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -48,6 +48,15 @@ android { } signingConfigs { + // A checked-in debug key shared by every builder (local or cluster): without it each + // machine mints its own ~/.android key and new dev APKs refuse to install over old ones. + // Debug keys are not secrets; the release key stays out of the repo. + named("debug") { + storeFile = file("./debug.keystore") + storePassword = "android" + keyAlias = "androiddebugkey" + keyPassword = "android" + } create("release") { if (isCiBuild() && isReleaseBuild()) { val keystore = file("./keystore.ks") @@ -64,6 +73,7 @@ android { buildTypes { getByName("debug") { + signingConfig = signingConfigs.getByName("debug") applicationIdSuffix = ".dev" if (isCiBuild()) { // We want proguard enabled on CI, so our instrumented tests run on obfuscated code diff --git a/android/app/debug.keystore b/android/app/debug.keystore new file mode 100644 index 0000000000000000000000000000000000000000..cd78a9a010d69086e2dc111483b66e77004b8354 GIT binary patch literal 2666 zcma)8XH=7k5>3LFu)$EIia-DjMMd}kDM2tuQ34{g^W|_uiSGcLt>Kxxt`3AdOE5fjmk- zN9XcGd7%s%9~7V=cR(6)1Ej$_{)>Xw05o{z9$dN?MTmX>nL_bFVGJ7Fa1Yc6-F{BM z`9UJ6`%jAkj{%}Ne2kt;7K07@DfiL?dcJo%JBUTXU`j$Ts2qqw{POROFeDrT${>)= z^m9;G9sqh25bBCG`;s6?mao_60x#hQ2-OdP=-IZ6(6!4Xym#D3vk6ADa3l zo-=D%`4Kgs$T8uB;y+LJ?1r_=Xqk7X494%khRPQ;>8#v-Kc`wZ672q&ds1pEeFXWk zJeRmPrpLkqbe;8%92{ID)wu;@e83_$86Ny>_@Z64rPHa=s_}u*@*^re(r$U2kHr#9 zspI!)k}w+$B}q~}cjl;|s4K3DyGs(goObVc^knFZg4Oj1VHYc_qZsD&Ey(7&qsqdp zaFIbmsxn`c_pVV?3^z{Atnc9dLRlquadZ8VQ}FA^AsC(~QNSp8mtXp}ctNGZ5NEAq zIgWGO#G`jIF6Ajcs%58C2JWi9Wp971{t(Pk;=|Q!KU|G&XYrFwMV^6$apoms`e=b` z(HLOhH0v9DfLUJ|hC82s#m@y$yVG%8e`ep&-ulLbUJvq<>c@j0ja*jzw=f~6Sg_m6 zexxvVn-bp5XK8I7&FgY<8+;2Ewy6cjP2O%vT%!JNMn(3DjTR&g@@iEvbz=9O`Ef^w z_10POLvA2Lh>HjBXezIrHWkLIqAoWBV!|G0>ApiAq&}Oer_P3v!_gBDqA$%swE)HI zbFQtI#(`e7C7hhH$585WS*J_kGmcyGDwFi>{GE*2u}D6+m8n?bt>o8Y`CS=jTDw}k z%`jJqW<9Y-7s2ftP(b8Tf_9x9)E;;;mPl};4^L_6O z&Q_;(q@?>}OZ>Ck=S^Y2<>Vy#g)VQR&h=@=?yaqbK}S-IFQ${j+cbl?8XrLMYxq4w zvEnOFkHi5~?af!S`yj!Fk`tVq>0=y1YWTDkK8ayW?Y4Z=ZdAwWeWHBYp*m~A>JGo> zl@PD!@D1Po@b1L~XZmxIR@N&?QM-UN%Ax^wJ!ShHSu*Xbe@*k(5yhvTj_b0R6a+lE z+GCnJ)Q@2|5A3&mC#$E}b22RVM(#GI5B2ttEtkkG_Xs$1Q`D$j@_GvMN{=Ckjxq=CAE^Zg zA$59fb`6oCO@n0H)D5f6*g#@@1XH^^vhTsBfWG^VZO10N!&|``Gp${<Rm^e~cUN4>!3usPy{K5_^~;u2UFE<6-!jZpPMQX*-z!UiwOQ z=Fa;G=^zZg!%9P^($NKH1c(hR&eVKSmAi?4HN)i-N&cn)B6*IeNqFRD7W)*pnUQn% z1Hnne2aBPW3ZZ8A5+D103At(Nm~X7C#pOMfrzyiv-+nB%vus;p3rWL9#GKPUukyp? zta?%UgR@mw>7tjn)3SQgH=6U`eLlFozbH;AQ z1*P~LZ!;igK3L~`#u*WC&mwqRJ~*!Y>bUMOdJjMKDC~Mn)1fIR%ezNARpqo_4FX!Y z+$l1GbrK@vyc}Vm!f^j%MQVj%Q!{spsGzC0b;5IbHK{3Erfe5-d9^KPeOrX_0)d*B z?P5d)rWDsD^=P}3_4Hed9oEC6=Nc?X4%5hlnpCGFIWeicT5ePRifVY4t;)s=&rffK zc(CU3B2@+fH%?ESu=wq>!+cxg!wP_2v6jzh((k(p$GK?}ZiEHVf5VXe2pWETz@|^2 z?z`MpVR=Q1$ZVsz zur0S25?=hY=Cu5oUD=o#6Z+Tc6H|gy85ge`1;&(guFxoBN)r4KusOWnEMkSc9}Vlg z6%?4?AOUTEOh31#UQDi=4Bfb!@#jL)0ihrp-*e^HTve`awsxHI_SU>~<5uyW*!Z|uIm zu)Abn8s_suKAM^}5{x8sM1*WOM>f43lUO7~@@^G66g<}+&ZE3j&ev{#Rz=?+GL5~v zQ}dieDeNIXzCiUST;mX8OwfpssBAo~9<&|jwH*_D(%!i(`{4~%$tfm^#aGp?z6cDj z9=1kT5Rvel(JO^5r%;Qv_rxW|F0JKl<{f0?jF+V91LUz$@J}%fpUCC(DdKXE<%r<> zkk|7s3Ux;atVhwV(n^qsDldchuTExLoSRDLsR7bT7^`zS@l8A;5g5+UPcn z+&V+B%KOa`C18x;Sqn`_Y%|Jy;GkswWRS!JEkSjV|L6Y&gTf(zoG#KE)6X&2QnO2b xNnjbXve}WqiOdt>UW#0a1!p!NcZQcC bootstrapping Android SDK into PVC cache" From 083474ac0aa0a8fdf4c2ee3372b1b0e3d0e366c6 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 11:18:53 +0000 Subject: [PATCH 31/34] feat(ui): Shuttle brand header, colorful shortcuts, fuller shelves Brand row with the launcher logo and Shuttle name tops Home. Shortcut circles go solid classic colors (orange/green/red/blue) with white glyphs. Shelf tiles grow (128dp classic, 144dp modern) so rows fill the screen vertically. --- .../shuttle/ui/screens/home/HomeScreen.kt | 45 ++++++++++++++++--- .../app/src/main/res/values/strings_home.xml | 2 + .../shuttle/ui/screens/home/HomeScreenTest.kt | 8 ++++ 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index 8f6f2ba0c3..74b4e8fce6 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -1,6 +1,7 @@ package com.simplecityapps.shuttle.ui.screens.home import androidx.annotation.StringRes +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -38,8 +39,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -48,6 +51,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.simplecityapps.shuttle.BuildConfig import com.simplecityapps.shuttle.R +import com.simplecityapps.core.R as CoreR import com.simplecityapps.shuttle.designsystem.R as DesignR import com.simplecityapps.shuttle.designsystem.component.ArtworkPlaceholder import com.simplecityapps.shuttle.designsystem.component.ArtworkShape @@ -130,6 +134,7 @@ private fun HomeContent( modifier = modifier.statusBarsPadding(), contentPadding = PaddingValues(bottom = if (LocalCompactMode.current) 8.dp else 16.dp), ) { + item(key = "brand") { BrandHeader() } item(key = "shortcuts") { SmartShortcuts(callbacks) } content.resume?.let { resume -> item(key = "resume") { ResumeHero(resume, callbacks) } @@ -145,8 +150,33 @@ private fun HomeContent( } /** - * The old home's shortcut row: the three smart playlists plus Shuffle all, as tonal circles over - * labels. The playlists open their detail screens; the names match the Playlists tab's rows. + * The old home's brand row: the Shuttle logo and name, like the classic toolbar title. + */ +@Composable +private fun BrandHeader() { + val compact = LocalCompactMode.current + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = if (compact) 12.dp else 16.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + Image( + painter = painterResource(CoreR.drawable.ic_shuttle_logo), + contentDescription = null, + modifier = Modifier.size(if (compact) 28.dp else 32.dp), + ) + Text( + text = stringResource(R.string.home_brand), + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface, + ) + } +} + +/** + * The old home's shortcut row: the three smart playlists plus Shuffle all, as solid-colour circles + * over labels, like the classic icons. The playlists open their detail screens; the names match + * the Playlists tab's rows. */ @Composable private fun SmartShortcuts(callbacks: HomeCallbacks) { @@ -161,21 +191,25 @@ private fun SmartShortcuts(callbacks: HomeCallbacks) { icon = Icons.Rounded.History, label = stringResourceKey(SmartPlaylistId.History.nameKey), onClick = callbacks.onOpenHistory, + containerColor = Color(0xFFEF6C00), ) Shortcut( icon = Icons.Rounded.LibraryAdd, label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), onClick = callbacks.onOpenRecentlyAdded, + containerColor = Color(0xFF43A047), ) Shortcut( icon = Icons.Rounded.Favorite, label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), onClick = callbacks.onOpenFavourites, + containerColor = Color(0xFFE53935), ) Shortcut( icon = Icons.Rounded.Shuffle, label = stringResource(R.string.btn_shuffle), onClick = callbacks.onShuffleAll, + containerColor = Color(0xFF1E88E5), ) } } @@ -185,6 +219,7 @@ private fun RowScope.Shortcut( icon: ImageVector, label: String, onClick: () -> Unit, + containerColor: Color, ) { val compact = LocalCompactMode.current val circle = if (compact) 48.dp else 56.dp @@ -200,10 +235,10 @@ private fun RowScope.Shortcut( modifier = Modifier .size(circle) .clip(CircleShape) - .background(MaterialTheme.colorScheme.secondaryContainer), + .background(containerColor), contentAlignment = Alignment.Center, ) { - Icon(icon, contentDescription = label, tint = MaterialTheme.colorScheme.onSecondaryContainer, modifier = Modifier.size(if (compact) 24.dp else 28.dp)) + Icon(icon, contentDescription = label, tint = Color.White, modifier = Modifier.size(if (compact) 24.dp else 28.dp)) } Text( text = label, @@ -380,4 +415,4 @@ private fun ArtistTile( } private val ShelfTileWidth: Dp - @Composable get() = if (LocalCompactMode.current) 96.dp else 120.dp + @Composable get() = if (LocalCompactMode.current) 128.dp else 144.dp diff --git a/android/app/src/main/res/values/strings_home.xml b/android/app/src/main/res/values/strings_home.xml index a59f16ebba..d5b56ee54c 100644 --- a/android/app/src/main/res/values/strings_home.xml +++ b/android/app/src/main/res/values/strings_home.xml @@ -4,6 +4,8 @@ Shuffle Shuffle all + + Shuttle Continue listening diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt index 0b2a11d5a0..8b2089534a 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt @@ -158,6 +158,14 @@ class HomeScreenTest { robot.openedAlbums.shouldBeEmpty() } + @Test + fun `home opens with the Shuttle brand over the shortcuts`() { + robot.setContent(HomeScenarios.content) + + robot.assertTextDisplayed("Shuttle") + robot.scrollTo("Recently added") + } + @Test fun `shortcuts open their smart playlists`() { robot.setContent(HomeScenarios.content) From ca5634e9b14ab044db6a47774729d2f61d8c81da Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 11:52:21 +0000 Subject: [PATCH 32/34] feat(ui): bigger brand row, classic filled shortcut glyphs Brand logo 40/44dp with headlineSmall name. Shortcuts keep their 48/56dp circles but swap Rounded for the sharp Filled glyphs the classic app used. Dual debug+release now the default cluster build; dev release signs with the shared debug key under the .dev id. --- android/app/build.gradle.kts | 11 +++++++++- .../shuttle/ui/screens/home/HomeScreen.kt | 21 ++++++++++--------- k8s/config.env | 4 +++- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 13409305c6..59464bff84 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -90,7 +90,16 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) - signingConfig = signingConfigs.getByName("release") + // Play releases sign with the upload key (CI). Everywhere else the debug key + // signs release too, under the .dev id, so `assembleRelease` yields an + // installable, minified dev build instead of failing on a missing keystore. + // Same package and key as dev debug: the two swap in place, data intact. + if (isCiBuild() && isReleaseBuild()) { + signingConfig = signingConfigs.getByName("release") + } else { + signingConfig = signingConfigs.getByName("debug") + applicationIdSuffix = ".dev" + } } } diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index 74b4e8fce6..6af7dceefd 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -22,10 +22,11 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.History +import androidx.compose.material.icons.filled.LibraryAdd +import androidx.compose.material.icons.filled.Shuffle import androidx.compose.material.icons.rounded.Close -import androidx.compose.material.icons.rounded.Favorite -import androidx.compose.material.icons.rounded.History -import androidx.compose.material.icons.rounded.LibraryAdd import androidx.compose.material.icons.rounded.NewReleases import androidx.compose.material.icons.rounded.Pause import androidx.compose.material.icons.rounded.PlayArrow @@ -158,16 +159,16 @@ private fun BrandHeader() { Row( modifier = Modifier.fillMaxWidth().padding(horizontal = if (compact) 12.dp else 16.dp, vertical = 8.dp), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(8.dp), + horizontalArrangement = Arrangement.spacedBy(12.dp), ) { Image( painter = painterResource(CoreR.drawable.ic_shuttle_logo), contentDescription = null, - modifier = Modifier.size(if (compact) 28.dp else 32.dp), + modifier = Modifier.size(if (compact) 40.dp else 44.dp), ) Text( text = stringResource(R.string.home_brand), - style = MaterialTheme.typography.titleLarge, + style = MaterialTheme.typography.headlineSmall, color = MaterialTheme.colorScheme.onSurface, ) } @@ -188,25 +189,25 @@ private fun SmartShortcuts(callbacks: HomeCallbacks) { horizontalArrangement = Arrangement.SpaceEvenly, ) { Shortcut( - icon = Icons.Rounded.History, + icon = Icons.Filled.History, label = stringResourceKey(SmartPlaylistId.History.nameKey), onClick = callbacks.onOpenHistory, containerColor = Color(0xFFEF6C00), ) Shortcut( - icon = Icons.Rounded.LibraryAdd, + icon = Icons.Filled.LibraryAdd, label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), onClick = callbacks.onOpenRecentlyAdded, containerColor = Color(0xFF43A047), ) Shortcut( - icon = Icons.Rounded.Favorite, + icon = Icons.Filled.Favorite, label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), onClick = callbacks.onOpenFavourites, containerColor = Color(0xFFE53935), ) Shortcut( - icon = Icons.Rounded.Shuffle, + icon = Icons.Filled.Shuffle, label = stringResource(R.string.btn_shuffle), onClick = callbacks.onShuffleAll, containerColor = Color(0xFF1E88E5), diff --git a/k8s/config.env b/k8s/config.env index bd8f242804..f597691e45 100644 --- a/k8s/config.env +++ b/k8s/config.env @@ -22,7 +22,9 @@ CACHE_PVC="${CACHE_PVC:-shuttle-build-cache}" CACHE_SIZE="${CACHE_SIZE:-25Gi}" # --- build job ------------------------------------------------------------- -GRADLE_TASK="${GRADLE_TASK:-:android:app:assembleDebug}" +# Default builds both: debug for iteration, release (minified, debug-signed on +# this builder) because debug builds can be laggy on device. +GRADLE_TASK="${GRADLE_TASK:-:android:app:assembleDebug :android:app:assembleRelease}" JOB_CPU_LIMIT="${JOB_CPU_LIMIT:-4}" JOB_MEM_LIMIT="${JOB_MEM_LIMIT:-10000Mi}" GRADLE_OPTS_VALUE="${GRADLE_OPTS_VALUE:--Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.compiler.execution.strategy=in-process -Dorg.gradle.workers.max=2}" From bc0d6da4e55d90a93a81837c24a8af4ddf31ef85 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 12:30:23 +0000 Subject: [PATCH 33/34] feat(ui): classic-only home restoration, build identity in About Brand mark, shortcut row, two-line shelf headers and play-count badges render in classic mode only; modern returns to the plain top bar. Settings > About shows version (code/sha) so dev builds are told apart; build-remote.sh forwards the local sha as -PGitSha. --- android/app/build.gradle.kts | 4 + .../shuttle/ui/screens/home/HomeScreen.kt | 95 ++++++++++++++----- .../ui/screens/settings/SettingsRoutes.kt | 3 +- .../shuttle/ui/screens/home/HomeRobot.kt | 3 +- .../shuttle/ui/screens/home/HomeScreenTest.kt | 29 ++++-- k8s/scripts/build-remote.sh | 8 ++ 6 files changed, 108 insertions(+), 34 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 59464bff84..ce19fdbac8 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -45,6 +45,10 @@ android { // Last.fm scrobbling (#503): the key and secret ship in the APK (owner decision, 2026-09-27). buildConfigField("String", "LASTFM_API_KEY", "\"${secret("LASTFM_API_KEY", "LASTFM_API_KEY").orEmpty()}\"") buildConfigField("String", "LASTFM_SHARED_SECRET", "\"${secret("LASTFM_SHARED_SECRET", "LASTFM_SHARED_SECRET").orEmpty()}\"") + + // Short commit the APK was built from, shown in Settings > About so dev builds + // (which share one version name) are told apart. Forwarded by k8s/scripts/build-remote.sh. + buildConfigField("String", "GIT_SHA", "\"${findProperty("gitSha")?.toString()?.takeIf { it.isNotBlank() } ?: "unknown"}\"") } signingConfigs { diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index 6af7dceefd..19076b403b 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -33,15 +34,19 @@ import androidx.compose.material.icons.rounded.PlayArrow import androidx.compose.material.icons.rounded.Shuffle import androidx.compose.material3.Card import androidx.compose.material3.ElevatedCard +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.pluralStringResource @@ -65,6 +70,7 @@ import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2ButtonStyle import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.S2IconButton +import com.simplecityapps.shuttle.designsystem.component.S2TopBar import com.simplecityapps.shuttle.designsystem.component.SectionHeader import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration @@ -95,9 +101,12 @@ class HomeCallbacks( /** * Home: the shortcut row over the library's shelves, or the empty state when there's no music yet. - * There's no top bar: the shortcuts hold Shuffle all, settings lives in its own tab and search in - * its own, so the first screen is music. + * + * Classic mode restores the old home: a centered brand mark, the smart-playlist shortcut row and + * two-line shelf headers, with no top bar. Modern keeps the plain top bar (Shuffle all only; + * settings and search live in their own tabs) and single-line shelves. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun HomeScreen( uiState: HomeUiState, @@ -106,22 +115,53 @@ fun HomeScreen( /** Shown in place of the generic empty state while the library has no songs (#422), so it can offer access. */ emptyContent: (@Composable (Modifier) -> Unit)? = null, ) { - // No top bar: the shell pads the nav bar and player, and the status bar is consumed below. - val contentModifier = modifier.fillMaxSize() + if (LocalCompactMode.current) { + // Classic has no top bar: the shortcuts hold Shuffle all, and the list takes the status bar. + HomeBody(uiState, callbacks, modifier.fillMaxSize().statusBarsPadding(), emptyContent) + } else { + val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() + Scaffold( + modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + // The shell pads destinations clear of the nav bar and player; the bar takes the status bar. + contentWindowInsets = WindowInsets(0), + topBar = { + S2TopBar( + title = "", + actions = { + if (uiState is HomeUiState.Content) { + S2IconButton(icon = Icons.Filled.Shuffle, contentDescription = stringResource(R.string.home_shuffle_all), onClick = callbacks.onShuffleAll) + } + }, + scrollBehavior = scrollBehavior, + ) + }, + ) { padding -> + HomeBody(uiState, callbacks, Modifier.fillMaxSize().padding(padding), emptyContent) + } + } +} + +@Composable +private fun HomeBody( + uiState: HomeUiState, + callbacks: HomeCallbacks, + modifier: Modifier, + emptyContent: (@Composable (Modifier) -> Unit)?, +) { when (uiState) { - HomeUiState.Loading -> LoadingState(contentModifier) + HomeUiState.Loading -> LoadingState(modifier) HomeUiState.Empty -> if (emptyContent != null) { - emptyContent(contentModifier) + emptyContent(modifier) } else { EmptyState( title = stringResource(R.string.home_empty_title), message = stringResource(R.string.home_empty_message), - modifier = contentModifier, + modifier = modifier, ) } - is HomeUiState.Content -> HomeContent(uiState, callbacks, contentModifier) + is HomeUiState.Content -> HomeContent(uiState, callbacks, modifier) } } @@ -131,44 +171,47 @@ private fun HomeContent( callbacks: HomeCallbacks, modifier: Modifier, ) { + val compact = LocalCompactMode.current LazyColumn( - modifier = modifier.statusBarsPadding(), - contentPadding = PaddingValues(bottom = if (LocalCompactMode.current) 8.dp else 16.dp), + modifier = modifier, + contentPadding = PaddingValues(bottom = if (compact) 8.dp else 16.dp), ) { - item(key = "brand") { BrandHeader() } - item(key = "shortcuts") { SmartShortcuts(callbacks) } + if (compact) { + item(key = "brand") { BrandHeader() } + item(key = "shortcuts") { SmartShortcuts(callbacks) } + } content.resume?.let { resume -> item(key = "resume") { ResumeHero(resume, callbacks) } } if (content.showWhatsNew) { item(key = "whats-new") { WhatsNewCard(callbacks) } } - shelf(R.string.home_recently_played, R.string.home_recently_played_subtitle, "recently-played", content.recentlyPlayed, onPlay = { callbacks.onPlayAlbums(content.recentlyPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_recently_added, R.string.home_recently_added_subtitle, "recently-added", content.recentlyAdded, onPlay = { callbacks.onPlayAlbums(content.recentlyAdded) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } - shelf(R.string.home_most_played, R.string.home_most_played_subtitle, "most-played", content.mostPlayed, onPlay = { callbacks.onPlayAlbums(content.mostPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = true) } - shelf(R.string.home_something_different, R.string.home_something_different_subtitle, "something-different", content.somethingDifferent, onPlay = { callbacks.onPlayArtists(content.somethingDifferent) }) { artist -> ArtistTile(artist, callbacks) } + shelf(R.string.home_recently_played, if (compact) R.string.home_recently_played_subtitle else null, "recently-played", content.recentlyPlayed, onPlay = { callbacks.onPlayAlbums(content.recentlyPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_recently_added, if (compact) R.string.home_recently_added_subtitle else null, "recently-added", content.recentlyAdded, onPlay = { callbacks.onPlayAlbums(content.recentlyAdded) }) { album -> AlbumTile(album, callbacks, showPlayCount = false) } + shelf(R.string.home_most_played, if (compact) R.string.home_most_played_subtitle else null, "most-played", content.mostPlayed, onPlay = { callbacks.onPlayAlbums(content.mostPlayed) }) { album -> AlbumTile(album, callbacks, showPlayCount = compact) } + shelf(R.string.home_something_different, if (compact) R.string.home_something_different_subtitle else null, "something-different", content.somethingDifferent, onPlay = { callbacks.onPlayArtists(content.somethingDifferent) }) { artist -> ArtistTile(artist, callbacks) } } } /** - * The old home's brand row: the Shuttle logo and name, like the classic toolbar title. + * The old home's centered brand mark: a large Shuttle logo over the name, like the classic home. + * Classic only; modern leads with the top bar instead. */ @Composable private fun BrandHeader() { - val compact = LocalCompactMode.current - Row( - modifier = Modifier.fillMaxWidth().padding(horizontal = if (compact) 12.dp else 16.dp, vertical = 8.dp), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp), + Column( + modifier = Modifier.fillMaxWidth().padding(top = 16.dp, bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(8.dp), ) { Image( painter = painterResource(CoreR.drawable.ic_shuttle_logo), contentDescription = null, - modifier = Modifier.size(if (compact) 40.dp else 44.dp), + modifier = Modifier.size(64.dp), ) Text( text = stringResource(R.string.home_brand), - style = MaterialTheme.typography.headlineSmall, + style = MaterialTheme.typography.headlineMedium, color = MaterialTheme.colorScheme.onSurface, ) } @@ -349,7 +392,7 @@ private fun WhatsNewCard(callbacks: HomeCallbacks) { */ private fun LazyListScope.shelf( @StringRes title: Int, - @StringRes subtitle: Int, + @StringRes subtitle: Int?, key: String, items: List, onPlay: (() -> Unit)? = null, @@ -362,7 +405,7 @@ private fun LazyListScope.shelf( // The top gap separates shelves; the bottom gap keeps the header off the artwork. SectionHeader( title = shelfTitle, - subtitle = stringResource(subtitle), + subtitle = subtitle?.let { stringResource(it) }, iconAction = onPlay?.let { Icons.Rounded.PlayArrow }, iconActionContentDescription = onPlay?.let { stringResource(R.string.home_play_shelf, shelfTitle) }, onIconAction = { onPlay?.invoke() }, diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt index 78f7ff90e7..9cd6d88add 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/settings/SettingsRoutes.kt @@ -151,7 +151,8 @@ private fun SettingsDestinationEntry( onSliderChange = viewModel::onSliderChange, onAction = viewModel::onAction, onOpenLink = onOpenLink, - versionName = BuildConfig.VERSION_NAME, + // The code and sha disambiguate dev builds, which otherwise share one version name. + versionName = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE}/${BuildConfig.GIT_SHA})", snackbarHostState = snackbarHostState, leadingContent = if (destination == SettingsDestination.Sources) sourcesRows(snackbarHostState) else ({}) ) diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt index 831e1779ac..cc1fe6d04c 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeRobot.kt @@ -51,10 +51,11 @@ class HomeRobot(private val rule: ComposeContentTestRule) { fun setContent( uiState: HomeUiState, theme: ThemeMode = ThemeMode.Light, + compact: Boolean = false, emptyContent: (@Composable (Modifier) -> Unit)? = null, ) { rule.setContent { - S2AppTheme(AppThemeState(theme = theme)) { + S2AppTheme(AppThemeState(theme = theme, compactMode = compact)) { HomeScreen( uiState = uiState, callbacks = callbacks(), diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt index 8b2089534a..9e97cee386 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt @@ -117,7 +117,7 @@ class HomeScreenTest { @Test fun `most played tiles badge their play count instead of repeating it in the subtitle`() { - robot.setContent(HomeScenarios.content) + robot.setContent(HomeScenarios.content, compact = true) robot.scrollTo("Soft Focus") robot.assertTextDisplayed("14") @@ -159,17 +159,25 @@ class HomeScreenTest { } @Test - fun `home opens with the Shuttle brand over the shortcuts`() { - robot.setContent(HomeScenarios.content) + fun `classic home opens with the centered Shuttle brand over the shortcuts`() { + robot.setContent(HomeScenarios.content, compact = true) robot.assertTextDisplayed("Shuttle") robot.scrollTo("Recently added") } @Test - fun `shortcuts open their smart playlists`() { + fun `modern home has no brand row, the top bar covers shuffle`() { robot.setContent(HomeScenarios.content) + robot.assertTextNotShown("Shuttle") + robot.assertDescriptionNotShown("History") + } + + @Test + fun `shortcuts open their smart playlists`() { + robot.setContent(HomeScenarios.content, compact = true) + robot.tapDescription("History") robot.tapDescription("Recently Added") robot.tapDescription("Favorites") @@ -180,8 +188,8 @@ class HomeScreenTest { } @Test - fun `shuffle all is wired from the shortcut row, with no settings gear duplicating the tab`() { - robot.setContent(HomeScenarios.content) + fun `shuffle all is wired from the classic shortcut row, with no settings gear duplicating the tab`() { + robot.setContent(HomeScenarios.content, compact = true) robot.tapDescription("Shuffle") @@ -189,6 +197,15 @@ class HomeScreenTest { robot.assertDescriptionNotShown("Settings") } + @Test + fun `shuffle all is wired from the modern top bar`() { + robot.setContent(HomeScenarios.content) + + robot.tapDescription("Shuffle all") + + robot.shuffles shouldBe 1 + } + @Test fun `home has no page title and no search button, which the Search tab covers`() { robot.setContent(HomeScenarios.content) diff --git a/k8s/scripts/build-remote.sh b/k8s/scripts/build-remote.sh index 14d9a90d4a..4cd799326e 100755 --- a/k8s/scripts/build-remote.sh +++ b/k8s/scripts/build-remote.sh @@ -50,6 +50,14 @@ if [[ "$GRADLE_ARGS" != *versionCode* ]]; then GRADLE_ARGS="$GRADLE_ARGS -PversionCode=$VCODE -PversionName=$VNAME" fi fi +# Forward the local commit sha the same way: Settings > About shows it, so dev +# builds (one shared version name) are told apart on device. +if [[ "$GRADLE_ARGS" != *gitSha* ]]; then + GSHA="$(git -C "$REPO_ROOT" rev-parse --short HEAD 2>/dev/null || true)" + if [ -n "$GSHA" ]; then + GRADLE_ARGS="$GRADLE_ARGS -PGitSha=$GSHA" + fi +fi if [ -n "$KUBE_CONTEXT" ]; then CTX=(--context "$KUBE_CONTEXT"); else CTX=(); fi kc() { "$KUBECTL" "${CTX[@]}" "$@"; } From 2bd891277fba7a52592802c325cfd5ffe7e1a3e2 Mon Sep 17 00:00:00 2001 From: PylotLight Date: Tue, 29 Sep 2026 13:01:50 +0000 Subject: [PATCH 34/34] feat(ui): classic shortcuts use the restored legacy glyphs Restores ic_history, ic_playlist_add and ic_favorite_border from before the legacy-resource deletion, pairing with the surviving shuffle glyph. Classic shortcuts render them tinted in the reference accent colors on dark circles; modern keeps filled white glyphs. Brand splits by mode: centered Shuttle Music Player in classic, small row in modern. --- .../shuttle/ui/screens/home/HomeScreen.kt | 199 ++++++++++-------- .../ic_favorite_border_black_24dp.xml | 9 + .../res/drawable/ic_history_black_24dp.xml | 9 + .../drawable/ic_playlist_add_black_24dp.xml | 10 + .../app/src/main/res/values/strings_home.xml | 2 + .../shuttle/ui/screens/home/HomeScreenTest.kt | 27 +-- 6 files changed, 153 insertions(+), 103 deletions(-) create mode 100644 android/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml create mode 100644 android/app/src/main/res/drawable/ic_history_black_24dp.xml create mode 100644 android/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml diff --git a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt index 19076b403b..42a1137daf 100644 --- a/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt +++ b/android/app/src/main/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreen.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope -import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -34,19 +33,16 @@ import androidx.compose.material.icons.rounded.PlayArrow import androidx.compose.material.icons.rounded.Shuffle import androidx.compose.material3.Card import androidx.compose.material3.ElevatedCard -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Scaffold import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.pluralStringResource @@ -70,7 +66,6 @@ import com.simplecityapps.shuttle.designsystem.component.S2ButtonGroup import com.simplecityapps.shuttle.designsystem.component.S2ButtonStyle import com.simplecityapps.shuttle.designsystem.component.S2GroupAction import com.simplecityapps.shuttle.designsystem.component.S2IconButton -import com.simplecityapps.shuttle.designsystem.component.S2TopBar import com.simplecityapps.shuttle.designsystem.component.SectionHeader import com.simplecityapps.shuttle.designsystem.theme.LocalCompactMode import com.simplecityapps.shuttle.format.formatDuration @@ -101,12 +96,13 @@ class HomeCallbacks( /** * Home: the shortcut row over the library's shelves, or the empty state when there's no music yet. + * There's no top bar: the shortcut row holds Shuffle all, and settings and search live in their + * own tabs, so the first screen is music. * - * Classic mode restores the old home: a centered brand mark, the smart-playlist shortcut row and - * two-line shelf headers, with no top bar. Modern keeps the plain top bar (Shuffle all only; - * settings and search live in their own tabs) and single-line shelves. + * Classic restores the old home exactly: a centered logo over "Shuttle Music Player" and dark + * tinted shortcut circles with coloured outline glyphs. Modern keeps a small left-aligned brand + * row and solid bright circles with white glyphs. */ -@OptIn(ExperimentalMaterial3Api::class) @Composable fun HomeScreen( uiState: HomeUiState, @@ -115,30 +111,8 @@ fun HomeScreen( /** Shown in place of the generic empty state while the library has no songs (#422), so it can offer access. */ emptyContent: (@Composable (Modifier) -> Unit)? = null, ) { - if (LocalCompactMode.current) { - // Classic has no top bar: the shortcuts hold Shuffle all, and the list takes the status bar. - HomeBody(uiState, callbacks, modifier.fillMaxSize().statusBarsPadding(), emptyContent) - } else { - val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior() - Scaffold( - modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection), - // The shell pads destinations clear of the nav bar and player; the bar takes the status bar. - contentWindowInsets = WindowInsets(0), - topBar = { - S2TopBar( - title = "", - actions = { - if (uiState is HomeUiState.Content) { - S2IconButton(icon = Icons.Filled.Shuffle, contentDescription = stringResource(R.string.home_shuffle_all), onClick = callbacks.onShuffleAll) - } - }, - scrollBehavior = scrollBehavior, - ) - }, - ) { padding -> - HomeBody(uiState, callbacks, Modifier.fillMaxSize().padding(padding), emptyContent) - } - } + // No top bar: the shell pads the nav bar and player, and the list takes the status bar. + HomeBody(uiState, callbacks, modifier.fillMaxSize().statusBarsPadding(), emptyContent) } @Composable @@ -176,10 +150,8 @@ private fun HomeContent( modifier = modifier, contentPadding = PaddingValues(bottom = if (compact) 8.dp else 16.dp), ) { - if (compact) { - item(key = "brand") { BrandHeader() } - item(key = "shortcuts") { SmartShortcuts(callbacks) } - } + item(key = "brand") { BrandHeader() } + item(key = "shortcuts") { SmartShortcuts(callbacks) } content.resume?.let { resume -> item(key = "resume") { ResumeHero(resume, callbacks) } } @@ -194,33 +166,53 @@ private fun HomeContent( } /** - * The old home's centered brand mark: a large Shuttle logo over the name, like the classic home. - * Classic only; modern leads with the top bar instead. + * The brand: classic centers a large logo over "Shuttle Music Player" like the old home; modern + * keeps a small left-aligned logo and name row. */ @Composable private fun BrandHeader() { - Column( - modifier = Modifier.fillMaxWidth().padding(top = 16.dp, bottom = 8.dp), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(8.dp), - ) { - Image( - painter = painterResource(CoreR.drawable.ic_shuttle_logo), - contentDescription = null, - modifier = Modifier.size(64.dp), - ) - Text( - text = stringResource(R.string.home_brand), - style = MaterialTheme.typography.headlineMedium, - color = MaterialTheme.colorScheme.onSurface, - ) + if (LocalCompactMode.current) { + Column( + modifier = Modifier.fillMaxWidth().padding(top = 16.dp, bottom = 8.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(8.dp), + ) { + Image( + painter = painterResource(CoreR.drawable.ic_shuttle_logo), + contentDescription = null, + modifier = Modifier.size(64.dp), + ) + Text( + text = stringResource(R.string.home_brand_full), + style = MaterialTheme.typography.headlineMedium, + color = MaterialTheme.colorScheme.onSurface, + ) + } + } else { + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + Image( + painter = painterResource(CoreR.drawable.ic_shuttle_logo), + contentDescription = null, + modifier = Modifier.size(32.dp), + ) + Text( + text = stringResource(R.string.home_brand), + style = MaterialTheme.typography.titleLarge, + color = MaterialTheme.colorScheme.onSurface, + ) + } } } /** - * The old home's shortcut row: the three smart playlists plus Shuffle all, as solid-colour circles - * over labels, like the classic icons. The playlists open their detail screens; the names match - * the Playlists tab's rows. + * The old home's shortcut row: the three smart playlists plus Shuffle all. Classic matches the + * reference exactly: dark tinted circles with coloured outline glyphs. Modern uses solid bright + * circles with white filled glyphs. The playlists open their detail screens; the names match the + * Playlists tab's rows. */ @Composable private fun SmartShortcuts(callbacks: HomeCallbacks) { @@ -231,39 +223,76 @@ private fun SmartShortcuts(callbacks: HomeCallbacks) { modifier = Modifier.fillMaxWidth().padding(start = if (compact) 12.dp else 16.dp, end = if (compact) 12.dp else 16.dp, top = if (compact) 12.dp else 16.dp, bottom = if (compact) 8.dp else 12.dp), horizontalArrangement = Arrangement.SpaceEvenly, ) { - Shortcut( - icon = Icons.Filled.History, - label = stringResourceKey(SmartPlaylistId.History.nameKey), - onClick = callbacks.onOpenHistory, - containerColor = Color(0xFFEF6C00), - ) - Shortcut( - icon = Icons.Filled.LibraryAdd, - label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), - onClick = callbacks.onOpenRecentlyAdded, - containerColor = Color(0xFF43A047), - ) - Shortcut( - icon = Icons.Filled.Favorite, - label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), - onClick = callbacks.onOpenFavourites, - containerColor = Color(0xFFE53935), - ) - Shortcut( - icon = Icons.Filled.Shuffle, - label = stringResource(R.string.btn_shuffle), - onClick = callbacks.onShuffleAll, - containerColor = Color(0xFF1E88E5), - ) + if (compact) { + // The legacy glyphs, restored from the pre-rewrite resources. + Shortcut( + icon = painterResource(R.drawable.ic_history_black_24dp), + label = stringResourceKey(SmartPlaylistId.History.nameKey), + onClick = callbacks.onOpenHistory, + containerColor = Color(0xFF1E2E28), + glyphColor = Color(0xFF4DB6AC), + ) + Shortcut( + icon = painterResource(R.drawable.ic_playlist_add_black_24dp), + label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), + onClick = callbacks.onOpenRecentlyAdded, + containerColor = Color(0xFF2E2A18), + glyphColor = Color(0xFFFFB300), + ) + Shortcut( + icon = painterResource(R.drawable.ic_favorite_border_black_24dp), + label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), + onClick = callbacks.onOpenFavourites, + containerColor = Color(0xFF331B1E), + glyphColor = Color(0xFFE53935), + ) + Shortcut( + icon = painterResource(R.drawable.ic_shuffle_black_24dp), + label = stringResource(R.string.btn_shuffle), + onClick = callbacks.onShuffleAll, + containerColor = Color(0xFF182430), + glyphColor = Color(0xFF42A5F5), + ) + } else { + Shortcut( + icon = rememberVectorPainter(Icons.Filled.History), + label = stringResourceKey(SmartPlaylistId.History.nameKey), + onClick = callbacks.onOpenHistory, + containerColor = Color(0xFFEF6C00), + glyphColor = Color.White, + ) + Shortcut( + icon = rememberVectorPainter(Icons.Filled.LibraryAdd), + label = stringResourceKey(SmartPlaylistId.RecentlyAdded.nameKey), + onClick = callbacks.onOpenRecentlyAdded, + containerColor = Color(0xFF43A047), + glyphColor = Color.White, + ) + Shortcut( + icon = rememberVectorPainter(Icons.Filled.Favorite), + label = stringResourceKey(SmartPlaylistId.Favourites.nameKey), + onClick = callbacks.onOpenFavourites, + containerColor = Color(0xFFE53935), + glyphColor = Color.White, + ) + Shortcut( + icon = rememberVectorPainter(Icons.Filled.Shuffle), + label = stringResource(R.string.btn_shuffle), + onClick = callbacks.onShuffleAll, + containerColor = Color(0xFF1E88E5), + glyphColor = Color.White, + ) + } } } @Composable private fun RowScope.Shortcut( - icon: ImageVector, + icon: Painter, label: String, onClick: () -> Unit, containerColor: Color, + glyphColor: Color, ) { val compact = LocalCompactMode.current val circle = if (compact) 48.dp else 56.dp @@ -282,7 +311,7 @@ private fun RowScope.Shortcut( .background(containerColor), contentAlignment = Alignment.Center, ) { - Icon(icon, contentDescription = label, tint = Color.White, modifier = Modifier.size(if (compact) 24.dp else 28.dp)) + Icon(icon, contentDescription = label, tint = glyphColor, modifier = Modifier.size(if (compact) 24.dp else 28.dp)) } Text( text = label, diff --git a/android/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml b/android/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml new file mode 100644 index 0000000000..0cfbad6452 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_favorite_border_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_history_black_24dp.xml b/android/app/src/main/res/drawable/ic_history_black_24dp.xml new file mode 100644 index 0000000000..a61de1bc9e --- /dev/null +++ b/android/app/src/main/res/drawable/ic_history_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml b/android/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml new file mode 100644 index 0000000000..d20768cc37 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/android/app/src/main/res/values/strings_home.xml b/android/app/src/main/res/values/strings_home.xml index d5b56ee54c..fd854e6f51 100644 --- a/android/app/src/main/res/values/strings_home.xml +++ b/android/app/src/main/res/values/strings_home.xml @@ -6,6 +6,8 @@ Shuffle all Shuttle + + Shuttle Music Player Continue listening diff --git a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt index 9e97cee386..32944b408b 100644 --- a/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt +++ b/android/app/src/test/java/com/simplecityapps/shuttle/ui/screens/home/HomeScreenTest.kt @@ -159,19 +159,20 @@ class HomeScreenTest { } @Test - fun `classic home opens with the centered Shuttle brand over the shortcuts`() { + fun `classic home opens with the centered Shuttle Music Player brand over the shortcuts`() { robot.setContent(HomeScenarios.content, compact = true) - robot.assertTextDisplayed("Shuttle") + robot.assertTextDisplayed("Shuttle Music Player") robot.scrollTo("Recently added") } @Test - fun `modern home has no brand row, the top bar covers shuffle`() { + fun `modern home shows the small Shuttle brand and the shortcut row`() { robot.setContent(HomeScenarios.content) - robot.assertTextNotShown("Shuttle") - robot.assertDescriptionNotShown("History") + robot.assertTextDisplayed("Shuttle") + robot.assertTextNotShown("Shuttle Music Player") + robot.assertDescriptionDisplayed("History") } @Test @@ -188,8 +189,8 @@ class HomeScreenTest { } @Test - fun `shuffle all is wired from the classic shortcut row, with no settings gear duplicating the tab`() { - robot.setContent(HomeScenarios.content, compact = true) + fun `shuffle all is wired from the shortcut row, with no settings gear duplicating the tab`() { + robot.setContent(HomeScenarios.content) robot.tapDescription("Shuffle") @@ -198,19 +199,9 @@ class HomeScreenTest { } @Test - fun `shuffle all is wired from the modern top bar`() { - robot.setContent(HomeScenarios.content) - - robot.tapDescription("Shuffle all") - - robot.shuffles shouldBe 1 - } - - @Test - fun `home has no page title and no search button, which the Search tab covers`() { + fun `home has no search button, which the Search tab covers`() { robot.setContent(HomeScenarios.content) - robot.assertTextNotShown("Home") robot.assertDescriptionNotShown("Search") }