Use one standard Iris resource bundle

app/src/android/bench_client.rs

@@ -3,7 +3,7 @@ use crate::client::transcript_fold::{TranscriptItem, fold_event};
 use crate::ui::{self, TranscriptScreen};
 use android_view::jni::{JavaVM, objects::GlobalRef};
 use event_model::SeqEvent;
-use iris::android::{AndroidAppState, AndroidRsc, AndroidUiState, HasAndroidUiState};
+use iris::android::{AndroidAppState, AndroidUiState};
 use iris::prelude::*;
 use std::{
     fs, mem,
@@ -42,6 +42,7 @@ const POLL_MS: u64 = 16;
 
 const REPORT_MAX_HEIGHT_DP: f32 = 260.0;
 
+#[derive(AndroidUiState)]
 pub struct BenchClient {
     ui_state: AndroidUiState,
     content: WeakWidget<WidgetPtr>,
@@ -65,15 +66,6 @@ struct ImeState {
     hidden_events: u32,
 }
 
-impl HasAndroidUiState for BenchClient {
-    fn android_state(&self) -> &AndroidUiState {
-        &self.ui_state
-    }
-    fn android_state_mut(&mut self) -> &mut AndroidUiState {
-        &mut self.ui_state
-    }
-}
-
 fn placeholder<Rsc: HasEvents>(rsc: &mut Rsc, message: &str) -> StrongWidget {
     wtext(message.to_string())
         .color(PaintId::WHITE)
@@ -121,7 +113,7 @@ fn battery_line(samples: &[i32]) -> String {
 }
 
 impl AndroidAppState for BenchClient {
-    fn new(mut ui_state: AndroidUiState, rsc: &mut AndroidRsc<Self>) -> Self {
+    fn new(mut ui_state: AndroidUiState, rsc: &mut StdRsc<Self>) -> Self {
         let content = WidgetPtr::new().add(rsc);
         let loading = placeholder(rsc, "Loading fixture...");
         content(rsc).set(loading);
@@ -195,19 +187,15 @@ impl AndroidAppState for BenchClient {
         client
     }
 
-    fn platform_ready(&mut self, _rsc: &mut AndroidRsc<Self>, vm: JavaVM, view: GlobalRef) {
+    fn platform_ready(&mut self, _rsc: &mut StdRsc<Self>, vm: JavaVM, view: GlobalRef) {
         self.platform = Some(Arc::new(PlatformHandle::new(vm, view)));
     }
 
-    fn back_pressed(&mut self, _rsc: &mut AndroidRsc<Self>) -> bool {
+    fn back_pressed(&mut self, _rsc: &mut StdRsc<Self>) -> bool {
         false
     }
 
-    fn on_insets_changed(
-        &mut self,
-        rsc: &mut AndroidRsc<Self>,
-        insets: iris::android::WindowInsets,
-    ) {
+    fn on_insets_changed(&mut self, rsc: &mut StdRsc<Self>, insets: iris::android::WindowInsets) {
         if insets.top != self.last_top_pad {
             self.last_top_pad = insets.top;
             let controls = bench_controls(rsc, insets.top);
@@ -255,7 +243,7 @@ impl AndroidAppState for BenchClient {
 
 const KEYBOARD_DIAGNOSTICS_DELAY_MS: u64 = 500;
 
-type Rsc = AndroidRsc<BenchClient>;
+type Rsc = StdRsc<BenchClient>;
 
 /// What a report says about the `iris::input`/`iris::frame` trace, from
 /// the flag read at the start of what is being reported and again at the