Return the tabs demo to one example

app/Cargo.lock

@@ -180,7 +180,6 @@ dependencies = [
  "pulldown-cmark",
  "serde",
  "serde_json",
- "tabs-ui",
  "tempfile",
  "tokio",
  "ureq",
@@ -3611,13 +3610,6 @@ dependencies = [
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "tabs-ui"
-version = "0.1.0"
-dependencies = [
- "iris",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.27.0"

app/Cargo.toml

@@ -34,7 +34,6 @@ log = { version = "0.4.34", features = ["std"] }
 
 # UI dependencies stay optional so client-only tests do not link the renderer.
 iris = { path = "../iris", optional = true }
-tabs-ui = { path = "../iris/tabs-ui", optional = true }
 libc = { version = "0.2.189", optional = true }
 tokio = { version = "1.53.1", features = ["rt", "time"], optional = true }
 
@@ -51,9 +50,7 @@ default = ["screens", "fixture"]
 screens = ["dep:iris"]
 # Default-on for tests; APK builds opt in so ordinary APKs omit the 1.9 MB fixture.
 fixture = ["screens"]
-transcript-screen = ["screens"]
-tabs-screen = ["screens", "dep:tabs-ui"]
-bench = ["transcript-screen", "fixture", "dep:libc", "dep:tokio"]
+bench = ["screens", "fixture", "dep:libc", "dep:tokio"]
 force-gles = ["screens", "iris/force-gles"]
 
 [dev-dependencies]

app/build-apk.sh

@@ -7,15 +7,15 @@
 #   emulator stays on debug" rule -- pass `release` explicitly for a phone
 #   build). --abi defaults to arm64-v8a (a phone/real device); pass
 #   x86_64 for this checkout's own AVD. --features defaults to
-#   "transcript-screen". Pass "transcript-screen bench" for the retained
-#   benchmark app. Never force GLES for a phone or emulator build; Iris's
+#   "screens". Pass "screens bench" for the retained benchmark app. Never
+#   force GLES for a phone or emulator build; Iris's
 #   runtime selects the available hardware backend.
 set -eu
 cd "$(dirname "$0")"
 
 BUILD_TYPE="debug"
 ABI="arm64-v8a"
-FEATURES="transcript-screen"
+FEATURES="screens"
 case "${1:-}" in
     debug|release) BUILD_TYPE="$1"; shift ;;
 esac

app/run-bench.sh

@@ -9,7 +9,7 @@
 #   (android-project/app/build/outputs/apk/release/app-release.apk) if it
 #   exists, else the
 #   debug one. Build it first with:
-#   ./build-apk.sh release --features "transcript-screen bench"
+#   ./build-apk.sh release --features "screens bench"
 set -eu
 cd "$(dirname "$0")"
 

app/src/android/devlog.rs

@@ -4,14 +4,9 @@
 use android_view::jni::JNIEnv;
 use android_view::jni::objects::{JClass, JObject, JString};
 use android_view::jni::sys::{jlong, jobjectArray};
-#[cfg(feature = "transcript-screen")]
 use std::path::Path;
 use std::{ptr, sync::OnceLock};
 
-/// Gated with its one reader: the tabs demo links no `client-core` and so
-/// has no ring to lay out, and an ungated constant is a warning in that
-/// build (`iris-android-app` without `transcript-screen`).
-#[cfg(feature = "transcript-screen")]
 const FIELDS_PER_LINE: usize = 5;
 
 /// The authority the provider registered itself under, once it has been
@@ -43,12 +38,9 @@ pub extern "system" fn Java_dev_iris_android_demo_DevLogProvider_nativeReady(
     authority: JString,
     files_dir: JString,
 ) {
-    #[cfg(feature = "transcript-screen")]
     if let Some(dir) = string_arg(&mut env, &files_dir) {
         crate::android::app_log::set_crash_dir(Path::new(&dir));
     }
-    #[cfg(not(feature = "transcript-screen"))]
-    let _ = &files_dir;
     let Some(authority) = string_arg(&mut env, &authority) else {
         return;
     };
@@ -95,7 +87,6 @@ pub extern "system" fn Java_dev_iris_android_demo_DevLogProvider_nativeLinesSinc
     string_array(&mut env, &line_fields(since.max(0) as u64))
 }
 
-#[cfg(feature = "transcript-screen")]
 fn status_fields() -> Vec<String> {
     let ring = crate::client::log_ring::process_ring();
     vec![
@@ -105,17 +96,6 @@ fn status_fields() -> Vec<String> {
     ]
 }
 
-/// The tabs demo links no `client-core` and keeps no ring, so it holds
-/// nothing and has never dropped anything -- which is the truth, not a
-/// stand-in. The natives are still exported there, because a `native`
-/// method Java declares and the library does not is an
-/// `UnsatisfiedLinkError` the moment the class loads.
-#[cfg(not(feature = "transcript-screen"))]
-fn status_fields() -> Vec<String> {
-    vec!["0".to_string(), "0".to_string(), "-1".to_string()]
-}
-
-#[cfg(feature = "transcript-screen")]
 fn line_fields(since: u64) -> Vec<String> {
     let (lines, _next) = crate::client::log_ring::process_ring().since(since);
     let mut fields = Vec::with_capacity(lines.len() * FIELDS_PER_LINE);
@@ -129,11 +109,6 @@ fn line_fields(since: u64) -> Vec<String> {
     fields
 }
 
-#[cfg(not(feature = "transcript-screen"))]
-fn line_fields(_since: u64) -> Vec<String> {
-    Vec::new()
-}
-
 /// Null rather than a panic across the JNI boundary: `DevLogProvider`
 /// reads it as "the provider could not answer" and returns no cursor,
 /// which Dev Updater already draws as a distinct state. Taking the app

app/src/android/mod.rs

@@ -7,61 +7,26 @@ use android_view::{
     },
     register_view_class,
 };
-#[cfg(not(feature = "transcript-screen"))]
-use iris::{
-    android::{AndroidAppState, AndroidUiState},
-    macros::AndroidUiState,
-    rsc::StdRsc,
-};
 use log::LevelFilter;
 use std::ffi::c_void;
-#[cfg(feature = "transcript-screen")]
 use std::path::{Path, PathBuf};
 
-/// The app's own log ring and its upload -- only where `client-core` is
-/// linked, which is every build that has a server to send to. The plain
-/// tabs demo keeps `android_logger` alone, as it always had.
-#[cfg(feature = "transcript-screen")]
+/// The app's own log ring and its upload.
 mod app_log;
 #[cfg(feature = "bench")]
 mod bench_client;
 #[cfg(feature = "bench")]
 mod bench_jni;
 mod devlog;
-#[cfg(feature = "transcript-screen")]
 mod enrollment;
-#[cfg(all(feature = "transcript-screen", not(feature = "bench")))]
+#[cfg(not(feature = "bench"))]
 mod transcript_client;
 
 /// The app's `View` subclass, matching the Java side's package --
 /// `app/src/main/java/dev/iris/android/demo/IrisView.java`.
 const VIEW_CLASS: &str = "dev/iris/android/demo/IrisView";
 
-#[cfg(not(feature = "transcript-screen"))]
-#[derive(AndroidUiState)]
-pub struct Client {
-    ui_state: AndroidUiState,
-}
-
-#[cfg(not(feature = "transcript-screen"))]
-impl AndroidAppState for Client {
-    fn new(mut ui_state: AndroidUiState, rsc: &mut StdRsc<Self>) -> Self {
-        // `widgets.info` is the winit example's frame-debug readout, kept
-        // current from `DesktopAppState::window_event` -- android-view has
-        // no per-frame hook to drive the equivalent from here yet, so it
-        // is left at its built "" text rather than wired to nothing.
-        let _ = tabs_ui::build(rsc, &mut ui_state);
-        Self { ui_state }
-    }
-
-    fn back_pressed(&mut self, _rsc: &mut StdRsc<Self>) -> bool {
-        false
-    }
-}
-
-#[cfg(not(feature = "transcript-screen"))]
-type ActiveClient = Client;
-#[cfg(all(feature = "transcript-screen", not(feature = "bench")))]
+#[cfg(not(feature = "bench"))]
 type ActiveClient = transcript_client::TranscriptClient;
 #[cfg(feature = "bench")]
 type ActiveClient = bench_client::BenchClient;
@@ -79,18 +44,7 @@ extern "system" fn new_view_peer<'local>(
 /// mirrors android-view's own demo, which carries the same comment.
 #[unsafe(no_mangle)]
 pub unsafe extern "system" fn JNI_OnLoad(vm: *mut RawJavaVM, _: *mut c_void) -> jint {
-    // The ring in front of `android_logger` where there is one (see
-    // `app_log`), and `android_logger` alone otherwise. Both install the
-    // same tag and level, so `logcat` cannot tell the two builds apart --
-    // the ring only adds a second reader.
-    #[cfg(feature = "transcript-screen")]
     app_log::install(LevelFilter::Debug);
-    #[cfg(not(feature = "transcript-screen"))]
-    android_logger::init_once(
-        android_logger::Config::default()
-            .with_max_level(LevelFilter::Debug)
-            .with_tag("iris-android-app"),
-    );
     let vm = unsafe { JavaVM::from_raw(vm) }.unwrap();
     let mut env = vm.get_env().unwrap();
     register_view_class(&mut env, VIEW_CLASS, new_view_peer);
@@ -118,11 +72,8 @@ pub extern "system" fn Java_dev_iris_android_demo_MainActivity_nativeSetFilesDir
     let Some(dir) = jstring(&mut env, dir) else {
         return;
     };
-    #[cfg(feature = "transcript-screen")]
-    {
-        app_log::set_crash_dir(Path::new(&dir));
-        enrollment::set_files_dir(PathBuf::from(&dir));
-    }
+    app_log::set_crash_dir(Path::new(&dir));
+    enrollment::set_files_dir(PathBuf::from(&dir));
     log::debug!("iris app: files directory is {dir}");
 }
 
@@ -137,15 +88,12 @@ pub extern "system" fn Java_dev_iris_android_demo_MainActivity_nativeEnroll(
     let Some(uri) = jstring(&mut env, uri) else {
         return;
     };
-    #[cfg(feature = "transcript-screen")]
     match enrollment::apply_link(&uri) {
         // Never the token: `wg-app-link`'s enroll module forbids logging
         // it, and this line would otherwise be the one place it leaked.
         Ok(server) => log::info!("iris app: enrolled with {}:{}", server.host, server.port),
         Err(error) => log::warn!("iris app: that enrolment link was refused -- {error}"),
     }
-    #[cfg(not(feature = "transcript-screen"))]
-    log::warn!("iris app: {uri} arrived, but this build has no server to enrol with");
 }
 
 fn jstring(env: &mut JNIEnv, value: JString) -> Option<String> {