[Android] Setup Frame with all of the missing Mapper methods #11804
Merged
[Android] Setup Frame with all of the missing Mapper methods #11804
Frame with all of the missing Mapper methods #11804Conversation
Eilon
added
the
legacy-area-controls
PureWeen
force-pushed
the
winui_frame_fixes
branch
2 times, most recently
from
f7c2f31 to
1342129
Compare
jsuarezruiz
reviewed
Dec 7, 2022
PureWeen
force-pushed
the
android_frame_fixes
branch
from
4aacd52 to
4930c9c
Compare
PureWeen
force-pushed
the
android_frame_fixes
branch
from
4930c9c to
52ae931
Compare
rmarinho
approved these changes
Jan 2, 2023
This was
linked to
issues
Jan 2, 2023
Member
Author
|
/backport to net7.0 |
Contributor
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/3903863655 |
Contributor
|
@PureWeen backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [Android] Fix Frame to call missing mapper methods
.git/rebase-apply/patch:21: trailing whitespace.
// With NET8 we can move the BatchMapper call to the actual ViewHandler.Mapper.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
A src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.cs
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.cs deleted in HEAD and modified in [Android] Fix Frame to call missing mapper methods. Version [Android] Fix Frame to call missing mapper methods of src/Controls/tests/DeviceTests/Elements/Frame/FrameHandlerTest.cs left in tree.
Auto-merging src/Controls/src/Core/Compatibility/Handlers/Android/FrameRenderer.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [Android] Fix Frame to call missing mapper methods
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@PureWeen an error occurred while backporting to net7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Member
Author
|
/backport to net7.0 |
Contributor
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/3906395914 |
samhouts
added
the
fixed-in-8.0.0-preview.1.7762
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Description of Change
The
AndroidBatchMapperis manually called onViewHandlermeaning if you have aHandlerthat just uses theViewHandler.Mapperand doesn't use our base class then everything insideAndroidBatchMapperwon't run. I have a different PR that fixes this across the board. This PR isolates the changes toFramespecifically to minimize the effect of this PR.This PR also takes the
Containercode we have inViewHandlerand applies toFrameso thatFramecan benefit from all theContainerscenarios as well.Issues Fixed
Fixes #10220
Fixes #10503
Fixes #10503
Fixes #8840