From cc29669cfb010969dead05fd2579c1641fd72848 Mon Sep 17 00:00:00 2001
From: Ray Ryan <ray@squareup.com>
Date: Thu, 9 Mar 2023 11:16:52 -0800
Subject: [PATCH 1/4] cp samples/{hellow-workflow,nested-overlays}

---
 samples/nested-overlays/build.gradle.kts      | 25 +++++++++++
 .../nestedoverlays/NestedOverlaysAppTest.kt   | 40 +++++++++++++++++
 .../src/main/AndroidManifest.xml              | 23 ++++++++++
 .../sample/nestedoverlays/HelloRendering.kt   | 19 ++++++++
 .../nestedoverlays/NestedOverlaysActivity.kt  | 43 +++++++++++++++++++
 .../nestedoverlays/NestedOverlaysWorkflow.kt  | 42 ++++++++++++++++++
 .../main/res/layout/hello_goodbye_layout.xml  | 14 ++++++
 .../src/main/res/values/strings.xml           |  3 ++
 .../src/main/res/values/styles.xml            |  8 ++++
 settings.gradle.kts                           |  1 +
 10 files changed, 218 insertions(+)
 create mode 100644 samples/nested-overlays/build.gradle.kts
 create mode 100644 samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
 create mode 100644 samples/nested-overlays/src/main/AndroidManifest.xml
 create mode 100644 samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt
 create mode 100644 samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt
 create mode 100644 samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
 create mode 100644 samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml
 create mode 100644 samples/nested-overlays/src/main/res/values/strings.xml
 create mode 100644 samples/nested-overlays/src/main/res/values/styles.xml

diff --git a/samples/nested-overlays/build.gradle.kts b/samples/nested-overlays/build.gradle.kts
new file mode 100644
index 0000000000..7d31f7a461
--- /dev/null
+++ b/samples/nested-overlays/build.gradle.kts
@@ -0,0 +1,25 @@
+plugins {
+  id("com.android.application")
+  `kotlin-android`
+  `android-sample-app`
+  `android-ui-tests`
+}
+
+android {
+  defaultConfig {
+    applicationId = "com.squareup.sample.nestedoverlays"
+  }
+  namespace = "com.squareup.sample.nestedoverlays"
+}
+
+dependencies {
+  debugImplementation(libs.squareup.leakcanary.android)
+
+  implementation(libs.androidx.activity.ktx)
+  implementation(libs.androidx.lifecycle.viewmodel.ktx)
+  implementation(libs.androidx.lifecycle.viewmodel.savedstate)
+  implementation(libs.androidx.viewbinding)
+
+  implementation(project(":workflow-ui:core-android"))
+  implementation(project(":workflow-ui:core-common"))
+}
diff --git a/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt b/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
new file mode 100644
index 0000000000..5d20722b29
--- /dev/null
+++ b/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
@@ -0,0 +1,40 @@
+package com.squareup.sample.nestedoverlays
+
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
+import com.squareup.workflow1.ui.internal.test.inAnyView
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@OptIn(WorkflowUiExperimentalApi::class)
+class NestedOverlaysAppTest {
+
+  private val scenarioRule = ActivityScenarioRule(NestedOverlaysActivity::class.java)
+
+  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+    .around(scenarioRule)
+    .around(IdlingDispatcherRule)
+
+  @Test fun togglesHelloAndGoodbye() {
+    inAnyView(withText("Hello"))
+      .check(matches(isDisplayed()))
+      .perform(click())
+
+    inAnyView(withText("Goodbye"))
+      .check(matches(isDisplayed()))
+      .perform(click())
+
+    inAnyView(withText("Hello"))
+      .check(matches(isDisplayed()))
+  }
+}
diff --git a/samples/nested-overlays/src/main/AndroidManifest.xml b/samples/nested-overlays/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..594e1fde1d
--- /dev/null
+++ b/samples/nested-overlays/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+  <application
+      android:allowBackup="false"
+      android:label="@string/app_name"
+      android:theme="@style/AppTheme"
+      tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon"
+      >
+
+    <activity android:name="com.squareup.sample.nestedoverlays.NestedOverlaysActivity"
+        android:exported="true">
+
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+
+    </activity>
+
+  </application>
+</manifest>
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt
new file mode 100644
index 0000000000..3087d9deda
--- /dev/null
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt
@@ -0,0 +1,19 @@
+package com.squareup.sample.nestedoverlays
+
+import com.squareup.sample.nestedoverlays.databinding.HelloGoodbyeLayoutBinding
+import com.squareup.workflow1.ui.AndroidScreen
+import com.squareup.workflow1.ui.ScreenViewFactory
+import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
+import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+
+@OptIn(WorkflowUiExperimentalApi::class)
+data class HelloRendering(
+  val message: String,
+  val onClick: () -> Unit
+) : AndroidScreen<HelloRendering> {
+  override val viewFactory: ScreenViewFactory<HelloRendering> =
+    fromViewBinding(HelloGoodbyeLayoutBinding::inflate) { r, _ ->
+      helloMessage.text = r.message
+      helloMessage.setOnClickListener { r.onClick() }
+    }
+}
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt
new file mode 100644
index 0000000000..44b5b2b2d7
--- /dev/null
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt
@@ -0,0 +1,43 @@
+@file:OptIn(WorkflowExperimentalRuntime::class)
+
+package com.squareup.sample.nestedoverlays
+
+import android.os.Bundle
+import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.squareup.workflow1.WorkflowExperimentalRuntime
+import com.squareup.workflow1.config.AndroidRuntimeConfigTools
+import com.squareup.workflow1.ui.WorkflowLayout
+import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+import com.squareup.workflow1.ui.renderWorkflowIn
+import kotlinx.coroutines.flow.StateFlow
+
+@OptIn(WorkflowUiExperimentalApi::class)
+class NestedOverlaysActivity : AppCompatActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    // This ViewModel will survive configuration changes. It's instantiated
+    // by the first call to viewModels(), and that original instance is returned by
+    // succeeding calls.
+    val model: HelloViewModel by viewModels()
+    setContentView(
+      WorkflowLayout(this).apply { take(lifecycle, model.renderings) }
+    )
+  }
+}
+
+class HelloViewModel(savedState: SavedStateHandle) : ViewModel() {
+  @OptIn(WorkflowUiExperimentalApi::class)
+  val renderings: StateFlow<HelloRendering> by lazy {
+    renderWorkflowIn(
+      workflow = NestedOverlaysWorkflow,
+      scope = viewModelScope,
+      savedStateHandle = savedState,
+      runtimeConfig = AndroidRuntimeConfigTools.getAppWorkflowRuntimeConfig()
+    )
+  }
+}
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
new file mode 100644
index 0000000000..9503cf7051
--- /dev/null
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
@@ -0,0 +1,42 @@
+package com.squareup.sample.nestedoverlays
+
+import com.squareup.sample.nestedoverlays.NestedOverlaysWorkflow.State
+import com.squareup.sample.nestedoverlays.NestedOverlaysWorkflow.State.Goodbye
+import com.squareup.sample.nestedoverlays.NestedOverlaysWorkflow.State.Hello
+import com.squareup.workflow1.Snapshot
+import com.squareup.workflow1.StatefulWorkflow
+import com.squareup.workflow1.action
+import com.squareup.workflow1.parse
+
+object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloRendering>() {
+  enum class State {
+    Hello,
+    Goodbye
+  }
+
+  override fun initialState(
+    props: Unit,
+    snapshot: Snapshot?
+  ): State = snapshot?.bytes?.parse { source -> if (source.readInt() == 1) Hello else Goodbye }
+    ?: Hello
+
+  override fun render(
+    renderProps: Unit,
+    renderState: State,
+    context: RenderContext
+  ): HelloRendering {
+    return HelloRendering(
+      message = renderState.name,
+      onClick = { context.actionSink.send(helloAction) }
+    )
+  }
+
+  override fun snapshotState(state: State): Snapshot = Snapshot.of(if (state == Hello) 1 else 0)
+
+  private val helloAction = action {
+    state = when (state) {
+      Hello -> Goodbye
+      Goodbye -> Hello
+    }
+  }
+}
diff --git a/samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml b/samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml
new file mode 100644
index 0000000000..dcd6f7c0b6
--- /dev/null
+++ b/samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:id="@+id/hello_message"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:gravity="center"
+    />
+
+</LinearLayout>
diff --git a/samples/nested-overlays/src/main/res/values/strings.xml b/samples/nested-overlays/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..eaa5276c97
--- /dev/null
+++ b/samples/nested-overlays/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+  <string name="app_name">Nested Overlays</string>
+</resources>
diff --git a/samples/nested-overlays/src/main/res/values/styles.xml b/samples/nested-overlays/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..e2331afcc2
--- /dev/null
+++ b/samples/nested-overlays/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+  <!-- Base application theme. -->
+  <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <!-- Customize your theme here. -->
+  </style>
+
+</resources>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 662672fedb..c2a8ddcac1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -55,6 +55,7 @@ include(
   ":samples:hello-terminal:todo-terminal-app",
   ":samples:hello-workflow",
   ":samples:hello-workflow-fragment",
+  ":samples:nested-overlays",
   ":samples:stub-visibility",
   ":samples:tictactoe:app",
   ":samples:tictactoe:common",

From fbfda508ef331ee039f7970f03b633c18d049162 Mon Sep 17 00:00:00 2001
From: Ray Ryan <ray@squareup.com>
Date: Thu, 9 Mar 2023 14:44:59 -0800
Subject: [PATCH 2/4] Nested overlays sample uses overlays.

And can demonstrate the bug where dialogs are shown out of order:

- Click _Cover Everything_
- Click _Cover Body_

The red inner dialog is shown over the outer green dialog,
but the green one should always be on top. (#966)

Also introduces `name` parameter for `BodyAndOverlaysScreen`, because they're
a nightmare to nest without it. See the kdoc for details.
---
 samples/nested-overlays/lint-baseline.xml     |   4 +
 .../nestedoverlays/NestedOverlaysAppTest.kt   |  85 +++++++++++---
 .../sample/nestedoverlays/ButtonBar.kt        |  52 +++++++++
 .../sample/nestedoverlays/HelloRendering.kt   |  19 ----
 .../nestedoverlays/NestedOverlaysActivity.kt  |   7 +-
 .../nestedoverlays/NestedOverlaysWorkflow.kt  | 107 ++++++++++++++----
 .../nestedoverlays/TopAndBottomBarsScreen.kt  |  31 +++++
 .../main/res/layout/hello_goodbye_layout.xml  |  14 ---
 .../main/res/layout/top_and_bottom_bars.xml   |  28 +++++
 .../src/main/res/values/strings.xml           |  10 ++
 .../container/ScreenOverlayDialogFactory.kt   |   3 +-
 .../ui/container/BodyAndOverlaysScreen.kt     |  15 ++-
 12 files changed, 300 insertions(+), 75 deletions(-)
 create mode 100644 samples/nested-overlays/lint-baseline.xml
 create mode 100644 samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt
 delete mode 100644 samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt
 create mode 100644 samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/TopAndBottomBarsScreen.kt
 delete mode 100644 samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml
 create mode 100644 samples/nested-overlays/src/main/res/layout/top_and_bottom_bars.xml

diff --git a/samples/nested-overlays/lint-baseline.xml b/samples/nested-overlays/lint-baseline.xml
new file mode 100644
index 0000000000..4aec7fcd50
--- /dev/null
+++ b/samples/nested-overlays/lint-baseline.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.1)" variant="fatal" version="7.4.1">
+
+</issues>
diff --git a/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt b/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
index 5d20722b29..bebcd2ac73 100644
--- a/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
+++ b/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
@@ -1,40 +1,99 @@
 package com.squareup.sample.nestedoverlays
 
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withParent
+import androidx.test.espresso.matcher.ViewMatchers.withParentIndex
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
+import org.hamcrest.core.AllOf.allOf
+import org.hamcrest.core.IsNot.not
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 class NestedOverlaysAppTest {
 
   private val scenarioRule = ActivityScenarioRule(NestedOverlaysActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
-  @Test fun togglesHelloAndGoodbye() {
-    inAnyView(withText("Hello"))
-      .check(matches(isDisplayed()))
-      .perform(click())
+  @Test fun basics() {
+    onTopCoverBody().assertDisplayed()
+    onTopCoverEverything().assertDisplayed()
+    onBottomCoverBody().assertDisplayed()
+    onBottomCoverEverything().assertDisplayed()
 
-    inAnyView(withText("Goodbye"))
-      .check(matches(isDisplayed()))
-      .perform(click())
+    onTopCoverBody().perform(click())
+    onView(withText("Close")).perform(click())
+    onTopCoverEverything().perform(click())
+    onView(withText("Close")).perform(click())
 
-    inAnyView(withText("Hello"))
-      .check(matches(isDisplayed()))
+    onView(withText("Hide Top Bar")).perform(click())
+    onTopCoverBody().assertNotDisplayed()
+    onTopCoverEverything().assertNotDisplayed()
+    onBottomCoverBody().assertDisplayed()
+    onBottomCoverEverything().assertDisplayed()
+
+    onView(withText("Hide Bottom Bar")).perform(click())
+    onTopCoverBody().assertNotDisplayed()
+    onTopCoverEverything().assertNotDisplayed()
+    onBottomCoverBody().assertNotDisplayed()
+    onBottomCoverEverything().assertNotDisplayed()
+  }
+
+  // https://github.com/square/workflow-kotlin/issues/966
+  @Test fun canInsertDialog() {
+    onTopCoverEverything().perform(click())
+    onView(withText("Hide Top Bar")).check(doesNotExist())
+    onView(withText("Cover Body")).perform(click())
+
+    // This line fails due to https://github.com/square/workflow-kotlin/issues/966
+    // onView(withText("Hide Top Bar")).check(doesNotExist())
+
+    // Should continue to close the top sheet and assert that the inner sheet is visible.
+  }
+
+  // So far can't express this in Espresso. Considering move to Maestro
+  // @Test fun canClickPastInnerWindow() {
+  //   onView(allOf(withText("Cover Everything"), withParent(withParentIndex(0))))
+  //     .perform(click())
+  //
+  //   scenario.onActivity { activity ->
+  //     onView(allOf(withText("Cover Everything"), withParent(withParentIndex(0))))
+  //       .inRoot(withDecorView(not(`is`(activity.window.decorView))))
+  //       .perform(click())
+  //   }
+  // }
+  
+  private fun ViewInteraction.assertNotDisplayed() {
+    check(matches(not(isDisplayed())))
   }
+
+  private fun ViewInteraction.assertDisplayed() {
+    check(matches(isDisplayed()))
+  }
+
+  private fun onBottomCoverEverything() =
+    onView(allOf(withText("Cover Everything"), withParent(withParentIndex(2))))
+
+  private fun onBottomCoverBody() =
+    onView(allOf(withText("Cover Body"), withParent(withParentIndex(2))))
+
+  private fun onTopCoverBody() =
+    onView(allOf(withText("Cover Body"), withParent(withParentIndex(0))))
+
+  private fun onTopCoverEverything() =
+    onView(allOf(withText("Cover Everything"), withParent(withParentIndex(0))))
 }
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt
new file mode 100644
index 0000000000..ce85e72f31
--- /dev/null
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt
@@ -0,0 +1,52 @@
+package com.squareup.sample.nestedoverlays
+
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.widget.LinearLayout
+import androidx.annotation.ColorRes
+import androidx.annotation.StringRes
+import androidx.core.view.get
+import com.squareup.workflow1.ui.AndroidScreen
+import com.squareup.workflow1.ui.ScreenViewFactory
+import com.squareup.workflow1.ui.ScreenViewHolder
+import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+import android.widget.Button as ButtonView
+
+data class Button(
+  @StringRes val name: Int,
+  val onClick: () -> Unit
+)
+
+@OptIn(WorkflowUiExperimentalApi::class)
+class ButtonBar(
+  vararg buttons: Button?,
+  @ColorRes val color: Int = -1,
+) : AndroidScreen<ButtonBar> {
+  val buttons: List<Button> = buttons.filterNotNull().toList()
+
+  override val viewFactory =
+    ScreenViewFactory.fromCode<ButtonBar> { _, initialEnvironment, context, _ ->
+      LinearLayout(context).let { view ->
+        if (color > -1) view.background = ColorDrawable(view.resources.getColor(color))
+
+        view.gravity = Gravity.CENTER
+
+        ScreenViewHolder(initialEnvironment, view) { bar, _ ->
+          val existing = view.childCount
+
+          bar.buttons.forEachIndexed { index, button ->
+            val buttonView = if (index < existing) {
+              view[index] as ButtonView
+            } else {
+              ButtonView(context).also { view.addView(it) }
+            }
+            with(buttonView) {
+              text = view.resources.getText(button.name)
+              setOnClickListener { button.onClick() }
+            }
+          }
+          for (i in bar.buttons.size until view.childCount) view.removeViewAt(i)
+        }
+      }
+    }
+}
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt
deleted file mode 100644
index 3087d9deda..0000000000
--- a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/HelloRendering.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.squareup.sample.nestedoverlays
-
-import com.squareup.sample.nestedoverlays.databinding.HelloGoodbyeLayoutBinding
-import com.squareup.workflow1.ui.AndroidScreen
-import com.squareup.workflow1.ui.ScreenViewFactory
-import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-
-@OptIn(WorkflowUiExperimentalApi::class)
-data class HelloRendering(
-  val message: String,
-  val onClick: () -> Unit
-) : AndroidScreen<HelloRendering> {
-  override val viewFactory: ScreenViewFactory<HelloRendering> =
-    fromViewBinding(HelloGoodbyeLayoutBinding::inflate) { r, _ ->
-      helloMessage.text = r.message
-      helloMessage.setOnClickListener { r.onClick() }
-    }
-}
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt
index 44b5b2b2d7..97bcefada0 100644
--- a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysActivity.kt
@@ -10,6 +10,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.squareup.workflow1.WorkflowExperimentalRuntime
 import com.squareup.workflow1.config.AndroidRuntimeConfigTools
+import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.renderWorkflowIn
@@ -23,16 +24,16 @@ class NestedOverlaysActivity : AppCompatActivity() {
     // This ViewModel will survive configuration changes. It's instantiated
     // by the first call to viewModels(), and that original instance is returned by
     // succeeding calls.
-    val model: HelloViewModel by viewModels()
+    val model: NestedOverlaysViewModel by viewModels()
     setContentView(
       WorkflowLayout(this).apply { take(lifecycle, model.renderings) }
     )
   }
 }
 
-class HelloViewModel(savedState: SavedStateHandle) : ViewModel() {
+class NestedOverlaysViewModel(savedState: SavedStateHandle) : ViewModel() {
   @OptIn(WorkflowUiExperimentalApi::class)
-  val renderings: StateFlow<HelloRendering> by lazy {
+  val renderings: StateFlow<Screen> by lazy {
     renderWorkflowIn(
       workflow = NestedOverlaysWorkflow,
       scope = viewModelScope,
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
index 9503cf7051..20c396c307 100644
--- a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
@@ -1,42 +1,105 @@
+@file:OptIn(WorkflowUiExperimentalApi::class)
+
 package com.squareup.sample.nestedoverlays
 
 import com.squareup.sample.nestedoverlays.NestedOverlaysWorkflow.State
-import com.squareup.sample.nestedoverlays.NestedOverlaysWorkflow.State.Goodbye
-import com.squareup.sample.nestedoverlays.NestedOverlaysWorkflow.State.Hello
 import com.squareup.workflow1.Snapshot
 import com.squareup.workflow1.StatefulWorkflow
-import com.squareup.workflow1.action
-import com.squareup.workflow1.parse
+import com.squareup.workflow1.ui.Screen
+import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.container.FullScreenOverlay
+import com.squareup.workflow1.ui.container.Overlay
 
-object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, HelloRendering>() {
-  enum class State {
-    Hello,
-    Goodbye
-  }
+typealias NestedOverlaysRendering = BodyAndOverlaysScreen<
+  TopAndBottomBarsScreen<BodyAndOverlaysScreen<Screen, Overlay>>,
+  Overlay
+  >
+
+object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, NestedOverlaysRendering>() {
+  data class State(
+    val showTopBar: Boolean = true,
+    val showBottomBar: Boolean = true,
+    val showInnerSheet: Boolean = false,
+    val showOuterSheet: Boolean = false
+  )
 
   override fun initialState(
     props: Unit,
     snapshot: Snapshot?
-  ): State = snapshot?.bytes?.parse { source -> if (source.readInt() == 1) Hello else Goodbye }
-    ?: Hello
+  ) = State()
 
   override fun render(
     renderProps: Unit,
     renderState: State,
     context: RenderContext
-  ): HelloRendering {
-    return HelloRendering(
-      message = renderState.name,
-      onClick = { context.actionSink.send(helloAction) }
+  ): NestedOverlaysRendering {
+    val toggleTopBarButton = Button(
+      name = if (renderState.showTopBar) R.string.HIDE_TOP else R.string.SHOW_TOP,
+      onClick = context.eventHandler { state = state.copy(showTopBar = !state.showTopBar) }
     )
-  }
 
-  override fun snapshotState(state: State): Snapshot = Snapshot.of(if (state == Hello) 1 else 0)
+    val toggleBottomBarButton = Button(
+      name = if (renderState.showBottomBar) R.string.HIDE_BOTTOM else R.string.SHOW_BOTTOM,
+      onClick = context.eventHandler { state = state.copy(showBottomBar = !state.showBottomBar) }
+    )
+
+    val outerSheet = if (!renderState.showOuterSheet) null else FullScreenOverlay(
+      ButtonBar(
+        Button(
+          name = R.string.CLOSE,
+          onClick = context.eventHandler { state = state.copy(showOuterSheet = false) }
+        ),
+        context.toggleInnerSheetButton(renderState),
+        color = android.R.color.holo_green_light
+      )
+    )
 
-  private val helloAction = action {
-    state = when (state) {
-      Hello -> Goodbye
-      Goodbye -> Hello
-    }
+    val innerSheet = if (!renderState.showInnerSheet) null else FullScreenOverlay(
+      ButtonBar(
+        Button(
+          name = R.string.CLOSE,
+          onClick = context.eventHandler { state = state.copy(showInnerSheet = false) }
+        ),
+        toggleTopBarButton,
+        toggleBottomBarButton,
+        color = android.R.color.holo_red_light
+      )
+    )
+    val bodyBarButtons = ButtonBar(toggleTopBarButton, toggleBottomBarButton)
+
+    return BodyAndOverlaysScreen(
+      name = "outer",
+      overlays = listOfNotNull(outerSheet),
+      body = TopAndBottomBarsScreen(
+        topBar = if (!renderState.showTopBar) null else context.topBottomBar(renderState),
+        content = BodyAndOverlaysScreen(
+          name = "inner",
+          body = bodyBarButtons,
+          overlays = listOfNotNull(innerSheet)
+        ),
+        bottomBar = if (!renderState.showBottomBar) null else context.topBottomBar(renderState)
+      )
+    )
   }
+
+  override fun snapshotState(state: State) = null
+
+  private fun RenderContext.topBottomBar(
+    renderState: State
+  ) = ButtonBar(
+    toggleInnerSheetButton(renderState),
+    Button(
+      name = R.string.COVER_ALL,
+      onClick = eventHandler { state = state.copy(showOuterSheet = true) }
+    )
+  )
+
+  private fun RenderContext.toggleInnerSheetButton(renderState: State) =
+    Button(
+      name = if (renderState.showInnerSheet) R.string.REVEAL_BODY else R.string.COVER_BODY,
+      onClick = eventHandler {
+        state = state.copy(showInnerSheet = !state.showInnerSheet)
+      }
+    )
 }
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/TopAndBottomBarsScreen.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/TopAndBottomBarsScreen.kt
new file mode 100644
index 0000000000..9314cd33b7
--- /dev/null
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/TopAndBottomBarsScreen.kt
@@ -0,0 +1,31 @@
+package com.squareup.sample.nestedoverlays
+
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import com.squareup.sample.nestedoverlays.databinding.TopAndBottomBarsBinding
+import com.squareup.workflow1.ui.AndroidScreen
+import com.squareup.workflow1.ui.Screen
+import com.squareup.workflow1.ui.ScreenViewFactory
+import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
+import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+import com.squareup.workflow1.ui.Wrapper
+
+@OptIn(WorkflowUiExperimentalApi::class)
+data class TopAndBottomBarsScreen<T : Screen>(
+  override val content: T,
+  val topBar: ButtonBar? = null,
+  val bottomBar: ButtonBar? = null
+) : AndroidScreen<TopAndBottomBarsScreen<T>>, Wrapper<Screen, T> {
+  override fun <ContentU : Screen> map(transform: (T) -> ContentU) =
+    TopAndBottomBarsScreen(transform(content), topBar, bottomBar)
+
+  override val viewFactory: ScreenViewFactory<TopAndBottomBarsScreen<T>> =
+    fromViewBinding(TopAndBottomBarsBinding::inflate) { screen, environment ->
+      bodyStub.show(screen.content, environment)
+
+      screen.topBar?.let { topBarStub.show(it, environment) }
+      screen.bottomBar?.let { bottomBarStub.show(it, environment) }
+      topBarStub.actual.visibility = if (screen.topBar != null) VISIBLE else GONE
+      bottomBarStub.actual.visibility = if (screen.bottomBar != null) VISIBLE else GONE
+    }
+}
diff --git a/samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml b/samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml
deleted file mode 100644
index dcd6f7c0b6..0000000000
--- a/samples/nested-overlays/src/main/res/layout/hello_goodbye_layout.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-  <TextView
-      android:id="@+id/hello_message"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:gravity="center"
-    />
-
-</LinearLayout>
diff --git a/samples/nested-overlays/src/main/res/layout/top_and_bottom_bars.xml b/samples/nested-overlays/src/main/res/layout/top_and_bottom_bars.xml
new file mode 100644
index 0000000000..91fe7a7da5
--- /dev/null
+++ b/samples/nested-overlays/src/main/res/layout/top_and_bottom_bars.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@android:color/holo_orange_light"
+    >
+
+  <com.squareup.workflow1.ui.WorkflowViewStub
+      android:id="@+id/top_bar_stub"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      />
+
+  <com.squareup.workflow1.ui.WorkflowViewStub
+      android:id="@+id/body_stub"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="1"
+      />
+
+  <com.squareup.workflow1.ui.WorkflowViewStub
+      android:id="@+id/bottom_bar_stub"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      />
+
+</LinearLayout>
diff --git a/samples/nested-overlays/src/main/res/values/strings.xml b/samples/nested-overlays/src/main/res/values/strings.xml
index eaa5276c97..5323fbc978 100644
--- a/samples/nested-overlays/src/main/res/values/strings.xml
+++ b/samples/nested-overlays/src/main/res/values/strings.xml
@@ -1,3 +1,13 @@
 <resources>
   <string name="app_name">Nested Overlays</string>
+  <string name="BODY">body</string>
+  <string name="COVER_BODY">Cover Body</string>
+  <string name="BOTTOM">bottom</string>
+  <string name="HIDE_BOTTOM">Hide Bottom Bar</string>
+  <string name="SHOW_BOTTOM">Show Bottom Bar</string>
+  <string name="HIDE_TOP">Hide Top Bar</string>
+  <string name="SHOW_TOP">Show Top Bar</string>
+  <string name="REVEAL_BODY">Reveal Body</string>
+  <string name="COVER_ALL">Cover Everything</string>
+  <string name="CLOSE">Close</string>
 </resources>
diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt
index fde26d881a..8bcd5ef84a 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt
@@ -163,8 +163,7 @@ public fun Dialog.setContent(contentHolder: ScreenViewHolder<*>) {
     if (maybeWindowColor.type in TypedValue.TYPE_FIRST_COLOR_INT..TypedValue.TYPE_LAST_COLOR_INT) {
       ColorDrawable(maybeWindowColor.data)
     } else {
-      // If we don't at least set it to null, the window cannot go full bleed.
-      null
+      ColorDrawable(contentHolder.view.resources.getColor(android.R.color.white))
     }
   window!!.setBackgroundDrawable(background)
 }
diff --git a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt
index 3e0a92a1a3..fee692b5bc 100644
--- a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt
+++ b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt
@@ -1,7 +1,10 @@
 package com.squareup.workflow1.ui.container
 
+import com.squareup.workflow1.ui.Compatible
+import com.squareup.workflow1.ui.Compatible.Companion.keyFor
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+import com.squareup.workflow1.ui.Wrapper
 
 /**
  * A screen that may stack a number of [Overlay]s over a body.
@@ -10,12 +13,20 @@ import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
  * events -- touch, keyboard, etc.
  *
  * UI kits are expected to provide handling for this class by default.
+ *
+ * @param name included in the [compatibilityKey] of this screen, for ease
+ * of nesting -- on Android, each BodyAndOverlaysScreen view state persistence
+ * support requires each BodyAndOverlaysScreen in a hierarchy to have a
+ * unique key
  */
 @WorkflowUiExperimentalApi
 public class BodyAndOverlaysScreen<B : Screen, O : Overlay>(
   public val body: B,
-  public val overlays: List<O> = emptyList()
-) : Screen {
+  public val overlays: List<O> = emptyList(),
+  public val name: String = ""
+) : Screen, Compatible {
+  override val compatibilityKey: String = keyFor(this, name)
+
   public constructor(
     body: B,
     vararg modals: O

From e8811c6abeb234cf74cf58fca1c56896f56c61ed Mon Sep 17 00:00:00 2001
From: Ray Ryan <ray@squareup.com>
Date: Fri, 10 Mar 2023 14:53:30 -0800
Subject: [PATCH 3/4] Fixes some Dialog handling problems revealed by Nested
 Overlays sample

- Replaces `View.getGlobalVisibleRect` calls with new, more robust `View.getScreenRect` extension

- `Dialog.setBounds` sets `FLAG_LAYOUT_IN_SCREEN` to ensure `Dialog` is really placed where we want it.
  Otherwise it may be offset by the height of the toolbar. I think we've missed this up until
  now because our other samples and prod use all have richer themes than the default codepaths
  set up.

- Default `ScreenOverlayDialogFactory` implementation disables dimming, for least confusing
  out of box behavior.

Note that these tweaks do not address #966, that's a bigger effort.
---
 .../nestedoverlays/NestedOverlaysAppTest.kt   |  2 +-
 .../sample/nestedoverlays/ButtonBar.kt        |  3 +-
 .../nestedoverlays/NestedOverlaysWorkflow.kt  | 46 +++++++++++--------
 workflow-ui/core-android/api/core-android.api |  1 +
 .../ui/container/AndroidDialogBounds.kt       | 28 +++++++++--
 .../ui/container/LayeredDialogSessions.kt     |  7 ++-
 .../container/ScreenOverlayDialogFactory.kt   | 16 +++++--
 workflow-ui/core-common/api/core-common.api   |  8 ++--
 .../ui/container/BodyAndOverlaysScreen.kt     |  1 -
 9 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt b/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
index bebcd2ac73..c616d62a14 100644
--- a/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
+++ b/samples/nested-overlays/src/androidTest/java/com/squareup/sample/nestedoverlays/NestedOverlaysAppTest.kt
@@ -76,7 +76,7 @@ class NestedOverlaysAppTest {
   //       .perform(click())
   //   }
   // }
-  
+
   private fun ViewInteraction.assertNotDisplayed() {
     check(matches(not(isDisplayed())))
   }
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt
index ce85e72f31..37f9f7726f 100644
--- a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/ButtonBar.kt
@@ -22,11 +22,12 @@ class ButtonBar(
   vararg buttons: Button?,
   @ColorRes val color: Int = -1,
 ) : AndroidScreen<ButtonBar> {
-  val buttons: List<Button> = buttons.filterNotNull().toList()
+  private val buttons: List<Button> = buttons.filterNotNull().toList()
 
   override val viewFactory =
     ScreenViewFactory.fromCode<ButtonBar> { _, initialEnvironment, context, _ ->
       LinearLayout(context).let { view ->
+        @Suppress("DEPRECATION")
         if (color > -1) view.background = ColorDrawable(view.resources.getColor(color))
 
         view.gravity = Gravity.CENTER
diff --git a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
index 20c396c307..837faea903 100644
--- a/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
+++ b/samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
@@ -44,28 +44,36 @@ object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, NestedOve
       onClick = context.eventHandler { state = state.copy(showBottomBar = !state.showBottomBar) }
     )
 
-    val outerSheet = if (!renderState.showOuterSheet) null else FullScreenOverlay(
-      ButtonBar(
-        Button(
-          name = R.string.CLOSE,
-          onClick = context.eventHandler { state = state.copy(showOuterSheet = false) }
-        ),
-        context.toggleInnerSheetButton(renderState),
-        color = android.R.color.holo_green_light
+    val outerSheet = if (!renderState.showOuterSheet) {
+      null
+    } else {
+      FullScreenOverlay(
+        ButtonBar(
+          Button(
+            name = R.string.CLOSE,
+            onClick = context.eventHandler { state = state.copy(showOuterSheet = false) }
+          ),
+          context.toggleInnerSheetButton(renderState),
+          color = android.R.color.holo_green_light
+        )
       )
-    )
+    }
 
-    val innerSheet = if (!renderState.showInnerSheet) null else FullScreenOverlay(
-      ButtonBar(
-        Button(
-          name = R.string.CLOSE,
-          onClick = context.eventHandler { state = state.copy(showInnerSheet = false) }
-        ),
-        toggleTopBarButton,
-        toggleBottomBarButton,
-        color = android.R.color.holo_red_light
+    val innerSheet = if (!renderState.showInnerSheet) {
+      null
+    } else {
+      FullScreenOverlay(
+        ButtonBar(
+          Button(
+            name = R.string.CLOSE,
+            onClick = context.eventHandler { state = state.copy(showInnerSheet = false) }
+          ),
+          toggleTopBarButton,
+          toggleBottomBarButton,
+          color = android.R.color.holo_red_light
+        )
       )
-    )
+    }
     val bodyBarButtons = ButtonBar(toggleTopBarButton, toggleBottomBarButton)
 
     return BodyAndOverlaysScreen(
diff --git a/workflow-ui/core-android/api/core-android.api b/workflow-ui/core-android/api/core-android.api
index c361f12378..42ae922364 100644
--- a/workflow-ui/core-android/api/core-android.api
+++ b/workflow-ui/core-android/api/core-android.api
@@ -306,6 +306,7 @@ public final class com/squareup/workflow1/ui/container/AlertOverlayDialogFactory
 }
 
 public final class com/squareup/workflow1/ui/container/AndroidDialogBoundsKt {
+	public static final fun getScreenRect (Landroid/view/View;Landroid/graphics/Rect;)V
 	public static final fun setBounds (Landroid/app/Dialog;Landroid/graphics/Rect;)V
 }
 
diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/AndroidDialogBounds.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/AndroidDialogBounds.kt
index cbb7cd8dbd..d12f95aadd 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/AndroidDialogBounds.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/AndroidDialogBounds.kt
@@ -1,10 +1,12 @@
 package com.squareup.workflow1.ui.container
 
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.graphics.Rect
 import android.view.Gravity
 import android.view.View
 import android.view.Window
+import android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import kotlinx.coroutines.CoroutineScope
@@ -16,16 +18,19 @@ import kotlinx.coroutines.flow.onEach
 
 /**
  * Updates the size of the [Window] of the receiving [Dialog].
- * [bounds] is expected to be in global display coordinates,
- * e.g. as returned from [View.getGlobalVisibleRect].
+ * [bounds] is expected to be in global screen coordinates,
+ * as returned from [View.getScreenRect].
  *
  * @see OverlayDialogHolder.onUpdateBounds
  */
 @WorkflowUiExperimentalApi
 public fun Dialog.setBounds(bounds: Rect) {
   window?.let {
+    it.addFlags(FLAG_LAYOUT_IN_SCREEN)
     it.attributes = it.attributes.apply {
-      gravity = Gravity.TOP or Gravity.START
+      // Our absolute coordinates are independent from Rtl.
+      @SuppressLint("RtlHardcoded")
+      gravity = Gravity.LEFT or Gravity.TOP // we use absolute coordinates.
       width = bounds.width()
       height = bounds.height()
       x = bounds.left
@@ -34,6 +39,23 @@ public fun Dialog.setBounds(bounds: Rect) {
   }
 }
 
+/**
+ * Returns the bounds of this [View] in the coordinate space of the device
+ * screen, based on [View.getLocationOnScreen] and its reported [width][View.getWidth]
+ * and [height][View.getHeight].
+ */
+@WorkflowUiExperimentalApi
+public fun View.getScreenRect(rect: Rect) {
+  val coordinates = IntArray(2)
+  getLocationOnScreen(coordinates)
+  rect.apply {
+    left = coordinates[0]
+    top = coordinates[1]
+    right = left + width
+    bottom = top + height
+  }
+}
+
 @WorkflowUiExperimentalApi
 internal fun <D : Dialog> D.maintainBounds(
   environment: ViewEnvironment,
diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt
index c95b1f9d7e..6065c3e3c5 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/LayeredDialogSessions.kt
@@ -279,7 +279,7 @@ public class LayeredDialogSessions private constructor(
       superDispatchTouchEvent: (MotionEvent) -> Unit
     ): LayeredDialogSessions {
       val boundsRect = Rect()
-      if (view.isAttachedToWindow) view.getGlobalVisibleRect(boundsRect)
+      if (view.isAttachedToWindow) view.getScreenRect(boundsRect)
       val boundsStateFlow = MutableStateFlow(Rect(boundsRect))
 
       return LayeredDialogSessions(
@@ -326,9 +326,8 @@ public class LayeredDialogSessions private constructor(
         // accordingly.
         val attachStateChangeListener = object : OnAttachStateChangeListener {
           val boundsListener = OnGlobalLayoutListener {
-            if (view.getGlobalVisibleRect(boundsRect) && boundsRect != boundsStateFlow.value) {
-              boundsStateFlow.value = Rect(boundsRect)
-            }
+            view.getScreenRect(boundsRect)
+            if (boundsRect != boundsStateFlow.value) boundsStateFlow.value = Rect(boundsRect)
           }
 
           override fun onViewAttachedToWindow(v: View) {
diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt
index 8bcd5ef84a..7f2705ac80 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ScreenOverlayDialogFactory.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.graphics.drawable.ColorDrawable
 import android.util.TypedValue
 import android.view.Window
+import android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND
 import android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.ScreenViewHolder
@@ -135,19 +136,22 @@ public open class ScreenOverlayDialogFactory<S : Screen, O : ScreenOverlay<S>>(
       // Note that we always tell Android to make the window non-modal, regardless of our own
       // notion of its modality. Even a modal dialog should only block events within
       // the appropriate bounds, but Android makes them block everywhere.
-      window.setFlags(FLAG_NOT_TOUCH_MODAL, FLAG_NOT_TOUCH_MODAL)
+      window.addFlags(FLAG_NOT_TOUCH_MODAL)
     }
   }
 }
 
 /**
- * The default implementation of [ScreenOverlayDialogFactory.buildDialogWithContent].
+ * Used by the default implementation of [ScreenOverlayDialogFactory.buildDialogWithContent]
+ * to show [contentHolder].
  *
  * - Makes the receiver [non-cancelable][Dialog.setCancelable]
  *
  * - Sets the [background][Window.setBackgroundDrawable] of the receiver's [Window] based
  *   on its theme, if any, or else `null`. (Setting the background to `null` ensures the window
  *   can go full bleed.)
+ *
+ * - Disables dimming.
  */
 @OptIn(WorkflowUiExperimentalApi::class)
 public fun Dialog.setContent(contentHolder: ScreenViewHolder<*>) {
@@ -163,7 +167,11 @@ public fun Dialog.setContent(contentHolder: ScreenViewHolder<*>) {
     if (maybeWindowColor.type in TypedValue.TYPE_FIRST_COLOR_INT..TypedValue.TYPE_LAST_COLOR_INT) {
       ColorDrawable(maybeWindowColor.data)
     } else {
-      ColorDrawable(contentHolder.view.resources.getColor(android.R.color.white))
+      // If we don't at least set it to null, the window cannot go full bleed.
+      null
     }
-  window!!.setBackgroundDrawable(background)
+  with(window!!) {
+    setBackgroundDrawable(background)
+    clearFlags(FLAG_DIM_BEHIND)
+  }
 }
diff --git a/workflow-ui/core-common/api/core-common.api b/workflow-ui/core-common/api/core-common.api
index dcf71ed3b1..9e843889c1 100644
--- a/workflow-ui/core-common/api/core-common.api
+++ b/workflow-ui/core-common/api/core-common.api
@@ -216,11 +216,13 @@ public final class com/squareup/workflow1/ui/container/BackStackScreenKt {
 	public static final fun toBackStackScreenOrNull (Ljava/util/List;)Lcom/squareup/workflow1/ui/container/BackStackScreen;
 }
 
-public final class com/squareup/workflow1/ui/container/BodyAndOverlaysScreen : com/squareup/workflow1/ui/Screen {
-	public fun <init> (Lcom/squareup/workflow1/ui/Screen;Ljava/util/List;)V
-	public synthetic fun <init> (Lcom/squareup/workflow1/ui/Screen;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public final class com/squareup/workflow1/ui/container/BodyAndOverlaysScreen : com/squareup/workflow1/ui/Compatible, com/squareup/workflow1/ui/Screen {
+	public fun <init> (Lcom/squareup/workflow1/ui/Screen;Ljava/util/List;Ljava/lang/String;)V
+	public synthetic fun <init> (Lcom/squareup/workflow1/ui/Screen;Ljava/util/List;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun <init> (Lcom/squareup/workflow1/ui/Screen;[Lcom/squareup/workflow1/ui/container/Overlay;)V
 	public final fun getBody ()Lcom/squareup/workflow1/ui/Screen;
+	public fun getCompatibilityKey ()Ljava/lang/String;
+	public final fun getName ()Ljava/lang/String;
 	public final fun getOverlays ()Ljava/util/List;
 	public final fun mapBody (Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/ui/container/BodyAndOverlaysScreen;
 	public final fun mapModals (Lkotlin/jvm/functions/Function1;)Lcom/squareup/workflow1/ui/container/BodyAndOverlaysScreen;
diff --git a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt
index fee692b5bc..171f1dd830 100644
--- a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt
+++ b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/container/BodyAndOverlaysScreen.kt
@@ -4,7 +4,6 @@ import com.squareup.workflow1.ui.Compatible
 import com.squareup.workflow1.ui.Compatible.Companion.keyFor
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.Wrapper
 
 /**
  * A screen that may stack a number of [Overlay]s over a body.

From f35524991997f9815f7dbbb366be0d12397ad148 Mon Sep 17 00:00:00 2001
From: Ray Ryan <ray@squareup.com>
Date: Tue, 14 Mar 2023 16:35:37 -0700
Subject: [PATCH 4/4] Eliminates espresso hacks

Trying to reduce Espresso flakes by being more careful and conventional about `RootMatcher` use; about targetting back button presses; and by using `recreate()` for configuration changes.
---
 .../sample/poetryapp/PoetryAppTest.kt         |   9 +-
 .../squareup/sample/ravenapp/RavenAppTest.kt  |   8 +-
 .../HelloBackButtonEspressoTest.kt            |  29 +--
 .../squareup/sample/dungeon/DungeonAppTest.kt |   8 +-
 .../HelloWorkflowFragmentAppTest.kt           |  12 +-
 .../helloworkflow/HelloWorkflowAppTest.kt     |  12 +-
 .../stubvisibility/StubVisibilityAppTest.kt   |  16 +-
 .../squareup/sample/TicTacToeEspressoTest.kt  | 175 +++++++++---------
 .../sample/mainactivity/TodoAppTest.kt        |  22 +--
 .../BackStackContainerLifecycleActivity.kt    |  10 +-
 .../api/internal-testing-android.api          |   4 -
 .../workflow1/ui/internal/test/Espresso.kt    |  56 ------
 12 files changed, 144 insertions(+), 217 deletions(-)

diff --git a/samples/containers/app-poetry/src/androidTest/java/com/squareup/sample/poetryapp/PoetryAppTest.kt b/samples/containers/app-poetry/src/androidTest/java/com/squareup/sample/poetryapp/PoetryAppTest.kt
index 6bc56540d7..5701642b4b 100644
--- a/samples/containers/app-poetry/src/androidTest/java/com/squareup/sample/poetryapp/PoetryAppTest.kt
+++ b/samples/containers/app-poetry/src/androidTest/java/com/squareup/sample/poetryapp/PoetryAppTest.kt
@@ -1,14 +1,13 @@
 package com.squareup.sample.poetryapp
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.sample.container.poetryapp.R
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
@@ -16,17 +15,15 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 class PoetryAppTest {
 
   private val scenarioRule = ActivityScenarioRule(PoetryActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
   @Test fun launches() {
-    inAnyView(withText(R.string.poems))
-      .check(matches(isDisplayed()))
+    onView(withText(R.string.poems)).check(matches(isDisplayed()))
   }
 }
diff --git a/samples/containers/app-raven/src/androidTest/java/com/squareup/sample/ravenapp/RavenAppTest.kt b/samples/containers/app-raven/src/androidTest/java/com/squareup/sample/ravenapp/RavenAppTest.kt
index b1644b1e95..e7ad5d0822 100644
--- a/samples/containers/app-raven/src/androidTest/java/com/squareup/sample/ravenapp/RavenAppTest.kt
+++ b/samples/containers/app-raven/src/androidTest/java/com/squareup/sample/ravenapp/RavenAppTest.kt
@@ -1,13 +1,12 @@
 package com.squareup.sample.ravenapp
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
@@ -15,17 +14,16 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 class RavenAppTest {
 
   private val scenarioRule = ActivityScenarioRule(RavenActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
   @Test fun launches() {
-    inAnyView(withText("The Raven"))
+    onView(withText("The Raven"))
       .check(matches(isDisplayed()))
   }
 }
diff --git a/samples/containers/hello-back-button/src/androidTest/java/com/squareup/sample/hellobackbutton/HelloBackButtonEspressoTest.kt b/samples/containers/hello-back-button/src/androidTest/java/com/squareup/sample/hellobackbutton/HelloBackButtonEspressoTest.kt
index c353358a50..9b4772a165 100644
--- a/samples/containers/hello-back-button/src/androidTest/java/com/squareup/sample/hellobackbutton/HelloBackButtonEspressoTest.kt
+++ b/samples/containers/hello-back-button/src/androidTest/java/com/squareup/sample/hellobackbutton/HelloBackButtonEspressoTest.kt
@@ -1,7 +1,10 @@
 package com.squareup.sample.hellobackbutton
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.pressBack
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
@@ -9,9 +12,6 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.actuallyPressBack
-import com.squareup.workflow1.ui.internal.test.inAnyView
-import com.squareup.workflow1.ui.internal.test.retryBlocking
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
@@ -24,29 +24,32 @@ class HelloBackButtonEspressoTest {
 
   private val scenarioRule = ActivityScenarioRule(HelloBackButtonActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
-  @Test fun wrappedTakesPrecedence() = retryBlocking {
-    inAnyView(withId(R.id.hello_message)).apply {
+  @Test fun wrappedTakesPrecedence() {
+    onView(withId(R.id.hello_message)).apply {
       check(matches(withText("Able")))
       perform(click())
       check(matches(withText("Baker")))
       perform(click())
       check(matches(withText("Charlie")))
-      actuallyPressBack()
+      perform(pressBack())
       check(matches(withText("Baker")))
-      actuallyPressBack()
+      perform(pressBack())
       check(matches(withText("Able")))
     }
   }
 
-  @Test fun outerHandlerAppliesIfWrappedHandlerIsNull() = retryBlocking {
-    inAnyView(withId(R.id.hello_message)).apply {
-      actuallyPressBack()
-      inAnyView(withText("Are you sure you want to do this thing?"))
-        .check(matches(isDisplayed()))
+  @Test fun outerHandlerAppliesIfWrappedHandlerIsNull() {
+    onView(withId(R.id.hello_message)).apply {
+      check(matches(isDisplayed()))
+      perform(pressBack())
     }
+
+    onView(withText("Are you sure you want to do this thing?"))
+      .inRoot(isDialog())
+      .check(matches(isDisplayed()))
   }
 }
diff --git a/samples/dungeon/app/src/androidTest/java/com/squareup/sample/dungeon/DungeonAppTest.kt b/samples/dungeon/app/src/androidTest/java/com/squareup/sample/dungeon/DungeonAppTest.kt
index c38a2e8e02..df39036a2f 100644
--- a/samples/dungeon/app/src/androidTest/java/com/squareup/sample/dungeon/DungeonAppTest.kt
+++ b/samples/dungeon/app/src/androidTest/java/com/squareup/sample/dungeon/DungeonAppTest.kt
@@ -1,13 +1,12 @@
 package com.squareup.sample.dungeon
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
@@ -15,17 +14,16 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 class DungeonAppTest {
 
   private val scenarioRule = ActivityScenarioRule(DungeonActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
   @Test fun loadsBoardsList() {
-    inAnyView(withText(R.string.boards_list_label))
+    onView(withText(R.string.boards_list_label))
       .check(matches(isDisplayed()))
   }
 }
diff --git a/samples/hello-workflow-fragment/src/androidTest/java/com/squareup/sample/helloworkflowfragment/HelloWorkflowFragmentAppTest.kt b/samples/hello-workflow-fragment/src/androidTest/java/com/squareup/sample/helloworkflowfragment/HelloWorkflowFragmentAppTest.kt
index 78ad2d60ac..7ef655ea6a 100644
--- a/samples/hello-workflow-fragment/src/androidTest/java/com/squareup/sample/helloworkflowfragment/HelloWorkflowFragmentAppTest.kt
+++ b/samples/hello-workflow-fragment/src/androidTest/java/com/squareup/sample/helloworkflowfragment/HelloWorkflowFragmentAppTest.kt
@@ -1,14 +1,13 @@
 package com.squareup.sample.helloworkflowfragment
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.hamcrest.Matchers.containsString
 import org.junit.Rule
@@ -17,25 +16,24 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 class HelloWorkflowFragmentAppTest {
 
   private val scenarioRule = ActivityScenarioRule(HelloWorkflowFragmentActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
   @Test fun togglesHelloAndGoodbye() {
-    inAnyView(withText(containsString("Hello")))
+    onView(withText(containsString("Hello")))
       .check(matches(isDisplayed()))
       .perform(click())
 
-    inAnyView(withText(containsString("Goodbye")))
+    onView(withText(containsString("Goodbye")))
       .check(matches(isDisplayed()))
       .perform(click())
 
-    inAnyView(withText(containsString("Hello")))
+    onView(withText(containsString("Hello")))
       .check(matches(isDisplayed()))
   }
 }
diff --git a/samples/hello-workflow/src/androidTest/java/com/squareup/sample/helloworkflow/HelloWorkflowAppTest.kt b/samples/hello-workflow/src/androidTest/java/com/squareup/sample/helloworkflow/HelloWorkflowAppTest.kt
index 66dbdb8559..5f688422ea 100644
--- a/samples/hello-workflow/src/androidTest/java/com/squareup/sample/helloworkflow/HelloWorkflowAppTest.kt
+++ b/samples/hello-workflow/src/androidTest/java/com/squareup/sample/helloworkflow/HelloWorkflowAppTest.kt
@@ -1,14 +1,13 @@
 package com.squareup.sample.helloworkflow
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Rule
 import org.junit.Test
@@ -16,25 +15,24 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 class HelloWorkflowAppTest {
 
   private val scenarioRule = ActivityScenarioRule(HelloWorkflowActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
   @Test fun togglesHelloAndGoodbye() {
-    inAnyView(withText("Hello"))
+    onView(withText("Hello"))
       .check(matches(isDisplayed()))
       .perform(click())
 
-    inAnyView(withText("Goodbye"))
+    onView(withText("Goodbye"))
       .check(matches(isDisplayed()))
       .perform(click())
 
-    inAnyView(withText("Hello"))
+    onView(withText("Hello"))
       .check(matches(isDisplayed()))
   }
 }
diff --git a/samples/stub-visibility/src/androidTest/java/com/squareup/sample/stubvisibility/StubVisibilityAppTest.kt b/samples/stub-visibility/src/androidTest/java/com/squareup/sample/stubvisibility/StubVisibilityAppTest.kt
index a5f216963a..cecb773270 100644
--- a/samples/stub-visibility/src/androidTest/java/com/squareup/sample/stubvisibility/StubVisibilityAppTest.kt
+++ b/samples/stub-visibility/src/androidTest/java/com/squareup/sample/stubvisibility/StubVisibilityAppTest.kt
@@ -1,5 +1,6 @@
 package com.squareup.sample.stubvisibility
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -7,9 +8,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.hamcrest.CoreMatchers.not
 import org.junit.Rule
@@ -18,29 +17,28 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 internal class StubVisibilityAppTest {
 
   private val scenarioRule = ActivityScenarioRule(StubVisibilityActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
 
   @Test fun togglesFooter() {
-    inAnyView(withId(R.id.should_be_wrapped))
+    onView(withId(R.id.should_be_wrapped))
       .check(matches(not(isDisplayed())))
 
-    inAnyView(withText("Click to show footer"))
+    onView(withText("Click to show footer"))
       .perform(click())
 
-    inAnyView(withId(R.id.should_be_wrapped))
+    onView(withId(R.id.should_be_wrapped))
       .check(matches(isDisplayed()))
 
-    inAnyView(withText("Click to hide footer"))
+    onView(withText("Click to hide footer"))
       .perform(click())
 
-    inAnyView(withId(R.id.should_be_wrapped))
+    onView(withId(R.id.should_be_wrapped))
       .check(matches(not(isDisplayed())))
   }
 }
diff --git a/samples/tictactoe/app/src/androidTest/java/com/squareup/sample/TicTacToeEspressoTest.kt b/samples/tictactoe/app/src/androidTest/java/com/squareup/sample/TicTacToeEspressoTest.kt
index 12bd4c2f73..00337036e5 100644
--- a/samples/tictactoe/app/src/androidTest/java/com/squareup/sample/TicTacToeEspressoTest.kt
+++ b/samples/tictactoe/app/src/androidTest/java/com/squareup/sample/TicTacToeEspressoTest.kt
@@ -1,13 +1,14 @@
 package com.squareup.sample
 
-import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-import android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.ViewInteraction
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressBack
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -18,11 +19,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.squareup.sample.mainactivity.TicTacToeActivity
 import com.squareup.sample.tictactoe.R
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.actuallyPressBack
-import com.squareup.workflow1.ui.internal.test.inAnyView
-import com.squareup.workflow1.ui.internal.test.retryBlocking
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.endsWith
@@ -38,140 +35,144 @@ import org.junit.runner.RunWith
  * integration testing — especially of modals, back stacks, back button handling,
  * and view state management.
  */
-@OptIn(WorkflowUiExperimentalApi::class)
 @RunWith(AndroidJUnit4::class)
 class TicTacToeEspressoTest {
-
   private val scenarioRule = ActivityScenarioRule(TicTacToeActivity::class.java)
 
-  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule
+  val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
+
   private val scenario get() = scenarioRule.scenario
 
   @Before
   fun setUp() {
     scenario.onActivity { activity ->
-      IdlingRegistry.getInstance()
-        .register(activity.idlingResource)
-      activity.requestedOrientation = SCREEN_ORIENTATION_PORTRAIT
+      IdlingRegistry.getInstance().register(activity.idlingResource)
     }
   }
 
   @After
   fun tearDown() {
     scenario.onActivity { activity ->
-      IdlingRegistry.getInstance()
-        .unregister(activity.idlingResource)
+      IdlingRegistry.getInstance().unregister(activity.idlingResource)
     }
   }
 
-  @Test fun configChangeReflectsWorkflowState() = retryBlocking {
-    inAnyView(withId(R.id.login_email)).type("bad email")
-    inAnyView(withId(R.id.login_button)).perform(click())
+  @Test fun configChangeReflectsWorkflowState() {
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("bad email")
+    onView(withId(R.id.login_button)).inRoot(isDialog()).perform(click())
 
-    inAnyView(withId(R.id.login_error_message)).check(matches(withText("Invalid address")))
-    rotate()
-    inAnyView(withId(R.id.login_error_message)).check(matches(withText("Invalid address")))
+    onView(withId(R.id.login_error_message)).inRoot(isDialog())
+      .check(matches(withText("Invalid address")))
+    scenario.recreate()
+    onView(withId(R.id.login_error_message)).inRoot(isDialog())
+      .check(matches(withText("Invalid address")))
   }
 
-  @Test fun editTextSurvivesConfigChange() = retryBlocking {
-    inAnyView(withId(R.id.login_email)).type("foo@bar")
-    inAnyView(withId(R.id.login_password)).type("password")
-    rotate()
-    inAnyView(withId(R.id.login_email)).check(matches(withText("foo@bar")))
+  @Test fun editTextSurvivesConfigChange() {
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("foo@bar")
+    onView(withId(R.id.login_password)).inRoot(isDialog()).type("password")
+    scenario.recreate()
+    onView(withId(R.id.login_email)).inRoot(isDialog()).check(matches(withText("foo@bar")))
     // Don't save fields that shouldn't be.
-    inAnyView(withId(R.id.login_password)).check(matches(withText("")))
+    onView(withId(R.id.login_password)).inRoot(isDialog()).check(matches(withText("")))
   }
 
-  @Test fun backStackPopRestoresViewState() = retryBlocking {
+  @Test fun backStackPopRestoresViewState() {
     // The loading screen is pushed onto the back stack.
-    inAnyView(withId(R.id.login_email)).type("foo@bar")
-    inAnyView(withId(R.id.login_password)).type("bad password")
-    inAnyView(withId(R.id.login_button)).perform(click())
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("foo@bar")
+    onView(withId(R.id.login_password)).inRoot(isDialog()).type("bad password")
+    onView(withId(R.id.login_button)).inRoot(isDialog()).perform(click())
 
     // Loading ends with an error, and we pop back to login. The
     // email should have been restored from view state.
-    inAnyView(withId(R.id.login_email)).check(matches(withText("foo@bar")))
-    inAnyView(withId(R.id.login_error_message))
+    onView(withId(R.id.login_email)).inRoot(isDialog()).check(matches(withText("foo@bar")))
+    onView(withId(R.id.login_error_message)).inRoot(isDialog())
       .check(matches(withText("Unknown email or invalid password")))
   }
 
-  @Test fun dialogSurvivesConfigChange() = retryBlocking {
-    inAnyView(withId(R.id.login_email)).type("foo@bar")
-    inAnyView(withId(R.id.login_password)).type("password")
-    inAnyView(withId(R.id.login_button)).perform(click())
+  @Test fun dialogSurvivesConfigChange() {
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("foo@bar")
+    onView(withId(R.id.login_password)).inRoot(isDialog()).type("password")
+    onView(withId(R.id.login_button)).inRoot(isDialog()).perform(click())
 
-    inAnyView(withId(R.id.player_X)).type("Mister X")
-    inAnyView(withId(R.id.player_O)).type("Sister O")
-    inAnyView(withId(R.id.start_game)).perform(click())
+    onView(withId(R.id.player_X)).inRoot(isDialog()).type("Mister X")
+    onView(withId(R.id.player_O)).inRoot(isDialog()).type("Sister O")
+    onView(withId(R.id.start_game)).inRoot(isDialog()).perform(click())
 
-    actuallyPressBack()
-    inAnyView(withText("Do you really want to concede the game?"))
+    onGameView().perform(pressBack())
+
+    onView(withText("Do you really want to concede the game?")).inRoot(isDialog())
       .check(matches(isDisplayed()))
-    rotate()
-    inAnyView(withText("Do you really want to concede the game?"))
+    scenario.recreate()
+    onView(withText("Do you really want to concede the game?")).inRoot(isDialog())
       .check(matches(isDisplayed()))
   }
 
-  @Test fun canGoBackFromAlert() = retryBlocking {
-    inAnyView(withId(R.id.login_email)).type("foo@bar")
-    inAnyView(withId(R.id.login_password)).type("password")
-    inAnyView(withId(R.id.login_button)).perform(click())
+  @Test fun canGoBackFromAlert() {
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("foo@bar")
+    onView(withId(R.id.login_password)).inRoot(isDialog()).type("password")
+    onView(withId(R.id.login_button)).inRoot(isDialog()).perform(click())
+
+    onView(withId(R.id.player_X)).inRoot(isDialog()).type("Mister X")
+    onView(withId(R.id.player_O)).inRoot(isDialog()).type("Sister O")
+    onView(withId(R.id.start_game)).inRoot(isDialog()).perform(click())
 
-    inAnyView(withId(R.id.player_X)).type("Mister X")
-    inAnyView(withId(R.id.player_O)).type("Sister O")
-    inAnyView(withId(R.id.start_game)).perform(click())
+    onGameView().perform(pressBack())
 
-    actuallyPressBack()
-    inAnyView(withText("Do you really want to concede the game?"))
+    onView(withText("Do you really want to concede the game?")).inRoot(isDialog())
       .check(matches(isDisplayed()))
-    inAnyView(withText("I QUIT")).perform(click())
-    inAnyView(withText("Really?"))
+    onView(withText("I QUIT")).inRoot(isDialog()).perform(click())
+    onView(withText("Really?")).inRoot(isDialog())
       .check(matches(isDisplayed()))
+      .perform(pressBack())
 
-    actuallyPressBack()
     // Click a game cell to confirm the alert went away.
     clickCell(0)
   }
 
-  @Test fun canGoBackInModalViewAndSeeRestoredViewState() = retryBlocking {
+  @Test fun canGoBackInModalViewAndSeeRestoredViewState() {
     // Log in and hit the 2fa screen.
-    inAnyView(withId(R.id.login_email)).type("foo@2fa")
-    inAnyView(withId(R.id.login_password)).type("password")
-    inAnyView(withId(R.id.login_button)).perform(click())
-    inAnyView(withId(R.id.second_factor)).check(matches(isDisplayed()))
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("foo@2fa")
+    onView(withId(R.id.login_password)).inRoot(isDialog()).type("password")
+    onView(withId(R.id.login_button)).inRoot(isDialog()).perform(click())
+
+    // See 2nd factor, then use the back button to go back and see the login screen again.
+    onView(withId(R.id.second_factor)).inRoot(isDialog())
+      .check(matches(isDisplayed()))
+      .perform(pressBack())
 
-    // Use the back button to go back and see the login screen again.
-    actuallyPressBack()
     // Make sure edit text was restored from view state cached by the back stack container.
-    inAnyView(withId(R.id.login_email)).check(matches(withText("foo@2fa")))
+    onView(withId(R.id.login_email)).inRoot(isDialog()).check(matches(withText("foo@2fa")))
   }
 
-  @Test fun canGoBackInModalViewAfterConfigChangeAndSeeRestoredViewState() = retryBlocking {
+  @Test fun canGoBackInModalViewAfterConfigChangeAndSeeRestoredViewState() {
     // Log in and hit the 2fa screen.
-    inAnyView(withId(R.id.login_email)).type("foo@2fa")
-    inAnyView(withId(R.id.login_password)).type("password")
-    inAnyView(withId(R.id.login_button)).perform(click())
-    inAnyView(withId(R.id.second_factor)).check(matches(isDisplayed()))
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("foo@2fa")
+    onView(withId(R.id.login_password)).inRoot(isDialog()).type("password")
+    onView(withId(R.id.login_button)).inRoot(isDialog()).perform(click())
+    onView(withId(R.id.second_factor)).inRoot(isDialog()).check(matches(isDisplayed()))
 
     // Rotate and then use the back button to go back and see the login screen again.
-    rotate()
-    actuallyPressBack()
+    scenario.recreate()
+    onView(withId(R.id.second_factor)).inRoot(isDialog()).perform(pressBack())
+
     // Make sure edit text was restored from view state cached by the back stack container.
-    inAnyView(withId(R.id.login_email)).check(matches(withText("foo@2fa")))
+    onView(withId(R.id.login_email)).inRoot(isDialog()).check(matches(withText("foo@2fa")))
   }
 
   /**
    * On tablets this revealed a problem with SavedStateRegistry.
    * https://github.com/square/workflow-kotlin/pull/656#issuecomment-1027274391
    */
-  @Test fun fullJourney() = retryBlocking {
-    inAnyView(withId(R.id.login_email)).type("foo@bar")
-    inAnyView(withId(R.id.login_password)).type("password")
-    inAnyView(withId(R.id.login_button)).perform(click())
+  @Test fun fullJourney() {
+    onView(withId(R.id.login_email)).inRoot(isDialog()).type("foo@bar")
+    onView(withId(R.id.login_password)).inRoot(isDialog()).type("password")
+    onView(withId(R.id.login_button)).inRoot(isDialog()).perform(click())
 
-    inAnyView(withId(R.id.start_game)).perform(click())
+    onView(withId(R.id.start_game)).inRoot(isDialog()).perform(click())
 
     clickCell(0)
     clickCell(3)
@@ -179,14 +180,20 @@ class TicTacToeEspressoTest {
     clickCell(4)
     clickCell(2)
 
-    inAnyView(withText(R.string.exit)).perform(click())
-    inAnyView(withId(R.id.start_game)).check(matches(isDisplayed()))
-    actuallyPressBack()
-    inAnyView(withId(R.id.login_email)).check(matches(isDisplayed()))
+    onView(withText(R.string.exit)).perform(click())
+    onView(withId(R.id.start_game)).inRoot(isDialog())
+      .check(matches(isDisplayed()))
+      .perform(pressBack())
+
+    onView(withId(R.id.login_email)).inRoot(isDialog()).check(matches(isDisplayed()))
+  }
+
+  private fun onGameView(): ViewInteraction {
+    return onView(withClassName(endsWith("GridLayout")))
   }
 
   private fun clickCell(index: Int) {
-    inAnyView(
+    onView(
       allOf(
         withParent(withClassName(endsWith("GridLayout"))),
         withParentIndex(index)
@@ -197,10 +204,4 @@ class TicTacToeEspressoTest {
   private fun ViewInteraction.type(text: String) {
     perform(typeText(text), closeSoftKeyboard())
   }
-
-  private fun rotate() {
-    scenario.onActivity {
-      it.requestedOrientation = SCREEN_ORIENTATION_LANDSCAPE
-    }
-  }
 }
diff --git a/samples/todo-android/app/src/androidTest/java/com/squareup/sample/mainactivity/TodoAppTest.kt b/samples/todo-android/app/src/androidTest/java/com/squareup/sample/mainactivity/TodoAppTest.kt
index 4f88c66763..327d14b547 100644
--- a/samples/todo-android/app/src/androidTest/java/com/squareup/sample/mainactivity/TodoAppTest.kt
+++ b/samples/todo-android/app/src/androidTest/java/com/squareup/sample/mainactivity/TodoAppTest.kt
@@ -1,6 +1,8 @@
 package com.squareup.sample.mainactivity
 
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.pressBack
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -11,10 +13,7 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import androidx.test.uiautomator.UiDevice
 import com.squareup.sample.todo.R
 import com.squareup.sample.todo.ToDoActivity
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
-import com.squareup.workflow1.ui.internal.test.actuallyPressBack
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import leakcanary.DetectLeaksAfterTestSuccess
 import org.hamcrest.Matchers.allOf
 import org.junit.After
@@ -25,12 +24,11 @@ import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@OptIn(WorkflowUiExperimentalApi::class)
 class TodoAppTest {
 
   private val scenarioRule = ActivityScenarioRule(ToDoActivity::class.java)
 
-  @get:Rule val rules = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+  @get:Rule val rules: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
     .around(scenarioRule)
     .around(IdlingDispatcherRule)
   private val uiDevice by lazy { UiDevice.getInstance(getInstrumentation()) }
@@ -49,13 +47,13 @@ class TodoAppTest {
     val isPortrait = uiDevice.displayWidth < uiDevice.displayHeight
     if (!isPortrait) uiDevice.setOrientationLeft()
 
-    inAnyView(withText("Daily Chores"))
+    onView(withText("Daily Chores"))
       .check(matches(allOf(isDisplayed())))
       .perform(click())
-    inAnyView(withId(R.id.item_container))
+    onView(withId(R.id.item_container))
       .check(matches(isDisplayed()))
-    actuallyPressBack()
-    inAnyView(withId(R.id.todo_lists_container))
+      .perform(pressBack())
+    onView(withId(R.id.todo_lists_container))
       .check(matches(isDisplayed()))
   }
 
@@ -63,12 +61,12 @@ class TodoAppTest {
     val isPortrait = uiDevice.displayWidth < uiDevice.displayHeight
     if (isPortrait) uiDevice.setOrientationLeft()
 
-    inAnyView(withText("Daily Chores"))
+    onView(withText("Daily Chores"))
       .check(matches(allOf(isDisplayed())))
       .perform(click())
-    inAnyView(withId(R.id.item_container))
+    onView(withId(R.id.item_container))
       .check(matches(isDisplayed()))
-    inAnyView(withId(R.id.todo_lists_container))
+    onView(withId(R.id.todo_lists_container))
       .check(matches(isDisplayed()))
   }
 }
diff --git a/workflow-ui/core-android/src/androidTest/java/com/squareup/workflow1/ui/container/fixtures/BackStackContainerLifecycleActivity.kt b/workflow-ui/core-android/src/androidTest/java/com/squareup/workflow1/ui/container/fixtures/BackStackContainerLifecycleActivity.kt
index 65b3b1f8d7..b90ae9d4d0 100644
--- a/workflow-ui/core-android/src/androidTest/java/com/squareup/workflow1/ui/container/fixtures/BackStackContainerLifecycleActivity.kt
+++ b/workflow-ui/core-android/src/androidTest/java/com/squareup/workflow1/ui/container/fixtures/BackStackContainerLifecycleActivity.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withTagValue
@@ -22,7 +23,6 @@ import com.squareup.workflow1.ui.container.fixtures.BackStackContainerLifecycleA
 import com.squareup.workflow1.ui.container.fixtures.BackStackContainerLifecycleActivity.TestRendering.OuterRendering
 import com.squareup.workflow1.ui.container.fixtures.BackStackContainerLifecycleActivity.TestRendering.RecurseRendering
 import com.squareup.workflow1.ui.internal.test.AbstractLifecycleTestActivity
-import com.squareup.workflow1.ui.internal.test.inAnyView
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.equalTo
 
@@ -39,9 +39,8 @@ internal class BackStackContainerLifecycleActivity : AbstractLifecycleTestActivi
       initialEnvironment: ViewEnvironment,
       context: Context,
       container: ViewGroup?
-    ): ScreenViewHolder<BaseRendering> = View(context).let { view ->
-      ScreenViewHolder(initialEnvironment, view) { _, _ -> /* Noop */ }
-    }
+    ): ScreenViewHolder<BaseRendering> =
+      ScreenViewHolder(initialEnvironment, View(context)) { _, _ -> /* Noop */ }
   }
 
   sealed class TestRendering : Screen {
@@ -160,8 +159,7 @@ internal fun ActivityScenario<BackStackContainerLifecycleActivity>.viewForScreen
   return view
 }
 
-@OptIn(WorkflowUiExperimentalApi::class)
 internal fun waitForScreen(name: String) {
-  inAnyView(withTagValue(equalTo(name)) as Matcher<View>)
+  onView(withTagValue(equalTo(name)) as Matcher<View>)
     .check(matches(isCompletelyDisplayed()))
 }
diff --git a/workflow-ui/internal-testing-android/api/internal-testing-android.api b/workflow-ui/internal-testing-android/api/internal-testing-android.api
index 68a9699a02..31b13f38e9 100644
--- a/workflow-ui/internal-testing-android/api/internal-testing-android.api
+++ b/workflow-ui/internal-testing-android/api/internal-testing-android.api
@@ -50,12 +50,8 @@ public final class com/squareup/workflow1/ui/internal/test/AbstractLifecycleTest
 public final class com/squareup/workflow1/ui/internal/test/EspressoKt {
 	public static final field DEFAULT_RETRY_TIMEOUT J
 	public static final field RETRY_POLLING_INTERVAL J
-	public static final fun actuallyPressBack ()V
-	public static final fun inAnyView (Lorg/hamcrest/Matcher;)Landroidx/test/espresso/ViewInteraction;
 	public static final fun retry (Ljava/lang/String;JLkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun retry$default (Ljava/lang/String;JLkotlin/jvm/functions/Function0;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
-	public static final fun retryBlocking (Ljava/lang/String;JLkotlin/jvm/functions/Function0;)V
-	public static synthetic fun retryBlocking$default (Ljava/lang/String;JLkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
 }
 
 public final class com/squareup/workflow1/ui/internal/test/IdleAfterTestRule : org/junit/rules/TestRule {
diff --git a/workflow-ui/internal-testing-android/src/main/java/com/squareup/workflow1/ui/internal/test/Espresso.kt b/workflow-ui/internal-testing-android/src/main/java/com/squareup/workflow1/ui/internal/test/Espresso.kt
index 1bfe9a006e..915eb9da1f 100644
--- a/workflow-ui/internal-testing-android/src/main/java/com/squareup/workflow1/ui/internal/test/Espresso.kt
+++ b/workflow-ui/internal-testing-android/src/main/java/com/squareup/workflow1/ui/internal/test/Espresso.kt
@@ -1,56 +1,10 @@
 package com.squareup.workflow1.ui.internal.test
 
-import android.view.View
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.NoMatchingViewException
 import androidx.test.espresso.PerformException
-import androidx.test.espresso.Root
-import androidx.test.espresso.ViewInteraction
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isRoot
-import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import junit.framework.AssertionFailedError
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeoutOrNull
-import org.hamcrest.Description
-import org.hamcrest.Matcher
-import org.hamcrest.Matchers.allOf
-import org.hamcrest.Matchers.any
-import org.hamcrest.TypeSafeMatcher
-
-/**
- * Fork of [Espresso.onView] that looks in all [Root]s, not just the one matched by the default
- * root matcher. The default root matcher will sometimes fail to find views in our dialogs.
- */
-@WorkflowUiExperimentalApi
-public fun inAnyView(viewMatcher: Matcher<View>): ViewInteraction {
-  return Espresso.onView(viewMatcher).inRoot(any(Root::class.java))
-}
-
-/**
- * Fork of [Espresso.pressBack] that finds the root view of the focused window only, instead of
- * using the default root matcher. This is necessary because when we are showing dialogs,
- * the default matcher will sometimes match the wrong window, and the back press won't do
- * anything.
- */
-@WorkflowUiExperimentalApi
-public fun actuallyPressBack() {
-  val rootHasFocusMatcher = object : TypeSafeMatcher<Root>() {
-    override fun describeTo(description: Description) {
-      description.appendText("has window focus")
-    }
-
-    override fun matchesSafely(item: Root): Boolean {
-      return item.decorView.hasWindowFocus()
-    }
-  }
-
-  Espresso.onView(allOf(isRoot(), isDisplayed()))
-    .inRoot(rootHasFocusMatcher)
-    .perform(ViewActions.pressBack())
-}
 
 public const val DEFAULT_RETRY_TIMEOUT: Long = 100L
 public const val RETRY_POLLING_INTERVAL: Long = 16L
@@ -92,13 +46,3 @@ public suspend inline fun retry(
     throw it
   }
 }
-
-public inline fun retryBlocking(
-  clue: String = "",
-  timeout_ms: Long = DEFAULT_RETRY_TIMEOUT,
-  crossinline predicate: () -> Any
-) {
-  runBlocking {
-    retry(clue, timeout_ms, predicate)
-  }
-}