iris is the framework alone; the app is one crate in app-rust/
Iris: "the organization of the rust rewrite is a mess right now... there shouldn't be anything related to the app inside of iris. Iris is supposed to be the UI framework alone." And, on the crate count: "I'm confused why the app only code needs more than one crate though." Nine cargo workspaces become three, and the port's project code -- which sat in five places, four of them inside the framework -- becomes one crate, `ai-app`, in `app-rust/`: client-core -> app-rust/src/client iris/transcript-ui -> app-rust/src/ui iris/transcript-fixture -> app-rust/src/ui/fixture.rs + tests/ + touch/ iris/desktop-app -> app-rust/src/desktop + src/bin_desktop.rs iris/android-app -> app-rust/src/android + android-project/ android-shell -> app-rust/src/shell iris/ keeps core, macro, the iris crate, tabs-ui and rig-input, and now mentions no session, transcript, setup or server anywhere. Only two of the old splits had a reason that survived reading. event-model stays a crate at the repo root because server/ depends on it too, so a crate is what makes the backend and the app agree by construction. The two Android .so names looked like a hard constraint -- a package produces one library artifact -- until P2 turned out to already plan merging those two Android apps into one; both faces now come out of libai_app.so, picked apart by features so `--no-default-features --features shell` keeps wgpu, parley and iris out of the Compose app's APK. docs/RUST.md's "One app crate" has the rest, including what each remaining feature is for. DECISIONS.md and SUBAGENTS.md move into docs/ with everything else. Verified: ./run-tests.sh and `cd iris && cargo test` green, clippy and fmt clean in all five workspaces, `cargo ndk -t x86_64` links libai_app.so, build-apk.sh produces an APK that installs and launches on this checkout's emulator (Gl ... virgl, as expected), and the phone-sized headless screenshot renders the transcript unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
7b54aaf3c4
commit
a9312e9431
113 files changed
+23221
-2992
No files matched your search
@@ -0,0 +1,45 @@
|
||||
//! iris's second windowing backend: `android-view` (a `SurfaceView` plus a
|
||||
//! JNI `ViewPeer`) instead of winit. See RUST.md's I2 for why this exists
|
||||
//! as a second backend rather than winit's own (unfinished, and blocked on
|
||||
//! `android-activity`'s backend-feature requirement) Android support, and
|
||||
//! for the pass condition this was built against.
|
||||
//!
|
||||
//! Structured to mirror `default/` module for module: `view.rs` is that
|
||||
//! module's `app.rs` + `state.rs` combined (android-view has one harness
|
||||
//! type, `ViewPeer`, where winit splits `ApplicationHandler` from the
|
||||
//! per-window state), `render.rs` is `render.rs`, `input.rs` is `input.rs`,
|
||||
//! `attr.rs` is `attr.rs`. `ime.rs` and `insets.rs` have no winit
|
||||
//! counterpart: winit cannot drive an IME beyond `Ime::Preedit`/`Commit`
|
||||
//! (RUST.md's E1) and has no concept of Android's window insets at all.
|
||||
|
||||
mod access;
|
||||
mod attr;
|
||||
mod ime;
|
||||
mod input;
|
||||
mod insets;
|
||||
mod platform;
|
||||
mod render;
|
||||
mod view;
|
||||
|
||||
pub use insets::Insets;
|
||||
pub use render::AndroidRenderer;
|
||||
pub use view::{
|
||||
AndroidAppState, AndroidRsc, AndroidUiState, HasAndroidUiState, IrisViewPeer, WindowInsets,
|
||||
new_peer,
|
||||
};
|
||||
|
||||
/// Registers the extra native methods this backend needs beyond what
|
||||
/// `android_view::register_view_class` covers (window insets -- see
|
||||
/// `insets.rs`'s doc comment for why that one could not ride along on an
|
||||
/// existing android-view callback the way the back gesture does). Call
|
||||
/// from `JNI_OnLoad` alongside `register_view_class`, on the same `View`
|
||||
/// subclass.
|
||||
pub fn register_native_methods<'local, 'other_local>(
|
||||
env: &mut android_view::jni::JNIEnv<'local>,
|
||||
class: impl android_view::jni::descriptors::Desc<
|
||||
'local,
|
||||
android_view::jni::objects::JClass<'other_local>,
|
||||
>,
|
||||
) {
|
||||
insets::register_native_methods(env, class);
|
||||
}
|
||||
Reference in new issue
Block a user