Compare commits

...
Author SHA1 Message Date
waozi a71021c7da Fix Android startup, offline game launch and launcher icon 2026-10-30 21:56:33 -03:00
14 changed files with 114 additions and 6 deletions

No files matched your search

+6
View File
@@ -1,5 +1,11 @@
# Arcade changelog
## 0.7.115
- Arcade opens correctly on Android instead of closing during startup.
- Bundled offline games open with the full library installed.
- The Android launcher icon fills its launcher shape with a larger gamepad.
## 0.7.114
- Apfelwurm Editor uses its painted logo cover in the library.
+1
View File
@@ -54,6 +54,7 @@ run: all
./build/arcade
test: all
python3 tests/android_jni_contract_test.py
python3 tests/game_updates_test.py
$(ZIRAN) fmt --check src/*.zi apps/chess/*.zi tests/chess_engine_behavior.zi tests/chess_app_behavior.zi
python3 tests/chess_locale_test.py
+1 -1
View File
@@ -1 +1 @@
0.7.114
0.7.115
+2 -2
View File
@@ -34,8 +34,8 @@
"arcade": {
"id": "inbe.arcade",
"title": "Arcade",
"version": "0.7.114",
"sequence": 193,
"version": "0.7.115",
"sequence": 194,
"host_api": 41
},
"wurm": {
@@ -52,6 +52,8 @@ public class ArcadeActivity extends NativeActivity {
private native void nativeTextInputCommit(int codepoint);
private native void nativeTextInputBackspace();
private native void nativeTextInputEnter();
// Registered by the locked Kryon host even when using key-event input.
private native void nativeTextInputState(long target, long revision, byte[] value, int cursor, int anchor);
private native int nativeSyncLifecycleState(boolean paused, boolean windowFocused);
private native void nativeInvalidateGraphicsResources();
// Kryon's android_picker: a picked file arrives as a private copy's path.
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
+24 -1
View File
@@ -16,6 +16,27 @@ ROOT = Path(__file__).resolve().parents[1]
ABIS = ['arm64-v8a', 'armeabi-v7a']
def verify_launcher(apk, tools, names):
"""Resolve compiled resource IDs, including shortened release paths."""
resources = subprocess.check_output(
[str(tools / 'aapt'), 'dump', '--values', 'resources', str(apk)], text=True)
entries = re.findall(r'resource (0x[0-9a-f]+) [^\n]+:(drawable/ic_launcher_\w+|mipmap/ic_launcher):[^\n]*\n\s*\(string8\) "([^"]+)"', resources)
paths = {path for _, _, path in entries}
assert paths <= set(names), 'A launcher resource is missing from the APK'
legacy = [path for _, name, path in entries if name == 'mipmap/ic_launcher' and path.endswith('.png')]
assert len(legacy) == 5, 'All five legacy icon densities must be present'
adaptive = [path for _, name, path in entries if name == 'mipmap/ic_launcher' and path.endswith('.xml')]
assert len(adaptive) == 1 and 'config anydpi-v26:' in resources, 'The Android adaptive icon is missing'
layers = {name: identifier for identifier, name, _ in entries if name.startswith('drawable/')}
tree = subprocess.check_output(
[str(tools / 'aapt'), 'dump', 'xmltree', str(apk), adaptive[0]], text=True)
assert 'E: adaptive-icon' in tree, 'The launcher XML is not adaptive'
for layer in ('background', 'foreground'):
identifier = layers.get('drawable/ic_launcher_' + layer)
assert identifier and re.search(r'E: ' + layer + r'[^\n]*\n[^\n]*@' + identifier, tree), \
f'The adaptive {layer} drawable is missing'
def build_tools():
sdk = Path(os.environ.get('ANDROID_SDK_ROOT') or os.environ.get('ANDROID_HOME') or Path.home() / 'Android/Sdk')
folders = sorted((sdk / 'build-tools').glob('*'), key=lambda p: tuple(int(n) for n in re.findall(r'\d+', p.name)))
@@ -31,7 +52,7 @@ def verify(apk, version, tools, edition='direct'):
assert package and package[1] == 'xyz.waozi.arcade' and package[3] == version, 'APK identity or version differs'
assert "application-label:'Arcade'" in badging, 'The APK is not labelled Arcade'
# Release builds shorten resource names; the manifest names the icon.
icon = re.search(r"^application: label='Arcade' icon='(res/[^']+\.png)'", badging, re.M)
icon = re.search(r"^application: label='Arcade' icon='(res/[^']+\.(?:png|xml))'", badging, re.M)
assert icon, "Arcade's launcher icon is missing"
assert 'application-debuggable' not in badging, 'A debug build cannot be published'
google_play = edition == 'gplay'
@@ -48,6 +69,8 @@ def verify(apk, version, tools, edition='direct'):
abis = sorted(p.split('/')[1] for p in names if re.fullmatch(r'lib/[^/]+/libmain\.so', p))
assert abis == ABIS, 'Both supported ARM architectures must be present'
assert icon[1] in names, "Arcade's launcher icon is missing"
if tuple(map(int, version.split('.'))) >= (0, 7, 115):
verify_launcher(apk, tools, names)
metadata = json.loads(archive.read('assets/arcade.json'))
payload = archive.read('assets/arcade.zx')
assert metadata['id'] == 'inbe.arcade' and metadata['version'] == version
+5 -1
View File
@@ -55,7 +55,9 @@ def stage_arcade():
(assets / 'arcade.json').write_text(json.dumps(offline, indent=2) + '\n')
# Android before 10 has no font lookup; the Windows build ships the same font.
shutil.copyfile(package('kryon') / 'assets/fonts/LiberationSans-Regular.ttf', assets / 'kryon-font.ttf')
launcher_icon(ROOT / 'site/icon-512.png', ROOT / 'build/android-res')
launcher_icon(ROOT / 'site/android-launcher-512.png', ROOT / 'build/android-res')
# Only Arcade gets this adaptive icon; standalone Shovey keeps its art.
shutil.copytree(ROOT / 'packaging/android/icon-res', ROOT / 'build/android-res', dirs_exist_ok=True)
return release
def stage_shovey():
@@ -88,6 +90,8 @@ def main():
parser.add_argument('--abis', default='arm64-v8a,armeabi-v7a', help='Native ABIs to build')
parser.add_argument('--build-dir', type=Path, help='Separate Gradle and CMake output for verification')
args = parser.parse_args()
subprocess.run(['python3', str(ROOT / 'tests/android_jni_contract_test.py')],
cwd=ROOT, check=True)
arcade = args.product == 'arcade'
if arcade and args.bundle:
parser.error('Arcade builds APKs; the App Bundle is the standalone Shovey one')
Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

+7
View File
@@ -511,6 +511,13 @@ CollectionOpen :: (bundle: string, digest: string, harness_digest: string,
}
collection_ready = AppHostStart(*collection_host, bundle, "arcade.local", "inbe.arcade",
"arcade", digest, "local", platform, harness_digest, locale)
// The offline collection already contains every game's payload. Keep the
// ordinary bounded game budget available in addition to that resident
// collection; otherwise its packed bytes consume the game's allowance
// before the first game opens. AppHostStart bounds the root to 64 MiB.
if collection_ready && packed {
collection_host.tree.byte_limit = APP_HOST_BYTE_LIMIT + bundle.count
}
if !collection_ready { Report("Arcade: the shared Apps host refused the collection") }
return collection_ready
}
+44
View File
@@ -0,0 +1,44 @@
"""Every native registered on ArcadeActivity must exist with its JNI signature.
Android rejects the entire library in JNI_OnLoad when even one method is
missing. Check the resolved host, so a package update cannot silently ship
an activity that crashes before onCreate.
"""
from pathlib import Path
import re
import subprocess
ROOT = Path(__file__).resolve().parents[1]
def verify():
kryon = Path(subprocess.check_output(
[str(ROOT / 'scripts/ziran.sh'), 'pkg', 'path', 'kryon'],
cwd=ROOT, text=True).strip())
host = (kryon / 'src/backend/android_device.zi').read_text()
glue = (ROOT / 'src/android_glue.zi').read_text()
java = (ROOT / 'droid/app/src/main/java/xyz/waozi/arcade/ArcadeActivity.java').read_text()
types = {'void': 'V', 'int': 'I', 'long': 'J', 'boolean': 'Z',
'float': 'F', 'byte[]': '[B', 'String': 'Ljava/lang/String;'}
declared = {}
for result, name, arguments in re.findall(
r'native\s+(\w+)\s+(\w+)\(([^)]*)\)', java):
parameters = [argument.strip().split()[0] for argument in arguments.split(',') if argument.strip()]
declared[name] = '(' + ''.join(types[t] for t in parameters) + ')' + types[result]
registered = 0
for source in (host, glue):
names = dict((index, name) for name, index in re.findall(
r'CopyCString\("(native\w+)", names\[(\d+)\]', source))
signatures = dict((index, signature) for signature, index in re.findall(
r'CopyCString\("([^"]+)", signatures\[(\d+)\]', source))
for index, name in names.items():
expected = signatures[index]
assert declared.get(name) == expected, (
f'{name}{expected} registered by native host, Java declares {declared.get(name)}')
registered += 1
assert registered >= 12, 'No Android JNI registration contract found'
print(f'Android JNI contract: {registered} registered methods match ArcadeActivity')
if __name__ == '__main__':
verify()
+17 -1
View File
@@ -71,11 +71,27 @@ with tempfile.TemporaryDirectory(prefix='arcade-offline-') as temporary:
driver.wait_gone(label=LEVEL_UPDATES, role='text')
if [node for node in driver.tree() if str(node.get('label', '')).startswith('Level 1 / ')]:
break
assert not driver.find(label='Request rejected'), 'The packed host rejected its game'
assert time.monotonic() < deadline, 'Shovey did not start from the packed collection'
time.sleep(0.05)
if driver.find(label='How do you want to move?', role='text'):
driver.press(label='Swipe and tap')
driver.wait_gone(label='How do you want to move?', role='text')
driver.press(label='Back', role='button')
# Shared-code dependencies and the larger standalone game must
# also fit while the full offline collection remains resident.
for title, marker, role in [('Shovey Editor', 'New level', 'text'),
('Apfelwurm', 'Play', 'button')]:
driver.wait(label=title, role='button')
driver.press(label=title, role='button')
driver.wait(label=marker, role=role, timeout=60)
assert not driver.find(label='Request rejected')
assert not driver.find(label='Download', role='button')
driver.key('escape')
driver.wait(label='Shovey', role='button')
assert not list((profile / 'resources').rglob('*.zx')), 'Nothing may be downloaded'
finally:
if child.poll() is None:
child.terminate()
child.wait(timeout=10)
print('The Android collection opens every game and its art offline')
print('The Android collection draws its art and opens Shovey, its shared-code editor and Apfelwurm offline')