Author SHA1 Message Date
yuriy.pandClaude Opus 5.5 33ab0c8a66 Bump version to 0.1.9 (10)
CI / check (push) Successful in 13m4s
Release / release (push) Successful in 11m33s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:30:52 +06:00
yuriy.pandClaude Opus 5.5 ecdd9abc7f Bump phone app version to 0.1.4 (5)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:30:52 +06:00
yuriy.pandClaude Opus 5.5 6e6b260020 Fill the launcher icon's shape instead of framing it in white
Launchers on Android 8+ and Android Auto put the old icon, a rounded square
with a transparent margin, inside their own shape and filled the margin with
white. Both apps now have an adaptive icon (the gradient behind a wave layer,
which also serves as the themed monochrome icon), and the legacy PNGs are
opaque full-bleed squares, so nothing is left to frame. make_icon.py draws
both with --foreground and --square.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-30 10:30:52 +06:00
Yuriy PanovandClaude Opus 5.5 461a3cf4d4 Install the x86-64 glibc on arm64 runners
CI / check (push) Successful in 13m18s
AGP's aapt2 is built for x86-64 only, so on the mac-mini runner's arm64
containers it can't find its dynamic loader. OrbStack runs it through
Rosetta once the x86-64 glibc is there.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 13:48:14 +06:00
Yuriy PanovandClaude Opus 5.5 35702ba820 Test CI on the mac-mini runner
CI / check (push) Failing after 8m55s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 13:27:21 +06:00
Yuriy PanovandClaude Opus 5.5 2127c48cc9 Run CI on the mac-mini runner
CI / check (push) Failing after 1s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 13:20:07 +06:00
yuriy.pandClaude Opus 5.5 1253b266ea Install the SDK platform as android-37.0
CI / check (push) Failing after 2h1m12s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 12:42:20 +06:00
yuriy.pandClaude Opus 5.5 aa06b6896e Drop the Gradle cache from CI
CI / check (push) Failing after 39s
The runner's cache server doesn't answer, so restoring the cache hangs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 12:34:44 +06:00
yuriy.pandClaude Opus 5.5 39e61d33a6 Cache Gradle through setup-java
CI / check (push) Failing after 7m40s
The runner can't resolve gradle/actions' v4 tag.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 12:27:53 +06:00
yuriy.pandClaude Opus 5.5 9f1b045ead Run CI on the dev_docker_runner_org runner
CI / check (push) Failing after 9m44s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 12:14:36 +06:00
yuriy.pandClaude Opus 5.5 4848e6bed6 Add Gitea Actions CI and tag releases
CI / check (push) Canceled after 0s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 12:05:25 +06:00
30 changed files with 325 additions and 7 deletions

No files matched your search

+61
View File
@@ -0,0 +1,61 @@
# Unit tests, Android Lint and debug builds of both apps on every push to main and every PR.
name: CI
on:
push:
branches: [main]
pull_request:
jobs:
check:
runs-on: mac-mini
# Ubuntu with Node, git and curl, which the setup actions need.
container:
image: gitea/runner-images:ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
# Accepts the SDK licenses, so AGP can fetch the build tools it wants on its own.
- uses: android-actions/setup-android@v3
with:
packages: platform-tools platforms;android-37.0
# The mac-mini runner's containers are arm64, while AGP's aapt2 is built for x86-64 only.
# OrbStack runs it through Rosetta, once the x86-64 glibc it links against is installed.
- name: Install the x86-64 glibc
run: |
if [ "$(uname -m)" != aarch64 ]; then exit 0; fi
# Ubuntu serves amd64 packages from a different archive than arm64 ones.
sed -i '/^URIs:/a Architectures: arm64' /etc/apt/sources.list.d/ubuntu.sources
cat > /etc/apt/sources.list.d/amd64.sources <<EOF
Types: deb
URIs: http://archive.ubuntu.com/ubuntu/
Suites: noble noble-updates noble-security
Components: main
Architectures: amd64
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
EOF
dpkg --add-architecture amd64
# apt only warns when a lookup fails, and the runner's DNS sometimes does.
for attempt in 1 2 3 4 5; do
apt-get update -qq && apt-cache show libc6:amd64 > /dev/null 2>&1 && break
sleep 5
done
apt-get install -y -qq --no-install-recommends libc6:amd64
- run: ./gradlew testDebugUnitTest lint assembleDebug
# Gitea's artifact backend speaks the v3 protocol only.
- if: failure()
uses: actions/upload-artifact@v3
with:
name: reports
path: |
*/build/reports/
*/build/test-results/
if-no-files-found: ignore
+178
View File
@@ -0,0 +1,178 @@
# Pushing a tag v<phone>-tv<tv> builds both apps signed with the release key and publishes them
# on the tag's release, creating it if it doesn't exist yet. Run by hand, it's a dry run: it
# builds and checks the signatures, then keeps the APKs as run artifacts instead of publishing.
name: Release
on:
push:
tags: ['v*']
workflow_dispatch:
env:
# The start of the release key's SHA-256 certificate digest, as apksigner prints it.
RELEASE_CERT: df4c799f
jobs:
release:
runs-on: mac-mini
container:
image: gitea/runner-images:ubuntu-24.04
permissions:
contents: write
steps:
- uses: actions/checkout@v4
with:
# The whole history and tags, for the changes since the last release.
fetch-depth: 0
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
- uses: android-actions/setup-android@v3
with:
packages: platform-tools platforms;android-37.0
# aapt2 is x86-64 only, see ci.yml.
- name: Install the x86-64 glibc
run: |
if [ "$(uname -m)" != aarch64 ]; then exit 0; fi
sed -i '/^URIs:/a Architectures: arm64' /etc/apt/sources.list.d/ubuntu.sources
cat > /etc/apt/sources.list.d/amd64.sources <<EOF
Types: deb
URIs: http://archive.ubuntu.com/ubuntu/
Suites: noble noble-updates noble-security
Components: main
Architectures: amd64
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
EOF
dpkg --add-architecture amd64
for attempt in 1 2 3 4 5; do
apt-get update -qq && apt-cache show libc6:amd64 > /dev/null 2>&1 && break
sleep 5
done
apt-get install -y -qq --no-install-recommends libc6:amd64
- name: Read versions
id: versions
run: |
name() { sed -nE 's/^[[:space:]]*versionName = "(.*)"/\1/p' "$1/build.gradle.kts"; }
code() { sed -nE 's/^[[:space:]]*versionCode = ([0-9]+)/\1/p' "$1/build.gradle.kts"; }
{
echo "tv_name=$(name tv)"
echo "tv_code=$(code tv)"
echo "phone_name=$(name mobile)"
echo "phone_code=$(code mobile)"
echo "tag=v$(name mobile)-tv$(name tv)"
} >> "$GITHUB_OUTPUT"
- name: Check the tag matches the versions
if: gitea.event_name == 'push'
env:
TAG: ${{ gitea.ref_name }}
EXPECTED: ${{ steps.versions.outputs.tag }}
run: |
if [ "$TAG" != "$EXPECTED" ]; then
echo "::error::Tag $TAG doesn't match the app versions, which want $EXPECTED"
exit 1
fi
- name: Write keystore.properties
env:
KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
run: |
# Without these the build would quietly sign with a debug key.
for secret in KEYSTORE_BASE64 STORE_PASSWORD KEY_ALIAS KEY_PASSWORD; do
if [ -z "${!secret}" ]; then
echo "::error::The RELEASE_$secret secret isn't set"
exit 1
fi
done
umask 077
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/musyx.keystore"
# Properties files treat a backslash as an escape.
escape() { printf '%s' "${1//\\/\\\\}"; }
{
echo "storeFile=$(escape "$RUNNER_TEMP/musyx.keystore")"
echo "storePassword=$(escape "$STORE_PASSWORD")"
echo "keyAlias=$(escape "$KEY_ALIAS")"
echo "keyPassword=$(escape "$KEY_PASSWORD")"
} > keystore.properties
- run: ./gradlew :tv:assembleRelease :mobile:assembleRelease
- name: Check the signatures
run: |
apksigner="$(ls -d "$ANDROID_HOME"/build-tools/* | sort -V | tail -1)/apksigner"
for apk in tv/build/outputs/apk/release/tv-release.apk mobile/build/outputs/apk/release/mobile-release.apk; do
if ! "$apksigner" verify --print-certs "$apk" | grep -q "SHA-256 digest: $RELEASE_CERT"; then
echo "::error::$apk isn't signed with the release key"
exit 1
fi
done
- name: Keep the APKs
if: gitea.event_name == 'workflow_dispatch'
uses: actions/upload-artifact@v3
with:
name: apks
path: |
tv/build/outputs/apk/release/tv-release.apk
mobile/build/outputs/apk/release/mobile-release.apk
- name: Publish the release
if: gitea.event_name == 'push'
env:
TOKEN: ${{ secrets.GITEA_TOKEN }}
API: ${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}
TAG: ${{ gitea.ref_name }}
TV_NAME: ${{ steps.versions.outputs.tv_name }}
TV_CODE: ${{ steps.versions.outputs.tv_code }}
PHONE_NAME: ${{ steps.versions.outputs.phone_name }}
PHONE_CODE: ${{ steps.versions.outputs.phone_code }}
run: |
api() { curl -sSf -H "Authorization: token $TOKEN" "$@"; }
json() { python3 -c "import json, sys; d = json.load(sys.stdin); $1"; }
# A release made by hand for the tag keeps its notes; otherwise write them.
if release=$(api "$API/releases/tags/$TAG" 2>/dev/null); then
id=$(echo "$release" | json 'print(d["id"])')
else
previous=$(git describe --tags --abbrev=0 --match 'v*' "$TAG^" 2>/dev/null || true)
changes=$(git log --no-merges --format='- %s' "${previous:+$previous..}$TAG" | grep -v '^- Bump ' || true)
cat > "$RUNNER_TEMP/notes.md" <<EOF
Android TV app **$TV_NAME** (build $TV_CODE) and phone app **$PHONE_NAME** (build $PHONE_CODE).
- \`tv-release.apk\` — Android TV
- \`mobile-release.apk\` — phone, with Android Auto
### Recent changes
$changes
EOF
id=$(python3 -c 'import json, os, sys; e = os.environ; print(json.dumps({
"tag_name": e["TAG"],
"name": "TV " + e["TV_NAME"] + " · Phone " + e["PHONE_NAME"],
"body": open(sys.argv[1]).read(),
}))' "$RUNNER_TEMP/notes.md" \
| api -X POST -H 'Content-Type: application/json' --data @- "$API/releases" \
| json 'print(d["id"])')
fi
# Replace any earlier upload of the same APKs.
api "$API/releases/$id/assets" \
| json 'print("\n".join(str(a["id"]) for a in d if a["name"] in ("tv-release.apk", "mobile-release.apk")))' \
| while read -r asset; do
if [ -n "$asset" ]; then api -X DELETE "$API/releases/$id/assets/$asset"; fi
done
for apk in tv/build/outputs/apk/release/tv-release.apk mobile/build/outputs/apk/release/mobile-release.apk; do
api -X POST -F "attachment=@$apk" "$API/releases/$id/assets?name=$(basename "$apk")" > /dev/null
done
echo "Published $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/tag/$TAG"
- name: Remove the key
if: always()
run: rm -f keystore.properties "$RUNNER_TEMP/musyx.keystore"
+25
View File
@@ -82,6 +82,31 @@ changing the sources:
- `python3 tool/make_icon.py assets/icon/musyx.png` redraws the icon itself. - `python3 tool/make_icon.py assets/icon/musyx.png` redraws the icon itself.
- The fonts are copied by hand from `assets/fonts` to `res/font` (lower-case names). - The fonts are copied by hand from `assets/fonts` to `res/font` (lower-case names).
### CI and releases
Gitea Actions runs `.gitea/workflows/ci.yml` on every push to `main` and every pull request:
the unit tests, Lint and debug builds of both apps. A failed run keeps the reports as an
artifact.
To release, bump `versionName` and `versionCode` in `tv/build.gradle.kts` and/or
`mobile/build.gradle.kts`, commit, and push a tag named `v<phone>-tv<tv>`:
```bash
git tag v0.1.3-tv0.1.8 && git push origin v0.1.3-tv0.1.8
```
`.gitea/workflows/release.yml` then checks that the tag matches the versions, builds both
apps signed with the release key, and attaches `tv-release.apk` and `mobile-release.apk` to
the tag's release. It creates the release if there isn't one yet, with the commit subjects
since the previous tag as its notes; a release written by hand beforehand keeps its notes.
Running the workflow by hand from the Actions tab is a dry run that keeps the signed APKs as
an artifact instead of publishing.
The key comes from four repository secrets (Settings, Actions, Secrets):
`RELEASE_KEYSTORE_BASE64` (the keystore, from `base64 -i musyx-key.keystore`),
`RELEASE_STORE_PASSWORD`, `RELEASE_KEY_ALIAS` and `RELEASE_KEY_PASSWORD`, the same values
`keystore.properties` holds locally.
## Layout ## Layout
- `core/`: what the apps share (`it.panov.musyx`), under `core/src/main/java/it/panov/musyx`: - `core/`: what the apps share (`it.panov.musyx`), under `core/src/main/java/it/panov/musyx`:
+2 -2
View File
@@ -13,8 +13,8 @@ android {
applicationId = "it.panov.musyx" applicationId = "it.panov.musyx"
minSdk = 23 minSdk = 23
targetSdk = 37 targetSdk = 37
versionCode = 4 versionCode = 5
versionName = "0.1.3" versionName = "0.1.4"
} }
// The same keystore.properties as the TV app; without one, release builds use the debug key. // The same keystore.properties as the TV app; without one, release builds use the debug key.
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- The aubergine gradient behind the launcher icon's waves. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:endColor="#1C1A22"
android:startColor="#353042" />
</shape>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Full-bleed layers, so launchers fill their icon shape instead of framing
the legacy PNG. Drawn by tool/make_icon.py in foreground mode. -->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
<monochrome android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

+25 -3
View File
@@ -3,6 +3,16 @@
Aubergine squircle with amber wave lines, matching the My Wave hero. Aubergine squircle with amber wave lines, matching the My Wave hero.
Usage: python3 tool/make_icon.py assets/icon/musyx.png Usage: python3 tool/make_icon.py assets/icon/musyx.png
With --foreground it draws the adaptive icon's foreground instead: the waves
alone on a transparent, full-bleed 108dp canvas, laid out so the launcher's
mask (the middle 72dp) shows what the squircle does. The background layer is
the gradient in res/drawable/ic_launcher_background.xml.
With --square it draws the legacy res/mipmap-*/ic_launcher.png: the artwork as
an opaque, full-bleed square. Anything that still loads the legacy icon on a
newer Android (Android Auto's media header does) wraps it in a shape, and any
transparent margin left in it shows there as a white frame.
""" """
import math import math
import struct import struct
@@ -12,6 +22,12 @@ import zlib
SIZE = 1024 SIZE = 1024
# macOS icon grid: the body is 824px, centred, with a ~185px corner radius. # macOS icon grid: the body is 824px, centred, with a ~185px corner radius.
BODY, RADIUS = 824, 185 BODY, RADIUS = 824, 185
FOREGROUND = "--foreground" in sys.argv
SQUARE = "--square" in sys.argv
if FOREGROUND:
BODY = SIZE * 72 / 108
if SQUARE:
BODY = SIZE
OFF = (SIZE - BODY) / 2 OFF = (SIZE - BODY) / 2
TOP, BOTTOM = (0x35, 0x30, 0x42), (0x1C, 0x1A, 0x22) TOP, BOTTOM = (0x35, 0x30, 0x42), (0x1C, 0x1A, 0x22)
AMBER = (0xF0, 0xB2, 0x3E) AMBER = (0xF0, 0xB2, 0x3E)
@@ -51,21 +67,26 @@ def main(out):
t = y / SIZE t = y / SIZE
bg = tuple(round(TOP[i] + (BOTTOM[i] - TOP[i]) * t) for i in range(3)) bg = tuple(round(TOP[i] + (BOTTOM[i] - TOP[i]) * t) for i in range(3))
for x in range(SIZE): for x in range(SIZE):
cover = rounded_alpha(x, y) cover = 1.0 if FOREGROUND or SQUARE else rounded_alpha(x, y)
if cover == 0.0: if cover == 0.0:
row += b"\x00\x00\x00\x00" row += b"\x00\x00\x00\x00"
continue continue
r, g, b = bg r, g, b = bg
clear = 1.0 # how much of the background the lines leave showing
for k in range(LINES): for k in range(LINES):
cy, slope = curves[k][x] cy, slope = curves[k][x]
dist = abs(y + 0.5 - cy) / math.sqrt(1 + slope * slope) dist = abs(y + 0.5 - cy) / math.sqrt(1 + slope * slope)
width = 4.0 + k * 0.9 width = (4.0 + k * 0.9) * BODY / 824
a = min(max(width / 2 - dist + 0.5, 0.0), 1.0) a = min(max(width / 2 - dist + 0.5, 0.0), 1.0)
if a: if a:
a *= 0.18 + 0.82 * (k / (LINES - 1)) a *= 0.18 + 0.82 * (k / (LINES - 1))
clear *= 1 - a
r = r + (AMBER[0] - r) * a r = r + (AMBER[0] - r) * a
g = g + (AMBER[1] - g) * a g = g + (AMBER[1] - g) * a
b = b + (AMBER[2] - b) * a b = b + (AMBER[2] - b) * a
if FOREGROUND:
row += bytes((*AMBER, round((1 - clear) * 255)))
else:
row += bytes((round(r), round(g), round(b), round(cover * 255))) row += bytes((round(r), round(g), round(b), round(cover * 255)))
rows.append(bytes(row)) rows.append(bytes(row))
@@ -81,4 +102,5 @@ def main(out):
if __name__ == "__main__": if __name__ == "__main__":
main(sys.argv[1] if len(sys.argv) > 1 else "musyx.png") args = [a for a in sys.argv[1:] if not a.startswith("--")]
main(args[0] if args else "musyx.png")
+2 -2
View File
@@ -14,8 +14,8 @@ android {
// Compose (and so Compose for TV) needs API 23. // Compose (and so Compose for TV) needs API 23.
minSdk = 23 minSdk = 23
targetSdk = 37 targetSdk = 37
versionCode = 9 versionCode = 10
versionName = "0.1.8" versionName = "0.1.9"
} }
// A release key comes from keystore.properties (gitignored): storeFile, storePassword, // A release key comes from keystore.properties (gitignored): storeFile, storePassword,
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- The aubergine gradient behind the launcher icon's waves. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:endColor="#1C1A22"
android:startColor="#353042" />
</shape>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Full-bleed layers, so launchers fill their icon shape instead of framing
the legacy PNG. Drawn by tool/make_icon.py in foreground mode. -->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
<monochrome android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB