Update AccessKit, Parley, and Masonry

Author: mwcampbell

Cargo.lock

@@ -8,13 +8,13 @@ name = "main"
 crate-type = ["cdylib"]
 
 [dependencies]
-accesskit = "0.19.0"
-accesskit_android = "0.2.0"
+accesskit = "0.21.0"
+accesskit_android = "0.4.0"
 android-view = { path = ".." }
 android_logger = "0.15.0"
 anyhow = "1.0.96"
 log = "0.4.26"
-parley = { version = "0.5.0", features = ["accesskit"] }
+parley = { git = "https://github.com/linebender/parley", rev = "587b7634ae8601c10de7f0361bfd56085a5b7b4e", features = ["accesskit"] }
 peniko = { version = "0.4.0", default-features = false }
 pollster = "0.4.0"
 ui-events = "0.1.0"

demo/Cargo.toml

@@ -11,10 +11,10 @@ use android_view::{
     *,
 };
 use masonry::{
-    core::{Action, DefaultProperties, Widget, WidgetId},
+    core::{Action, Properties, Widget, WidgetId, WidgetPod},
     properties::Padding,
     theme::default_property_set,
-    widgets::{Button, Flex, Label, Portal, RootWidget, TextArea, Textbox},
+    widgets::{Button, Flex, Label, Portal, TextArea, TextInput},
 };
 use masonry_android::{AppDriver, DriverCtx};
 use std::{ffi::c_void, sync::Arc};
@@ -31,18 +31,15 @@ impl AppDriver for Driver {
         match action {
             Action::ButtonPressed(_) => {
                 ctx.render_root().edit_root_widget(|mut root| {
-                    let mut root = root.downcast::<RootWidget>();
-
-                    let mut portal = RootWidget::child_mut(&mut root);
-                    let mut portal = portal.downcast::<Portal<Flex>>();
+                    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()));
 
                     let mut first_row = Flex::child_mut(&mut flex, 0).unwrap();
                     let mut first_row = first_row.downcast::<Flex>();
-                    let mut textbox = Flex::child_mut(&mut first_row, 0).unwrap();
-                    let mut textbox = textbox.downcast::<Textbox>();
-                    let mut text_area = Textbox::text_mut(&mut textbox);
+                    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, "");
                 });
             }
@@ -57,22 +54,19 @@ impl AppDriver for Driver {
 fn make_widget_tree() -> impl Widget {
     Portal::new(
         Flex::column()
-            .with_child(
-                Flex::row()
-                    .with_flex_child(Textbox::new(""), 1.0)
-                    .with_child(Button::new("Add task")),
+            .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),
     )
 }
 
-fn default_props() -> Arc<DefaultProperties> {
-    let mut default_properties = default_property_set();
-    default_properties.insert::<RootWidget, _>(Padding::all(WIDGET_SPACING));
-
-    Arc::new(default_properties)
-}
-
 extern "system" fn new_view_peer<'local>(
     mut env: JNIEnv<'local>,
     _view: View<'local>,
@@ -81,11 +75,11 @@ extern "system" fn new_view_peer<'local>(
     masonry_android::new_view_peer(
         &mut env,
         &context,
-        RootWidget::new(make_widget_tree()),
+        make_widget_tree(),
         Driver {
             next_task: String::new(),
         },
-        default_props(),
+        Arc::new(default_property_set()),
     )
 }
 

masonry-demo/src/lib.rs

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-accesskit = "0.19.0"
-accesskit_android = "0.2.0"
+accesskit = "0.21.0"
+accesskit_android = "0.4.0"
 android-view = { path = ".." }
 masonry = { git = "https://github.com/linebender/xilem" }
 pollster = "0.4.0"