diff --git a/Cargo.toml b/Cargo.toml index e0bdac4..0e25f11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ openssl-sys = { version = "0.9.82", features = ["vendored"] } #grin_wallet_util = "5.1.0" egui = "0.21.0" -egui-winit = "0.21.1" +egui-winit = { version = "0.21.1", features = ['default', 'bytemuck', 'android-game-activity'] } wgpu = "0.15.1" egui_wgpu_backend = "0.22.0" epi = "0.17.0" @@ -41,6 +41,9 @@ egui_demo_lib = "0.21.0" ## grin_servers futures = "0.3" +[patch.crates-io] +egui-winit = { path = '../egui/crates/egui-winit' } + [build-dependencies] built = { version = "0.6.0", features = ["git2"]} @@ -50,7 +53,7 @@ winit = { version = "0.28.3" } [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.13.1" -winit = { version = "0.28.3", features = [ "android-native-activity" ] } +winit = { version = "0.28.3", features = [ "android-game-activity" ] } [lib] name="grin_android" diff --git a/app/src/main/java/mw/gri/android/MainActivity.java b/app/src/main/java/mw/gri/android/MainActivity.java index 915ac11..6356711 100644 --- a/app/src/main/java/mw/gri/android/MainActivity.java +++ b/app/src/main/java/mw/gri/android/MainActivity.java @@ -1,11 +1,11 @@ package mw.gri.android; -import android.app.NativeActivity; import android.os.Bundle; import android.system.ErrnoException; import android.system.Os; +import com.google.androidgamesdk.GameActivity; -public class MainActivity extends NativeActivity { +public class MainActivity extends GameActivity { static { System.loadLibrary("grin_android");