Update examples to use android_activity

examples/agdk-egui/Cargo.toml

@@ -17,7 +17,7 @@ egui-winit = { version = "0.18", default-features = false }
 egui_demo_lib = "0.18"
 
 [patch.crates-io]
-winit = { git = "https://github.com/rib/winit", branch = "agdk-game-activity" }
+winit = { git = "https://github.com/rib/winit", branch = "android-activity" }
 #winit = { path="../../../winit" }
 
 egui = { git = "https://github.com/emilk/egui" }
@@ -37,7 +37,7 @@ env_logger = "0.9"
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.11.0"
-game-activity = { path="../../game-activity" }
+android-activity = { path="../../android-activity", features = [ "game-activity" ] }
 
 [features]
 default = []

examples/agdk-egui/src/lib.rs

@@ -1,11 +1,11 @@
 use log::Level;
 use winit::event_loop::{EventLoopWindowTarget, EventLoopBuilder, EventLoop};
 
+#[cfg(target_os="android")]
+use android_activity::AndroidApp;
 #[cfg(target_os="android")]
 use winit::platform::android::EventLoopBuilderExtAndroid;
 
-use game_activity::AndroidApp;
-
 use winit::{
     event_loop::{ControlFlow},
 };

examples/agdk-mainloop/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 log = "0.4"
 android_logger = "0.11.0"
-game-activity = { path="../../game-activity" }
+android-activity = { path="../../android-activity", features = "game-activity" }
 
 [lib]
 name="main"

examples/agdk-mainloop/src/lib.rs

@@ -1,4 +1,4 @@
-use game_activity::{AndroidApp, PollEvent, MainEvent};
+use android_activity::{AndroidApp, PollEvent, MainEvent};
 use log::info;
 
 #[no_mangle]

examples/agdk-winit-wgpu/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-winit = { git = "https://github.com/rib/winit", branch = "agdk-game-activity" }
+winit = { git = "https://github.com/rib/winit", branch = "android-activity"}
 #winit = { path="../../../winit" }
 wgpu = "0.12.0"
 pollster = "0.2"
@@ -17,7 +17,7 @@ env_logger = "0.9"
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.11.0"
-game-activity = { path="../../game-activity" }
+android-activity = { path="../../android-activity", features = [ "game-activity" ] }
 
 [features]
 default = []

examples/agdk-winit-wgpu/src/lib.rs

@@ -6,8 +6,6 @@ use std::sync::{Arc, RwLock};
 use log::Level;
 use log::trace;
 
-use game_activity::AndroidApp;
-
 use wgpu::TextureFormat;
 use wgpu::{Instance, Adapter, Device, ShaderModule, PipelineLayout, RenderPipeline, Queue};
 
@@ -16,6 +14,8 @@ use winit::{
     event_loop::{ControlFlow, EventLoop, EventLoopBuilder, EventLoopWindowTarget},
 };
 
+#[cfg(target_os="android")]
+use game_activity::AndroidApp;
 #[cfg(target_os="android")]
 use winit::platform::android::EventLoopBuilderExtAndroid;
 
@@ -314,7 +314,7 @@ fn _main(event_loop: EventLoop<()>) {
 
 #[cfg(target_os="android")]
 #[no_mangle]
-extern "C" fn android_main(app: AndroidApp) {
+fn android_main(app: AndroidApp) {
     android_logger::init_once(
         android_logger::Config::default().with_min_level(Level::Trace)
     );
@@ -324,9 +324,6 @@ extern "C" fn android_main(app: AndroidApp) {
         .build();
     _main(event_loop);
 }
-// Stop rust-analyzer from complaining that this file doesn't have a main() function...
-#[cfg(target_os="android")]
-fn main() {}
 
 #[cfg(not(target_os="android"))]
 fn main() {

examples/na-mainloop/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 log = "0.4"
 android_logger = "0.11.0"
-native-activity = { path="../../native-activity" }
+android-activity = { path="../../android-activity", features = [ "native-activity" ] }
 
 [lib]
 #name="na_mainloop"

examples/na-mainloop/src/lib.rs

@@ -1,4 +1,4 @@
-use native_activity::{PollEvent, MainEvent, AndroidApp};
+use android_activity::{PollEvent, MainEvent, AndroidApp};
 use log::info;
 
 #[no_mangle]

examples/na-subclass-jni/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 log = "0.4"
 android_logger = "0.11.0"
-native-activity = { path="../../native-activity" }
+android-activity = { path="../../android-activity", features = [ "native-activity" ] }
 ndk-context = "0.1"
 jni = "0.19"
 

examples/na-subclass-jni/src/lib.rs

@@ -1,5 +1,5 @@
 
-use native_activity::{PollEvent, MainEvent};
+use android_activity::{PollEvent, MainEvent, AndroidApp};
 use log::Level;
 use log::{trace, info};
 use std::time::Duration;
@@ -11,8 +11,7 @@ struct AppState {
 }
 
 #[no_mangle]
-extern "C" fn android_main() {
-
+fn android_main(app: AndroidApp) {
     android_logger::init_once(
         android_logger::Config::default().with_min_level(Level::Info)
     );
@@ -21,7 +20,6 @@ extern "C" fn android_main() {
     let mut redraw_pending = true;
     let mut render_state: Option<()> = Default::default();
 
-    let app = native_activity::android_app();
     while !quit {
         app.poll_events(Some(Duration::from_millis(500)) /* timeout */, |event| {
             match event {

examples/na-winit-wgpu/Cargo.toml

@@ -7,7 +7,8 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
-winit = { version = "0.26", default-features = false, features = [ "native-activity" ] }
+winit = { git = "https://github.com/rib/winit", branch = "android-activity" }
+#winit = { path="../../../winit" }
 wgpu = "0.12.0"
 pollster = "0.2"
 
@@ -16,7 +17,7 @@ env_logger = "0.9"
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.11.0"
-native-activity = { path="../../native-activity" }
+android-activity = { path="../../android-activity", features = [ "native-activity" ] }
 
 [features]
 default = []

examples/na-winit-wgpu/src/lib.rs

@@ -9,13 +9,13 @@ use log::trace;
 use wgpu::TextureFormat;
 use wgpu::{Instance, Adapter, Device, ShaderModule, PipelineLayout, RenderPipeline, Queue};
 
-use native_activity::AndroidApp;
-
 use winit::{
     event::{Event, WindowEvent},
     event_loop::{ControlFlow, EventLoop, EventLoopWindowTarget, EventLoopBuilder},
 };
 
+#[cfg(target_os="android")]
+use android_activity::AndroidApp;
 #[cfg(target_os="android")]
 use winit::platform::android::EventLoopBuilderExtAndroid;