examples: winit simplifications

* Since we can rely on `Resumed` events for all platforms with Winit 0.27
we can remove the alternative `NewEvents` path for initializing state.
* Removes some unnecessary abstraction for the app state.
* Bumps agdk-egui to egui 0.19 (Winit 0.27)

Author: rib

agdk-egui/Cargo.toml

@@ -11,21 +11,15 @@ log = "0.4"
 winit = "0.27"
 wgpu = "0.13.0"
 pollster = "0.2"
-egui = "0.18"
-egui-wgpu = { version = "0.18", features = [ "winit" ] }
-egui-winit = { version = "0.18", default-features = false }
-egui_demo_lib = "0.18"
+egui = "0.19"
+egui-wgpu = { version = "0.19", features = [ "winit" ] }
+egui-winit = { version = "0.19", default-features = false }
+egui_demo_lib = "0.19"
 
 [patch.crates-io]
 winit = { git = "https://github.com/rib/winit", branch = "android-activity-0.27" }
 #winit = { path="../../../winit" }
 
-egui = { git = "https://github.com/budde25/egui", branch = "bump-winit" }
-egui-wgpu = { git = "https://github.com/budde25/egui", branch = "bump-winit" }
-egui-winit = { git = "https://github.com/budde25/egui", branch = "bump-winit" }
-egui_extras = { git = "https://github.com/budde25/egui", branch = "bump-winit" }
-egui_demo_lib = { git = "https://github.com/budde25/egui", branch = "bump-winit" }
-
 #egui = { git = "https://github.com/emilk/egui" }
 #egui-wgpu = { git = "https://github.com/emilk/egui" }
 #egui-winit = { git = "https://github.com/emilk/egui" }

agdk-egui/src/lib.rs

@@ -1,10 +1,7 @@
-use log::Level;
 use winit::event_loop::{EventLoop, EventLoopBuilder, EventLoopWindowTarget};
 
 #[cfg(target_os = "android")]
 use android_activity::AndroidApp;
-#[cfg(target_os = "android")]
-use winit::platform::android::EventLoopBuilderExtAndroid;
 
 use winit::event_loop::ControlFlow;
 
@@ -87,15 +84,7 @@ fn _main(event_loop: EventLoop<Event>) {
     let mut window: Option<winit::window::Window> = None;
     let mut egui_demo_windows = egui_demo_lib::DemoWindows::default();
 
-    // On most platforms we can immediately create a winit window. On Android we manage
-    // window + surface state according to Resumed/Paused events.
-    #[cfg(not(target_os = "android"))]
-    {
-        window = Some(create_window(&event_loop, &mut state, &mut painter));
-    }
-
     event_loop.run(move |event, event_loop, control_flow| match event {
-        #[cfg(target_os = "android")]
         Resumed => match window {
             None => {
                 window = Some(create_window(event_loop, &mut state, &mut painter));
@@ -105,12 +94,9 @@ fn _main(event_loop: EventLoop<Event>) {
                 window.request_redraw();
             }
         },
-
-        #[cfg(target_os = "android")]
         Suspended => {
             window = None;
         }
-
         RedrawRequested(..) => {
             if let Some(window) = window.as_ref() {
                 let raw_input = state.take_egui_input(window);
@@ -154,17 +140,21 @@ fn _main(event_loop: EventLoop<Event>) {
     });
 }
 
+#[allow(dead_code)]
 #[cfg(target_os = "android")]
 #[no_mangle]
 fn android_main(app: AndroidApp) {
-    android_logger::init_once(android_logger::Config::default().with_min_level(Level::Trace));
+    use winit::platform::android::EventLoopBuilderExtAndroid;
+
+    android_logger::init_once(android_logger::Config::default().with_min_level(log::Level::Trace));
 
     let event_loop = EventLoopBuilder::with_user_event()
         .with_android_app(app)
         .build();
     _main(event_loop);
 }
 
+#[allow(dead_code)]
 #[cfg(not(target_os = "android"))]
 fn main() {
     env_logger::builder()