Update Masonry

Author: mwcampbell

Cargo.lock

@@ -11,10 +11,10 @@ use android_view::{
     *,
 };
 use masonry::{
-    core::{Action, Properties, Widget, WidgetId, WidgetPod},
+    core::{ErasedAction, NewWidget, Properties, Widget, WidgetId},
     properties::Padding,
     theme::default_property_set,
-    widgets::{Button, Flex, Label, Portal, TextArea, TextInput},
+    widgets::{Button, ButtonPress, Flex, Label, Portal, TextAction, TextArea, TextInput},
 };
 use masonry_android::{AppDriver, DriverCtx};
 use std::{ffi::c_void, sync::Arc};
@@ -27,43 +27,43 @@ struct Driver {
 }
 
 impl AppDriver for Driver {
-    fn on_action(&mut self, ctx: &mut DriverCtx<'_>, _widget_id: WidgetId, action: Action) {
-        match action {
-            Action::ButtonPressed(_) => {
-                ctx.render_root().edit_root_widget(|mut root| {
-                    let mut portal = root.downcast::<Portal<Flex>>();
-                    let mut flex = Portal::child_mut(&mut portal);
-                    Flex::add_child(&mut flex, Label::new(self.next_task.clone()));
+    fn on_action(&mut self, ctx: &mut DriverCtx<'_>, _widget_id: WidgetId, action: ErasedAction) {
+        if action.is::<ButtonPress>() {
+            ctx.render_root().edit_root_widget(|mut root| {
+                let mut portal = root.downcast::<Portal<Flex>>();
+                let mut flex = Portal::child_mut(&mut portal);
+                Flex::add_child(&mut flex, Label::new(self.next_task.clone()).with_auto_id());
 
-                    let mut first_row = Flex::child_mut(&mut flex, 0).unwrap();
-                    let mut first_row = first_row.downcast::<Flex>();
-                    let mut text_input = Flex::child_mut(&mut first_row, 0).unwrap();
-                    let mut text_input = text_input.downcast::<TextInput>();
-                    let mut text_area = TextInput::text_mut(&mut text_input);
-                    TextArea::reset_text(&mut text_area, "");
-                });
+                let mut first_row = Flex::child_mut(&mut flex, 0).unwrap();
+                let mut first_row = first_row.downcast::<Flex>();
+                let mut text_input = Flex::child_mut(&mut first_row, 0).unwrap();
+                let mut text_input = text_input.downcast::<TextInput>();
+                let mut text_area = TextInput::text_mut(&mut text_input);
+                TextArea::reset_text(&mut text_area, "");
+            });
+        } else if action.is::<TextAction>() {
+            let action = action.downcast::<TextAction>().unwrap();
+            match *action {
+                TextAction::Changed(new_text) => {
+                    self.next_task = new_text.clone();
+                }
+                TextAction::Entered(_) => {}
             }
-            Action::TextChanged(new_text) => {
-                self.next_task = new_text.clone();
-            }
-            _ => {}
         }
     }
 }
 
 fn make_widget_tree() -> impl Widget {
     Portal::new(
         Flex::column()
-            .with_child_pod(
-                WidgetPod::new_with_props(
-                    Flex::row()
-                        .with_flex_child(TextInput::new(""), 1.0)
-                        .with_child(Button::new("Add task")),
-                    Properties::new().with(Padding::all(WIDGET_SPACING)),
-                )
-                .erased(),
-            )
-            .with_spacer(WIDGET_SPACING),
+            .with_child(NewWidget::new_with_props(
+                Flex::row()
+                    .with_flex_child(TextInput::new("").with_auto_id(), 1.0)
+                    .with_child(Button::new("Add task").with_auto_id()),
+                Properties::new().with(Padding::all(WIDGET_SPACING)),
+            ))
+            .with_spacer(WIDGET_SPACING)
+            .with_auto_id(),
     )
 }
 
@@ -75,7 +75,7 @@ extern "system" fn new_view_peer<'local>(
     masonry_android::new_view_peer(
         &mut env,
         &context,
-        WidgetPod::new(make_widget_tree()).erased(),
+        NewWidget::new(make_widget_tree()).erased(),
         Driver {
             next_task: String::new(),
         },

masonry-demo/src/lib.rs

@@ -3,7 +3,7 @@
 
 use masonry::{
     app::RenderRoot,
-    core::{Action, WidgetId},
+    core::{ErasedAction, WidgetId},
 };
 
 use crate::MasonryState;
@@ -27,7 +27,7 @@ pub struct DriverCtx<'a> {
 /// a type that implements this trait.
 pub trait AppDriver {
     /// A hook which will be executed when a widget emits an [`Action`].
-    fn on_action(&mut self, ctx: &mut DriverCtx<'_>, widget_id: WidgetId, action: Action);
+    fn on_action(&mut self, ctx: &mut DriverCtx<'_>, widget_id: WidgetId, action: ErasedAction);
 
     #[expect(unused_variables, reason = "Default impl doesn't use arguments")]
     /// A hook which will be executed when the application starts, to allow initial configuration of the `MasonryState`.

masonry/src/app_driver.rs

@@ -11,9 +11,8 @@ use android_view::{
     *,
 };
 use masonry::{
-    Handled,
     app::{RenderRoot, RenderRootOptions, RenderRootSignal, WindowSizePolicy},
-    core::{DefaultProperties, TextEvent, Widget, WidgetPod, WindowEvent},
+    core::{DefaultProperties, Handled, NewWidget, TextEvent, Widget, WindowEvent},
     dpi::PhysicalSize,
     peniko::Color,
     util::Instant,
@@ -99,7 +98,7 @@ pub struct MasonryState {
 
 impl MasonryState {
     pub fn new(
-        root_widget: WidgetPod<dyn Widget>,
+        root_widget: NewWidget<dyn Widget>,
         default_properties: Arc<DefaultProperties>,
         scale_factor: f64,
     ) -> Self {
@@ -594,7 +593,7 @@ impl<Driver: AppDriver> AccessibilityNodeProvider for MasonryViewPeer<Driver> {
 pub fn new_view_peer<'local>(
     env: &mut JNIEnv<'local>,
     android_ctx: &Context<'local>,
-    root_widget: WidgetPod<dyn Widget>,
+    root_widget: NewWidget<dyn Widget>,
     mut app_driver: impl AppDriver + 'static,
     default_properties: Arc<DefaultProperties>,
 ) -> jlong {