Skip to content

Commit e7f3c44

Browse files
rjrjrrjrjr
committed
Renames ui modules to workflow-ui-core, workflow-ui-android.
1 parent 7856ec1 commit e7f3c44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+175
-146
lines changed

Diff for: ‎kotlin/samples/tictactoe/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ android {
3131

3232
dependencies {
3333
implementation project(':samples:tictactoe:common')
34-
implementation project(':viewregistry-android')
34+
implementation project(':workflow-ui-android')
3535
implementation project(':workflow-core')
3636
implementation project(':workflow-host')
3737

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/AuthViewBindings.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.squareup.sample.authworkflow
1717

18-
import com.squareup.viewregistry.ViewRegistry
18+
import com.squareup.workflow.ui.ViewRegistry
1919

2020
val AuthViewBindings = ViewRegistry(
2121
AuthorizingCoordinator,

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/AuthorizingCoordinator.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import android.view.View
1919
import android.widget.TextView
2020
import com.squareup.coordinators.Coordinator
2121
import com.squareup.sample.tictactoe.R
22-
import com.squareup.viewregistry.LayoutBinding
23-
import com.squareup.viewregistry.ViewBinding
22+
import com.squareup.workflow.ui.LayoutBinding
23+
import com.squareup.workflow.ui.ViewBinding
2424
import io.reactivex.Observable
2525
import io.reactivex.disposables.CompositeDisposable
2626

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/LoginCoordinator.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import android.widget.EditText
2121
import android.widget.TextView
2222
import com.squareup.coordinators.Coordinator
2323
import com.squareup.sample.authworkflow.LoginScreen.SubmitLogin
24-
import com.squareup.viewregistry.LayoutBinding
25-
import com.squareup.viewregistry.ViewBinding
24+
import com.squareup.workflow.ui.LayoutBinding
25+
import com.squareup.workflow.ui.ViewBinding
2626
import io.reactivex.Observable
2727
import io.reactivex.disposables.CompositeDisposable
2828
import com.squareup.sample.tictactoe.R

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/authworkflow/SecondFactorCoordinator.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import android.widget.TextView
2323
import com.squareup.coordinators.Coordinator
2424
import com.squareup.sample.authworkflow.SecondFactorScreen.Event.CancelSecondFactor
2525
import com.squareup.sample.authworkflow.SecondFactorScreen.Event.SubmitSecondFactor
26-
import com.squareup.viewregistry.LayoutBinding
27-
import com.squareup.viewregistry.ViewBinding
28-
import com.squareup.viewregistry.setBackHandler
26+
import com.squareup.workflow.ui.LayoutBinding
27+
import com.squareup.workflow.ui.ViewBinding
28+
import com.squareup.workflow.ui.setBackHandler
2929
import io.reactivex.Observable
3030
import io.reactivex.disposables.CompositeDisposable
3131
import com.squareup.sample.tictactoe.R

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/GameOverCoordinator.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import com.squareup.sample.gameworkflow.SyncState.SAVED
3030
import com.squareup.sample.gameworkflow.SyncState.SAVE_FAILED
3131
import com.squareup.sample.gameworkflow.SyncState.SAVING
3232
import com.squareup.sample.tictactoe.R
33-
import com.squareup.viewregistry.LayoutBinding
34-
import com.squareup.viewregistry.ViewBinding
35-
import com.squareup.viewregistry.setBackHandler
33+
import com.squareup.workflow.ui.LayoutBinding
34+
import com.squareup.workflow.ui.ViewBinding
35+
import com.squareup.workflow.ui.setBackHandler
3636
import io.reactivex.Observable
3737
import io.reactivex.disposables.CompositeDisposable
3838

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/GamePlayCoordinator.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import com.squareup.coordinators.Coordinator
2222
import com.squareup.sample.gameworkflow.GamePlayScreen.Event.Quit
2323
import com.squareup.sample.gameworkflow.GamePlayScreen.Event.TakeSquare
2424
import com.squareup.sample.tictactoe.R
25-
import com.squareup.viewregistry.LayoutBinding
26-
import com.squareup.viewregistry.ViewBinding
27-
import com.squareup.viewregistry.setBackHandler
25+
import com.squareup.workflow.ui.LayoutBinding
26+
import com.squareup.workflow.ui.ViewBinding
27+
import com.squareup.workflow.ui.setBackHandler
2828
import io.reactivex.Observable
2929
import io.reactivex.disposables.CompositeDisposable
3030

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/NewGameCoordinator.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import com.squareup.coordinators.Coordinator
2222
import com.squareup.sample.gameworkflow.NewGameScreen.Event.CancelNewGame
2323
import com.squareup.sample.gameworkflow.NewGameScreen.Event.StartGame
2424
import com.squareup.sample.tictactoe.R
25-
import com.squareup.viewregistry.LayoutBinding
26-
import com.squareup.viewregistry.ViewBinding
27-
import com.squareup.viewregistry.setBackHandler
25+
import com.squareup.workflow.ui.LayoutBinding
26+
import com.squareup.workflow.ui.ViewBinding
27+
import com.squareup.workflow.ui.setBackHandler
2828
import io.reactivex.Observable
2929
import io.reactivex.disposables.CompositeDisposable
3030

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/gameworkflow/TicTacToeViewBindings.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
*/
1616
package com.squareup.sample.gameworkflow
1717

18-
import com.squareup.viewregistry.ViewRegistry
19-
import com.squareup.viewregistry.backstack.NoEffect
18+
import com.squareup.workflow.ui.ViewRegistry
19+
import com.squareup.workflow.ui.backstack.NoEffect
2020

2121
val TicTacToeViewBindings = ViewRegistry(
2222
NewGameCoordinator,
2323
GamePlayCoordinator,
2424
GameOverCoordinator
25-
) + NoEffect(from = GamePlayScreen::class, to = GameOverScreen::class)
25+
) + NoEffect(
26+
from = GamePlayScreen::class, to = GameOverScreen::class
27+
)

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/mainactivity/MainActivity.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import com.squareup.sample.authworkflow.AuthViewBindings
2222
import com.squareup.sample.gameworkflow.RunGameScreen
2323
import com.squareup.sample.gameworkflow.TicTacToeViewBindings
2424
import com.squareup.sample.panel.PanelContainer
25-
import com.squareup.viewregistry.AlertContainerScreen
26-
import com.squareup.viewregistry.HandlesBack
27-
import com.squareup.viewregistry.ModalContainer
28-
import com.squareup.viewregistry.ViewBinding
29-
import com.squareup.viewregistry.ViewRegistry
30-
import com.squareup.viewregistry.backstack.BackStackContainer
31-
import com.squareup.viewregistry.backstack.PushPopEffect
25+
import com.squareup.workflow.ui.AlertContainerScreen
26+
import com.squareup.workflow.ui.HandlesBack
27+
import com.squareup.workflow.ui.ModalContainer
28+
import com.squareup.workflow.ui.ViewBinding
29+
import com.squareup.workflow.ui.ViewRegistry
30+
import com.squareup.workflow.ui.backstack.BackStackContainer
31+
import com.squareup.workflow.ui.backstack.PushPopEffect
3232
import com.squareup.workflow.Snapshot
3333
import io.reactivex.android.schedulers.AndroidSchedulers
3434
import io.reactivex.disposables.CompositeDisposable

Diff for: ‎kotlin/samples/tictactoe/android/src/main/java/com/squareup/sample/panel/PanelContainer.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import android.widget.FrameLayout
2525
import com.squareup.sample.mainworkflow.display
2626
import com.squareup.sample.mainworkflow.isTablet
2727
import com.squareup.sample.tictactoe.R
28-
import com.squareup.viewregistry.ModalContainer
29-
import com.squareup.viewregistry.ViewBinding
28+
import com.squareup.workflow.ui.ModalContainer
29+
import com.squareup.workflow.ui.ViewBinding
3030
import kotlin.math.min
3131

3232
/**

Diff for: ‎kotlin/samples/tictactoe/common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apply plugin: 'java'
1717
apply plugin: 'kotlin'
1818

1919
dependencies {
20-
implementation project(':viewregistry')
20+
implementation project(':workflow-ui-core')
2121
implementation project(':workflow-core')
2222
implementation project(':workflow-rx2')
2323

Diff for: ‎kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/authworkflow/AuthWorkflow.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.squareup.sample.authworkflow.AuthState.SecondFactorPrompt
2525
import com.squareup.sample.authworkflow.LoginScreen.SubmitLogin
2626
import com.squareup.sample.authworkflow.SecondFactorScreen.Event.CancelSecondFactor
2727
import com.squareup.sample.authworkflow.SecondFactorScreen.Event.SubmitSecondFactor
28-
import com.squareup.viewregistry.BackStackScreen
28+
import com.squareup.workflow.ui.BackStackScreen
2929
import com.squareup.workflow.Snapshot
3030
import com.squareup.workflow.StatefulWorkflow
3131
import com.squareup.workflow.Workflow
@@ -116,7 +116,9 @@ class RealAuthWorkflow(private val authService: AuthService) : AuthWorkflow,
116116

117117
// We give this one a uniquing key so that it pushes rather than pops
118118
// the first Authorizing screen.
119-
BackStackScreen(AuthorizingScreen("Submitting one time token…"), "2fa")
119+
BackStackScreen(
120+
AuthorizingScreen("Submitting one time token…"), "2fa"
121+
)
120122
}
121123
}
122124
}

Diff for: ‎kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/gameworkflow/RunGameWorkflow.kt

+13-9
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ import com.squareup.sample.gameworkflow.SyncState.SAVE_FAILED
3535
import com.squareup.sample.gameworkflow.SyncState.SAVING
3636
import com.squareup.sample.panel.PanelContainerScreen
3737
import com.squareup.sample.panel.asPanelOver
38-
import com.squareup.viewregistry.AlertContainerScreen
39-
import com.squareup.viewregistry.AlertScreen
40-
import com.squareup.viewregistry.AlertScreen.Button.NEGATIVE
41-
import com.squareup.viewregistry.AlertScreen.Button.NEUTRAL
42-
import com.squareup.viewregistry.AlertScreen.Button.POSITIVE
43-
import com.squareup.viewregistry.AlertScreen.Event.ButtonClicked
44-
import com.squareup.viewregistry.AlertScreen.Event.Canceled
38+
import com.squareup.workflow.ui.AlertContainerScreen
39+
import com.squareup.workflow.ui.AlertScreen
40+
import com.squareup.workflow.ui.AlertScreen.Button.NEGATIVE
41+
import com.squareup.workflow.ui.AlertScreen.Button.NEUTRAL
42+
import com.squareup.workflow.ui.AlertScreen.Button.POSITIVE
43+
import com.squareup.workflow.ui.AlertScreen.Event.ButtonClicked
44+
import com.squareup.workflow.ui.AlertScreen.Event.Canceled
4545
import com.squareup.workflow.EventHandler
4646
import com.squareup.workflow.Snapshot
4747
import com.squareup.workflow.StatefulWorkflow
@@ -190,14 +190,18 @@ class RealRunGameWorkflow(
190190
base: Any,
191191
vararg alerts: AlertScreen
192192
): RunGameScreen {
193-
return AlertContainerScreen(PanelContainerScreen<Any, Any>(base), *alerts)
193+
return AlertContainerScreen(
194+
PanelContainerScreen<Any, Any>(base), *alerts
195+
)
194196
}
195197

196198
private fun alertScreen(
197199
base: Any,
198200
alert: AlertScreen
199201
): RunGameScreen {
200-
return AlertContainerScreen(PanelContainerScreen<Any, Any>(base), alert)
202+
return AlertContainerScreen(
203+
PanelContainerScreen<Any, Any>(base), alert
204+
)
201205
}
202206

203207
private fun subflowScreen(

Diff for: ‎kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/mainworkflow/MainWorkflow.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.squareup.sample.gameworkflow.RunGameWorkflow
2323
import com.squareup.sample.mainworkflow.MainState.Authenticating
2424
import com.squareup.sample.mainworkflow.MainState.RunningGame
2525
import com.squareup.sample.panel.asPanelOver
26-
import com.squareup.viewregistry.AlertContainerScreen
26+
import com.squareup.workflow.ui.AlertContainerScreen
2727
import com.squareup.workflow.Snapshot
2828
import com.squareup.workflow.StatefulWorkflow
2929
import com.squareup.workflow.Workflow

Diff for: ‎kotlin/samples/tictactoe/common/src/main/java/com/squareup/sample/panel/PanelContainerScreen.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package com.squareup.sample.panel
1717

18-
import com.squareup.viewregistry.BackStackScreen
19-
import com.squareup.viewregistry.HasModals
18+
import com.squareup.workflow.ui.BackStackScreen
19+
import com.squareup.workflow.ui.HasModals
2020

2121
/**
2222
* Custom modal container used in Tic Tac Workflow sample. Shows one or more

Diff for: ‎kotlin/samples/tictactoe/common/src/test/java/com/squareup/sample/mainworkflow/MainWorkflowTest.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.squareup.sample.gameworkflow.GamePlayScreen
55
import com.squareup.sample.gameworkflow.RunGameScreen
66
import com.squareup.sample.gameworkflow.RunGameWorkflow
77
import com.squareup.sample.panel.PanelContainerScreen
8-
import com.squareup.viewregistry.BackStackScreen
8+
import com.squareup.workflow.ui.BackStackScreen
99
import com.squareup.workflow.Workflow
1010
import com.squareup.workflow.WorkflowAction.Companion.emitOutput
1111
import com.squareup.workflow.rendering
@@ -51,7 +51,8 @@ class MainWorkflowTest {
5151
body: String = DEFAULT_RUN_GAME
5252
) = RunGameScreen(PanelContainerScreen<String, String>(body))
5353

54-
private fun authScreen(wrapped: String = DEFAULT_AUTH) = BackStackScreen(wrapped)
54+
private fun authScreen(wrapped: String = DEFAULT_AUTH) =
55+
BackStackScreen(wrapped)
5556

5657
private val RunGameScreen.panels: List<Any> get() = baseScreen.modals.map { it.wrapped }
5758
private val RunGameScreen.body: Any get() = baseScreen.baseScreen

Diff for: ‎kotlin/settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ include ':legacy:legacy-workflow-rx2'
2020
include ':legacy:legacy-workflow-test'
2121
include ':samples:tictactoe:android'
2222
include ':samples:tictactoe:common'
23-
include ':viewregistry-android'
24-
include ':viewregistry'
2523
include ':workflow-core'
2624
include ':workflow-host'
2725
include ':workflow-rx2'
2826
include ':workflow-testing'
27+
include ':workflow-ui-core'
28+
include ':workflow-ui-android'

Diff for: ‎kotlin/viewregistry-android/build.gradle renamed to ‎kotlin/workflow-ui-android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ targetCompatibility = JavaVersion.VERSION_1_7
2323
android rootProject.ext.defaultAndroidConfig
2424

2525
dependencies {
26-
api project(':viewregistry')
26+
api project(':workflow-ui-core')
2727

2828
api deps.coordinators
2929
api deps.kotlin.stdLib.jdk6

Diff for: ‎kotlin/viewregistry-android/gradle.properties renamed to ‎kotlin/workflow-ui-android/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
POM_ARTIFACT_ID=viewregistry-android
17-
POM_NAME=View Registry Android
16+
POM_ARTIFACT_ID=workflow-ui-android
17+
POM_NAME=Workflow UI Android
1818
POM_PACKAGING=aar

Diff for: ‎kotlin/viewregistry-android/src/main/AndroidManifest.xml renamed to ‎kotlin/workflow-ui-android/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
<manifest package="com.squareup.viewregistry"/>
16+
<manifest package="com.squareup.workflow.ui"/>

Diff for: ‎kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/AlertContainer.kt renamed to ‎kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/AlertContainer.kt

+12-11
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.squareup.viewregistry
16+
package com.squareup.workflow.ui
1717

1818
import android.content.Context
1919
import android.support.annotation.StyleRes
2020
import android.support.v7.app.AlertDialog
2121
import android.util.AttributeSet
2222
import android.view.ViewGroup
2323
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
24-
import com.squareup.viewregistry.AlertScreen.Button.NEGATIVE
25-
import com.squareup.viewregistry.AlertScreen.Button.NEUTRAL
26-
import com.squareup.viewregistry.AlertScreen.Button.POSITIVE
27-
import com.squareup.viewregistry.AlertScreen.Event.ButtonClicked
28-
import com.squareup.viewregistry.AlertScreen.Event.Canceled
24+
import com.squareup.workflow.ui.AlertScreen.Button.NEGATIVE
25+
import com.squareup.workflow.ui.AlertScreen.Button.NEUTRAL
26+
import com.squareup.workflow.ui.AlertScreen.Button.POSITIVE
27+
import com.squareup.workflow.ui.AlertScreen.Event.ButtonClicked
28+
import com.squareup.workflow.ui.AlertScreen.Event.Canceled
2929
import io.reactivex.Observable
3030

3131
/**
@@ -79,11 +79,12 @@ internal class AlertContainer
7979
by BuilderBinding(
8080
type = AlertContainerScreen::class.java,
8181
builder = { screens, viewRegistry, context, _ ->
82-
AlertContainer(context, dialogThemeResId = dialogThemeResId).apply {
83-
id = R.id.workflow_alert_container
84-
layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
85-
takeScreens(screens, viewRegistry)
86-
}
82+
AlertContainer(context, dialogThemeResId = dialogThemeResId)
83+
.apply {
84+
id = R.id.workflow_alert_container
85+
layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
86+
takeScreens(screens, viewRegistry)
87+
}
8788
}
8889
)
8990
}

Diff for: ‎kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/BuilderBinding.kt renamed to ‎kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/BuilderBinding.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.squareup.viewregistry
16+
package com.squareup.workflow.ui
1717

1818
import android.content.Context
1919
import android.support.transition.Scene

Diff for: ‎kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/HandlesBack.kt renamed to ‎kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/HandlesBack.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.squareup.viewregistry
16+
package com.squareup.workflow.ui
1717

1818
import android.view.View
19-
import com.squareup.viewregistry.HandlesBack.Helper.setConditionalBackHandler
19+
import com.squareup.workflow.ui.HandlesBack.Helper.setConditionalBackHandler
2020

2121
/**
2222
* Implemented by objects that want the option to intercept back button taps.

Diff for: ‎kotlin/viewregistry-android/src/main/java/com/squareup/viewregistry/LayoutBinding.kt renamed to ‎kotlin/workflow-ui-android/src/main/java/com/squareup/workflow/ui/LayoutBinding.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.squareup.viewregistry
16+
package com.squareup.workflow.ui
1717

1818
import android.content.Context
1919
import android.support.annotation.LayoutRes
@@ -103,7 +103,9 @@ class LayoutBinding<T : Any> private constructor(
103103
inline fun <reified T : Any> of(
104104
@LayoutRes layoutId: Int,
105105
noinline coordinatorConstructor: (Observable<out T>) -> Coordinator
106-
) = of(layoutId) { screens: Observable<out T>, _ -> coordinatorConstructor(screens) }
106+
) = of(
107+
layoutId
108+
) { screens: Observable<out T>, _ -> coordinatorConstructor(screens) }
107109

108110
inline fun <reified T : Any> of(
109111
@LayoutRes layoutId: Int,

0 commit comments

Comments
 (0)