Container and Wrapper interfaces, improved forWrapper()
#920
Conversation
This file contains hidden or 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
rjrjr
commented
Feb 8, 2023
workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/AsScreen.kt
Outdated
Show resolved
Hide resolved
steve-the-edwards
approved these changes
Feb 9, 2023
Contributor
steve-the-edwards
left a comment
steve-the-edwards
left a comment
There was a problem hiding this comment.
😵 . I hope I managed to understand things.
workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/Container.kt
Outdated
Show resolved
Hide resolved
workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/Container.kt
Outdated
Show resolved
Hide resolved
workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/Container.kt
Outdated
Show resolved
Hide resolved
workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/AsScreen.kt
Outdated
Show resolved
Hide resolved
workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/ScreenViewFactory.kt
Show resolved
Hide resolved
workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/ScreenViewFactory.kt
Show resolved
Hide resolved
Collaborator
Author
|
Update:
|
Collaborator
Author
|
Update:
God bless CI and unit tests. |
rjrjr
force-pushed
the
ray/container
branch
2 times, most recently
from
db1005c to
5f65bec
Compare
steve-the-edwards
approved these changes
Feb 28, 2023
samples/containers/common/src/main/java/com/squareup/sample/container/panel/PanelOverlay.kt
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| /** | ||
| * A singleton [Container] -- that is, a rendering which wraps a single rendering of type |
Contributor
There was a problem hiding this comment.
nit: "singleton" Container still throws me off as I think, oh - it makes it so that this Rendering is a Singleton; which, i get, is absurd but I need the explanation sentence anyway so why not change what we are summarizing this as?
"A frame [Container]"?
Collaborator
Author
There was a problem hiding this comment.
* A [Container] rendering that wraps exactly one other rendering, its [content]. These are
* typically used to "add value" to the [content], e.g. an
* [EnvironmentScreen][com.squareup.workflow1.ui.container.EnvironmentScreen] that allows
* changes to be made to the the [ViewEnvironment].
ece4923 to
7cd607f
Compare
Collaborator
Author
|
Addressed the last couple of issues that @steve-the-edwards raised, thanks Steve. Holding off on merging this until #944 has been vetted, maybe until it's published. |
Introduces the `Container` and `Wrapper` types, giving Workflow UI its first general notion of structure. Their integration with `Compatibile` reduces the likelihood of making the most common mistake with wrapper types (namely, forgetting to do that). And they standardize the `map()` function that gets implemented by wrappers more often than not. Also updates `forWrapper` and `toUnwrappingViewFactory` to be defined in terms of `Wrapper`, allowing us to simplify their APIs by relying on `Wrapper.content` in default lambda implementations. And while we're in the neighborhood, adds long needed `prepEnvironment` and `prepContext` function arguments that simplify transforming a `ScreenViewFactory` to pre-process its `ViewEnvironment` and `Context`. We use this new capability to simplify the default `ScreenViewFactory` implementation for `EnvironmentScreen`. Closes #916
And can demonstrate the bug where dialogs are shown out of order: - Click _Cover Everything_ - Click _Cover Body_ The red inner dialog is shown over the outer green dialog, but the green one should always be on top. (#966) Also introduces `name` parameter for `BodyAndOverlaysScreen`, because they're a nightmare to nest without it. See the kdoc for details.
- Replaces `View.getGlobalVisibleRect` calls with new, more robust `View.getScreenRect` extension - `Dialog.setBounds` sets `FLAG_LAYOUT_IN_SCREEN` to ensure `Dialog` is really placed where we want it. Otherwise it may be offset by the height of the toolbar. I think we've missed this up until now because our other samples and prod use all have richer themes than the default codepaths set up. - Default `ScreenOverlayDialogFactory` implementation disables dimming, for least confusing out of box behavior. Note that these tweaks do not address #966, that's a bigger effort.
Trying to reduce Espresso flakes by being more careful and conventional about `RootMatcher` use; about targetting back button presses; and by using `recreate()` for configuration changes.
Nested overlays sample, small bug fixes
Collaborator
Author
|
I've merged #967 down into this branch, merged master into it, and have set this for auto-merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduces the
ContainerandWrappertypes, giving Workflow UI its first general notion of structure. Their integration withCompatibilereduces the likelihood of making the most common mistake with wrapper types (namely, forgetting to do that). And they standardize themap()function that gets implemented by wrappers more often than not.Also updates
forWrapperandtoUnwrappingViewFactoryto be defined in terms ofWrapper, allowing us to simplify their APIs by relying onWrapper.contentin default lambda implementations.And while we're in the neighborhood, adds long needed
prepEnvironmentandprepContextfunction arguments that simplify transforming aScreenViewFactoryto pre-process itsViewEnvironmentandContext. We use this new capability to simplify the defaultScreenViewFactoryimplementation forEnvironmentScreen.Closes #916