Merge pull request #809 from square/ray/dialog-holder-713

    Makes `OverlayDialogFactory` more consistent with `ScreenViewFactory`.

Author: rjrjr

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

@@ -23,9 +23,9 @@ class LegacyRunner(private val binding: LegacyViewBinding) : ScreenViewRunner<Le
 
   override fun showRendering(
     rendering: LegacyRendering,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
-    binding.stub.update(rendering.rendering, viewEnvironment)
+    binding.stub.update(rendering.rendering, environment)
   }
 
   companion object : ScreenViewFactory<LegacyRendering> by fromViewBinding(

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

@@ -43,10 +43,10 @@ class OverviewDetailContainer(view: View) : ScreenViewRunner<OverviewDetailScree
 
   override fun showRendering(
     rendering: OverviewDetailScreen,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
-    if (singleStub == null) renderSplitView(rendering, viewEnvironment)
-    else renderSingleView(rendering, viewEnvironment, singleStub)
+    if (singleStub == null) renderSplitView(rendering, environment)
+    else renderSingleView(rendering, environment, singleStub)
   }
 
   private fun renderSplitView(

samples/containers/android/src/main/java/com/squareup/sample/container/panel/PanelOverlayDialogFactory.kt

@@ -2,26 +2,28 @@ package com.squareup.sample.container.panel
 
 import android.app.Dialog
 import android.graphics.Rect
-import android.view.View
 import com.squareup.sample.container.R
+import com.squareup.workflow1.ui.Screen
+import com.squareup.workflow1.ui.ScreenViewHolder
 import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
 import com.squareup.workflow1.ui.container.ScreenOverlayDialogFactory
-import com.squareup.workflow1.ui.container.setModalContent
+import com.squareup.workflow1.ui.container.setContent
 
 /**
  * Android support for [PanelOverlay].
  */
 @OptIn(WorkflowUiExperimentalApi::class)
-internal object PanelOverlayDialogFactory : ScreenOverlayDialogFactory<PanelOverlay<*>>(
-  type = PanelOverlay::class
-) {
+internal object PanelOverlayDialogFactory :
+  ScreenOverlayDialogFactory<Screen, PanelOverlay<Screen>>(
+    type = PanelOverlay::class
+  ) {
   /**
    * Forks the default implementation to apply [R.style.PanelDialog], for
    * enter and exit animation.
    */
-  override fun buildDialogWithContentView(contentView: View): Dialog {
-    return Dialog(contentView.context, R.style.PanelDialog).also {
-      it.setModalContent(contentView)
+  override fun buildDialogWithContent(content: ScreenViewHolder<Screen>): Dialog {
+    return Dialog(content.view.context, R.style.PanelDialog).also {
+      it.setContent(content)
     }
   }
 

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

@@ -26,7 +26,7 @@ private class HelloBackButtonLayoutRunner(view: View) : ScreenViewRunner<HelloBa
 
   override fun showRendering(
     rendering: HelloBackButtonScreen,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
     messageView.text = rendering.message
     messageView.setOnClickListener { rendering.onClick() }

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/PoemListRendering.kt

@@ -49,10 +49,10 @@ private class PoemListLayoutRunner(view: View) : ScreenViewRunner<PoemListScreen
 
   override fun showRendering(
     rendering: PoemListScreen,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
     adapter.rendering = rendering
-    adapter.environment = viewEnvironment
+    adapter.environment = environment
     adapter.notifyDataSetChanged()
     if (recyclerView.adapter == null) recyclerView.adapter = adapter
 

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaListScreen.kt

@@ -42,16 +42,16 @@ private class StanzaListLayoutRunner(view: View) : ScreenViewRunner<StanzaListSc
 
   override fun showRendering(
     rendering: StanzaListScreen,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
     adapter.view = rendering
-    adapter.environment = viewEnvironment
+    adapter.environment = environment
     adapter.notifyDataSetChanged()
     if (recyclerView.adapter == null) recyclerView.adapter = adapter
     toolbar.title = rendering.title
     toolbar.subtitle = rendering.subtitle
 
-    if (viewEnvironment[BackStackConfig] == Other) {
+    if (environment[BackStackConfig] == Other) {
       toolbar.setNavigationOnClickListener { rendering.onExit() }
       toolbar.backPressedHandler = rendering.onExit
     } else {

samples/containers/poetry/src/main/java/com/squareup/sample/poetry/StanzaScreen.kt

@@ -51,9 +51,9 @@ private class StanzaLayoutRunner(private val view: View) : ScreenViewRunner<Stan
 
   override fun showRendering(
     rendering: StanzaScreen,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
-    if (viewEnvironment[OverviewDetailConfig] == Detail) {
+    if (environment[OverviewDetailConfig] == Detail) {
       toolbar.title = "Stanza ${rendering.stanzaNumber}"
       toolbar.subtitle = null
     } else {
@@ -85,16 +85,16 @@ private class StanzaLayoutRunner(private val view: View) : ScreenViewRunner<Stan
         goBack.visibility = View.INVISIBLE
       }
 
-    if (viewEnvironment[OverviewDetailConfig] != Detail &&
-      viewEnvironment[BackStackConfig] != None
+    if (environment[OverviewDetailConfig] != Detail &&
+      environment[BackStackConfig] != None
     ) {
       toolbar.setNavigationOnClickListener { rendering.onGoUp.invoke() }
     } else {
       toolbar.navigationIcon = null
     }
 
     view.backPressedHandler = rendering.onGoBack
-      ?: rendering.onGoUp.takeIf { viewEnvironment[OverviewDetailConfig] != Detail }
+      ?: rendering.onGoUp.takeIf { environment[OverviewDetailConfig] != Detail }
   }
 
   private fun TextView.setTabulatedText(lines: List<String>) {

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/BoardsListLayoutRunner.kt

@@ -73,14 +73,14 @@ class BoardsListLayoutRunner(rootView: View) : ScreenViewRunner<DisplayBoardsLis
 
   override fun showRendering(
     rendering: DisplayBoardsListScreen,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
     // Associate the viewEnvironment and event handler to each item because it needs to be used when
     // binding the RecyclerView item above.
     // Recycler is configured with a DataSource, which effectively (and often in practice) a simple
     // wrapper around a List.
     recycler.update {
-      data = rendering.toDataSource(viewEnvironment)
+      data = rendering.toDataSource(environment)
     }
   }
 

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/GameLayoutRunner.kt

@@ -41,9 +41,9 @@ class GameLayoutRunner(view: View) : ScreenViewRunner<GameRendering> {
 
   override fun showRendering(
     rendering: GameRendering,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
-    boardView.show(rendering.board, viewEnvironment)
+    boardView.show(rendering.board, environment)
     this.rendering = rendering
 
     // Disable the views if we don't have an event handler, e.g. when the game has finished.

samples/dungeon/app/src/main/java/com/squareup/sample/dungeon/LoadingBinding.kt

@@ -39,7 +39,7 @@ internal class LoadingLayoutRunner<RenderingT : Screen>(
 
   override fun showRendering(
     rendering: RenderingT,
-    viewEnvironment: ViewEnvironment
+    environment: ViewEnvironment
   ) {
     // No-op.
   }