Cast to a less derived type on TabbedPageManager #13689
Merged
Conversation
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
PureWeen
added
the
backport/suggested
|
Thank you for your pull request. We are auto-formating your source code to follow our code guidelines. |
|
Thank you for your pull request. We are auto-formating your source code to follow our code guidelines. |
mandel-macaque
approved these changes
Mar 6, 2023
mattleibow
reviewed
Mar 7, 2023
mattleibow
approved these changes
Mar 7, 2023
|
/backport to net7.0 |
|
Started backporting to net7.0: https://github.com/dotnet/maui/actions/runs/4439997678 |
|
@PureWeen backporting to net7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Cast to a less derived type on TabbedPageManager
Using index info to reconstruct a base tree...
M src/Controls/src/Core/Platform/Android/TabbedPageManager.cs
M src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Android.cs
M src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
CONFLICT (content): Merge conflict in src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
Auto-merging src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Android.cs
CONFLICT (content): Merge conflict in src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Android.cs
Auto-merging src/Controls/src/Core/Platform/Android/TabbedPageManager.cs
CONFLICT (content): Merge conflict in src/Controls/src/Core/Platform/Android/TabbedPageManager.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 Cast to a less derived type on TabbedPageManager
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! |
|
@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. |
PureWeen
added a commit
that referenced
this pull request
Mar 16, 2023
# Conflicts: # src/Controls/src/Core/Platform/Android/TabbedPageManager.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Android.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
PureWeen
added a commit
that referenced
this pull request
Mar 17, 2023
…13998) * Cast to a less derived type on TabbedPageManager (#13689) # Conflicts: # src/Controls/src/Core/Platform/Android/TabbedPageManager.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Android.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs * Update TabbedPageManager.cs * - fix namespaces for tests
github-actions bot
pushed a commit
that referenced
this pull request
Mar 20, 2023
# Conflicts: # src/Controls/src/Core/Platform/Android/TabbedPageManager.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Android.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
rmarinho
pushed a commit
that referenced
this pull request
Mar 20, 2023
…anager (#13689) (#14068) * Cast to a less derived type on TabbedPageManager (#13689) # Conflicts: # src/Controls/src/Core/Platform/Android/TabbedPageManager.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.Android.cs # src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs * Update TabbedPageManager.cs * - fix namespaces for tests --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
PureWeen
added
the
backport/approved
samhouts
added
the
fixed-in-8.0.0-preview.3.8149
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Currently inside
TabbedPageManagerwe are forcing theadaptertype to be of typeMultiPageFragmentStateAdapterwhen we don't really need it to be. This is making it so it's not possible to swap out theAdapteron the ViewPager.For .NET8 we'll make
TabbedPageManagerpublic so users can more easily swap theAdapter, for now, this lets users apply changes themselves in .NET7. This PR takes a step in the right direction of makingTabbedPageManagerjust generically work with anyFragmentStateAdapter