From b21e39dea9da8b0cfcfd5315ad6bded11229e708 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Tue, 28 Jan 2025 13:35:43 -0800 Subject: [PATCH] android: get GameActivity to launch For some reason there are no touch inputs though Signed-off-by: William Casarin --- Cargo.toml | 2 +- crates/notedeck_chrome/Cargo.toml | 4 ++-- .../notedeck_chrome/android/app/src/main/AndroidManifest.xml | 2 +- .../app/src/main/java/com/damus/notedeck/MainActivity.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9d4a1f2..5c04d3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ rmpv = "1.3.0" bech32 = { version = "0.11", default-features = false } bitflags = "2.5.0" dirs = "5.0.1" -eframe = { version = "0.29.1", default-features = false, features = [ "wgpu", "wayland", "x11", "android-native-activity" ] } +eframe = { version = "0.29.1", default-features = false, features = [ "wgpu", "wayland", "x11", "android-game-activity" ] } egui = { version = "0.29.1", features = ["serde"] } egui_extras = { version = "0.29.1", features = ["all_loaders"] } egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "ac7d663307b76634757024b438dd4b899790da99" } diff --git a/crates/notedeck_chrome/Cargo.toml b/crates/notedeck_chrome/Cargo.toml index 6b6d348..1476c81 100644 --- a/crates/notedeck_chrome/Cargo.toml +++ b/crates/notedeck_chrome/Cargo.toml @@ -47,8 +47,8 @@ debug-interactive-widgets = [] [target.'cfg(target_os = "android")'.dependencies] tracing-logcat = "0.1.0" log = { workspace = true } -android-activity = { version = "0.4", features = [ "native-activity" ] } -winit = { version = "0.30.5", features = [ "android-native-activity" ] } +android-activity = { version = "0.4", features = [ "game-activity" ] } +winit = { version = "0.30.5", features = [ "android-game-activity" ] } [package.metadata.bundle] name = "Notedeck" diff --git a/crates/notedeck_chrome/android/app/src/main/AndroidManifest.xml b/crates/notedeck_chrome/android/app/src/main/AndroidManifest.xml index 8b28c53..6ea8c60 100644 --- a/crates/notedeck_chrome/android/app/src/main/AndroidManifest.xml +++ b/crates/notedeck_chrome/android/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:value="notedeck_chrome" /> diff --git a/crates/notedeck_chrome/android/app/src/main/java/com/damus/notedeck/MainActivity.java b/crates/notedeck_chrome/android/app/src/main/java/com/damus/notedeck/MainActivity.java index 34fd8a5..4a52877 100644 --- a/crates/notedeck_chrome/android/app/src/main/java/com/damus/notedeck/MainActivity.java +++ b/crates/notedeck_chrome/android/app/src/main/java/com/damus/notedeck/MainActivity.java @@ -16,7 +16,7 @@ import com.google.androidgamesdk.GameActivity; public class MainActivity extends GameActivity { static { - System.loadLibrary("main"); + System.loadLibrary("notedeck_chrome"); } @Override