Renames ui modules to workflow-ui-core, workflow-ui-android.

kotlin/samples/tictactoe/android/build.gradle

@@ -31,7 +31,7 @@ android {
 
 dependencies {
   implementation project(':samples:tictactoe:common')
-  implementation project(':viewregistry-android')
+  implementation project(':workflow-ui-android')
   implementation project(':workflow-core')
   implementation project(':workflow-runtime')
 

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/AuthViewBindings.kt

@@ -15,7 +15,7 @@
  */
 package com.squareup.sample.authworkflow
 
-import com.squareup.viewregistry.ViewRegistry
+import com.squareup.workflow.ui.ViewRegistry
 
 val AuthViewBindings = ViewRegistry(
     AuthorizingCoordinator,

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/AuthorizingCoordinator.kt

@@ -19,8 +19,8 @@ import android.view.View
 import android.widget.TextView
 import com.squareup.coordinators.Coordinator
 import com.squareup.sample.tictactoe.R
-import com.squareup.viewregistry.LayoutBinding
-import com.squareup.viewregistry.ViewBinding
+import com.squareup.workflow.ui.LayoutBinding
+import com.squareup.workflow.ui.ViewBinding
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/LoginCoordinator.kt

@@ -21,8 +21,8 @@ import android.widget.EditText
 import android.widget.TextView
 import com.squareup.coordinators.Coordinator
 import com.squareup.sample.authworkflow.LoginScreen.SubmitLogin
-import com.squareup.viewregistry.LayoutBinding
-import com.squareup.viewregistry.ViewBinding
+import com.squareup.workflow.ui.LayoutBinding
+import com.squareup.workflow.ui.ViewBinding
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import com.squareup.sample.tictactoe.R

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/SecondFactorCoordinator.kt

@@ -23,9 +23,9 @@ import android.widget.TextView
 import com.squareup.coordinators.Coordinator
 import com.squareup.sample.authworkflow.SecondFactorScreen.Event.CancelSecondFactor
 import com.squareup.sample.authworkflow.SecondFactorScreen.Event.SubmitSecondFactor
-import com.squareup.viewregistry.LayoutBinding
-import com.squareup.viewregistry.ViewBinding
-import com.squareup.viewregistry.setBackHandler
+import com.squareup.workflow.ui.LayoutBinding
+import com.squareup.workflow.ui.ViewBinding
+import com.squareup.workflow.ui.setBackHandler
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import com.squareup.sample.tictactoe.R

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/GameOverCoordinator.kt

@@ -30,9 +30,9 @@ import com.squareup.sample.gameworkflow.SyncState.SAVED
 import com.squareup.sample.gameworkflow.SyncState.SAVE_FAILED
 import com.squareup.sample.gameworkflow.SyncState.SAVING
 import com.squareup.sample.tictactoe.R
-import com.squareup.viewregistry.LayoutBinding
-import com.squareup.viewregistry.ViewBinding
-import com.squareup.viewregistry.setBackHandler
+import com.squareup.workflow.ui.LayoutBinding
+import com.squareup.workflow.ui.ViewBinding
+import com.squareup.workflow.ui.setBackHandler
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/GamePlayCoordinator.kt

@@ -22,9 +22,9 @@ import com.squareup.coordinators.Coordinator
 import com.squareup.sample.gameworkflow.GamePlayScreen.Event.Quit
 import com.squareup.sample.gameworkflow.GamePlayScreen.Event.TakeSquare
 import com.squareup.sample.tictactoe.R
-import com.squareup.viewregistry.LayoutBinding
-import com.squareup.viewregistry.ViewBinding
-import com.squareup.viewregistry.setBackHandler
+import com.squareup.workflow.ui.LayoutBinding
+import com.squareup.workflow.ui.ViewBinding
+import com.squareup.workflow.ui.setBackHandler
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/NewGameCoordinator.kt

@@ -22,9 +22,9 @@ import com.squareup.coordinators.Coordinator
 import com.squareup.sample.gameworkflow.NewGameScreen.Event.CancelNewGame
 import com.squareup.sample.gameworkflow.NewGameScreen.Event.StartGame
 import com.squareup.sample.tictactoe.R
-import com.squareup.viewregistry.LayoutBinding
-import com.squareup.viewregistry.ViewBinding
-import com.squareup.viewregistry.setBackHandler
+import com.squareup.workflow.ui.LayoutBinding
+import com.squareup.workflow.ui.ViewBinding
+import com.squareup.workflow.ui.setBackHandler
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/TicTacToeViewBindings.kt

@@ -15,11 +15,13 @@
  */
 package com.squareup.sample.gameworkflow
 
-import com.squareup.viewregistry.ViewRegistry
-import com.squareup.viewregistry.backstack.NoEffect
+import com.squareup.workflow.ui.ViewRegistry
+import com.squareup.workflow.ui.backstack.NoEffect
 
 val TicTacToeViewBindings = ViewRegistry(
     NewGameCoordinator,
     GamePlayCoordinator,
     GameOverCoordinator
-) + NoEffect(from = GamePlayScreen::class, to = GameOverScreen::class)
+) + NoEffect(
+    from = GamePlayScreen::class, to = GameOverScreen::class
+)

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/mainactivity/MainActivity.kt

@@ -22,13 +22,13 @@ import com.squareup.sample.authworkflow.AuthViewBindings
 import com.squareup.sample.gameworkflow.RunGameScreen
 import com.squareup.sample.gameworkflow.TicTacToeViewBindings
 import com.squareup.sample.panel.PanelContainer
-import com.squareup.viewregistry.AlertContainerScreen
-import com.squareup.viewregistry.HandlesBack
-import com.squareup.viewregistry.ModalContainer
-import com.squareup.viewregistry.ViewBinding
-import com.squareup.viewregistry.ViewRegistry
-import com.squareup.viewregistry.backstack.BackStackContainer
-import com.squareup.viewregistry.backstack.PushPopEffect
+import com.squareup.workflow.ui.AlertContainerScreen
+import com.squareup.workflow.ui.HandlesBack
+import com.squareup.workflow.ui.ModalContainer
+import com.squareup.workflow.ui.ViewBinding
+import com.squareup.workflow.ui.ViewRegistry
+import com.squareup.workflow.ui.backstack.BackStackContainer
+import com.squareup.workflow.ui.backstack.PushPopEffect
 import com.squareup.workflow.Snapshot
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable

kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/panel/PanelContainer.kt

@@ -25,8 +25,8 @@ import android.widget.FrameLayout
 import com.squareup.sample.mainworkflow.display
 import com.squareup.sample.mainworkflow.isTablet
 import com.squareup.sample.tictactoe.R
-import com.squareup.viewregistry.ModalContainer
-import com.squareup.viewregistry.ViewBinding
+import com.squareup.workflow.ui.ModalContainer
+import com.squareup.workflow.ui.ViewBinding
 import kotlin.math.min
 
 /**

kotlin/samples/tictactoe/common/build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'java'
 apply plugin: 'kotlin'
 
 dependencies {
-  implementation project(':viewregistry')
+  implementation project(':workflow-ui-core')
   implementation project(':workflow-core')
   implementation project(':workflow-rx2')
 

kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/authworkflow/AuthWorkflow.kt

@@ -25,7 +25,7 @@ import com.squareup.sample.authworkflow.AuthState.SecondFactorPrompt
 import com.squareup.sample.authworkflow.LoginScreen.SubmitLogin
 import com.squareup.sample.authworkflow.SecondFactorScreen.Event.CancelSecondFactor
 import com.squareup.sample.authworkflow.SecondFactorScreen.Event.SubmitSecondFactor
-import com.squareup.viewregistry.BackStackScreen
+import com.squareup.workflow.ui.BackStackScreen
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.Workflow
@@ -116,7 +116,9 @@ class RealAuthWorkflow(private val authService: AuthService) : AuthWorkflow,
 
         // We give this one a uniquing key so that it pushes rather than pops
         // the first Authorizing screen.
-        BackStackScreen(AuthorizingScreen("Submitting one time token…"), "2fa")
+        BackStackScreen(
+            AuthorizingScreen("Submitting one time token…"), "2fa"
+        )
       }
     }
   }

kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/gameworkflow/RunGameWorkflow.kt

@@ -35,13 +35,13 @@ import com.squareup.sample.gameworkflow.SyncState.SAVE_FAILED
 import com.squareup.sample.gameworkflow.SyncState.SAVING
 import com.squareup.sample.panel.PanelContainerScreen
 import com.squareup.sample.panel.asPanelOver
-import com.squareup.viewregistry.AlertContainerScreen
-import com.squareup.viewregistry.AlertScreen
-import com.squareup.viewregistry.AlertScreen.Button.NEGATIVE
-import com.squareup.viewregistry.AlertScreen.Button.NEUTRAL
-import com.squareup.viewregistry.AlertScreen.Button.POSITIVE
-import com.squareup.viewregistry.AlertScreen.Event.ButtonClicked
-import com.squareup.viewregistry.AlertScreen.Event.Canceled
+import com.squareup.workflow.ui.AlertContainerScreen
+import com.squareup.workflow.ui.AlertScreen
+import com.squareup.workflow.ui.AlertScreen.Button.NEGATIVE
+import com.squareup.workflow.ui.AlertScreen.Button.NEUTRAL
+import com.squareup.workflow.ui.AlertScreen.Button.POSITIVE
+import com.squareup.workflow.ui.AlertScreen.Event.ButtonClicked
+import com.squareup.workflow.ui.AlertScreen.Event.Canceled
 import com.squareup.workflow.EventHandler
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
@@ -190,14 +190,18 @@ class RealRunGameWorkflow(
     base: Any,
     vararg alerts: AlertScreen
   ): RunGameScreen {
-    return AlertContainerScreen(PanelContainerScreen<Any, Any>(base), *alerts)
+    return AlertContainerScreen(
+        PanelContainerScreen<Any, Any>(base), *alerts
+    )
   }
 
   private fun alertScreen(
     base: Any,
     alert: AlertScreen
   ): RunGameScreen {
-    return AlertContainerScreen(PanelContainerScreen<Any, Any>(base), alert)
+    return AlertContainerScreen(
+        PanelContainerScreen<Any, Any>(base), alert
+    )
   }
 
   private fun subflowScreen(

kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/mainworkflow/MainWorkflow.kt

@@ -23,7 +23,7 @@ import com.squareup.sample.gameworkflow.RunGameWorkflow
 import com.squareup.sample.mainworkflow.MainState.Authenticating
 import com.squareup.sample.mainworkflow.MainState.RunningGame
 import com.squareup.sample.panel.asPanelOver
-import com.squareup.viewregistry.AlertContainerScreen
+import com.squareup.workflow.ui.AlertContainerScreen
 import com.squareup.workflow.Snapshot
 import com.squareup.workflow.StatefulWorkflow
 import com.squareup.workflow.Workflow

kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/panel/PanelContainerScreen.kt

@@ -15,8 +15,8 @@
  */
 package com.squareup.sample.panel
 
-import com.squareup.viewregistry.BackStackScreen
-import com.squareup.viewregistry.HasModals
+import com.squareup.workflow.ui.BackStackScreen
+import com.squareup.workflow.ui.HasModals
 
 /**
  * Custom modal container used in Tic Tac Workflow sample. Shows one or more

kotlin/samples/tictactoe/common/src/test/java/com/squareup/sample/mainworkflow/MainWorkflowTest.kt

@@ -5,7 +5,7 @@ import com.squareup.sample.gameworkflow.GamePlayScreen
 import com.squareup.sample.gameworkflow.RunGameScreen
 import com.squareup.sample.gameworkflow.RunGameWorkflow
 import com.squareup.sample.panel.PanelContainerScreen
-import com.squareup.viewregistry.BackStackScreen
+import com.squareup.workflow.ui.BackStackScreen
 import com.squareup.workflow.Workflow
 import com.squareup.workflow.WorkflowAction.Companion.emitOutput
 import com.squareup.workflow.rendering
@@ -51,7 +51,8 @@ class MainWorkflowTest {
     body: String = DEFAULT_RUN_GAME
   ) = RunGameScreen(PanelContainerScreen<String, String>(body))
 
-  private fun authScreen(wrapped: String = DEFAULT_AUTH) = BackStackScreen(wrapped)
+  private fun authScreen(wrapped: String = DEFAULT_AUTH) =
+    BackStackScreen(wrapped)
 
   private val RunGameScreen.panels: List<Any> get() = baseScreen.modals.map { it.wrapped }
   private val RunGameScreen.body: Any get() = baseScreen.baseScreen

kotlin/settings.gradle

@@ -20,9 +20,9 @@ include ':legacy:legacy-workflow-rx2'
 include ':legacy:legacy-workflow-test'
 include ':samples:tictactoe:android'
 include ':samples:tictactoe:common'
-include ':viewregistry-android'
-include ':viewregistry'
 include ':workflow-core'
 include ':workflow-runtime'
 include ':workflow-rx2'
 include ':workflow-testing'
+include ':workflow-ui-core'
+include ':workflow-ui-android'

kotlin/viewregistry-android/build.gradle → kotlin/workflow-ui-android/build.gradle

@@ -23,7 +23,7 @@ targetCompatibility = JavaVersion.VERSION_1_7
 android rootProject.ext.defaultAndroidConfig
 
 dependencies {
-  api project(':viewregistry')
+  api project(':workflow-ui-core')
 
   api deps.coordinators
   api deps.kotlin.stdLib.jdk6

kotlin/viewregistry-android/gradle.properties → kotlin/workflow-ui-android/gradle.properties

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-POM_ARTIFACT_ID=viewregistry-android
-POM_NAME=View Registry Android
+POM_ARTIFACT_ID=workflow-ui-android
+POM_NAME=Workflow UI Android
 POM_PACKAGING=aar

kotlin/viewregistry-android/src/main/AndroidManifest.xml → kotlin/workflow-ui-android/src/main/AndroidManifest.xml

@@ -13,4 +13,4 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<manifest package="com.squareup.viewregistry"/>
+<manifest package="com.squareup.workflow.ui"/>

kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/AlertContainer.kt → kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/AlertContainer.kt

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.viewregistry
+package com.squareup.workflow.ui
 
 import android.content.Context
 import android.support.annotation.StyleRes
 import android.support.v7.app.AlertDialog
 import android.util.AttributeSet
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import com.squareup.viewregistry.AlertScreen.Button.NEGATIVE
-import com.squareup.viewregistry.AlertScreen.Button.NEUTRAL
-import com.squareup.viewregistry.AlertScreen.Button.POSITIVE
-import com.squareup.viewregistry.AlertScreen.Event.ButtonClicked
-import com.squareup.viewregistry.AlertScreen.Event.Canceled
+import com.squareup.workflow.ui.AlertScreen.Button.NEGATIVE
+import com.squareup.workflow.ui.AlertScreen.Button.NEUTRAL
+import com.squareup.workflow.ui.AlertScreen.Button.POSITIVE
+import com.squareup.workflow.ui.AlertScreen.Event.ButtonClicked
+import com.squareup.workflow.ui.AlertScreen.Event.Canceled
 import io.reactivex.Observable
 
 /**
@@ -79,11 +79,12 @@ internal class AlertContainer
   by BuilderBinding(
       type = AlertContainerScreen::class.java,
       builder = { screens, viewRegistry, context, _ ->
-        AlertContainer(context, dialogThemeResId = dialogThemeResId).apply {
-          id = R.id.workflow_alert_container
-          layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
-          takeScreens(screens, viewRegistry)
-        }
+        AlertContainer(context, dialogThemeResId = dialogThemeResId)
+            .apply {
+              id = R.id.workflow_alert_container
+              layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
+              takeScreens(screens, viewRegistry)
+            }
       }
   )
 }

kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/BuilderBinding.kt → kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/BuilderBinding.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.viewregistry
+package com.squareup.workflow.ui
 
 import android.content.Context
 import android.support.transition.Scene

kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/HandlesBack.kt → kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/HandlesBack.kt

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.viewregistry
+package com.squareup.workflow.ui
 
 import android.view.View
-import com.squareup.viewregistry.HandlesBack.Helper.setConditionalBackHandler
+import com.squareup.workflow.ui.HandlesBack.Helper.setConditionalBackHandler
 
 /**
  * Implemented by objects that want the option to intercept back button taps.

kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/LayoutBinding.kt → kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/LayoutBinding.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.viewregistry
+package com.squareup.workflow.ui
 
 import android.content.Context
 import android.support.annotation.LayoutRes
@@ -103,7 +103,9 @@ class LayoutBinding<T : Any> private constructor(
     inline fun <reified T : Any> of(
       @LayoutRes layoutId: Int,
       noinline coordinatorConstructor: (Observable<out T>) -> Coordinator
-    ) = of(layoutId) { screens: Observable<out T>, _ -> coordinatorConstructor(screens) }
+    ) = of(
+        layoutId
+    ) { screens: Observable<out T>, _ -> coordinatorConstructor(screens) }
 
     inline fun <reified T : Any> of(
       @LayoutRes layoutId: Int,