Simplify Iris app initialization and task updates

examples/task/android.rs

@@ -2,19 +2,11 @@ use iris::prelude::*;
 
 #[path = "lib.rs"]
 mod app;
-use app::*;
-
-#[derive(AndroidUiState)]
-struct State {
-    ui_state: AndroidUiState,
-}
-
-impl AndroidAppState for State {
-    type Resources = StdRsc<Self>;
-}
 
 #[iris::app_init]
-fn create(mut ui_state: AndroidUiState, rsc: &mut StdRsc<State>) -> State {
-    build(rsc, &mut ui_state);
-    State { ui_state }
+fn create(
+    ui_state: &mut AndroidUiState,
+    rsc: &mut StdRsc<AndroidUiState>,
+) {
+    app::build(rsc, ui_state);
 }

examples/task/desktop.rs

@@ -2,20 +2,7 @@ use iris::prelude::*;
 
 #[path = "lib.rs"]
 mod app;
-use app::*;
-
-#[derive(DesktopUiState)]
-struct State {
-    ui_state: DesktopUiState,
-}
-
-impl DesktopAppState for State {
-    fn new(mut ui_state: DesktopUiState, rsc: &mut StdRsc<Self>, _: Proxy<Self::Event>) -> Self {
-        build(rsc, &mut ui_state);
-        Self { ui_state }
-    }
-}
 
 fn main() {
-    DesktopApp::<State>::run();
+    DesktopApp::<DesktopUiState>::run_with(|ui_state, rsc| app::build(rsc, ui_state));
 }

examples/task/lib.rs

@@ -6,16 +6,17 @@ where
     Rsc::State: FocusHost,
 {
     let rect = rect(PaintId::RED).add(rsc);
-    rect.task_on(CursorSense::click(), async move |mut ctx| {
-        iris::task::sleep(Duration::from_secs(1)).await;
-        ctx.update(move |_, rsc| {
-            let rect = rect(rsc);
-            if rect.is_paint(&PaintId::RED) {
-                rect.set_paint(PaintId::BLUE);
-            } else {
-                rect.set_paint(PaintId::RED);
-            }
-        });
-    })
-    .set_root(rsc, ui_state);
+    rect.label("Toggle color")
+        .task_on(CursorSense::click(), async move |mut ctx| {
+            iris::task::sleep(Duration::from_secs(1)).await;
+            ctx.update(move |_, rsc| {
+                let rect = rect(rsc);
+                if rect.is_paint(&PaintId::RED) {
+                    rect.set_paint(PaintId::BLUE);
+                } else {
+                    rect.set_paint(PaintId::RED);
+                }
+            });
+        })
+        .set_root(rsc, ui_state);
 }