RootWorkflow > WithEnvironment; Screen.buildView

Renames `RootWorkflow` to `WithEnvironment`. Moves `ViewEnvironment.buildView` to `Screen`.

Author: rjrjr

samples/containers/app-poetry/src/main/java/com/squareup/sample/poetryapp/PoetryActivity.kt

@@ -11,7 +11,7 @@ import com.squareup.sample.poetry.model.Poem
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.asRoot
+import com.squareup.workflow1.ui.container.withRegistry
 import com.squareup.workflow1.ui.renderWorkflowIn
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
@@ -27,7 +27,7 @@ class PoetryActivity : AppCompatActivity() {
 
     val model: PoetryModel by viewModels()
     setContentView(
-      WorkflowLayout(this).apply { take(model.renderings.map { it.asRoot(viewRegistry) }) }
+      WorkflowLayout(this).apply { take(model.renderings.map { it.withRegistry(viewRegistry) }) }
     )
   }
 

samples/containers/app-raven/src/main/java/com/squareup/sample/ravenapp/RavenActivity.kt

@@ -15,7 +15,7 @@ import com.squareup.sample.poetry.model.Raven
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.asRoot
+import com.squareup.workflow1.ui.container.withRegistry
 import com.squareup.workflow1.ui.renderWorkflowIn
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.StateFlow
@@ -31,7 +31,7 @@ class RavenActivity : AppCompatActivity() {
 
     val model: RavenModel by viewModels()
     setContentView(
-      WorkflowLayout(this).apply { take(model.renderings.map { it.asRoot(viewRegistry) }) }
+      WorkflowLayout(this).apply { take(model.renderings.map { it.withRegistry(viewRegistry) }) }
     )
 
     lifecycleScope.launch {

samples/containers/hello-back-button/src/main/java/com/squareup/sample/hellobackbutton/HelloBackButtonActivity.kt

@@ -13,7 +13,7 @@ import com.squareup.sample.container.SampleContainers
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowLayout
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.container.asRoot
+import com.squareup.workflow1.ui.container.withRegistry
 import com.squareup.workflow1.ui.modal.AlertContainer
 import com.squareup.workflow1.ui.plus
 import com.squareup.workflow1.ui.renderWorkflowIn
@@ -30,7 +30,7 @@ class HelloBackButtonActivity : AppCompatActivity() {
 
     val model: HelloBackButtonModel by viewModels()
     setContentView(
-      WorkflowLayout(this).apply { take(model.renderings.map { it.asRoot(viewRegistry) }) }
+      WorkflowLayout(this).apply { take(model.renderings.map { it.withRegistry(viewRegistry) }) }
     )
 
     lifecycleScope.launch {

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.asRoot
+import com.squareup.workflow1.ui.container.withRegistry
 import kotlinx.coroutines.flow.map
 
 class DungeonActivity : AppCompatActivity() {
@@ -19,7 +19,7 @@ class DungeonActivity : AppCompatActivity() {
     val model: TimeMachineModel by viewModels { component.timeMachineModelFactory }
 
     val contentView = WorkflowLayout(this).apply {
-      take(model.renderings.map { it.asRoot(component.viewRegistry) })
+      take(model.renderings.map { it.withRegistry(component.viewRegistry) })
     }
     setContentView(contentView)
   }

samples/tictactoe/app/src/main/java/com/squareup/sample/mainactivity/TicTacToeActivity.kt

@@ -10,7 +10,7 @@ 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.asRoot
+import com.squareup.workflow1.ui.container.withRegistry
 import com.squareup.workflow1.ui.modal.AlertContainer
 import com.squareup.workflow1.ui.plus
 import kotlinx.coroutines.flow.collect
@@ -32,7 +32,7 @@ class TicTacToeActivity : AppCompatActivity() {
     idlingResource = component.idlingResource
 
     setContentView(
-      WorkflowLayout(this).apply { take(model.renderings.map { it.asRoot(viewRegistry) }) }
+      WorkflowLayout(this).apply { take(model.renderings.map { it.withRegistry(viewRegistry) }) }
     )
 
     lifecycleScope.launch {

samples/todo-android/app/src/main/java/com/squareup/sample/todo/ToDoActivity.kt

@@ -14,7 +14,7 @@ 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.asRoot
+import com.squareup.workflow1.ui.container.withRegistry
 import com.squareup.workflow1.ui.renderWorkflowIn
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
@@ -29,7 +29,7 @@ class ToDoActivity : AppCompatActivity() {
 
     setContentView(
       WorkflowLayout(this).apply {
-        take(model.ensureWorkflow(traceFilesDir = filesDir).map { it.asRoot(viewRegistry) })
+        take(model.ensureWorkflow(traceFilesDir = filesDir).map { it.withRegistry(viewRegistry) })
       }
     )
   }

workflow-ui/compose/src/androidTest/java/com/squareup/workflow1/ui/compose/ComposeViewTreeIntegrationTest.kt

@@ -27,7 +27,7 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import com.google.common.truth.Truth.assertThat
 import com.squareup.workflow1.ui.AndroidViewRendering
-import com.squareup.workflow1.ui.AsScreen.Companion.asScreen
+import com.squareup.workflow1.ui.asScreen
 import com.squareup.workflow1.ui.Compatible
 import com.squareup.workflow1.ui.NamedScreen
 import com.squareup.workflow1.ui.ViewEnvironment

workflow-ui/container-android/src/androidTest/java/com/squareup/workflow1/ui/modal/test/ModalViewContainerLifecycleActivity.kt

@@ -6,7 +6,7 @@ import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import com.squareup.workflow1.ui.AsScreen.Companion.asScreen
+import com.squareup.workflow1.ui.asScreen
 import com.squareup.workflow1.ui.Compatible
 import com.squareup.workflow1.ui.ManualScreenViewFactory
 import com.squareup.workflow1.ui.Screen

workflow-ui/container-android/src/main/java/com/squareup/workflow1/ui/modal/ModalViewContainer.kt

@@ -12,7 +12,7 @@ import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import androidx.annotation.IdRes
-import com.squareup.workflow1.ui.AsScreen.Companion.asScreen
+import com.squareup.workflow1.ui.asScreen
 import com.squareup.workflow1.ui.BuilderViewFactory
 import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.ViewRegistry
@@ -64,15 +64,11 @@ public open class ModalViewContainer @JvmOverloads constructor(
     initialModalRendering: Any,
     initialViewEnvironment: ViewEnvironment
   ): DialogRef<Any> {
-    val view = initialViewEnvironment
-      // Notice that we don't pass a custom initializeView function to set the
-      // WorkflowLifecycleOwner here. ModalContainer will do that itself, on the parent of the view
-      // created here.
-      .buildView(
-        initialRendering = asScreen(initialModalRendering),
-        contextForNewView = this.context,
-        container = this
-      )
+    val view = asScreen(initialModalRendering).buildView(
+            viewEnvironment = initialViewEnvironment,
+            contextForNewView = this.context,
+            container = this
+    )
         .apply {
           // If the modal's root view has no backPressedHandler, add a no-op one to
           // ensure that the `onBackPressed` call below will not leak up to handlers

workflow-ui/container-common/src/main/java/com/squareup/workflow1/ui/backstack/BackStackScreen.kt

@@ -2,7 +2,7 @@
 
 package com.squareup.workflow1.ui.backstack
 
-import com.squareup.workflow1.ui.AsScreen.Companion.asScreen
+import com.squareup.workflow1.ui.asScreen
 import com.squareup.workflow1.ui.Screen
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.container.BackStackScreen as NewBackStackScreen