diff --git a/Android/app/src/main/res/drawable/ic_launcher_foreground.xml b/Android/app/src/main/res/drawable/ic_launcher_foreground.xml index 88405981..fcd986e4 100644 --- a/Android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/Android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,8 +1,9 @@ - + + android:scaleX="0.93" + android:scaleY="0.93"> + + + + + + + + + + + + diff --git a/Android/ship-companion.sh b/Android/ship-companion.sh new file mode 100755 index 00000000..8639f7a6 --- /dev/null +++ b/Android/ship-companion.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# +# Build the Android companion app and publish it as the served download +# (neode-ui/public/packages/archipelago-companion.apk.zip), then commit + push. +# +# Use this INSTEAD of `git push` when shipping the companion app, so the +# downloadable APK on the node always matches what's on main. +# +# ./Android/ship-companion.sh +# +set -euo pipefail + +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" +cd "$ROOT" + +export JAVA_HOME="${JAVA_HOME:-/opt/homebrew/opt/openjdk@17}" +export ANDROID_HOME="${ANDROID_HOME:-$HOME/Library/Android/sdk}" + +APK="Android/app/build/outputs/apk/debug/app-debug.apk" +DEST="neode-ui/public/packages/archipelago-companion.apk.zip" + +echo "==> Building debug APK" +( cd Android && ./gradlew :app:assembleDebug --console=plain -q ) +[ -f "$APK" ] || { echo "ERROR: APK not found at $APK" >&2; exit 1; } + +echo "==> Publishing -> $DEST" +mkdir -p "$(dirname "$DEST")" +rm -f "$DEST" +( cd "$(dirname "$APK")" && zip -j -q "$ROOT/$DEST" "$(basename "$APK")" ) + +git add "$DEST" +if git diff --cached --quiet; then + echo "==> Nothing to commit (working tree + APK unchanged)" +else + git commit -q -m "chore(android): update companion apk download" + echo "==> Committed" +fi + +echo "==> Pushing $(git branch --show-current)" +# SHIP_COMPANION lets the pre-push guard know the APK was just refreshed. +SHIP_COMPANION=1 git push origin "$(git branch --show-current)" +echo "==> Done — companion APK published and pushed."