Merge pull request #1154 from square/ray/container-is-navigation

container > navigation
square · Jan 18, 2024 · 821c5dd · 821c5dd
2 parents b6403fb + 6ccfc5a
commit 821c5dd
Show file tree

Hide file tree

Showing 109 changed files with 367 additions and 377 deletions.
diff --git a/...c/main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemWorkflow.kt b/...c/main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemWorkflow.kt
@@ -33,8 +33,8 @@ import com.squareup.workflow1.WorkflowAction.Companion.noAction
 import com.squareup.workflow1.action
 import com.squareup.workflow1.runningWorker
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
-import com.squareup.workflow1.ui.container.toBackStackScreen
+import com.squareup.workflow1.ui.navigation.BackStackScreen
+import com.squareup.workflow1.ui.navigation.toBackStackScreen
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flow

diff --git a/...ava/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemsBrowserWorkflow.kt b/...ava/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemsBrowserWorkflow.kt
@@ -25,7 +25,7 @@ import com.squareup.workflow1.WorkflowAction.Companion.noAction
 import com.squareup.workflow1.action
 import com.squareup.workflow1.runningWorker
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
+import com.squareup.workflow1.ui.navigation.BackStackScreen
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 

diff --git a/...main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoetryActivity.kt b/...main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoetryActivity.kt
@@ -29,8 +29,8 @@ import com.squareup.workflow1.ui.ViewEnvironment.Companion.EMPTY
 import com.squareup.workflow1.ui.ViewRegistry
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.withEnvironment
 import com.squareup.workflow1.ui.renderWorkflowIn
+import com.squareup.workflow1.ui.withEnvironment
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach

diff --git a/.../main/java/com/squareup/benchmarks/performance/complex/poetry/views/MayBeLoadingScreen.kt b/.../main/java/com/squareup/benchmarks/performance/complex/poetry/views/MayBeLoadingScreen.kt
@@ -3,8 +3,8 @@ package com.squareup.benchmarks.performance.complex.poetry.views
 import com.squareup.sample.container.overviewdetail.OverviewDetailScreen
 import com.squareup.sample.container.panel.ScrimScreen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
-import com.squareup.workflow1.ui.container.FullScreenModal
+import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.navigation.FullScreenModal
 
 @OptIn(WorkflowUiExperimentalApi::class)
 typealias MayBeLoadingScreen =

diff --git a/...les/src/main/java/com/squareup/sample/compose/hellocomposebinding/HelloBindingActivity.kt b/...les/src/main/java/com/squareup/sample/compose/hellocomposebinding/HelloBindingActivity.kt
@@ -19,9 +19,9 @@ import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.compose.composeViewFactory
 import com.squareup.workflow1.ui.compose.withCompositionRoot
-import com.squareup.workflow1.ui.container.withEnvironment
 import com.squareup.workflow1.ui.plus
 import com.squareup.workflow1.ui.renderWorkflowIn
+import com.squareup.workflow1.ui.withEnvironment
 import kotlinx.coroutines.flow.StateFlow
 
 @OptIn(WorkflowUiExperimentalApi::class)

diff --git a/...es/src/main/java/com/squareup/sample/compose/nestedrenderings/NestedRenderingsActivity.kt b/...es/src/main/java/com/squareup/sample/compose/nestedrenderings/NestedRenderingsActivity.kt
@@ -19,9 +19,9 @@ import com.squareup.workflow1.ui.ViewRegistry
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.compose.withCompositionRoot
-import com.squareup.workflow1.ui.container.withEnvironment
 import com.squareup.workflow1.ui.plus
 import com.squareup.workflow1.ui.renderWorkflowIn
+import com.squareup.workflow1.ui.withEnvironment
 import kotlinx.coroutines.flow.StateFlow
 
 @OptIn(WorkflowUiExperimentalApi::class)

diff --git a/...oid/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailContainer.kt b/...oid/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailContainer.kt
@@ -13,8 +13,8 @@ import com.squareup.workflow1.ui.ScreenViewRunner
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.WorkflowViewStub
-import com.squareup.workflow1.ui.container.BackStackScreen
-import com.squareup.workflow1.ui.container.plus
+import com.squareup.workflow1.ui.navigation.BackStackScreen
+import com.squareup.workflow1.ui.navigation.plus
 
 /**
  * Displays [OverviewDetailScreen] renderings in either split pane or single pane

diff --git a/...rs/android/src/main/java/com/squareup/sample/container/panel/PanelOverlayDialogFactory.kt b/...rs/android/src/main/java/com/squareup/sample/container/panel/PanelOverlayDialogFactory.kt
@@ -6,10 +6,10 @@ import androidx.appcompat.app.AppCompatDialog
 import com.squareup.sample.container.R
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.OverlayDialogFactory
-import com.squareup.workflow1.ui.container.OverlayDialogHolder
-import com.squareup.workflow1.ui.container.asDialogHolderWithContent
-import com.squareup.workflow1.ui.container.setBounds
+import com.squareup.workflow1.ui.navigation.OverlayDialogFactory
+import com.squareup.workflow1.ui.navigation.OverlayDialogHolder
+import com.squareup.workflow1.ui.navigation.asDialogHolderWithContent
+import com.squareup.workflow1.ui.navigation.setBounds
 import kotlin.reflect.KClass
 
 /**

diff --git a/samples/containers/app-poetry/src/main/java/com/squareup/sample/poetryapp/PoetryActivity.kt b/samples/containers/app-poetry/src/main/java/com/squareup/sample/poetryapp/PoetryActivity.kt
@@ -17,8 +17,8 @@ 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.container.withRegistry
 import com.squareup.workflow1.ui.renderWorkflowIn
+import com.squareup.workflow1.ui.withRegistry
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber

diff --git a/samples/containers/app-raven/src/main/java/com/squareup/sample/ravenapp/RavenActivity.kt b/samples/containers/app-raven/src/main/java/com/squareup/sample/ravenapp/RavenActivity.kt
@@ -17,8 +17,8 @@ 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.container.withRegistry
 import com.squareup.workflow1.ui.renderWorkflowIn
+import com.squareup.workflow1.ui.withRegistry
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map

diff --git a/...common/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailScreen.kt b/...common/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailScreen.kt
@@ -2,8 +2,8 @@ package com.squareup.sample.container.overviewdetail
 
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
-import com.squareup.workflow1.ui.container.plus
+import com.squareup.workflow1.ui.navigation.BackStackScreen
+import com.squareup.workflow1.ui.navigation.plus
 
 /**
  * Rendering type for overview / detail containers, with [BackStackScreen] in both roles.

diff --git a/samples/containers/common/src/main/java/com/squareup/sample/container/panel/PanelOverlay.kt b/samples/containers/common/src/main/java/com/squareup/sample/container/panel/PanelOverlay.kt
@@ -2,8 +2,8 @@ package com.squareup.sample.container.panel
 
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.ModalOverlay
-import com.squareup.workflow1.ui.container.ScreenOverlay
+import com.squareup.workflow1.ui.navigation.ModalOverlay
+import com.squareup.workflow1.ui.navigation.ScreenOverlay
 
 @OptIn(WorkflowUiExperimentalApi::class)
 class PanelOverlay<out C : Screen>(

diff --git a/...on/src/test/java/com/squareup/sample/container/overviewdetail/OverviewDetailScreenTest.kt b/...on/src/test/java/com/squareup/sample/container/overviewdetail/OverviewDetailScreenTest.kt
@@ -3,7 +3,7 @@ package com.squareup.sample.container.overviewdetail
 import com.google.common.truth.Truth.assertThat
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
+import com.squareup.workflow1.ui.navigation.BackStackScreen
 import org.junit.Test
 
 @OptIn(WorkflowUiExperimentalApi::class)

diff --git a/...hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/AreYouSureWorkflow.kt b/...hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/AreYouSureWorkflow.kt
@@ -15,13 +15,13 @@ import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.ScreenViewFactory
 import com.squareup.workflow1.ui.ScreenViewFactory.Companion.map
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.AlertOverlay
-import com.squareup.workflow1.ui.container.AlertOverlay.Button.NEGATIVE
-import com.squareup.workflow1.ui.container.AlertOverlay.Button.POSITIVE
-import com.squareup.workflow1.ui.container.AlertOverlay.Event.ButtonClicked
-import com.squareup.workflow1.ui.container.AlertOverlay.Event.Canceled
-import com.squareup.workflow1.ui.container.BackButtonScreen
-import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.navigation.AlertOverlay
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.NEGATIVE
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.POSITIVE
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.ButtonClicked
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.Canceled
+import com.squareup.workflow1.ui.navigation.BackButtonScreen
+import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
 import com.squareup.workflow1.ui.toParcelable
 import com.squareup.workflow1.ui.toSnapshot
 import kotlinx.parcelize.Parcelize

diff --git a/...-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonActivity.kt b/...-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonActivity.kt
@@ -15,8 +15,8 @@ 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.container.withRegistry
 import com.squareup.workflow1.ui.renderWorkflowIn
+import com.squareup.workflow1.ui.withRegistry
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map

diff --git a/...lo-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonScreen.kt b/...lo-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonScreen.kt
@@ -6,7 +6,7 @@ import com.squareup.sample.hellobackbutton.databinding.HelloBackButtonLayoutBind
 import com.squareup.workflow1.ui.AndroidScreen
 import com.squareup.workflow1.ui.ScreenViewFactory
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.setBackHandler
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 data class HelloBackButtonScreen(

diff --git a/samples/containers/poetry/src/main/java/com/squareup/sample/poetry/RealPoemWorkflow.kt b/samples/containers/poetry/src/main/java/com/squareup/sample/poetry/RealPoemWorkflow.kt
@@ -18,8 +18,8 @@ import com.squareup.workflow1.WorkflowAction
 import com.squareup.workflow1.WorkflowAction.Companion.noAction
 import com.squareup.workflow1.parse
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
-import com.squareup.workflow1.ui.container.toBackStackScreen
+import com.squareup.workflow1.ui.navigation.BackStackScreen
+import com.squareup.workflow1.ui.navigation.toBackStackScreen
 
 /**
  * Default implementation of [PoemWorkflow].

diff --git a/...es/containers/poetry/src/main/java/com/squareup/sample/poetry/RealPoemsBrowserWorkflow.kt b/...es/containers/poetry/src/main/java/com/squareup/sample/poetry/RealPoemsBrowserWorkflow.kt
@@ -10,7 +10,7 @@ import com.squareup.workflow1.StatefulWorkflow
 import com.squareup.workflow1.action
 import com.squareup.workflow1.parse
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
+import com.squareup.workflow1.ui.navigation.BackStackScreen
 
 typealias SelectedPoem = Int
 

diff --git a/samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaListScreen.kt b/samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaListScreen.kt
@@ -16,9 +16,9 @@ import com.squareup.workflow1.ui.ScreenViewFactory
 import com.squareup.workflow1.ui.ScreenViewRunner
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackConfig
-import com.squareup.workflow1.ui.container.BackStackConfig.Other
-import com.squareup.workflow1.ui.setBackHandler
+import com.squareup.workflow1.ui.navigation.BackStackConfig
+import com.squareup.workflow1.ui.navigation.BackStackConfig.Other
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 data class StanzaListScreen(

diff --git a/samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaScreen.kt b/samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaScreen.kt
@@ -17,9 +17,9 @@ import com.squareup.workflow1.ui.ScreenViewFactory
 import com.squareup.workflow1.ui.ScreenViewRunner
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackConfig
-import com.squareup.workflow1.ui.container.BackStackConfig.None
-import com.squareup.workflow1.ui.setBackHandler
+import com.squareup.workflow1.ui.navigation.BackStackConfig
+import com.squareup.workflow1.ui.navigation.BackStackConfig.None
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 data class StanzaScreen(

diff --git a/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/DungeonActivity.kt b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/DungeonActivity.kt
@@ -5,7 +5,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.withRegistry
+import com.squareup.workflow1.ui.withRegistry
 import kotlinx.coroutines.flow.map
 
 class DungeonActivity : AppCompatActivity() {

diff --git a/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/DungeonAppWorkflow.kt b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/DungeonAppWorkflow.kt
@@ -13,8 +13,8 @@ import com.squareup.workflow1.renderChild
 import com.squareup.workflow1.runningWorker
 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.Overlay
+import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.navigation.Overlay
 
 @OptIn(WorkflowUiExperimentalApi::class)
 class DungeonAppWorkflow(

diff --git a/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/GameSessionWorkflow.kt b/samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/GameSessionWorkflow.kt
@@ -17,10 +17,10 @@ import com.squareup.workflow1.action
 import com.squareup.workflow1.runningWorker
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.AlertOverlay
-import com.squareup.workflow1.ui.container.AlertOverlay.Button.POSITIVE
-import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
-import com.squareup.workflow1.ui.container.Overlay
+import com.squareup.workflow1.ui.navigation.AlertOverlay
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.POSITIVE
+import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.navigation.Overlay
 
 typealias BoardPath = String
 

diff --git a/...c/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineLayoutRunner.kt b/...c/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineLayoutRunner.kt
@@ -13,7 +13,7 @@ import com.squareup.workflow1.ui.ScreenViewRunner
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.WorkflowViewStub
-import com.squareup.workflow1.ui.setBackHandler
+import com.squareup.workflow1.ui.navigation.setBackHandler
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.ExperimentalTime

diff --git a/...ested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt b/...ested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt
@@ -7,9 +7,9 @@ import com.squareup.workflow1.Snapshot
 import com.squareup.workflow1.StatefulWorkflow
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackButtonScreen
-import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
-import com.squareup.workflow1.ui.container.FullScreenModal
+import com.squareup.workflow1.ui.navigation.BackButtonScreen
+import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.navigation.FullScreenModal
 
 @OptIn(WorkflowUiExperimentalApi::class)
 object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, Screen>() {

diff --git a/samples/tictactoe/app/src/main/java/com/squareup/sample/authworkflow/LoginViewFactory.kt b/samples/tictactoe/app/src/main/java/com/squareup/sample/authworkflow/LoginViewFactory.kt
@@ -4,7 +4,7 @@ import com.squareup.sample.tictactoe.databinding.LoginLayoutBinding
 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.setBackHandler
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 internal val LoginViewFactory: ScreenViewFactory<LoginScreen> =

diff --git a/...s/tictactoe/app/src/main/java/com/squareup/sample/authworkflow/SecondFactorViewFactory.kt b/...s/tictactoe/app/src/main/java/com/squareup/sample/authworkflow/SecondFactorViewFactory.kt
@@ -4,7 +4,7 @@ import com.squareup.sample.tictactoe.databinding.SecondFactorLayoutBinding
 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.setBackHandler
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 internal val SecondFactorViewFactory: ScreenViewFactory<SecondFactorScreen> =

diff --git a/samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/GameOverLayoutRunner.kt b/samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/GameOverLayoutRunner.kt
@@ -15,7 +15,7 @@ import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
 import com.squareup.workflow1.ui.ScreenViewRunner
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.setBackHandler
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 internal class GameOverLayoutRunner(

diff --git a/samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/GamePlayViewFactory.kt b/samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/GamePlayViewFactory.kt
@@ -6,7 +6,7 @@ import com.squareup.sample.tictactoe.databinding.GamePlayLayoutBinding
 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.setBackHandler
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 internal val GamePlayViewFactory: ScreenViewFactory<GamePlayScreen> =

diff --git a/samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/NewGameViewFactory.kt b/samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/NewGameViewFactory.kt
@@ -4,7 +4,7 @@ import com.squareup.sample.tictactoe.databinding.NewGameLayoutBinding
 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.setBackHandler
+import com.squareup.workflow1.ui.navigation.setBackHandler
 
 @OptIn(WorkflowUiExperimentalApi::class)
 internal val NewGameViewFactory: ScreenViewFactory<NewGameScreen> =

diff --git a/samples/tictactoe/app/src/main/java/com/squareup/sample/mainactivity/TicTacToeActivity.kt b/samples/tictactoe/app/src/main/java/com/squareup/sample/mainactivity/TicTacToeActivity.kt
@@ -10,8 +10,8 @@ import com.squareup.sample.container.SampleContainers
 import com.squareup.sample.gameworkflow.TicTacToeViewFactories
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.withRegistry
 import com.squareup.workflow1.ui.plus
+import com.squareup.workflow1.ui.withRegistry
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import timber.log.Timber

diff --git a/samples/tictactoe/common/src/main/java/com/squareup/sample/authworkflow/AuthWorkflow.kt b/samples/tictactoe/common/src/main/java/com/squareup/sample/authworkflow/AuthWorkflow.kt
@@ -16,7 +16,7 @@ import com.squareup.workflow1.action
 import com.squareup.workflow1.runningWorker
 import com.squareup.workflow1.rx2.asWorker
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
+import com.squareup.workflow1.ui.navigation.BackStackScreen
 
 /**
  * We define this otherwise redundant typealias to keep composite workflows

diff --git a/samples/tictactoe/common/src/main/java/com/squareup/sample/gameworkflow/RunGameWorkflow.kt b/samples/tictactoe/common/src/main/java/com/squareup/sample/gameworkflow/RunGameWorkflow.kt
@@ -23,12 +23,12 @@ import com.squareup.workflow1.runningWorker
 import com.squareup.workflow1.rx2.asWorker
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.AlertOverlay
-import com.squareup.workflow1.ui.container.AlertOverlay.Button.NEGATIVE
-import com.squareup.workflow1.ui.container.AlertOverlay.Button.NEUTRAL
-import com.squareup.workflow1.ui.container.AlertOverlay.Button.POSITIVE
-import com.squareup.workflow1.ui.container.AlertOverlay.Event.ButtonClicked
-import com.squareup.workflow1.ui.container.AlertOverlay.Event.Canceled
+import com.squareup.workflow1.ui.navigation.AlertOverlay
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.NEGATIVE
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.NEUTRAL
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.POSITIVE
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.ButtonClicked
+import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.Canceled
 
 enum class RunGameResult {
   CanceledStart,

diff --git a/samples/tictactoe/common/src/main/java/com/squareup/sample/mainworkflow/TicTacToeWorkflow.kt b/samples/tictactoe/common/src/main/java/com/squareup/sample/mainworkflow/TicTacToeWorkflow.kt
@@ -19,9 +19,9 @@ import com.squareup.workflow1.WorkflowAction.Companion.noAction
 import com.squareup.workflow1.action
 import com.squareup.workflow1.renderChild
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
-import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
-import com.squareup.workflow1.ui.container.plus
+import com.squareup.workflow1.ui.navigation.BackStackScreen
+import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.navigation.plus
 
 /**
  * Application specific root [Workflow], and demonstration of workflow composition.

diff --git a/.../tictactoe/common/src/test/java/com/squareup/sample/mainworkflow/TicTacToeWorkflowTest.kt b/.../tictactoe/common/src/test/java/com/squareup/sample/mainworkflow/TicTacToeWorkflowTest.kt
@@ -17,8 +17,8 @@ import com.squareup.workflow1.stateless
 import com.squareup.workflow1.testing.launchForTestingFromStartWith
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.BackStackScreen
-import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
+import com.squareup.workflow1.ui.navigation.BackStackScreen
+import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
 import org.junit.Test
 
 /**

diff --git a/samples/todo-android/app/src/main/java/com/squareup/sample/todo/ToDoActivity.kt b/samples/todo-android/app/src/main/java/com/squareup/sample/todo/ToDoActivity.kt
@@ -16,8 +16,8 @@ import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.ViewRegistry
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.withRegistry
 import com.squareup.workflow1.ui.renderWorkflowIn
+import com.squareup.workflow1.ui.withRegistry
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import java.io.File