File tree Expand file tree Collapse file tree 7 files changed +12
-10
lines changed
samples/compose-samples/src/main/java/com/squareup/sample/compose
androidTest/java/com/squareup/workflow1/ui/compose/tooling
main/java/com/squareup/workflow1/ui/compose/tooling
compose/src/main/java/com/squareup/workflow1/ui/compose Expand file tree Collapse file tree 7 files changed +12
-10
lines changed Original file line number Diff line number Diff line change @@ -26,8 +26,8 @@ import com.squareup.sample.compose.nestedrenderings.RecursiveWorkflow.Rendering
2626import com.squareup.workflow1.ui.Screen
2727import com.squareup.workflow1.ui.ViewEnvironment
2828import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
29- import com.squareup.workflow1.ui.compose.WorkflowRendering
3029import com.squareup.workflow1.ui.compose.ScreenComposableFactory
30+ import com.squareup.workflow1.ui.compose.WorkflowRendering
3131import com.squareup.workflow1.ui.compose.tooling.Preview
3232
3333/* *
Original file line number Diff line number Diff line change @@ -19,8 +19,8 @@ import androidx.compose.ui.unit.dp
1919import com.squareup.sample.compose.textinput.TextInputWorkflow.Rendering
2020import com.squareup.workflow1.ui.TextController
2121import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
22- import com.squareup.workflow1.ui.compose.asMutableState
2322import com.squareup.workflow1.ui.compose.ScreenComposableFactory
23+ import com.squareup.workflow1.ui.compose.asMutableState
2424import com.squareup.workflow1.ui.compose.tooling.Preview
2525
2626@OptIn(WorkflowUiExperimentalApi ::class )
Original file line number Diff line number Diff line change @@ -17,8 +17,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
1717import com.squareup.workflow1.ui.Screen
1818import com.squareup.workflow1.ui.ViewEnvironmentKey
1919import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
20- import com.squareup.workflow1.ui.compose.WorkflowRendering
2120import com.squareup.workflow1.ui.compose.ScreenComposableFactory
21+ import com.squareup.workflow1.ui.compose.WorkflowRendering
2222import com.squareup.workflow1.ui.internal.test.IdleAfterTestRule
2323import com.squareup.workflow1.ui.internal.test.IdlingDispatcherRule
2424import leakcanary.DetectLeaksAfterTestSuccess
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ import androidx.compose.ui.text.style.TextAlign
2323import androidx.compose.ui.unit.Dp
2424import androidx.compose.ui.unit.dp
2525import com.squareup.workflow1.ui.Screen
26- import com.squareup.workflow1.ui.ScreenViewFactory
2726import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2827import com.squareup.workflow1.ui.compose.ScreenComposableFactory
2928
Original file line number Diff line number Diff line change @@ -41,9 +41,11 @@ import com.squareup.workflow1.ui.compose.asViewFactory
4141 )
4242 }
4343 return remember(composableFactoryFinder, viewEnvironmentUpdater) {
44- (ViewEnvironment .EMPTY +
45- (ScreenComposableFactoryFinder to composableFactoryFinder) +
46- (ScreenViewFactoryFinder to screenFactoryFinder)).let { environment ->
44+ (
45+ ViewEnvironment .EMPTY +
46+ (ScreenComposableFactoryFinder to composableFactoryFinder) +
47+ (ScreenViewFactoryFinder to screenFactoryFinder)
48+ ).let { environment ->
4749 // Give the preview a chance to add its own elements to the ViewEnvironment.
4850 viewEnvironmentUpdater?.let { it(environment) } ? : environment
4951 }
Original file line number Diff line number Diff line change @@ -41,8 +41,10 @@ public fun Screen.Preview(
4141 placeholderModifier : Modifier = Modifier ,
4242 viewEnvironmentUpdater : ((ViewEnvironment ) -> ViewEnvironment )? = null
4343) {
44- val factoryEnv = (viewEnvironmentUpdater?.invoke(ViewEnvironment .EMPTY )
45- ? : ViewEnvironment .EMPTY )
44+ val factoryEnv = (
45+ viewEnvironmentUpdater?.invoke(ViewEnvironment .EMPTY )
46+ ? : ViewEnvironment .EMPTY
47+ )
4648
4749 factoryEnv[ScreenComposableFactoryFinder ]
4850 .getComposableFactoryForRendering(factoryEnv, this )
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ import com.squareup.workflow1.ui.ScreenViewHolder
2121import com.squareup.workflow1.ui.ViewEnvironment
2222import com.squareup.workflow1.ui.WorkflowUiExperimentalApi
2323import com.squareup.workflow1.ui.WorkflowViewStub
24- import com.squareup.workflow1.ui.androidx.OnBackPressedDispatcherOwnerKey
2524import com.squareup.workflow1.ui.androidx.WorkflowLifecycleOwner
2625
2726/* *
You can’t perform that action at this time.
0 commit comments