fix(android): keep the accent button's width and corners

Moving the gradient onto a row inside the button lost both: the button's own row hands its children no minimum size, so a fillMaxWidth button painted the ramp only behind its label, and with square corners. The gradient goes back on the button, and the 48dp touch-target padding is taken by a box around it instead, with the button inside told not to add its own. The primary button now matches the other buttons' 40dp container at every width. The screenshots are re-recorded for it.
chore(version): bump to 1.1.2
2026-11-05 09:10:02 +01:00 · 2026-10-04 17:14:11 +02:00 · 2026-10-04 16:55:38 +02:00 · 2026-10-04 16:45:25 +02:00 · 2026-10-04 02:54:21 +02:00 · 2026-10-04 02:42:53 +02:00
16 changed files with 51 additions and 32 deletions
@@ -39,8 +39,8 @@ env:
  CARGO_TERM_COLOR: always
  ANDROID_API: '36'
  ANDROID_BUILD_TOOLS: '37.0.0'
-  ANDROID_NDK: '29.0.14206865'
-  ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/29.0.14206865
+  ANDROID_NDK: '30.0.16248370'
+  ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/30.0.16248370

 jobs:
  build:
@@ -4359,7 +4359,7 @@ dependencies = [

 [[package]]
 name = "pstr-android"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
 "android_logger",
 "jni 0.21.1",
@@ -4378,7 +4378,7 @@ dependencies = [

 [[package]]
 name = "pstr-app"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
 "anyhow",
 "chrono",
@@ -4409,7 +4409,7 @@ dependencies = [

 [[package]]
 name = "pstr-cli"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
 "anyhow",
 "clap",
@@ -4427,7 +4427,7 @@ dependencies = [

 [[package]]
 name = "pstr-core"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
 "directories",
 "futures",
@@ -4445,7 +4445,7 @@ dependencies = [

 [[package]]
 name = "pstr-meta"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
 "pstr-core",
 "reqwest",
@@ -4458,7 +4458,7 @@ dependencies = [

 [[package]]
 name = "pstr-player"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
 "async-trait",
 "libloading",
@@ -4473,7 +4473,7 @@ dependencies = [

 [[package]]
 name = "pstr-stream"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
 "async-trait",
 "futures",
@@ -11,7 +11,7 @@ members = [
 ]

 [workspace.package]
-version = "1.1.0"
+version = "1.1.2"
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/narrrl/proton-stream"
@@ -7,7 +7,7 @@ distributions.
 | Component | License |
 |---|---|
 | mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
-| LLVM libc++ shared runtime (Android NDK r29) | Apache-2.0 WITH LLVM-exception |
+| LLVM libc++ shared runtime (Android NDK r30) | Apache-2.0 WITH LLVM-exception |
 | AndroidX and Jetpack Compose | Apache-2.0 |
 | Kotlin | Apache-2.0 |
 | JNA | Apache-2.0 or LGPL-2.1-or-later |
@@ -47,7 +47,7 @@ android {
    namespace = "io.narl.protonstream"
    compileSdk = 36
    buildToolsVersion = "37.0.0"
-    ndkVersion = "29.0.14206865"
+    ndkVersion = "30.0.16248370"

    defaultConfig {
        applicationId = "io.narl.protonstream"
@@ -6,7 +6,7 @@ complete GNU GPL version 3 text is packaged beside this file as `GPL-3.0.txt`.
 | Component | License |
 |---|---|
 | mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
-| LLVM libc++ shared runtime (Android NDK r29) | Apache-2.0 WITH LLVM-exception |
+| LLVM libc++ shared runtime (Android NDK r30) | Apache-2.0 WITH LLVM-exception |
 | AndroidX and Jetpack Compose | Apache-2.0 |
 | Kotlin | Apache-2.0 |
 | JNA | Apache-2.0 or LGPL-2.1-or-later |
@@ -2,6 +2,7 @@ package io.narl.protonstream.ui.theme

 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -9,6 +10,7 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.LocalMinimumInteractiveComponentSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBarItemDefaults
 import androidx.compose.material3.NavigationDrawerItemDefaults
@@ -18,14 +20,18 @@ import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaul
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItemColors
 import androidx.compose.material3.SliderState
 import androidx.compose.material3.TextButton
+import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp

 /**
@@ -68,17 +74,30 @@ internal fun AccentButton(
    content: @Composable RowScope.() -> Unit,
 ) {
    val shape = MaterialTheme.shapes.small
-    Button(
-        onClick = onClick,
-        // Only while it is live: a disabled button keeps Material's flat
-        // disabled container, because a greyed control that still wears the
-        // one strong colour in the window reads as pressable.
-        modifier = if (enabled) modifier.background(accentBrush(), shape) else modifier,
-        enabled = enabled,
-        shape = shape,
-        colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent),
-        content = content,
-    )
+    // The button pads itself out to the 48dp minimum touch target, and a
+    // background on its modifier fills that whole target — 8dp taller than
+    // the 40dp container every other button draws. So the padding is taken
+    // here, outside the ramp, and the button inside is told not to add its
+    // own. The box hands its size down, so a `fillMaxWidth` still reaches it.
+    Box(
+        modifier.minimumInteractiveComponentSize(),
+        contentAlignment = Alignment.Center,
+        propagateMinConstraints = true,
+    ) {
+        CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
+            Button(
+                onClick = onClick,
+                // Only while it is live: a disabled button keeps Material's flat
+                // disabled container, because a greyed control that still wears the
+                // one strong colour in the window reads as pressable.
+                modifier = if (enabled) Modifier.background(accentBrush(), shape) else Modifier,
+                enabled = enabled,
+                shape = shape,
+                colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent),
+                content = content,
+            )
+        }
+    }
 }

@Composable
@@ -10,7 +10,7 @@ reimplementing it in Kotlin.
 ## Toolchain

 Install JDK 17, Android SDK Platform/Build Tools 36, NDK
-`29.0.14206865`, Rust 1.96, Gradle 8.13, and the native helpers:
+`30.0.16248370`, Rust 1.96, Gradle 8.13, and the native helpers:

 ```bash
 rustup target add aarch64-linux-android x86_64-linux-android
@@ -14,7 +14,7 @@
 #     builds from the registry alone.

 pkgname=proton-stream
-pkgver=1.1.0
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="Netflix-style desktop client for Proton Drive public links: browse and stream a share"
 arch=('x86_64')
@@ -4,7 +4,7 @@ set -euo pipefail
 script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
 repo_root="$(cd -- "$script_dir/.." && pwd)"
 source_dir="${PSTR_MPV_SOURCE_DIR:-$repo_root/.build/mpv-android}"
-revision=20a3fa526fac6d3fe267aee0d4c349893fee65a3
+revision=687c7fd586d826fd0387809e14bec7a2b4fc45a1
 destination="$repo_root/android/app/build/generated/mpv"

 # The staged tree depends only on the pinned revision and on this script, which
@@ -32,19 +32,19 @@ git -C "$source_dir" submodule update --init --recursive
 if [[ -n "${ANDROID_NDK_HOME:-}" ]]; then
  ndk_dir="$ANDROID_NDK_HOME"
 elif [[ -n "${ANDROID_HOME:-}" ]]; then
-  ndk_dir="$ANDROID_HOME/ndk/29.0.14206865"
+  ndk_dir="$ANDROID_HOME/ndk/30.0.16248370"
 else
-  echo "error: set ANDROID_NDK_HOME or ANDROID_HOME to an Android NDK r29 installation" >&2
+  echo "error: set ANDROID_NDK_HOME or ANDROID_HOME to an Android NDK r30 installation" >&2
  exit 1
 fi
 if [[ ! -f "$ndk_dir/source.properties" ]] ||
-   ! grep -q '^Pkg.Revision = 29\.0\.14206865$' "$ndk_dir/source.properties"; then
-  echo "error: libmpv requires Android NDK 29.0.14206865: $ndk_dir" >&2
+   ! grep -q '^Pkg.Revision = 30\.0\.16248370$' "$ndk_dir/source.properties"; then
+  echo "error: libmpv requires Android NDK 30.0.16248370: $ndk_dir" >&2
  exit 1
 fi
 ndk_dir="$(cd -- "$ndk_dir" && pwd -P)"
 mpv_sdk_dir="$source_dir/buildscripts/sdk"
-mpv_ndk_link="$mpv_sdk_dir/android-ndk-r29"
+mpv_ndk_link="$mpv_sdk_dir/android-ndk-r30"
 mkdir -p "$mpv_sdk_dir"
 if [[ -e "$mpv_ndk_link" && ! -L "$mpv_ndk_link" ]]; then
  echo "error: refusing to replace non-symlink NDK path: $mpv_ndk_link" >&2
Author	SHA1	Message	Date
nvrl	67cf3044f1	fix(android): keep the accent button's width and corners Moving the gradient onto a row inside the button lost both: the button's own row hands its children no minimum size, so a fillMaxWidth button painted the ramp only behind its label, and with square corners. The gradient goes back on the button, and the 48dp touch-target padding is taken by a box around it instead, with the button inside told not to add its own. The primary button now matches the other buttons' 40dp container at every width. The screenshots are re-recorded for it.	2026-10-04 17:14:11 +02:00
nvrl	66be35c3d4	chore(version): bump to 1.1.2 Patch. The only change since 1.1.1 is on Android: the primary button on the library hero no longer draws taller than the button beside it. The catalog schema and on-disk data are unchanged from 1.1.1.	2026-10-04 16:55:38 +02:00
nvrl	046cfe62b8	fix(android): paint the accent button's gradient inside its container The gradient sat on the outer modifier, which Material pads out to the 48dp minimum touch target, so the primary button drew 8dp taller than the 40dp tonal button beside it on the library hero.	2026-10-04 16:45:25 +02:00
nvrl	e3dcbec1f2	chore(version): bump to 1.1.1 Patch, not minor. Nothing a viewer uses changes: the Android build moves to NDK r30 and mpv-android 687c7fd, which brings newer harfbuzz, fribidi, unibreak, fontconfig, libxml2 and curl into the bundled libmpv. The catalog schema and on-disk data are unchanged from 1.1.0.	2026-10-04 02:54:21 +02:00
nvrl	99abc8f205	build(android): move to NDK r30 and mpv-android 687c7fd Upstream mpv-android moved its build to NDK r30 (30.0.16248370), and each mpv-android revision pins its own NDK, so the two move together. The new revision also updates harfbuzz to 14.5.0, unibreak to 8.0, fribidi to 1.0.17, libxml2 to 2.15.4, fontconfig to 2.18.3 and curl to 8.22.0, and builds libass with assembly on x86_64 (nasm, already installed in CI). r30 brings an LLVM update with codegen and LTO fixes and sysroots up to API 37. It is also the NDK current SDK managers install, so a fresh setup no longer needs r29 installed beside it. The script change invalidates the cached libmpv tree, so CI rebuilds it once. The staged libraries are the same set as before, all 16 KiB aligned.	2026-10-04 02:42:53 +02:00