Skip to content

Commit 821c5dd

Browse files
rjrjrrjrjr
authored
Merge pull request #1154 from square/ray/container-is-navigation
container > navigation
2 parents b6403fb + 6ccfc5a commit 821c5dd

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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 4 additions & 4 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)