From ef6aa06df3be92338b410213e4e52e229bd47163 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 25 Aug 2026 00:35:55 +0700 Subject: [PATCH] text: adopt ui-events 0.3 for Android input --- Cargo.lock | 222 +------ Cargo.toml | 9 +- README.md | 11 - demo/Cargo.toml | 2 +- demo/src/lib.rs | 2 +- demo/src/text.rs | 58 +- masonry-app/build.gradle | 45 -- masonry-app/proguard-rules.pro | 21 - masonry-app/src/main/AndroidManifest.xml | 24 - .../android/masonrydemo/DemoActivity.java | 28 - .../android/masonrydemo/DemoView.java | 14 - .../drawable-v24/ic_launcher_foreground.xml | 30 - .../res/drawable/ic_launcher_background.xml | 170 ----- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 - .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes masonry-app/src/main/res/values/styles.xml | 7 - masonry-demo/Cargo.toml | 21 - masonry-demo/src/lib.rs | 108 ---- masonry/Cargo.toml | 11 - masonry/src/app_driver.rs | 63 -- masonry/src/lib.rs | 612 ------------------ settings.gradle | 1 - src/callback_ctx.rs | 4 +- src/events.rs | 82 ++- src/ime.rs | 3 + src/ime/text.rs | 455 +++++++++++++ src/view.rs | 4 +- src/view_configuration.rs | 21 + 38 files changed, 603 insertions(+), 1435 deletions(-) delete mode 100644 masonry-app/build.gradle delete mode 100644 masonry-app/proguard-rules.pro delete mode 100644 masonry-app/src/main/AndroidManifest.xml delete mode 100644 masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoActivity.java delete mode 100644 masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoView.java delete mode 100644 masonry-app/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 masonry-app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 masonry-app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 masonry-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 masonry-app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 masonry-app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 masonry-app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 masonry-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 masonry-app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 masonry-app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 masonry-app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 masonry-app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp delete mode 100644 masonry-app/src/main/res/values/styles.xml delete mode 100644 masonry-demo/Cargo.toml delete mode 100644 masonry-demo/src/lib.rs delete mode 100644 masonry/Cargo.toml delete mode 100644 masonry/src/app_driver.rs delete mode 100644 masonry/src/lib.rs create mode 100644 src/ime/text.rs diff --git a/Cargo.lock b/Cargo.lock index f9b0337..56f4a05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,6 +62,7 @@ dependencies = [ "send_wrapper", "smallvec", "ui-events", + "ui-text-input", ] [[package]] @@ -85,19 +86,6 @@ dependencies = [ "vello", ] -[[package]] -name = "android-view-masonry-demo" -version = "0.1.0" -dependencies = [ - "android-view", - "masonry", - "masonry_android", - "profiling", - "tracing", - "tracing-subscriber", - "tracing_android_trace", -] - [[package]] name = "android_log-sys" version = "0.3.2" @@ -139,17 +127,6 @@ version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" -[[package]] -name = "anymap3" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170433209e817da6aae2c51aa0dd443009a613425dd041ebfb2492d1c4c11a25" - -[[package]] -name = "anymore" -version = "0.1.0" -source = "git+https://github.com/linebender/anymore?rev=3537bdc3aa03c92e380f106d18b7957b934c9eb5#3537bdc3aa03c92e380f106d18b7957b934c9eb5" - [[package]] name = "arrayvec" version = "0.7.6" @@ -319,21 +296,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "cursor-icon" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" - -[[package]] -name = "deranged" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" -dependencies = [ - "powerfmt", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -632,12 +594,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "itoa" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" - [[package]] name = "jni" version = "0.21.1" @@ -707,6 +663,18 @@ dependencies = [ "smallvec", ] +[[package]] +name = "kurbo" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2" +dependencies = [ + "arrayvec", + "euclid", + "polycool", + "smallvec", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -766,63 +734,6 @@ dependencies = [ "libc", ] -[[package]] -name = "masonry" -version = "0.3.0" -source = "git+https://github.com/linebender/xilem#e14ba3a5f9461b403cb30d95826187fba7f6924b" -dependencies = [ - "accesskit", - "cursor-icon", - "dpi", - "masonry_core", - "parley", - "tracing", - "ui-events", - "vello", -] - -[[package]] -name = "masonry_android" -version = "0.1.0" -dependencies = [ - "accesskit_android", - "android-view", - "masonry_core", - "pollster", - "tracing", -] - -[[package]] -name = "masonry_core" -version = "0.3.0" -source = "git+https://github.com/linebender/xilem#e14ba3a5f9461b403cb30d95826187fba7f6924b" -dependencies = [ - "accesskit", - "anymap3", - "anymore", - "cursor-icon", - "dpi", - "parley", - "smallvec", - "time", - "tracing", - "tracing-subscriber", - "tracing_android_trace", - "tree_arena", - "ui-events", - "vello", - "web-time", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "memchr" version = "2.7.4" @@ -928,12 +839,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - [[package]] name = "num-traits" version = "0.2.19" @@ -1087,7 +992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f9529efd019889b2a205193c14ffb6e2839b54ed9d2720674f10f4b04d87ac9" dependencies = [ "color", - "kurbo", + "kurbo 0.11.2", "smallvec", ] @@ -1123,10 +1028,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" [[package]] -name = "powerfmt" -version = "0.2.0" +name = "polycool" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6" +dependencies = [ + "arrayvec", +] [[package]] name = "presser" @@ -1220,17 +1128,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -1241,15 +1140,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -1357,9 +1250,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "spirv" @@ -1485,37 +1378,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.3.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" - -[[package]] -name = "time-macros" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tinystr" version = "0.7.6" @@ -1592,15 +1454,10 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ - "matchers", "nu-ansi-term", - "once_cell", - "regex", "sharded-slab", "smallvec", "thread_local", - "time", - "tracing", "tracing-core", "tracing-log", ] @@ -1620,21 +1477,22 @@ dependencies = [ ] [[package]] -name = "tree_arena" -version = "0.1.0" -source = "git+https://github.com/linebender/xilem#e14ba3a5f9461b403cb30d95826187fba7f6924b" +name = "ui-events" +version = "0.3.0" +source = "git+https://github.com/waywardmonkeys/ui-events.git?rev=c46ff06ea4c18636aed62f20417e797505fcb211#c46ff06ea4c18636aed62f20417e797505fcb211" dependencies = [ - "hashbrown", + "dpi", + "keyboard-types", + "kurbo 0.13.1", ] [[package]] -name = "ui-events" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4c2cc34489c685d4e7a1a1f97b7b4416c5aa789892114ae77df6cd2a60f0ec4" +name = "ui-text-input" +version = "0.3.0" +source = "git+https://github.com/waywardmonkeys/ui-events.git?rev=c46ff06ea4c18636aed62f20417e797505fcb211#c46ff06ea4c18636aed62f20417e797505fcb211" dependencies = [ "dpi", - "keyboard-types", + "ui-events", ] [[package]] @@ -1802,16 +1660,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "wgpu" version = "24.0.3" diff --git a/Cargo.toml b/Cargo.toml index f1ef3a0..8de94e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,10 +2,12 @@ members = [ ".", "demo", - "masonry", - "masonry-demo", ] +[workspace.dependencies] +ui-events = { git = "https://github.com/waywardmonkeys/ui-events.git", rev = "c46ff06ea4c18636aed62f20417e797505fcb211" } +ui-text-input = { git = "https://github.com/waywardmonkeys/ui-events.git", rev = "c46ff06ea4c18636aed62f20417e797505fcb211" } + [package] name = "android-view" version = "0.1.0" @@ -18,7 +20,8 @@ ndk = "0.9.0" num_enum = "0.7.3" send_wrapper = "0.6.0" smallvec = "1.15.0" -ui-events = "0.1.0" +ui-events.workspace = true +ui-text-input.workspace = true [profile.dev] panic = "abort" diff --git a/README.md b/README.md index e1decb7..9affa76 100644 --- a/README.md +++ b/README.md @@ -30,17 +30,6 @@ adb shell am start -n org.linebender.android.viewdemo/.DemoActivity adb shell run-as org.linebender.android.viewdemo logcat -v color ``` -### Masonry demo - -```bash -cargo ndk -t arm64-v8a -o masonry-app/src/main/jniLibs/ build -p android-view-masonry-demo -./gradlew build -./gradlew installDebug -adb shell am start -n org.linebender.android.masonrydemo/.DemoActivity -# To view logs: -adb shell run-as org.linebender.android.masonrydemo logcat -v color -``` - ## Open questions * Do we need to be able to handle the view being reattached to a window after it has been detached? If not, then `onDetachedFromWindow` is the logical place to sever the connection between Java and native. diff --git a/demo/Cargo.toml b/demo/Cargo.toml index fb34ce5..c3bbe22 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -17,7 +17,7 @@ log = "0.4.26" 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" +ui-events.workspace = true vello = "0.5.0" # Send tracing events to Android GPU inspector, for profiling diff --git a/demo/src/lib.rs b/demo/src/lib.rs index d34671b..e1af7ce 100644 --- a/demo/src/lib.rs +++ b/demo/src/lib.rs @@ -371,7 +371,7 @@ impl ViewPeer for DemoViewPeer { return false; }; - if matches!(ev, PointerEvent::Up { .. }) { + if matches!(ev, PointerEvent::Up(..)) { ctx.push_static_deferred_callback(show_soft_input); } diff --git a/demo/src/text.rs b/demo/src/text.rs index 1c68a99..4ee157f 100644 --- a/demo/src/text.rs +++ b/demo/src/text.rs @@ -7,12 +7,12 @@ use core::default::Default; pub use parley::editor::Generation; use parley::{ FontContext, GenericFamily, LayoutContext, PlainEditor, PlainEditorDriver, StyleProperty, - editor::SplitString, layout::PositionedLayoutItem, + layout::PositionedLayoutItem, }; use std::time::{Duration, Instant}; use ui_events::{ keyboard::{Code, Key, KeyState, KeyboardEvent, NamedKey}, - pointer::{PointerButton, PointerEvent, PointerState, PointerUpdate}, + pointer::{PointerButton, PointerButtonEvent, PointerEvent, PointerState, PointerUpdate}, }; use vello::{ Scene, @@ -66,10 +66,6 @@ impl Editor { &mut self.editor } - pub fn text(&self) -> SplitString<'_> { - self.editor.text() - } - pub fn utf8_to_utf16_index(&self, utf8_index: usize) -> usize { let mut utf16_len_so_far = 0usize; let mut utf8_len_so_far = 0usize; @@ -110,16 +106,12 @@ impl Editor { } pub fn usv_to_utf8_index(&self, usv_index: usize) -> usize { - let mut usv_len_so_far = 0usize; - let mut utf8_len_so_far = 0usize; - for c in self.editor.raw_text().chars() { - if usv_len_so_far >= usv_index { - break; - } - usv_len_so_far += 1; - utf8_len_so_far += c.len_utf8(); - } - utf8_len_so_far + self.editor + .raw_text() + .chars() + .take(usv_index) + .map(char::len_utf8) + .sum() } pub fn cursor_reset(&mut self) { @@ -148,7 +140,7 @@ impl Editor { pub fn cursor_blink(&mut self) { self.cursor_visible = self.start_time.is_some_and(|start_time| { let elapsed = Instant::now().duration_since(start_time); - (elapsed.as_millis() / self.blink_period.as_millis()) % 2 == 0 + (elapsed.as_millis() / self.blink_period.as_millis()).is_multiple_of(2) }); } @@ -310,7 +302,7 @@ impl Editor { pub fn handle_pointer_event(&mut self, ev: PointerEvent) -> bool { let mut drv = self.editor.driver(&mut self.font_cx, &mut self.layout_cx); match ev { - PointerEvent::Down { + PointerEvent::Down(PointerButtonEvent { button: None | Some(PointerButton::Primary), state: PointerState { @@ -320,7 +312,7 @@ impl Editor { .. }, .. - } => match count { + }) => match count { 2 => drv.select_word_at_point(position.x as f32 - INSET, position.y as f32 - INSET), 3 => drv.select_line_at_point(position.x as f32 - INSET, position.y as f32 - INSET), 1 if modifiers.shift() => drv.extend_selection_to_point( @@ -346,10 +338,10 @@ impl Editor { } pub fn handle_accesskit_action_request(&mut self, req: &accesskit::ActionRequest) { - if req.action == accesskit::Action::SetTextSelection { - if let Some(accesskit::ActionData::SetTextSelection(selection)) = &req.data { - self.driver().select_from_accesskit(selection); - } + if req.action == accesskit::Action::SetTextSelection + && let Some(accesskit::ActionData::SetTextSelection(selection)) = &req.data + { + self.driver().select_from_accesskit(selection); } } @@ -372,16 +364,16 @@ impl Editor { &rect, ); }); - if self.cursor_visible { - if let Some(cursor) = self.editor.cursor_geometry(5.0) { - scene.fill( - Fill::NonZero, - transform, - palette::css::CADET_BLUE, - None, - &cursor, - ); - } + if self.cursor_visible + && let Some(cursor) = self.editor.cursor_geometry(5.0) + { + scene.fill( + Fill::NonZero, + transform, + palette::css::CADET_BLUE, + None, + &cursor, + ); } let layout = self.editor.layout(&mut self.font_cx, &mut self.layout_cx); for line in layout.lines() { diff --git a/masonry-app/build.gradle b/masonry-app/build.gradle deleted file mode 100644 index 13c7deb..0000000 --- a/masonry-app/build.gradle +++ /dev/null @@ -1,45 +0,0 @@ -plugins { - id 'com.android.application' -} - -group = "org.linebender.android.rustview" - -android { - ndkVersion "25.2.9519653" - compileSdk 31 - - defaultConfig { - applicationId "org.linebender.android.masonrydemo" - minSdk 28 - targetSdk 33 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - debug { - minifyEnabled false - //packagingOptions { - // doNotStrip '**/*.so' - //} - // debuggable true - } - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - namespace "org.linebender.android.masonrydemo" -} - -dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.core:core:1.5.0' - implementation project(":library") -} diff --git a/masonry-app/proguard-rules.pro b/masonry-app/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/masonry-app/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/masonry-app/src/main/AndroidManifest.xml b/masonry-app/src/main/AndroidManifest.xml deleted file mode 100644 index da5126b..0000000 --- a/masonry-app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoActivity.java b/masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoActivity.java deleted file mode 100644 index 88ee4e5..0000000 --- a/masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoActivity.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.linebender.android.masonrydemo; - -import android.app.Activity; -import android.os.Bundle; -import android.view.View; -import android.widget.FrameLayout; - -public final class DemoActivity extends Activity { - static { - System.loadLibrary("main"); - } - - @Override - public void onCreate(Bundle state) { - super.onCreate(state); - View view = new DemoView(this); - view.setLayoutParams( - new FrameLayout.LayoutParams( - FrameLayout.LayoutParams.MATCH_PARENT, - FrameLayout.LayoutParams.MATCH_PARENT)); - view.setFocusable(true); - view.setFocusableInTouchMode(true); - FrameLayout layout = new FrameLayout(this); - layout.addView(view); - setContentView(layout); - view.requestFocus(); - } -} diff --git a/masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoView.java b/masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoView.java deleted file mode 100644 index ae031b4..0000000 --- a/masonry-app/src/main/java/org/linebender/android/masonrydemo/DemoView.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.linebender.android.masonrydemo; - -import android.content.Context; - -import org.linebender.android.rustview.RustView; - -public final class DemoView extends RustView { - @Override - protected native long newViewPeer(Context context); - - public DemoView(Context context) { - super(context); - } -} diff --git a/masonry-app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/masonry-app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/masonry-app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/masonry-app/src/main/res/drawable/ic_launcher_background.xml b/masonry-app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/masonry-app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/masonry-app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/masonry-app/src/main/res/mipmap-hdpi/ic_launcher.webp b/masonry-app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/masonry-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/masonry-app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/masonry-app/src/main/res/mipmap-mdpi/ic_launcher.webp b/masonry-app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/masonry-app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/masonry-app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/masonry-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/masonry-app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/masonry-app/src/main/res/values/styles.xml b/masonry-app/src/main/res/values/styles.xml deleted file mode 100644 index a4bfa92..0000000 --- a/masonry-app/src/main/res/values/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/masonry-demo/Cargo.toml b/masonry-demo/Cargo.toml deleted file mode 100644 index 24c07cc..0000000 --- a/masonry-demo/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "android-view-masonry-demo" -version = "0.1.0" -edition = "2024" - -[lib] -name = "main" -crate-type = ["cdylib"] - -[dependencies] -android-view = { path = ".." } -masonry = { git = "https://github.com/linebender/xilem" } -masonry_android = { path = "../masonry" } - -# Send tracing events to Android GPU inspector, for profiling -tracing_android_trace = "0.1.1" -tracing-subscriber = "0.3.19" -# Make events recorded with profiling (e.g. in wgpu) visible to Android GPU inspector -profiling = { version = "1.0.16", features = ["profile-with-tracing"] } -# Make events recorded to `tracing` visible in logcat -tracing = { version = "0.1.38", features = ["log-always"] } diff --git a/masonry-demo/src/lib.rs b/masonry-demo/src/lib.rs deleted file mode 100644 index caaf52a..0000000 --- a/masonry-demo/src/lib.rs +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright 2024 the Xilem Authors -// SPDX-License-Identifier: Apache-2.0 - -#![deny(unsafe_op_in_unsafe_fn)] - -use android_view::{ - jni::{ - JNIEnv, JavaVM, - sys::{JNI_VERSION_1_6, JavaVM as RawJavaVM, jint, jlong}, - }, - *, -}; -use masonry::{ - core::{ErasedAction, NewWidget, Properties, Widget, WidgetId}, - properties::Padding, - theme::default_property_set, - widgets::{Button, ButtonPress, Flex, Label, Portal, TextAction, TextArea, TextInput}, -}; -use masonry_android::{AppDriver, DriverCtx}; -use std::{ffi::c_void, sync::Arc}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; - -const WIDGET_SPACING: f64 = 5.0; - -struct Driver { - next_task: String, -} - -impl AppDriver for Driver { - fn on_action(&mut self, ctx: &mut DriverCtx<'_>, _widget_id: WidgetId, action: ErasedAction) { - if action.is::() { - ctx.render_root().edit_root_widget(|mut root| { - let mut portal = root.downcast::>(); - 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::(); - let mut text_input = Flex::child_mut(&mut first_row, 0).unwrap(); - let mut text_input = text_input.downcast::(); - let mut text_area = TextInput::text_mut(&mut text_input); - TextArea::reset_text(&mut text_area, ""); - }); - } else if action.is::() { - let action = action.downcast::().unwrap(); - match *action { - TextAction::Changed(new_text) => { - self.next_task = new_text.clone(); - } - TextAction::Entered(_) => {} - } - } - } -} - -fn make_widget_tree() -> impl Widget { - Portal::new( - Flex::column() - .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(), - ) -} - -extern "system" fn new_view_peer<'local>( - mut env: JNIEnv<'local>, - _view: View<'local>, - context: Context<'local>, -) -> jlong { - masonry_android::new_view_peer( - &mut env, - &context, - NewWidget::new(make_widget_tree()).erased(), - Driver { - next_task: String::new(), - }, - Arc::new(default_property_set()), - ) -} - -/// Symbol run at JNI load time. -/// -/// # Safety -/// There is no alternative, interacting with JNI is always unsafe at some level. -#[unsafe(no_mangle)] -pub unsafe extern "system" fn JNI_OnLoad(vm: *mut RawJavaVM, _: *mut c_void) -> jint { - // This will try to create a "log" logger, and error because one was already created above - // We therefore ignore the error - // Ideally, we'd only ignore the SetLoggerError, but the only way that's possible is to inspect - // `Debug/Display` on the TryInitError, which is awful. - let _ = tracing_subscriber::registry() - .with(tracing_android_trace::AndroidTraceLayer::new()) - .try_init(); - - let vm = unsafe { JavaVM::from_raw(vm) }.unwrap(); - let mut env = vm.get_env().unwrap(); - register_view_class( - &mut env, - "org/linebender/android/masonrydemo/DemoView", - new_view_peer, - ); - JNI_VERSION_1_6 -} diff --git a/masonry/Cargo.toml b/masonry/Cargo.toml deleted file mode 100644 index 0362ef1..0000000 --- a/masonry/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "masonry_android" -version = "0.1.0" -edition = "2024" - -[dependencies] -accesskit_android = "0.4.0" -android-view = { path = ".." } -masonry_core = { git = "https://github.com/linebender/xilem" } -pollster = "0.4.0" -tracing = "0.1.40" diff --git a/masonry/src/app_driver.rs b/masonry/src/app_driver.rs deleted file mode 100644 index bb78782..0000000 --- a/masonry/src/app_driver.rs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2025 the Xilem Authors -// SPDX-License-Identifier: Apache-2.0 - -use masonry_core::{ - app::RenderRoot, - core::{ErasedAction, WidgetId}, -}; - -use crate::MasonryState; - -/// Context for the [`AppDriver`] trait. -/// -/// Currently holds a reference to the [`RenderRoot`]. -pub struct DriverCtx<'a> { - // We make no guarantees about the fields of this struct, but - // they must all be public so that the type can be constructed - // externally. - // This is needed for external users, whilst our external API - // is not yet designed. - #[doc(hidden)] - pub render_root: &'a mut RenderRoot, -} - -/// A trait for defining how your app interacts with the Masonry widget tree. -/// -/// When launching your app with [`crate::app::run`], you need to provide -/// 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: 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`. - /// - /// Use cases include loading fonts. - fn on_start(&mut self, state: &mut MasonryState) {} -} - -impl DriverCtx<'_> { - // TODO - Add method to create timer - - /// Access the [`RenderRoot`]. - pub fn render_root(&mut self) -> &mut RenderRoot { - self.render_root - } - - /// Returns `true` if something happened that requires a rewrite pass or a re-render. - pub fn content_changed(&self) -> bool { - self.render_root.needs_rewrite_passes() - } -} - -#[cfg(doctest)] -/// Doctests aren't collected under `cfg(test)`; we can use `cfg(doctest)` instead -mod doctests { - /// ```no_run - /// use masonry::app::DriverCtx; - /// let _ctx = DriverCtx { - /// render_root: unimplemented!() - /// }; - /// ``` - const _DRIVER_CTX_EXTERNALLY_CONSTRUCTIBLE: () = {}; -} diff --git a/masonry/src/lib.rs b/masonry/src/lib.rs deleted file mode 100644 index 4ffeafb..0000000 --- a/masonry/src/lib.rs +++ /dev/null @@ -1,612 +0,0 @@ -// Copyright 2024 the Xilem Authors -// SPDX-License-Identifier: Apache-2.0 - -use android_view::{ - jni::{ - JNIEnv, - sys::{jint, jlong}, - }, - ndk::{event::Keycode, native_window::NativeWindow}, - *, -}; -use masonry_core::{ - accesskit::{ActionHandler, ActionRequest, ActivationHandler, TreeUpdate}, - app::{RenderRoot, RenderRootOptions, RenderRootSignal, WindowSizePolicy}, - core::{DefaultProperties, Handled, NewWidget, TextEvent, Widget, WindowEvent}, - dpi::PhysicalSize, - peniko::Color, - util::Instant, - vello::{ - self, Renderer, RendererOptions, Scene, - kurbo::Affine, - util::{RenderContext, RenderSurface}, - wgpu::{ - self, PresentMode, - rwh::{DisplayHandle, HandleError, HasDisplayHandle, HasWindowHandle, WindowHandle}, - }, - }, -}; -use std::sync::{ - Arc, - mpsc::{self, Receiver}, -}; -use tracing::{debug, info, info_span}; - -mod app_driver; -pub use app_driver::*; - -// From VelloCompose -struct AndroidWindowHandle { - window: NativeWindow, -} - -impl HasDisplayHandle for AndroidWindowHandle { - fn display_handle(&self) -> Result, HandleError> { - Ok(DisplayHandle::android()) - } -} - -impl HasWindowHandle for AndroidWindowHandle { - fn window_handle(&self) -> Result, HandleError> { - self.window.window_handle() - } -} - -/// Helper function that creates a vello `Renderer` for a given `RenderContext` and `RenderSurface` -fn create_vello_renderer(render_cx: &RenderContext, surface: &RenderSurface<'_>) -> Renderer { - Renderer::new( - &render_cx.devices[surface.dev_id].device, - RendererOptions { - use_cpu: false, - antialiasing_support: vello::AaSupport::area_only(), - num_init_threads: None, - // TODO: add pipeline cache. - pipeline_cache: None, - }, - ) - .expect("Couldn't create renderer") -} - -fn scale_factor<'local>(env: &mut JNIEnv<'local>, android_ctx: &Context<'local>) -> f64 { - let res = android_ctx.resources(env); - let metrics = res.display_metrics(env); - metrics.density(env) as f64 -} - -fn show_soft_input<'local>(env: &mut JNIEnv<'local>, view: &View<'local>) { - let imm = view.input_method_manager(env); - imm.show_soft_input(env, view, 0); -} - -fn hide_soft_input<'local>(env: &mut JNIEnv<'local>, view: &View<'local>) { - let imm = view.input_method_manager(env); - let window_token = view.window_token(env); - imm.hide_soft_input_from_window(env, &window_token, 0); -} - -pub struct MasonryState { - render_cx: RenderContext, - render_root: RenderRoot, - signal_receiver: Receiver, - tap_counter: TapCounter, - renderer: Option, - render_surface: Option>, - // Is `Some` if the most recently displayed frame was an animation frame. - last_anim: Option, - accesskit_adapter: accesskit_android::Adapter, -} - -impl MasonryState { - pub fn new( - root_widget: NewWidget, - default_properties: Arc, - scale_factor: f64, - ) -> Self { - let render_cx = RenderContext::new(); - let (signal_sender, signal_receiver) = mpsc::channel(); - - Self { - render_cx, - render_root: RenderRoot::new( - root_widget, - move |signal| { - signal_sender.send(signal).unwrap(); - }, - RenderRootOptions { - default_properties, - use_system_fonts: true, - size_policy: WindowSizePolicy::User, - scale_factor, - test_font: None, - }, - ), - signal_receiver, - renderer: None, - tap_counter: TapCounter::default(), - render_surface: None, - last_anim: None, - accesskit_adapter: Default::default(), - } - } -} - -#[derive(Default)] -struct MasonryAccessActivationHandler { - requested_initial_tree: bool, -} - -impl ActivationHandler for MasonryAccessActivationHandler { - fn request_initial_tree(&mut self) -> Option { - self.requested_initial_tree = true; - None - } -} - -struct MasonryAccessActionHandler<'a> { - render_root: &'a mut RenderRoot, -} - -impl ActionHandler for MasonryAccessActionHandler<'_> { - fn do_action(&mut self, request: ActionRequest) { - self.render_root.handle_access_event(request); - } -} - -struct MasonryViewPeer { - state: MasonryState, - app_driver: Driver, -} - -impl MasonryViewPeer { - fn handle_signals(&mut self, ctx: &mut CallbackCtx) { - let mut needs_redraw = false; - while let Ok(signal) = self.state.signal_receiver.try_recv() { - match signal { - RenderRootSignal::Action(action, widget_id) => { - let mut driver_ctx = DriverCtx { - render_root: &mut self.state.render_root, - }; - debug!("Action {:?} on widget {:?}", action, widget_id); - self.app_driver - .on_action(&mut driver_ctx, widget_id, action); - } - RenderRootSignal::StartIme => { - ctx.push_static_deferred_callback(show_soft_input); - } - RenderRootSignal::EndIme => { - ctx.push_static_deferred_callback(hide_soft_input); - } - RenderRootSignal::ImeMoved(_position, _size) => { - // TODO - } - RenderRootSignal::RequestRedraw => { - needs_redraw = true; - } - RenderRootSignal::RequestAnimFrame => { - // Does this need to do something different from RequestRedraw? - needs_redraw = true; - } - RenderRootSignal::TakeFocus => { - // TODO - } - RenderRootSignal::SetCursor(_cursor) => { - // TODO? - } - RenderRootSignal::SetSize(_size) => { - // TODO: Does this ever apply, maybe for embedded views? - } - RenderRootSignal::SetTitle(_title) => { - // TODO: Does this ever apply? - } - RenderRootSignal::DragWindow => { - // TODO: Does this ever apply? - } - RenderRootSignal::DragResizeWindow(_direction) => { - // TODO: Does this ever apply? - } - RenderRootSignal::ToggleMaximized => { - // TODO: Does this ever apply? - } - RenderRootSignal::Minimize => { - // TODO: Does this ever apply? - } - RenderRootSignal::Exit => { - // TODO: Should we do something with this? - } - RenderRootSignal::ShowWindowMenu(_position) => { - // TODO: Does this ever apply? - } - RenderRootSignal::WidgetSelectedInInspector(widget_id) => { - let Some(widget) = self.state.render_root.get_widget(widget_id) else { - return; - }; - let widget_name = widget.short_type_name(); - let display_name = if let Some(debug_text) = widget.get_debug_text() { - format!("{widget_name}<{debug_text}>") - } else { - widget_name.into() - }; - info!("Widget selected in inspector: {widget_id} - {display_name}"); - } - } - } - - // If we're processing a lot of actions, we may have a lot of pending redraws. - // We batch them up to avoid redundant requests. - if needs_redraw && self.state.render_surface.is_some() { - ctx.view.post_frame_callback(&mut ctx.env); - } - } - - fn redraw(&mut self, ctx: &mut CallbackCtx) { - let _span = info_span!("redraw"); - - let (scene, tree_update) = self.state.render_root.redraw(); - - if let Some(events) = self - .state - .accesskit_adapter - .update_if_active(|| tree_update) - { - ctx.push_dynamic_deferred_callback(move |env, view| { - events.raise(env, &view.0); - }); - } - - let android_ctx = ctx.view.context(&mut ctx.env); - let scale_factor = scale_factor(&mut ctx.env, &android_ctx); - let scene = if scale_factor == 1.0 { - scene - } else { - let mut new_scene = Scene::new(); - new_scene.append(&scene, Some(Affine::scale(scale_factor))); - new_scene - }; - - // Get the RenderSurface (surface + config). - let surface = self.state.render_surface.as_ref().unwrap(); - - // Get the window size. - let width = surface.config.width; - let height = surface.config.height; - - // Get a handle to the device. - let device_handle = &self.state.render_cx.devices[surface.dev_id]; - - // Render to the surface's texture. - self.state - .renderer - .as_mut() - .unwrap() - .render_to_texture( - &device_handle.device, - &device_handle.queue, - &scene, - &surface.target_view, - &vello::RenderParams { - base_color: Color::BLACK, - width, - height, - antialiasing_method: vello::AaConfig::Area, - }, - ) - .expect("failed to render to surface"); - - // Get the surface's texture. - let surface_texture = surface - .surface - .get_current_texture() - .expect("failed to get surface texture"); - - // Perform the copy. - let mut encoder = - device_handle - .device - .create_command_encoder(&wgpu::CommandEncoderDescriptor { - label: Some("Surface Blit"), - }); - surface.blitter.copy( - &device_handle.device, - &mut encoder, - &surface.target_view, - &surface_texture - .texture - .create_view(&wgpu::TextureViewDescriptor::default()), - ); - device_handle.queue.submit([encoder.finish()]); - // Queue the texture to be presented on the surface. - surface_texture.present(); - - device_handle.device.poll(wgpu::Maintain::Poll); - } - - fn on_key_event<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - event: &KeyEvent<'local>, - ) -> bool { - let handled = self - .state - .render_root - .handle_text_event(TextEvent::Keyboard(event.to_keyboard_event(&mut ctx.env))); - self.handle_signals(ctx); - matches!(handled, Handled::Yes) - } - - fn with_access_activation_handler<'local, T>( - &mut self, - ctx: &mut CallbackCtx<'local>, - f: impl FnOnce( - &mut CallbackCtx<'local>, - &mut accesskit_android::Adapter, - &mut MasonryAccessActivationHandler, - ) -> T, - ) -> T { - let mut handler = MasonryAccessActivationHandler::default(); - let result = f(ctx, &mut self.state.accesskit_adapter, &mut handler); - if handler.requested_initial_tree { - self.state - .render_root - .handle_window_event(WindowEvent::RebuildAccessTree); - self.handle_signals(ctx); - } - result - } -} - -impl ViewPeer for MasonryViewPeer { - fn on_key_down<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - _: Keycode, - event: &KeyEvent<'local>, - ) -> bool { - self.on_key_event(ctx, event) - } - - fn on_key_up<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - _: Keycode, - event: &KeyEvent<'local>, - ) -> bool { - self.on_key_event(ctx, event) - } - - fn on_touch_event<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - event: &MotionEvent<'local>, - ) -> bool { - let Some(ev) = event.to_pointer_event(&mut ctx.env, &self.state.tap_counter.vc) else { - return false; - }; - let ev = self.state.tap_counter.attach_count(ev); - self.state.render_root.handle_pointer_event(ev); - self.handle_signals(ctx); - true - } - - fn on_generic_motion_event<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - event: &MotionEvent<'local>, - ) -> bool { - self.on_touch_event(ctx, event) - } - - fn on_hover_event<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - event: &MotionEvent<'local>, - ) -> bool { - let action = event.action(&mut ctx.env); - let x = event.x(&mut ctx.env); - let y = event.y(&mut ctx.env); - if let Some(events) = self.with_access_activation_handler(ctx, |_ctx, adapter, handler| { - adapter.on_hover_event(handler, action, x, y) - }) { - ctx.push_dynamic_deferred_callback(move |env, view| { - events.raise(env, &view.0); - }); - true - } else { - self.on_touch_event(ctx, event) - } - } - - fn on_focus_changed<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - gain_focus: bool, - _direction: jint, - _previously_focused_rect: Option<&Rect<'local>>, - ) { - self.state - .render_root - .handle_text_event(TextEvent::WindowFocusChange(gain_focus)); - self.handle_signals(ctx); - } - - fn surface_changed<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - holder: &SurfaceHolder<'local>, - _format: jint, - width: jint, - height: jint, - ) { - self.state.tap_counter = TapCounter::new(ctx.view.view_configuration(&mut ctx.env)); - let android_ctx = ctx.view.context(&mut ctx.env); - let scale_factor = scale_factor(&mut ctx.env, &android_ctx); - self.state - .render_root - .handle_window_event(WindowEvent::Rescale(scale_factor)); - let size = PhysicalSize { - width: width as u32, - height: height as u32, - }; - self.state - .render_root - .handle_window_event(WindowEvent::Resize(size)); - self.handle_signals(ctx); - - let window = holder.surface(&mut ctx.env).to_native_window(&mut ctx.env); - // Drop the old surface, if any, that owned the native window - // before creating a new one. Otherwise, we crash with - // ERROR_NATIVE_WINDOW_IN_USE_KHR. - self.state.render_surface = None; - let surface = self - .state - .render_cx - .instance - .create_surface(wgpu::SurfaceTarget::from(AndroidWindowHandle { window })) - .expect("Error creating surface"); - let dev_id = pollster::block_on(self.state.render_cx.device(Some(&surface))) - .expect("No compatible device"); - let device_handle = &self.state.render_cx.devices[dev_id]; - let capabilities = surface.get_capabilities(device_handle.adapter()); - let present_mode = if capabilities.present_modes.contains(&PresentMode::Mailbox) { - PresentMode::Mailbox - } else { - PresentMode::AutoVsync - }; - - let surface_future = self.state.render_cx.create_render_surface( - surface, - width as _, - height as _, - present_mode, - ); - let surface = pollster::block_on(surface_future).expect("Error creating surface"); - - // Create a vello Renderer for the surface (using its device id) - self.state - .renderer - .get_or_insert_with(|| create_vello_renderer(&self.state.render_cx, &surface)); - self.state.render_surface = Some(surface); - - self.redraw(ctx); - } - - fn surface_destroyed<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - _holder: &SurfaceHolder<'local>, - ) { - self.state.render_surface = None; - ctx.view.remove_frame_callback(&mut ctx.env); - } - - fn do_frame(&mut self, ctx: &mut CallbackCtx, _frame_time_nanos: jlong) { - let _span = info_span!("do_frame"); - - let now = Instant::now(); - // TODO: this calculation uses wall-clock time of the paint call, which - // potentially has jitter. - // - // See https://github.com/linebender/druid/issues/85 for discussion. - let last = self.state.last_anim.take(); - let elapsed = last.map(|t| now.duration_since(t)).unwrap_or_default(); - self.state - .render_root - .handle_window_event(WindowEvent::AnimFrame(elapsed)); - - // Make sure we handle any signals emitted in response to the - // `AnimFrame` event before we redraw. - self.handle_signals(ctx); - - // If this animation will continue, store the time. - // If a new animation starts, then it will have zero reported elapsed time. - let animation_continues = self.state.render_root.needs_anim(); - self.state.last_anim = animation_continues.then_some(now); - - self.redraw(ctx); - } - - fn as_accessibility_node_provider(&mut self) -> Option<&mut dyn AccessibilityNodeProvider> { - Some(self) - } - - fn as_input_connection(&mut self) -> Option<&mut dyn InputConnection> { - // TODO - None - } -} - -impl AccessibilityNodeProvider for MasonryViewPeer { - fn create_accessibility_node_info<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - virtual_view_id: jint, - ) -> AccessibilityNodeInfo<'local> { - self.with_access_activation_handler(ctx, |ctx, adapter, handler| { - AccessibilityNodeInfo(adapter.create_accessibility_node_info( - handler, - &mut ctx.env, - &ctx.view.0, - virtual_view_id, - )) - }) - } - - fn find_focus<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - focus_type: jint, - ) -> AccessibilityNodeInfo<'local> { - self.with_access_activation_handler(ctx, |ctx, adapter, handler| { - AccessibilityNodeInfo(adapter.find_focus( - handler, - &mut ctx.env, - &ctx.view.0, - focus_type, - )) - }) - } - - fn perform_action<'local>( - &mut self, - ctx: &mut CallbackCtx<'local>, - virtual_view_id: jint, - action: jint, - arguments: &Bundle<'local>, - ) -> bool { - let Some(action) = - accesskit_android::PlatformAction::from_java(&mut ctx.env, action, &arguments.0) - else { - return false; - }; - let mut action_handler = MasonryAccessActionHandler { - render_root: &mut self.state.render_root, - }; - if let Some(events) = self.state.accesskit_adapter.perform_action( - &mut action_handler, - virtual_view_id, - &action, - ) { - ctx.push_dynamic_deferred_callback(move |env, view| { - events.raise(env, &view.0); - }); - self.handle_signals(ctx); - true - } else { - false - } - } -} - -// TODO: InputConnection - -pub fn new_view_peer<'local>( - env: &mut JNIEnv<'local>, - android_ctx: &Context<'local>, - root_widget: NewWidget, - mut app_driver: impl AppDriver + 'static, - default_properties: Arc, -) -> jlong { - let scale_factor = scale_factor(env, android_ctx); - let mut state = MasonryState::new(root_widget, default_properties, scale_factor); - app_driver.on_start(&mut state); - register_view_peer(MasonryViewPeer { state, app_driver }) -} diff --git a/settings.gradle b/settings.gradle index e059924..9e81faa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,4 +15,3 @@ dependencyResolutionManagement { include ':app' include ':library' -include ':masonry-app' diff --git a/src/callback_ctx.rs b/src/callback_ctx.rs index cd26bd8..1d94cde 100644 --- a/src/callback_ctx.rs +++ b/src/callback_ctx.rs @@ -3,9 +3,11 @@ use smallvec::SmallVec; use crate::view::View; +type DynamicCallback<'local> = Box, &View<'local>)>; + enum DeferredCallback<'local> { Static(fn(&mut JNIEnv<'local>, &View<'local>)), - Dynamic(Box, &View<'local>)>), + Dynamic(DynamicCallback<'local>), } pub struct CallbackCtx<'local> { diff --git a/src/events.rs b/src/events.rs index fc6810b..652c1aa 100644 --- a/src/events.rs +++ b/src/events.rs @@ -12,7 +12,10 @@ use num_enum::FromPrimitive; use ui_events::{ ScrollDelta, keyboard::{KeyboardEvent, Modifiers}, - pointer::{ContactGeometry, PointerEvent, PointerId, PointerState, PointerUpdate}, + pointer::{ + ContactGeometry, PointerButtonEvent, PointerEvent, PointerId, PointerScrollEvent, + PointerState, PointerUpdate, + }, }; use crate::ViewConfiguration; @@ -425,9 +428,11 @@ impl<'local> MotionEvent<'local> { let contact_geometry = if pointer.pointer_type == PointerType::Touch { let height = self.axis(env, Axis::TouchMajor, action_index) as f64; let width = self.axis(env, Axis::TouchMinor, action_index) as f64; - (height > 0.0 && width > 0.0) - .then_some(ContactGeometry { width, height }) - .unwrap_or_default() + if height > 0.0 && width > 0.0 { + ContactGeometry { width, height } + } else { + ContactGeometry::default() + } } else { Default::default() }; @@ -445,6 +450,11 @@ impl<'local> MotionEvent<'local> { orientation, pressure: self.axis(env, Axis::Pressure, action_index) * 0.5, tangential_pressure: 0.0, + scale_factor: if vc.scale_factor.is_finite() && vc.scale_factor > 0.0 { + vc.scale_factor + } else { + 1.0 + }, }; let button = { @@ -467,16 +477,18 @@ impl<'local> MotionEvent<'local> { }; Some(match action { - MotionAction::Down | MotionAction::PointerDown => PointerEvent::Down { - pointer, - state, - button, - }, - MotionAction::Up | MotionAction::PointerUp => PointerEvent::Up { + MotionAction::Down | MotionAction::PointerDown => { + PointerEvent::Down(PointerButtonEvent { + pointer, + state, + button, + }) + } + MotionAction::Up | MotionAction::PointerUp => PointerEvent::Up(PointerButtonEvent { pointer, state, button, - }, + }), MotionAction::Move | MotionAction::HoverMove => { let hsz = self.history_size(env); let mut coalesced: Vec = vec![state.clone(); hsz as usize]; @@ -492,9 +504,11 @@ impl<'local> MotionEvent<'local> { self.historical_axis(env, Axis::TouchMajor, action_index, pos) as f64; let width = self.historical_axis(env, Axis::TouchMinor, action_index, pos) as f64; - (height > 0.0 && width > 0.0) - .then_some(ContactGeometry { width, height }) - .unwrap_or_default() + if height > 0.0 && width > 0.0 { + ContactGeometry { width, height } + } else { + ContactGeometry::default() + } } else { Default::default() }; @@ -527,7 +541,7 @@ impl<'local> MotionEvent<'local> { MotionAction::Cancel => PointerEvent::Cancel(pointer), MotionAction::HoverEnter => PointerEvent::Enter(pointer), MotionAction::HoverExit => PointerEvent::Leave(pointer), - MotionAction::Scroll => PointerEvent::Scroll { + MotionAction::Scroll => PointerEvent::Scroll(PointerScrollEvent { pointer, delta: ScrollDelta::PixelDelta(PhysicalPosition:: { x: (self.axis(env, Axis::Hscroll, action_index) @@ -536,7 +550,7 @@ impl<'local> MotionEvent<'local> { * vc.scaled_vertical_scroll_factor) as f64, }), state, - }, + }), _ => { // Other current `MotionAction` values relate to gamepad/joystick buttons; // ui-events doesn't currently have types for these, so consider them unhandled. @@ -620,11 +634,11 @@ impl TapCounter { /// pub fn attach_count(&mut self, e: PointerEvent) -> PointerEvent { match e { - PointerEvent::Down { + PointerEvent::Down(PointerButtonEvent { button, pointer, state, - } => { + }) => { let e = if let Some(i) = self.taps.iter().position(|TapState { x, y, up_time, .. }| { let dx = (x - state.position.x).abs(); @@ -641,11 +655,11 @@ impl TapCounter { self.taps[i].x = state.position.x; self.taps[i].y = state.position.y; - PointerEvent::Down { + PointerEvent::Down(PointerButtonEvent { button, pointer, state: PointerState { count, ..state }, - } + }) } else { let s = TapState { pointer_id: pointer.pointer_id, @@ -656,34 +670,34 @@ impl TapCounter { y: state.position.y, }; self.taps.push(s); - PointerEvent::Down { + PointerEvent::Down(PointerButtonEvent { button, pointer, state: PointerState { count: 1, ..state }, - } + }) }; self.clear_expired(state.time); e } - PointerEvent::Up { + PointerEvent::Up(PointerButtonEvent { button, pointer, ref state, - } => { + }) => { if let Some(i) = self .taps .iter() .position(|TapState { pointer_id, .. }| *pointer_id == pointer.pointer_id) { self.taps[i].up_time = state.time; - PointerEvent::Up { + PointerEvent::Up(PointerButtonEvent { button, pointer, state: PointerState { count: self.taps[i].count, ..state.clone() }, - } + }) } else { e.clone() } @@ -717,13 +731,17 @@ impl TapCounter { }, coalesced: coalesced .iter() - .cloned() - .map(|u| PointerState { count, ..u }) + .map(|state| PointerState { + count, + ..state.clone() + }) .collect(), predicted: predicted .iter() - .cloned() - .map(|u| PointerState { count, ..u }) + .map(|state| PointerState { + count, + ..state.clone() + }) .collect(), }) } else { @@ -735,7 +753,9 @@ impl TapCounter { .retain(|TapState { pointer_id, .. }| *pointer_id != p.pointer_id); e.clone() } - PointerEvent::Enter(..) | PointerEvent::Scroll { .. } => e.clone(), + PointerEvent::Enter(..) | PointerEvent::Scroll(..) | PointerEvent::Gesture(..) => { + e.clone() + } } } diff --git a/src/ime.rs b/src/ime.rs index 508bab7..d077020 100644 --- a/src/ime.rs +++ b/src/ime.rs @@ -7,6 +7,9 @@ use std::borrow::Cow; use crate::{binder::*, callback_ctx::*, events::KeyEvent, util::*, view::*}; +mod text; +pub use text::*; + pub const INPUT_TYPE_MASK_CLASS: u32 = 0x0000000f; pub const INPUT_TYPE_MASK_VARIATION: u32 = 0x00000ff0; pub const INPUT_TYPE_MASK_FLAGS: u32 = 0x00fff000; diff --git a/src/ime/text.rs b/src/ime/text.rs new file mode 100644 index 0000000..fda6134 --- /dev/null +++ b/src/ime/text.rs @@ -0,0 +1,455 @@ +// Copyright 2026 the UI Events Authors +// SPDX-License-Identifier: Apache-2.0 OR MIT + +//! Value adapters between Android [`InputConnection`] and `ui-events`. +//! +//! This module owns Android-specific value translation at the existing native +//! input-connection boundary: +//! +//! - mutating `InputConnection` calls become [`TextInputEvent`] values; +//! - [`SurroundingTextProvider`] becomes Android UTF-16 surrounding text; and +//! - coherent host snapshots become selection/composition updates. +//! +//! The parent `ime` module continues to own the Java object, JNI callbacks, +//! connection validity, thread affinity, nested batch-edit lifetime, styled +//! `CharSequence` handling, and `InputMethodManager` notifications. +//! +//! Android calls Java UTF-16 code units “characters” in most `InputConnection` +//! methods. Its explicit code-point deletion method is kept separate here. +//! +//! [`InputConnection`]: super::InputConnection +//! [`SurroundingTextProvider`]: ui_text_input::SurroundingTextProvider +//! [`TextInputEvent`]: ui_events::text::TextInputEvent + +use std::string::{String, ToString}; + +use ui_events::text::{ + CompositionState, TextCursorAnchor, TextCursorOffset, TextCursorPlacement, TextInputAction, + TextInputEvent, TextInsertEvent, TextRangeEncoding, TextTargetRange, +}; +use ui_text_input::{ + SurroundingTextProvider, SurroundingTextRequest, TextInputHost, TextRangeConverter, +}; + +/// Plain values accepted by Android's API-31 `SurroundingText` constructor. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct AndroidSurroundingText { + revision: u64, + text: String, + selection_start: i32, + selection_end: i32, + offset: i32, +} + +impl AndroidSurroundingText { + /// Return the coherent host revision used for this response. + pub const fn revision(&self) -> u64 { + self.revision + } + + /// Return the plain surrounding text. + pub fn text(&self) -> &str { + &self.text + } + + /// Return directional selection start relative to [`Self::text`]. + pub const fn selection_start(&self) -> i32 { + self.selection_start + } + + /// Return directional selection end relative to [`Self::text`]. + pub const fn selection_end(&self) -> i32 { + self.selection_end + } + + /// Return the absolute UTF-16 offset of the surrounding text's first unit. + pub const fn offset(&self) -> i32 { + self.offset + } +} + +/// Query plain surrounding text for Android `InputConnection`. +/// +/// `before_length` and `after_length` are Java UTF-16 code units. The host must +/// return a UTF-16 snapshot containing the complete directional selection. +/// `max_utf8_bytes` lets the JNI layer impose a payload budget. +pub fn surrounding_text_from_host( + host: &(impl SurroundingTextProvider + ?Sized), + before_length: i32, + after_length: i32, + max_utf8_bytes: u32, +) -> Option { + let before_length = u32::try_from(before_length).ok()?; + let after_length = u32::try_from(after_length).ok()?; + let surrounding = host.surrounding_text(SurroundingTextRequest::new( + before_length, + after_length, + TextRangeEncoding::Utf16CodeUnits, + max_utf8_bytes, + ))?; + let text = surrounding.text(); + if text.range().encoding != TextRangeEncoding::Utf16CodeUnits + || text.text().len() > max_utf8_bytes as usize + { + return None; + } + Some(AndroidSurroundingText { + revision: surrounding.revision(), + text: text.text().to_string(), + selection_start: i32::try_from(surrounding.relative_anchor()).ok()?, + selection_end: i32::try_from(surrounding.relative_active()).ok()?, + offset: i32::try_from(text.range().range.start).ok()?, + }) +} + +/// Selection and composing offsets for `InputMethodManager.updateSelection`. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] +pub struct AndroidSelectionUpdate { + /// Directional selection start in absolute UTF-16 code units. + pub selection_start: i32, + /// Directional selection end in absolute UTF-16 code units. + pub selection_end: i32, + /// Composing-range start in UTF-16, or `-1` when there is no composition. + pub composing_start: i32, + /// Composing-range end in UTF-16, or `-1` when there is no composition. + pub composing_end: i32, +} + +/// Convert a coherent host snapshot into Android selection notification values. +pub fn selection_update_from_host( + host: &(impl TextInputHost + TextRangeConverter + ?Sized), +) -> Option { + let snapshot = host.text_input_snapshot(); + let selection = snapshot.selection()?; + let selection_start = convert_offset( + host, + selection.anchor(), + selection.encoding(), + TextRangeEncoding::Utf16CodeUnits, + )?; + let selection_end = convert_offset( + host, + selection.active(), + selection.encoding(), + TextRangeEncoding::Utf16CodeUnits, + )?; + let (composing_start, composing_end) = + snapshot.composition().map_or(Some((-1, -1)), |state| { + let range = convert_range(host, state.range(), TextRangeEncoding::Utf16CodeUnits)?; + Some(( + i32::try_from(range.range.start).ok()?, + i32::try_from(range.range.end).ok()?, + )) + })?; + Some(AndroidSelectionUpdate { + selection_start: i32::try_from(selection_start).ok()?, + selection_end: i32::try_from(selection_end).ok()?, + composing_start, + composing_end, + }) +} + +/// Convert Android `commitText` to a committed text event. +pub fn commit_text_event(text: impl Into, new_cursor_position: i32) -> TextInputEvent { + TextInputEvent::Insert( + TextInsertEvent::new(text).with_cursor_placement(cursor_placement(new_cursor_position)), + ) +} + +/// Convert Android `setComposingText` to a composition snapshot event. +pub fn set_composing_text_event( + text: impl Into, + new_cursor_position: i32, +) -> TextInputEvent { + TextInputEvent::CompositionUpdate( + CompositionState::new(text).with_cursor_placement(cursor_placement(new_cursor_position)), + ) +} + +/// Convert Android `replaceText` to a committed replacement event. +pub fn replace_text_event( + start: i32, + end: i32, + text: impl Into, + new_cursor_position: i32, +) -> Option { + let range = ordered_utf16_range(start, end)?; + Some(TextInputEvent::Insert( + TextInsertEvent::new(text) + .with_replacement_range(range) + .with_cursor_placement(cursor_placement(new_cursor_position)), + )) +} + +/// Convert Android `deleteSurroundingText` lengths to a UTF-16 deletion event. +pub fn delete_surrounding_text_event( + before_length: i32, + after_length: i32, +) -> Option { + Some(TextInputEvent::delete_surrounding_utf16_code_units( + u32::try_from(before_length).ok()?, + u32::try_from(after_length).ok()?, + )) +} + +/// Convert Android `deleteSurroundingTextInCodePoints` lengths. +pub fn delete_surrounding_text_in_code_points_event( + before_length: i32, + after_length: i32, +) -> Option { + Some(TextInputEvent::delete_surrounding_unicode_code_points( + u32::try_from(before_length).ok()?, + u32::try_from(after_length).ok()?, + )) +} + +/// Convert Android `setSelection` to an ordered UTF-16 selection event. +pub fn set_selection_event(start: i32, end: i32) -> Option { + Some(TextInputEvent::set_selection(ordered_utf16_range( + start, end, + )?)) +} + +/// Convert Android `setComposingRegion` to an ordered UTF-16 region event. +/// +/// Android defines a zero-sized clipped region as finishing composition, so a +/// zero-sized input maps to [`TextInputEvent::CompositionEnd`]. +pub fn set_composing_region_event(start: i32, end: i32) -> Option { + let range = ordered_utf16_range(start, end)?; + if range.range.start == range.range.end { + Some(TextInputEvent::CompositionEnd) + } else { + Some(TextInputEvent::set_composing_region(range)) + } +} + +/// Convert Android `finishComposingText` to a composition-end event. +pub const fn finish_composing_text_event() -> TextInputEvent { + TextInputEvent::CompositionEnd +} + +/// Convert Android `EditorInfo.IME_ACTION_*` values to portable actions. +pub const fn editor_action_event(action_id: i32) -> Option { + let action = match action_id { + 2 => TextInputAction::Go, + 3 => TextInputAction::Search, + 4 => TextInputAction::Send, + 5 => TextInputAction::Next, + 6 => TextInputAction::Done, + 7 => TextInputAction::Previous, + _ => return None, + }; + Some(TextInputEvent::action(action)) +} + +fn cursor_placement(new_cursor_position: i32) -> TextCursorPlacement { + let (value, relative_to) = if new_cursor_position > 0 { + (new_cursor_position - 1, TextCursorAnchor::InsertedTextEnd) + } else { + (new_cursor_position, TextCursorAnchor::InsertedTextStart) + }; + TextCursorPlacement::Offset(TextCursorOffset::utf16_code_units(value, relative_to)) +} + +fn ordered_utf16_range(start: i32, end: i32) -> Option { + let start = u32::try_from(start).ok()?; + let end = u32::try_from(end).ok()?; + Some(TextTargetRange::utf16_code_units( + start.min(end), + start.max(end), + )) +} + +fn convert_offset( + host: &(impl TextRangeConverter + ?Sized), + offset: u32, + source: TextRangeEncoding, + destination: TextRangeEncoding, +) -> Option { + let range = target_range(offset, offset, source); + Some(convert_range(host, range, destination)?.range.start) +} + +fn convert_range( + host: &(impl TextRangeConverter + ?Sized), + range: TextTargetRange, + destination: TextRangeEncoding, +) -> Option { + if range.encoding == destination { + Some(range) + } else { + host.convert_range(range, destination) + } +} + +const fn target_range(start: u32, end: u32, encoding: TextRangeEncoding) -> TextTargetRange { + match encoding { + TextRangeEncoding::Utf8Bytes => TextTargetRange::utf8_bytes(start, end), + TextRangeEncoding::Utf16CodeUnits => TextTargetRange::utf16_code_units(start, end), + TextRangeEncoding::UnicodeCodePoints => TextTargetRange::unicode_code_points(start, end), + } +} + +#[cfg(test)] +mod tests { + use super::{ + AndroidSelectionUpdate, commit_text_event, delete_surrounding_text_event, + delete_surrounding_text_in_code_points_event, editor_action_event, replace_text_event, + selection_update_from_host, set_composing_region_event, set_composing_text_event, + set_selection_event, surrounding_text_from_host, + }; + use ui_events::text::{ + TextCursorAnchor, TextCursorOffset, TextCursorPlacement, TextInputAction, TextInputEvent, + TextRangeEncoding, TextTargetRange, + }; + use ui_text_input::{ + CompositionSnapshot, SurroundingTextProvider, SurroundingTextRequest, + SurroundingTextSnapshot, TextInputHost, TextInputSnapshot, TextRangeConverter, + TextRangeSlice, TextSelection, + }; + + #[derive(Debug)] + struct StubHost; + + impl TextInputHost for StubHost { + fn text_input_snapshot(&self) -> TextInputSnapshot { + TextInputSnapshot::new() + .with_revision(3) + .with_document_range(TextTargetRange::utf8_bytes(0, 6)) + .with_selection(TextSelection::utf8_bytes(5, 1)) + .with_composition(CompositionSnapshot::new(TextTargetRange::utf8_bytes(1, 5))) + } + } + + impl TextRangeConverter for StubHost { + fn convert_range( + &self, + range: TextTargetRange, + encoding: TextRangeEncoding, + ) -> Option { + if encoding != TextRangeEncoding::Utf16CodeUnits + || range.encoding != TextRangeEncoding::Utf8Bytes + { + return (range.encoding == encoding).then_some(range); + } + match (range.range.start, range.range.end) { + (1, 1) => Some(TextTargetRange::utf16_code_units(1, 1)), + (5, 5) => Some(TextTargetRange::utf16_code_units(3, 3)), + (1, 5) => Some(TextTargetRange::utf16_code_units(1, 3)), + _ => None, + } + } + } + + impl SurroundingTextProvider for StubHost { + fn surrounding_text( + &self, + request: SurroundingTextRequest, + ) -> Option { + assert_eq!(request.encoding, TextRangeEncoding::Utf16CodeUnits); + SurroundingTextSnapshot::new( + 3, + TextRangeSlice::new("a🙂b", TextTargetRange::utf16_code_units(10, 14))?, + TextSelection::utf16_code_units(14, 11), + ) + } + } + + #[test] + fn surrounding_text_preserves_reversed_utf16_selection_and_offset() { + let text = surrounding_text_from_host(&StubHost, 20, 30, 1024).expect("surrounding text"); + assert_eq!(text.revision(), 3); + assert_eq!(text.text(), "a🙂b"); + assert_eq!(text.selection_start(), 4); + assert_eq!(text.selection_end(), 1); + assert_eq!(text.offset(), 10); + } + + #[test] + fn selection_update_converts_direction_and_composition_to_utf16() { + assert_eq!( + selection_update_from_host(&StubHost), + Some(AndroidSelectionUpdate { + selection_start: 3, + selection_end: 1, + composing_start: 1, + composing_end: 3, + }) + ); + } + + #[test] + fn cursor_placement_matches_android_relative_rules() { + let TextInputEvent::Insert(after) = commit_text_event("🙂", 1) else { + panic!("insert event"); + }; + assert_eq!( + after.cursor_placement, + TextCursorPlacement::Offset(TextCursorOffset::utf16_code_units( + 0, + TextCursorAnchor::InsertedTextEnd + )) + ); + + let TextInputEvent::CompositionUpdate(before) = set_composing_text_event("🙂", -2) else { + panic!("composition event"); + }; + assert_eq!( + before.cursor_placement, + TextCursorPlacement::Offset(TextCursorOffset::utf16_code_units( + -2, + TextCursorAnchor::InsertedTextStart + )) + ); + } + + #[test] + fn deletion_helpers_keep_code_units_and_code_points_distinct() { + let TextInputEvent::DeleteSurrounding(units) = + delete_surrounding_text_event(2, 3).expect("valid lengths") + else { + panic!("delete event"); + }; + assert_eq!(units.encoding, TextRangeEncoding::Utf16CodeUnits); + let TextInputEvent::DeleteSurrounding(points) = + delete_surrounding_text_in_code_points_event(2, 3).expect("valid lengths") + else { + panic!("delete event"); + }; + assert_eq!(points.encoding, TextRangeEncoding::UnicodeCodePoints); + assert!(delete_surrounding_text_event(-1, 0).is_none()); + } + + #[test] + fn explicit_ranges_are_nonnegative_and_normalized() { + assert_eq!( + set_selection_event(7, 3), + Some(TextInputEvent::set_selection( + TextTargetRange::utf16_code_units(3, 7) + )) + ); + assert_eq!( + set_composing_region_event(5, 2), + Some(TextInputEvent::set_composing_region( + TextTargetRange::utf16_code_units(2, 5) + )) + ); + assert_eq!( + set_composing_region_event(2, 2), + Some(TextInputEvent::CompositionEnd) + ); + assert!(set_selection_event(-1, 0).is_none()); + assert!(replace_text_event(-1, 0, "x", 1).is_none()); + } + + #[test] + fn editor_actions_map_android_constants() { + assert_eq!( + editor_action_event(3), + Some(TextInputEvent::action(TextInputAction::Search)) + ); + assert_eq!(editor_action_event(0), None); + assert_eq!(editor_action_event(1), None); + assert_eq!(editor_action_event(8), None); + } +} diff --git a/src/view.rs b/src/view.rs index 53e9c56..191914a 100644 --- a/src/view.rs +++ b/src/view.rs @@ -228,8 +228,8 @@ pub trait ViewPeer { } static NEXT_PEER_ID: AtomicI64 = AtomicI64::new(0); -static PEER_MAP: Mutex>>>>> = - Mutex::new(BTreeMap::new()); +type ViewPeerHandle = SendWrapper>>>; +static PEER_MAP: Mutex> = Mutex::new(BTreeMap::new()); pub(crate) fn with_peer<'local, F, T: Default>( env: JNIEnv<'local>, diff --git a/src/view_configuration.rs b/src/view_configuration.rs index 43d59a9..fc02a50 100644 --- a/src/view_configuration.rs +++ b/src/view_configuration.rs @@ -9,6 +9,8 @@ use jni::{JNIEnv, errors::Error, objects::JObject}; #[derive(Debug, Clone, Default)] #[allow(dead_code)] pub struct ViewConfiguration { + /// Device density used to convert physical pixels to logical coordinates. + pub scale_factor: f64, /// Milliseconds between the first tap's up event and the /// subsequent tap's down event to detect a double tap. pub double_tap_timeout: i32, @@ -74,7 +76,26 @@ impl ViewConfiguration { )? .l()?; + let resources = env + .call_method( + &context, + "getResources", + "()Landroid/content/res/Resources;", + &[], + )? + .l()?; + let metrics = env + .call_method( + &resources, + "getDisplayMetrics", + "()Landroid/util/DisplayMetrics;", + &[], + )? + .l()?; + let scale_factor = env.get_field(&metrics, "density", "F")?.f()? as f64; + Ok(Self { + scale_factor, double_tap_timeout: env .call_static_method(CL, "getDoubleTapTimeout", "()I", &[])? .i()?,