This repository has been archived by the owner on May 1, 2024. It is now read-only.
Fix string constructor for ShellNavigationState #13478
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
blocker
PureWeen
commented
Jan 20, 2021
| @@ -637,6 +643,296 @@ public async Task InitialNavigatingArgs() | |||
| null, "//item"); | |||
| } | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
All of this is just moving code to the correct file. No changes happen here
PureWeen
commented
Jan 20, 2021
| public class ShellNavigationStateTests : ShellTestBase | ||
| { | ||
| [Test] | ||
| public void LocationInitializedWithUri() |
There was a problem hiding this comment.
These Tests are new
PureWeen
commented
Jan 20, 2021
| @@ -16,201 +16,6 @@ public override void TearDown() | |||
| Routing.Clear(); | |||
| } | |||
|
|
|||
| [Test] | |||
| public async Task RouteWithGlobalPageRoute() | |||
There was a problem hiding this comment.
All of this is just moving code to the correct file. No changes happen here
PureWeen
commented
Jan 20, 2021
| public ShellNavigationState(Uri location) | ||
| { | ||
| FullLocation = location; | ||
| Location = TrimDownImplicitAndDefaultPaths(FullLocation); |
There was a problem hiding this comment.
This is the primary change from this PR
PureWeen
commented
Jan 20, 2021
| @@ -852,7 +852,7 @@ protected override bool OnBackButtonPressed() | |||
| return true; | |||
| } | |||
|
|
|||
| var args = new ShellNavigatingEventArgs(this.CurrentState, "", ShellNavigationSource.Pop, true); | |||
| var args = new ShellNavigatingEventArgs(this.CurrentState, new ShellNavigationState(""), ShellNavigationSource.Pop, true); | |||
There was a problem hiding this comment.
This change is just so we're avoiding using the implicit operator
PureWeen
commented
Jan 20, 2021
| @@ -36,7 +36,7 @@ public async Task GoToAsync(ShellNavigationParameters shellNavigationParameters) | |||
| if (shellNavigationParameters.PagePushing != null) | |||
| Routing.RegisterImplicitPageRoute(shellNavigationParameters.PagePushing); | |||
|
|
|||
| ShellNavigationState state = shellNavigationParameters.TargetState ?? Routing.GetRoute(shellNavigationParameters.PagePushing); | |||
| var state = shellNavigationParameters.TargetState ?? new ShellNavigationState(Routing.GetRoute(shellNavigationParameters.PagePushing), false); | |||
There was a problem hiding this comment.
This change is just so we're avoiding using the implicit operator
PureWeen
commented
Jan 20, 2021
| @@ -1063,7 +1063,7 @@ protected override async Task<Page> OnPopAsync(bool animated) | |||
| var navigationParameters = new ShellNavigationParameters() | |||
| { | |||
| Animated = animated, | |||
| TargetState = ".." | |||
| TargetState = new ShellNavigationState("..") | |||
There was a problem hiding this comment.
This change is just so we're avoiding using the implicit operator
|
Failing tests not related |
hartez
approved these changes
Feb 2, 2021
rmarinho
approved these changes
Feb 5, 2021
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
Fix string constructor for ShellNavigationState so it sets both Location and FullLocation
Issues Resolved
Platforms Affected
Testing Procedure
PR Checklist