Skip to content

Commit 0937f6d

Browse files
rjrjrrjrjr
committed
container > navigation
In preparation for (finally!) locking down the workflow-ui API, renames the `com.squareup.workflow1.ui.container` package to `navigation`, since that's the common theme of nearly everything in there. I think this simple change should help make our navigation story a bit more self documentating. Yes, I'll still write navigation docs. Other changes: * `View.setBackHandler` moves from `ui` to `ui.navigation` * `EnvironmentScreen`, `Screen.withEnvironment()`, `Screen.withRegistry()` which this PR moves up to the `ui` package. References to these had bled out into other spots already, so this feels like a move in the right direction. * `OnBackPressedDispatcherOwnerKey` moves from `ui` to `ui.androidx` Also, note that the packages of the deprecated classes in the `container-android` and `container-common` modules were not changed, since they're about to be deleted.
1 parent b6403fb commit 0937f6d

File tree

109 files changed

+367
-377
lines changed

Some content is hidden

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

109 files changed

+367
-377
lines changed

‎benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemWorkflow.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import com.squareup.workflow1.WorkflowAction.Companion.noAction
3333
import com.squareup.workflow1.action
3434
import com.squareup.workflow1.runningWorker
3535
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
36-
import com.squareup.workflow1.ui.container.BackStackScreen
37-
import com.squareup.workflow1.ui.container.toBackStackScreen
36+
import com.squareup.workflow1.ui.navigation.BackStackScreen
37+
import com.squareup.workflow1.ui.navigation.toBackStackScreen
3838
import kotlinx.coroutines.delay
3939
import kotlinx.coroutines.flow.MutableStateFlow
4040
import kotlinx.coroutines.flow.flow

‎benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoemsBrowserWorkflow.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.squareup.workflow1.WorkflowAction.Companion.noAction
2525
import com.squareup.workflow1.action
2626
import com.squareup.workflow1.runningWorker
2727
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
28-
import com.squareup.workflow1.ui.container.BackStackScreen
28+
import com.squareup.workflow1.ui.navigation.BackStackScreen
2929
import kotlinx.coroutines.delay
3030
import kotlinx.coroutines.flow.MutableStateFlow
3131

‎benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/PerformancePoetryActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import com.squareup.workflow1.ui.ViewEnvironment.Companion.EMPTY
2929
import com.squareup.workflow1.ui.ViewRegistry
3030
import com.squareup.workflow1.ui.WorkflowLayout
3131
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
32-
import com.squareup.workflow1.ui.container.withEnvironment
3332
import com.squareup.workflow1.ui.renderWorkflowIn
33+
import com.squareup.workflow1.ui.withEnvironment
3434
import kotlinx.coroutines.flow.StateFlow
3535
import kotlinx.coroutines.flow.map
3636
import kotlinx.coroutines.flow.onEach

‎benchmarks/performance-poetry/complex-poetry/src/main/java/com/squareup/benchmarks/performance/complex/poetry/views/MayBeLoadingScreen.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.squareup.benchmarks.performance.complex.poetry.views
33
import com.squareup.sample.container.overviewdetail.OverviewDetailScreen
44
import com.squareup.sample.container.panel.ScrimScreen
55
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
6-
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
7-
import com.squareup.workflow1.ui.container.FullScreenModal
6+
import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
7+
import com.squareup.workflow1.ui.navigation.FullScreenModal
88

99
@OptIn(WorkflowUiExperimentalApi::class)
1010
typealias MayBeLoadingScreen =

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import com.squareup.workflow1.ui.WorkflowLayout
1919
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2020
import com.squareup.workflow1.ui.compose.composeViewFactory
2121
import com.squareup.workflow1.ui.compose.withCompositionRoot
22-
import com.squareup.workflow1.ui.container.withEnvironment
2322
import com.squareup.workflow1.ui.plus
2423
import com.squareup.workflow1.ui.renderWorkflowIn
24+
import com.squareup.workflow1.ui.withEnvironment
2525
import kotlinx.coroutines.flow.StateFlow
2626

2727
@OptIn(WorkflowUiExperimentalApi::class)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import com.squareup.workflow1.ui.ViewRegistry
1919
import com.squareup.workflow1.ui.WorkflowLayout
2020
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2121
import com.squareup.workflow1.ui.compose.withCompositionRoot
22-
import com.squareup.workflow1.ui.container.withEnvironment
2322
import com.squareup.workflow1.ui.plus
2423
import com.squareup.workflow1.ui.renderWorkflowIn
24+
import com.squareup.workflow1.ui.withEnvironment
2525
import kotlinx.coroutines.flow.StateFlow
2626

2727
@OptIn(WorkflowUiExperimentalApi::class)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import com.squareup.workflow1.ui.ScreenViewRunner
1313
import com.squareup.workflow1.ui.ViewEnvironment
1414
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1515
import com.squareup.workflow1.ui.WorkflowViewStub
16-
import com.squareup.workflow1.ui.container.BackStackScreen
17-
import com.squareup.workflow1.ui.container.plus
16+
import com.squareup.workflow1.ui.navigation.BackStackScreen
17+
import com.squareup.workflow1.ui.navigation.plus
1818

1919
/**
2020
* Displays [OverviewDetailScreen] renderings in either split pane or single pane

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import androidx.appcompat.app.AppCompatDialog
66
import com.squareup.sample.container.R
77
import com.squareup.workflow1.ui.ViewEnvironment
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.container.OverlayDialogFactory
10-
import com.squareup.workflow1.ui.container.OverlayDialogHolder
11-
import com.squareup.workflow1.ui.container.asDialogHolderWithContent
12-
import com.squareup.workflow1.ui.container.setBounds
9+
import com.squareup.workflow1.ui.navigation.OverlayDialogFactory
10+
import com.squareup.workflow1.ui.navigation.OverlayDialogHolder
11+
import com.squareup.workflow1.ui.navigation.asDialogHolderWithContent
12+
import com.squareup.workflow1.ui.navigation.setBounds
1313
import kotlin.reflect.KClass
1414

1515
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import com.squareup.workflow1.config.AndroidRuntimeConfigTools
1717
import com.squareup.workflow1.ui.Screen
1818
import com.squareup.workflow1.ui.WorkflowLayout
1919
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
20-
import com.squareup.workflow1.ui.container.withRegistry
2120
import com.squareup.workflow1.ui.renderWorkflowIn
21+
import com.squareup.workflow1.ui.withRegistry
2222
import kotlinx.coroutines.flow.StateFlow
2323
import kotlinx.coroutines.flow.map
2424
import timber.log.Timber

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import com.squareup.workflow1.config.AndroidRuntimeConfigTools
1717
import com.squareup.workflow1.ui.Screen
1818
import com.squareup.workflow1.ui.WorkflowLayout
1919
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
20-
import com.squareup.workflow1.ui.container.withRegistry
2120
import com.squareup.workflow1.ui.renderWorkflowIn
21+
import com.squareup.workflow1.ui.withRegistry
2222
import kotlinx.coroutines.Job
2323
import kotlinx.coroutines.flow.StateFlow
2424
import kotlinx.coroutines.flow.map

‎samples/containers/common/src/main/java/com/squareup/sample/container/overviewdetail/OverviewDetailScreen.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.squareup.sample.container.overviewdetail
22

33
import com.squareup.workflow1.ui.Screen
44
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
5-
import com.squareup.workflow1.ui.container.BackStackScreen
6-
import com.squareup.workflow1.ui.container.plus
5+
import com.squareup.workflow1.ui.navigation.BackStackScreen
6+
import com.squareup.workflow1.ui.navigation.plus
77

88
/**
99
* Rendering type for overview / detail containers, with [BackStackScreen] in both roles.

‎samples/containers/common/src/main/java/com/squareup/sample/container/panel/PanelOverlay.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.squareup.sample.container.panel
22

33
import com.squareup.workflow1.ui.Screen
44
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
5-
import com.squareup.workflow1.ui.container.ModalOverlay
6-
import com.squareup.workflow1.ui.container.ScreenOverlay
5+
import com.squareup.workflow1.ui.navigation.ModalOverlay
6+
import com.squareup.workflow1.ui.navigation.ScreenOverlay
77

88
@OptIn(WorkflowUiExperimentalApi::class)
99
class PanelOverlay<out C : Screen>(

‎samples/containers/common/src/test/java/com/squareup/sample/container/overviewdetail/OverviewDetailScreenTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.squareup.sample.container.overviewdetail
33
import com.google.common.truth.Truth.assertThat
44
import com.squareup.workflow1.ui.Screen
55
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
6-
import com.squareup.workflow1.ui.container.BackStackScreen
6+
import com.squareup.workflow1.ui.navigation.BackStackScreen
77
import org.junit.Test
88

99
@OptIn(WorkflowUiExperimentalApi::class)

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import com.squareup.workflow1.ui.Screen
1515
import com.squareup.workflow1.ui.ScreenViewFactory
1616
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.map
1717
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
18-
import com.squareup.workflow1.ui.container.AlertOverlay
19-
import com.squareup.workflow1.ui.container.AlertOverlay.Button.NEGATIVE
20-
import com.squareup.workflow1.ui.container.AlertOverlay.Button.POSITIVE
21-
import com.squareup.workflow1.ui.container.AlertOverlay.Event.ButtonClicked
22-
import com.squareup.workflow1.ui.container.AlertOverlay.Event.Canceled
23-
import com.squareup.workflow1.ui.container.BackButtonScreen
24-
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
18+
import com.squareup.workflow1.ui.navigation.AlertOverlay
19+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.NEGATIVE
20+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.POSITIVE
21+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.ButtonClicked
22+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.Canceled
23+
import com.squareup.workflow1.ui.navigation.BackButtonScreen
24+
import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
2525
import com.squareup.workflow1.ui.toParcelable
2626
import com.squareup.workflow1.ui.toSnapshot
2727
import kotlinx.parcelize.Parcelize

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import com.squareup.workflow1.config.AndroidRuntimeConfigTools
1515
import com.squareup.workflow1.ui.Screen
1616
import com.squareup.workflow1.ui.WorkflowLayout
1717
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
18-
import com.squareup.workflow1.ui.container.withRegistry
1918
import com.squareup.workflow1.ui.renderWorkflowIn
19+
import com.squareup.workflow1.ui.withRegistry
2020
import kotlinx.coroutines.Job
2121
import kotlinx.coroutines.flow.StateFlow
2222
import kotlinx.coroutines.flow.map

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.squareup.sample.hellobackbutton.databinding.HelloBackButtonLayoutBind
66
import com.squareup.workflow1.ui.AndroidScreen
77
import com.squareup.workflow1.ui.ScreenViewFactory
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.setBackHandler
9+
import com.squareup.workflow1.ui.navigation.setBackHandler
1010

1111
@OptIn(WorkflowUiExperimentalApi::class)
1212
data class HelloBackButtonScreen(

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import com.squareup.workflow1.WorkflowAction
1818
import com.squareup.workflow1.WorkflowAction.Companion.noAction
1919
import com.squareup.workflow1.parse
2020
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
21-
import com.squareup.workflow1.ui.container.BackStackScreen
22-
import com.squareup.workflow1.ui.container.toBackStackScreen
21+
import com.squareup.workflow1.ui.navigation.BackStackScreen
22+
import com.squareup.workflow1.ui.navigation.toBackStackScreen
2323

2424
/**
2525
* Default implementation of [PoemWorkflow].

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.squareup.workflow1.StatefulWorkflow
1010
import com.squareup.workflow1.action
1111
import com.squareup.workflow1.parse
1212
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
13-
import com.squareup.workflow1.ui.container.BackStackScreen
13+
import com.squareup.workflow1.ui.navigation.BackStackScreen
1414

1515
typealias SelectedPoem = Int
1616

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import com.squareup.workflow1.ui.ScreenViewFactory
1616
import com.squareup.workflow1.ui.ScreenViewRunner
1717
import com.squareup.workflow1.ui.ViewEnvironment
1818
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
19-
import com.squareup.workflow1.ui.container.BackStackConfig
20-
import com.squareup.workflow1.ui.container.BackStackConfig.Other
21-
import com.squareup.workflow1.ui.setBackHandler
19+
import com.squareup.workflow1.ui.navigation.BackStackConfig
20+
import com.squareup.workflow1.ui.navigation.BackStackConfig.Other
21+
import com.squareup.workflow1.ui.navigation.setBackHandler
2222

2323
@OptIn(WorkflowUiExperimentalApi::class)
2424
data class StanzaListScreen(

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import com.squareup.workflow1.ui.ScreenViewFactory
1717
import com.squareup.workflow1.ui.ScreenViewRunner
1818
import com.squareup.workflow1.ui.ViewEnvironment
1919
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
20-
import com.squareup.workflow1.ui.container.BackStackConfig
21-
import com.squareup.workflow1.ui.container.BackStackConfig.None
22-
import com.squareup.workflow1.ui.setBackHandler
20+
import com.squareup.workflow1.ui.navigation.BackStackConfig
21+
import com.squareup.workflow1.ui.navigation.BackStackConfig.None
22+
import com.squareup.workflow1.ui.navigation.setBackHandler
2323

2424
@OptIn(WorkflowUiExperimentalApi::class)
2525
data class StanzaScreen(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import androidx.activity.viewModels
55
import androidx.appcompat.app.AppCompatActivity
66
import com.squareup.workflow1.ui.WorkflowLayout
77
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
8-
import com.squareup.workflow1.ui.container.withRegistry
8+
import com.squareup.workflow1.ui.withRegistry
99
import kotlinx.coroutines.flow.map
1010

1111
class DungeonActivity : AppCompatActivity() {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import com.squareup.workflow1.renderChild
1313
import com.squareup.workflow1.runningWorker
1414
import com.squareup.workflow1.ui.Screen
1515
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
16-
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
17-
import com.squareup.workflow1.ui.container.Overlay
16+
import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
17+
import com.squareup.workflow1.ui.navigation.Overlay
1818

1919
@OptIn(WorkflowUiExperimentalApi::class)
2020
class DungeonAppWorkflow(

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import com.squareup.workflow1.action
1717
import com.squareup.workflow1.runningWorker
1818
import com.squareup.workflow1.ui.Screen
1919
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
20-
import com.squareup.workflow1.ui.container.AlertOverlay
21-
import com.squareup.workflow1.ui.container.AlertOverlay.Button.POSITIVE
22-
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
23-
import com.squareup.workflow1.ui.container.Overlay
20+
import com.squareup.workflow1.ui.navigation.AlertOverlay
21+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.POSITIVE
22+
import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
23+
import com.squareup.workflow1.ui.navigation.Overlay
2424

2525
typealias BoardPath = String
2626

‎samples/dungeon/timemachine-shakeable/src/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineLayoutRunner.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.squareup.workflow1.ui.ScreenViewRunner
1313
import com.squareup.workflow1.ui.ViewEnvironment
1414
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
1515
import com.squareup.workflow1.ui.WorkflowViewStub
16-
import com.squareup.workflow1.ui.setBackHandler
16+
import com.squareup.workflow1.ui.navigation.setBackHandler
1717
import kotlin.time.Duration
1818
import kotlin.time.Duration.Companion.milliseconds
1919
import kotlin.time.ExperimentalTime

‎samples/nested-overlays/src/main/java/com/squareup/sample/nestedoverlays/NestedOverlaysWorkflow.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import com.squareup.workflow1.Snapshot
77
import com.squareup.workflow1.StatefulWorkflow
88
import com.squareup.workflow1.ui.Screen
99
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
10-
import com.squareup.workflow1.ui.container.BackButtonScreen
11-
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
12-
import com.squareup.workflow1.ui.container.FullScreenModal
10+
import com.squareup.workflow1.ui.navigation.BackButtonScreen
11+
import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
12+
import com.squareup.workflow1.ui.navigation.FullScreenModal
1313

1414
@OptIn(WorkflowUiExperimentalApi::class)
1515
object NestedOverlaysWorkflow : StatefulWorkflow<Unit, State, Nothing, Screen>() {

‎samples/tictactoe/app/src/main/java/com/squareup/sample/authworkflow/LoginViewFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.squareup.sample.tictactoe.databinding.LoginLayoutBinding
44
import com.squareup.workflow1.ui.ScreenViewFactory
55
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
66
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
7-
import com.squareup.workflow1.ui.setBackHandler
7+
import com.squareup.workflow1.ui.navigation.setBackHandler
88

99
@OptIn(WorkflowUiExperimentalApi::class)
1010
internal val LoginViewFactory: ScreenViewFactory<LoginScreen> =

‎samples/tictactoe/app/src/main/java/com/squareup/sample/authworkflow/SecondFactorViewFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.squareup.sample.tictactoe.databinding.SecondFactorLayoutBinding
44
import com.squareup.workflow1.ui.ScreenViewFactory
55
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
66
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
7-
import com.squareup.workflow1.ui.setBackHandler
7+
import com.squareup.workflow1.ui.navigation.setBackHandler
88

99
@OptIn(WorkflowUiExperimentalApi::class)
1010
internal val SecondFactorViewFactory: ScreenViewFactory<SecondFactorScreen> =

‎samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/GameOverLayoutRunner.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
1515
import com.squareup.workflow1.ui.ScreenViewRunner
1616
import com.squareup.workflow1.ui.ViewEnvironment
1717
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
18-
import com.squareup.workflow1.ui.setBackHandler
18+
import com.squareup.workflow1.ui.navigation.setBackHandler
1919

2020
@OptIn(WorkflowUiExperimentalApi::class)
2121
internal class GameOverLayoutRunner(

‎samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/GamePlayViewFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.squareup.sample.tictactoe.databinding.GamePlayLayoutBinding
66
import com.squareup.workflow1.ui.ScreenViewFactory
77
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
88
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
9-
import com.squareup.workflow1.ui.setBackHandler
9+
import com.squareup.workflow1.ui.navigation.setBackHandler
1010

1111
@OptIn(WorkflowUiExperimentalApi::class)
1212
internal val GamePlayViewFactory: ScreenViewFactory<GamePlayScreen> =

‎samples/tictactoe/app/src/main/java/com/squareup/sample/gameworkflow/NewGameViewFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.squareup.sample.tictactoe.databinding.NewGameLayoutBinding
44
import com.squareup.workflow1.ui.ScreenViewFactory
55
import com.squareup.workflow1.ui.ScreenViewFactory.Companion.fromViewBinding
66
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
7-
import com.squareup.workflow1.ui.setBackHandler
7+
import com.squareup.workflow1.ui.navigation.setBackHandler
88

99
@OptIn(WorkflowUiExperimentalApi::class)
1010
internal val NewGameViewFactory: ScreenViewFactory<NewGameScreen> =

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import com.squareup.sample.container.SampleContainers
1010
import com.squareup.sample.gameworkflow.TicTacToeViewFactories
1111
import com.squareup.workflow1.ui.WorkflowLayout
1212
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
13-
import com.squareup.workflow1.ui.container.withRegistry
1413
import com.squareup.workflow1.ui.plus
14+
import com.squareup.workflow1.ui.withRegistry
1515
import kotlinx.coroutines.flow.map
1616
import kotlinx.coroutines.launch
1717
import timber.log.Timber

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.squareup.workflow1.action
1616
import com.squareup.workflow1.runningWorker
1717
import com.squareup.workflow1.rx2.asWorker
1818
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
19-
import com.squareup.workflow1.ui.container.BackStackScreen
19+
import com.squareup.workflow1.ui.navigation.BackStackScreen
2020

2121
/**
2222
* We define this otherwise redundant typealias to keep composite workflows

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import com.squareup.workflow1.runningWorker
2323
import com.squareup.workflow1.rx2.asWorker
2424
import com.squareup.workflow1.ui.Screen
2525
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
26-
import com.squareup.workflow1.ui.container.AlertOverlay
27-
import com.squareup.workflow1.ui.container.AlertOverlay.Button.NEGATIVE
28-
import com.squareup.workflow1.ui.container.AlertOverlay.Button.NEUTRAL
29-
import com.squareup.workflow1.ui.container.AlertOverlay.Button.POSITIVE
30-
import com.squareup.workflow1.ui.container.AlertOverlay.Event.ButtonClicked
31-
import com.squareup.workflow1.ui.container.AlertOverlay.Event.Canceled
26+
import com.squareup.workflow1.ui.navigation.AlertOverlay
27+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.NEGATIVE
28+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.NEUTRAL
29+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Button.POSITIVE
30+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.ButtonClicked
31+
import com.squareup.workflow1.ui.navigation.AlertOverlay.Event.Canceled
3232

3333
enum class RunGameResult {
3434
CanceledStart,

‎samples/tictactoe/common/src/main/java/com/squareup/sample/mainworkflow/TicTacToeWorkflow.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import com.squareup.workflow1.WorkflowAction.Companion.noAction
1919
import com.squareup.workflow1.action
2020
import com.squareup.workflow1.renderChild
2121
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
22-
import com.squareup.workflow1.ui.container.BackStackScreen
23-
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
24-
import com.squareup.workflow1.ui.container.plus
22+
import com.squareup.workflow1.ui.navigation.BackStackScreen
23+
import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
24+
import com.squareup.workflow1.ui.navigation.plus
2525

2626
/**
2727
* Application specific root [Workflow], and demonstration of workflow composition.

‎samples/tictactoe/common/src/test/java/com/squareup/sample/mainworkflow/TicTacToeWorkflowTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import com.squareup.workflow1.stateless
1717
import com.squareup.workflow1.testing.launchForTestingFromStartWith
1818
import com.squareup.workflow1.ui.Screen
1919
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
20-
import com.squareup.workflow1.ui.container.BackStackScreen
21-
import com.squareup.workflow1.ui.container.BodyAndOverlaysScreen
20+
import com.squareup.workflow1.ui.navigation.BackStackScreen
21+
import com.squareup.workflow1.ui.navigation.BodyAndOverlaysScreen
2222
import org.junit.Test
2323

2424
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import com.squareup.workflow1.ui.Screen
1616
import com.squareup.workflow1.ui.ViewRegistry
1717
import com.squareup.workflow1.ui.WorkflowLayout
1818
import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
19-
import com.squareup.workflow1.ui.container.withRegistry
2019
import com.squareup.workflow1.ui.renderWorkflowIn
20+
import com.squareup.workflow1.ui.withRegistry
2121
import kotlinx.coroutines.flow.StateFlow
2222
import kotlinx.coroutines.flow.map
2323
import java.io.File

0 commit comments

Comments
 (0)