Revert "Simpler, safer ViewEnvironment and ViewRegistry management."

This reverts commit 85ff181.

It was unreviewed and untested, accidental merge.

Author: rjrjr

samples/compose-samples/src/main/java/com/squareup/sample/compose/hellocompose/App.kt

@@ -16,9 +16,10 @@ import com.squareup.workflow1.ui.ViewRegistry
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.compose.WorkflowRendering
 import com.squareup.workflow1.ui.compose.renderAsState
-import com.squareup.workflow1.ui.plus
 
-private val viewEnvironment = ViewEnvironment.EMPTY + ViewRegistry(HelloBinding)
+private val viewRegistry = ViewRegistry(HelloBinding)
+
+private val viewEnvironment = ViewEnvironment(mapOf(ViewRegistry to viewRegistry))
 
 @Composable fun App() {
   MaterialTheme {

samples/compose-samples/src/main/java/com/squareup/sample/compose/hellocomposebinding/HelloBindingActivity.kt

@@ -15,13 +15,15 @@ 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.plus
 import com.squareup.workflow1.ui.renderWorkflowIn
 import kotlinx.coroutines.flow.StateFlow
 
+@OptIn(WorkflowUiExperimentalApi::class)
+private val viewRegistry = ViewRegistry(HelloBinding)
+
 @OptIn(WorkflowUiExperimentalApi::class)
 private val viewEnvironment =
-  (ViewEnvironment.EMPTY + ViewRegistry(HelloBinding)).withCompositionRoot { content ->
+  ViewEnvironment(mapOf(ViewRegistry to viewRegistry)).withCompositionRoot { content ->
     MaterialTheme(content = content)
   }
 
@@ -35,22 +37,22 @@ class HelloBindingActivity : AppCompatActivity() {
 
     val model: HelloBindingModel by viewModels()
     setContentView(
-      WorkflowLayout(this).apply {
-        start(
-          renderings = model.renderings,
-          environment = viewEnvironment
-        )
-      }
+        WorkflowLayout(this).apply {
+          start(
+              renderings = model.renderings,
+              environment = viewEnvironment
+          )
+        }
     )
   }
 
   class HelloBindingModel(savedState: SavedStateHandle) : ViewModel() {
     @OptIn(WorkflowUiExperimentalApi::class)
     val renderings: StateFlow<Any> by lazy {
       renderWorkflowIn(
-        workflow = HelloWorkflow,
-        scope = viewModelScope,
-        savedStateHandle = savedState
+          workflow = HelloWorkflow,
+          scope = viewModelScope,
+          savedStateHandle = savedState
       )
     }
   }

samples/compose-samples/src/main/java/com/squareup/sample/compose/hellocomposeworkflow/HelloComposeWorkflow.kt

@@ -48,5 +48,5 @@ object HelloComposeWorkflow : ComposeWorkflow<String, Toggle>() {
 @Preview(showBackground = true)
 @Composable fun HelloComposeWorkflowPreview() {
   val rendering by HelloComposeWorkflow.renderAsState(props = "hello", onOutput = {})
-  WorkflowRendering(rendering, ViewEnvironment.EMPTY)
+  WorkflowRendering(rendering, ViewEnvironment())
 }

samples/compose-samples/src/main/java/com/squareup/sample/compose/inlinerendering/InlineRenderingWorkflow.kt

@@ -55,7 +55,7 @@ object InlineRenderingWorkflow : StatefulWorkflow<Unit, Int, Nothing, AndroidVie
 @Preview
 @Composable fun InlineRenderingWorkflowPreview() {
   val rendering by InlineRenderingWorkflow.renderAsState(props = Unit, onOutput = {})
-  WorkflowRendering(rendering, ViewEnvironment.EMPTY)
+  WorkflowRendering(rendering, ViewEnvironment())
 }
 
 @OptIn(ExperimentalAnimationApi::class)

samples/compose-samples/src/main/java/com/squareup/sample/compose/nestedrenderings/NestedRenderingsActivity.kt

@@ -15,7 +15,6 @@ 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.plus
 import com.squareup.workflow1.ui.renderWorkflowIn
 import kotlinx.coroutines.flow.StateFlow
 
@@ -27,7 +26,7 @@ private val viewRegistry = ViewRegistry(
 
 @OptIn(WorkflowUiExperimentalApi::class)
 private val viewEnvironment =
-  (ViewEnvironment.EMPTY + viewRegistry).withCompositionRoot { content ->
+  ViewEnvironment(mapOf(ViewRegistry to viewRegistry)).withCompositionRoot { content ->
     CompositionLocalProvider(LocalBackgroundColor provides Color.Green) {
       content()
     }

samples/compose-samples/src/main/java/com/squareup/sample/compose/textinput/App.kt

@@ -1,5 +1,4 @@
 @file:OptIn(WorkflowUiExperimentalApi::class)
-@file:Suppress("FunctionName")
 
 package com.squareup.sample.compose.textinput
 
@@ -12,9 +11,10 @@ import com.squareup.workflow1.ui.ViewRegistry
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.compose.WorkflowRendering
 import com.squareup.workflow1.ui.compose.renderAsState
-import com.squareup.workflow1.ui.plus
 
-private val viewEnvironment = ViewEnvironment.EMPTY + ViewRegistry(TextInputViewFactory)
+private val viewRegistry = ViewRegistry(TextInputViewFactory)
+
+private val viewEnvironment = ViewEnvironment(mapOf(ViewRegistry to viewRegistry))
 
 @Composable fun TextInputApp() {
   MaterialTheme {

samples/containers/android/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailConfig.kt

@@ -1,8 +1,7 @@
 package com.squareup.sample.container.overviewdetail
 
-import com.squareup.workflow1.ui.ViewEnvironment
-import com.squareup.workflow1.ui.ViewEnvironmentKey
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
+import com.squareup.workflow1.ui.ViewEnvironmentKey
 
 /**
  * [com.squareup.workflow1.ui.ViewEnvironment] value that informs views
@@ -35,7 +34,3 @@ enum class OverviewDetailConfig {
     override val default = None
   }
 }
-
-@WorkflowUiExperimentalApi
-operator fun ViewEnvironment.plus(config: OverviewDetailConfig): ViewEnvironment =
-  this + (OverviewDetailConfig to config)

samples/containers/android/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailContainer.kt

@@ -56,14 +56,14 @@ class OverviewDetailContainer(view: View) : ScreenViewRunner<OverviewDetailScree
       // Since we have two sibling back stacks, we need to give them each different
       // SavedStateRegistry key prefixes.
       val overviewViewEnvironment = viewEnvironment
-        .withBackStackStateKeyPrefix(OverviewBackStackKey) + Overview
+        .withBackStackStateKeyPrefix(OverviewBackStackKey) + (OverviewDetailConfig to Overview)
       overviewStub!!.show(rendering.overviewRendering, overviewViewEnvironment)
       rendering.detailRendering
         ?.let { detail ->
           detailStub!!.actual.visibility = VISIBLE
           detailStub.show(
             detail,
-            viewEnvironment + Detail
+            viewEnvironment + (OverviewDetailConfig to Detail)
           )
         }
         ?: run {
@@ -81,7 +81,7 @@ class OverviewDetailContainer(view: View) : ScreenViewRunner<OverviewDetailScree
       ?.let { rendering.overviewRendering + it }
       ?: rendering.overviewRendering
 
-    stub.show(combined, viewEnvironment + Single)
+    stub.show(combined, viewEnvironment + (OverviewDetailConfig to Single))
   }
 
   companion object : ScreenViewFactory<OverviewDetailScreen> by ScreenViewRunner.bind(

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

@@ -79,7 +79,7 @@ internal class PreviewViewFactoryTest {
     composeRule.onNodeWithText("two").assertIsNotDisplayed()
   }
 
-  @Test fun customViewEnvironment.EMPTY {
+  @Test fun customViewEnvironment() {
     composeRule.setContent {
       ParentConsumesCustomKeyPreview()
     }

workflow-ui/compose-tooling/src/main/java/com/squareup/workflow1/ui/compose/tooling/PreviewViewEnvironment.kt

@@ -11,7 +11,6 @@ import com.squareup.workflow1.ui.ViewEnvironment
 import com.squareup.workflow1.ui.ViewFactory
 import com.squareup.workflow1.ui.ViewRegistry
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
-import com.squareup.workflow1.ui.plus
 import kotlin.reflect.KClass
 
 /**
@@ -31,7 +30,7 @@ import kotlin.reflect.KClass
     PreviewViewRegistry(mainFactory, placeholderViewFactory(placeholderModifier))
   }
   return remember(viewRegistry, viewEnvironmentUpdater) {
-    (ViewEnvironment.EMPTY + viewRegistry).let { environment ->
+    ViewEnvironment(mapOf(ViewRegistry to viewRegistry)).let { environment ->
       // Give the preview a chance to add its own elements to the ViewEnvironment.
       viewEnvironmentUpdater?.let { it(environment) } ?: environment
     }