-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BREAKING: Replaces
ComposeScreenViewFactory with `ScreenComposableF…
…actory`
This commit takes advantage of the new `ViewRegistry.Key`, which allows renderings to be bound to multiple UI factories, to fix a long standing problem where wrapper screens -- things like `NamedScreen` and `EnvironmentScreen` -- used in a Compose context would cause needless calls to `@Composeable fun AndroidView()` and `ComposeView()`.
For example, consider this rendering:
```
BodyAndOverlaysScreen(
body = SomeComposeScreen(
EnvironmentScreen(
SomeOtherComposeScreen
)
)
)
```
Before this change, that would create a View hierarchy something like this:
```
BodyAndOverlaysContainer : FrameLayout {
mChildren[0] = ComposeView {
// compose land
SomeComposeScreen.Content {
AndroidView {
ComposeView {
// nested compose land
SomeOtherComposeScreen.Content()
```
Now it will look this way:
```
BodyAndOverlaysContainer : FrameLayout {
mChildren[0] = ComposeView {
// compose land
SomeComposeScreen.Content {
SomeOtherComposeScreen.Content()
```
`ScreenComposableFactory` replaces `ComposeScreenViewFactory`, and `ComposeScreen` no longer extends `AndroidScreen`. Compose support is now a first class citizen, instead of a hack bolted on to View support.
Unfortunately, `ViewEnvironment.withComposeInteropSupport()` (see below) now must be called near the root of a Workflow app to enable the seamless Compose > Classic > Compose handling that used to be built in to `WorkflowRendering` and `ComposeScreenViewFactory`. This means that call is required for Compose support for built in rendering types like `BodyAndOverlaysScreen` and `BackStackScreen`, which so far are backed only by classic View implementations.
Other introductions, changes:
- `Screen.toComposableFactory()`, used by `WorkflowRendering()` in the same way that `WorkflowViewStub` uses `Screen.toViewFactory()`
- `ScreenComposableFactoryFinder`, a `ViewEnvironment`-based strategy object used by `Screen.toComposableFactory()` the same way that `Screen.toViewFactory()` uses `ScreenViewFactoryFinder`. The default implementation provides Compose bindings for `NamedScreen` and `EnvironmentScreen`, fixing #546.
- `ScreenViewFactoryFinder.getViewFactoryForRendering()` can now return `null`. A `requireViewFactoryForRendering()` extension is introduced for use when `null` is not acceptable.
- `ViewEnvironment.withComposeInteropSupport()`, which wraps the found `ScreenComposableFactoryFinder` and `ScreenViewFactoryFinder` with implementations that allow Compose contexts to handle renderings bound only to `ScreenViewFactory`, and classic contexts to handle renderings bound only to `ScreenComposableFactory`. Replaces the logic that used to be in the private `ScreenViewFactory.asComposeViewFactory()` extension in `WorkflowRendering()`.
- `Screen.Preview()` is introduced. The existing `Preview()` extension functions were tied to `ScreenViewFactory`, making them much less useful. It is still the case that previews work for non-Compose UI code just fine. Which is pretty cool, really.
Fixes #546- Loading branch information
Showing
40 changed files
with
1,076 additions
and
832 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 0 additions & 22 deletions
22
...es/compose-samples/src/main/java/com/squareup/sample/compose/hellocompose/HelloBinding.kt
This file was deleted.
Oops, something went wrong.
40 changes: 40 additions & 0 deletions
40
...pose-samples/src/main/java/com/squareup/sample/compose/hellocompose/HelloComposeScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package com.squareup.sample.compose.hellocompose | ||
|
|
||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.wrapContentSize | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import com.squareup.workflow1.ui.ViewEnvironment | ||
| import com.squareup.workflow1.ui.WorkflowUiExperimentalApi | ||
| import com.squareup.workflow1.ui.compose.ComposeScreen | ||
| import com.squareup.workflow1.ui.compose.tooling.Preview | ||
|
|
||
| @OptIn(WorkflowUiExperimentalApi::class) | ||
| data class HelloComposeScreen( | ||
| val message: String, | ||
| val onClick: () -> Unit | ||
| ) : ComposeScreen { | ||
| @Composable override fun Content(viewEnvironment: ViewEnvironment) { | ||
| Text( | ||
| message, | ||
| modifier = Modifier | ||
| .clickable(onClick = onClick) | ||
| .fillMaxSize() | ||
| .wrapContentSize(Alignment.Center) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @OptIn(WorkflowUiExperimentalApi::class) | ||
| @Preview(heightDp = 150, showBackground = true) | ||
| @Composable | ||
| private fun HelloPreview() { | ||
| HelloComposeScreen( | ||
| "Hello!", | ||
| onClick = {} | ||
| ).Preview() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.