summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crates/wipfel/src/app.rs8
-rw-r--r--dist/wipfel/wipfel.js4
-rw-r--r--dist/wipfel/wipfel_bg.wasmbin511878 -> 511473 bytes
-rw-r--r--wipfel-droid/.gitignore5
-rw-r--r--wipfel-droid/.gradle/8.11.1/checksums/checksums.lockbin17 -> 17 bytes
-rw-r--r--wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.binbin29647 -> 30197 bytes
-rw-r--r--wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.binbin44093 -> 45281 bytes
-rw-r--r--wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.binbin19560 -> 92302 bytes
-rw-r--r--wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lockbin17 -> 17 bytes
-rw-r--r--wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.binbin18697 -> 26347 bytes
-rw-r--r--wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lockbin17 -> 17 bytes
-rw-r--r--wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lockbin17 -> 17 bytes
-rw-r--r--wipfel-droid/.gradle/buildOutputCleanup/outputFiles.binbin18695 -> 22259 bytes
-rw-r--r--wipfel-droid/.gradle/file-system.probebin8 -> 8 bytes
-rw-r--r--wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt2
-rwxr-xr-xwipfel-droid/build.sh24
-rw-r--r--wipfel-droid/gradle.properties1
17 files changed, 39 insertions, 5 deletions
diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs
index 8ae78c4..78961fc 100644
--- a/crates/wipfel/src/app.rs
+++ b/crates/wipfel/src/app.rs
@@ -220,8 +220,12 @@ pub fn app() -> Html {
use_effect_with((), move |_| {
spawn_local(async move {
let result = async {
- let gz = bridge::fetch_bytes("gipfel.dat.gz").await?;
- let raw = gunzip(&gz)?;
+ // aapt gunzips .gz assets, so an APK ships the plain
+ // gipfel.dat while the web dist ships gipfel.dat.gz
+ let raw = match bridge::fetch_bytes("gipfel.dat.gz").await {
+ Ok(gz) => gunzip(&gz)?,
+ Err(_) => bridge::fetch_bytes("gipfel.dat").await?,
+ };
pan.borrow_mut()
.load_data_from_bytes(&raw)
.map_err(|e| format!("load: {e}"))
diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js
index d312617..e1eedc0 100644
--- a/dist/wipfel/wipfel.js
+++ b/dist/wipfel/wipfel.js
@@ -605,7 +605,7 @@ function __wbg_get_imports() {
return ret;
},
__wbindgen_generic_0000000000000002: function(arg0, arg1) {
- // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array<any>"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
+ // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array<any>"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_);
return ret;
},
@@ -615,7 +615,7 @@ function __wbg_get_imports() {
return ret;
},
__wbindgen_generic_0000000000000004: function(arg0, arg1) {
- // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
+ // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_);
return ret;
},
diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm
index 470fd43..3b906d2 100644
--- a/dist/wipfel/wipfel_bg.wasm
+++ b/dist/wipfel/wipfel_bg.wasm
Binary files differ
diff --git a/wipfel-droid/.gitignore b/wipfel-droid/.gitignore
new file mode 100644
index 0000000..1fed1dc
--- /dev/null
+++ b/wipfel-droid/.gitignore
@@ -0,0 +1,5 @@
+.gradle/
+build/
+app/build/
+local.properties
+app/src/main/assets/www/
diff --git a/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock b/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock
index 532a57c..2504abf 100644
--- a/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock
+++ b/wipfel-droid/.gradle/8.11.1/checksums/checksums.lock
Binary files differ
diff --git a/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin b/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin
index 53a3b95..2728bcf 100644
--- a/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin
+++ b/wipfel-droid/.gradle/8.11.1/checksums/md5-checksums.bin
Binary files differ
diff --git a/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin b/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin
index 43f2251..6848c74 100644
--- a/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin
+++ b/wipfel-droid/.gradle/8.11.1/checksums/sha1-checksums.bin
Binary files differ
diff --git a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin
index 7a97448..578da20 100644
--- a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin
+++ b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.bin
Binary files differ
diff --git a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock
index 62e3db2..23a576d 100644
--- a/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock
+++ b/wipfel-droid/.gradle/8.11.1/executionHistory/executionHistory.lock
Binary files differ
diff --git a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin
index ab9d95d..d39e551 100644
--- a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin
+++ b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.bin
Binary files differ
diff --git a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock
index 15a08b4..8963f7a 100644
--- a/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock
+++ b/wipfel-droid/.gradle/8.11.1/fileHashes/fileHashes.lock
Binary files differ
diff --git a/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 023be44..d2bce45 100644
--- a/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/wipfel-droid/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary files differ
diff --git a/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin b/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin
index ffc4b41..6687b95 100644
--- a/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/wipfel-droid/.gradle/buildOutputCleanup/outputFiles.bin
Binary files differ
diff --git a/wipfel-droid/.gradle/file-system.probe b/wipfel-droid/.gradle/file-system.probe
index 147f004..7fa8b5e 100644
--- a/wipfel-droid/.gradle/file-system.probe
+++ b/wipfel-droid/.gradle/file-system.probe
Binary files differ
diff --git a/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt
index 8a62a4a..ae2485d 100644
--- a/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt
+++ b/wipfel-droid/app/src/main/kotlin/org/flpsed/wipfel/MainActivity.kt
@@ -81,7 +81,7 @@ class MainActivity : Activity() {
val uris: Array<Uri>? = if (resultCode == RESULT_OK && data != null) {
val clip = data.clipData
when {
- clip != null -> Array(clip.itemCount) { clip.getItem(it).uri }
+ clip != null -> Array(clip.itemCount) { clip.getItemAt(it).uri }
data.data != null -> arrayOf(data.data!!)
else -> null
}
diff --git a/wipfel-droid/build.sh b/wipfel-droid/build.sh
new file mode 100755
index 0000000..c724374
--- /dev/null
+++ b/wipfel-droid/build.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Build the wipfel Android wrapper: wasm site -> assets -> debug APK.
+# Requires: wasm32 target + wasm-bindgen (cargo), Android SDK, JDK 17+.
+set -euo pipefail
+here="$(cd "$(dirname "$0")" && pwd)"
+repo="$(cd "$here/.." && pwd)"
+
+export ANDROID_HOME="${ANDROID_HOME:-$HOME/android-sdk}"
+export PATH="$PATH:$HOME/.cargo/bin"
+
+echo "==> building wipfel release site"
+( cd "$repo/crates/wipfel" && ./build-release.sh >/dev/null )
+
+echo "==> staging assets"
+mkdir -p "$here/app/src/main/assets/www"
+rm -f "$here/app/src/main/assets/www/"*
+cp "$repo/dist/wipfel/"* "$here/app/src/main/assets/www/"
+
+echo "==> gradle assembleDebug"
+( cd "$here" && ./gradlew assembleDebug --no-daemon -q )
+
+apk="$here/app/build/outputs/apk/debug/app-debug.apk"
+echo "==> done: $apk ($(stat -c%s "$apk") bytes)"
+echo " install: adb install -r $apk"
diff --git a/wipfel-droid/gradle.properties b/wipfel-droid/gradle.properties
index 589cec0..92851f5 100644
--- a/wipfel-droid/gradle.properties
+++ b/wipfel-droid/gradle.properties
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx3g
android.useAndroidX=true
kotlin.code.style=official
+org.gradle.java.home=/home/agent/jdk21