This repository has been archived by the owner on May 1, 2024. It is now read-only.
[Shell] refactor of processing uris #5852
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
paymicro
reviewed
Apr 9, 2019
Co-Authored-By: PureWeen <[email protected]>
paymicro
reviewed
Apr 10, 2019
| @@ -6,7 +6,7 @@ namespace Xamarin.Forms | |||
| { | |||
| public interface IShellItemController : IElementController | |||
| { | |||
| Task GoToPart(List<string> parts, Dictionary<string, string> queryData); | |||
| Task GoToPart(NavigationRequest navigationRequest, Dictionary<string, string> queryData); | |||
There was a problem hiding this comment.
It may be better to allocate this in a new interface
IShellElementController : IElementController
{
Task GoToPart(NavigationRequest navigationRequest, Dictionary<string, string> queryData);
}|
|
||
| string MakeUriString(List<string> segments) | ||
| { | ||
| if(segments[0].StartsWith("/") || segments[0].StartsWith("\\")) |
There was a problem hiding this comment.
I think this check needs to be extracted into some helper.
| Assert.AreEqual(new Uri("app://host/shellroute/path"), ShellUriHandler.ConvertToStandardFormat(shell, CreateUri("app:/shellroute/path"))); | ||
|
|
||
| Assert.AreEqual(new Uri("app://host/shellroute/path"), ShellUriHandler.ConvertToStandardFormat(shell, CreateUri("app://host/shellroute/path"))); | ||
| Assert.AreEqual(new Uri("app://host/shellroute/path"), ShellUriHandler.ConvertToStandardFormat(shell, CreateUri("app:/host/shellroute/path"))); |
There was a problem hiding this comment.
can make variable new Uri("app://host/shellroute/path") ?
Also need add CreateUri with backslash separator CreateUri("\\\\path")) and CreateUri("\\path"))
samhouts
requested review from
samhouts
and removed request for
StephaneDelcroix
samhouts
added
the
API-change
samhouts
approved these changes
Apr 10, 2019
| { | ||
| get | ||
| { | ||
| var segments = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).ToList().Skip(1).ToList(); |
There was a problem hiding this comment.
This seems like a lot of expensive enumeration that is not strictly necessary.
Suggested change
| var segments = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).ToList().Skip(1).ToList(); | |
| var segments = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).Skip(1); |
| { | ||
| get | ||
| { | ||
| var segments = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).ToList().Skip(1).ToList(); |
There was a problem hiding this comment.
Suggested change
| var segments = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).ToList().Skip(1).ToList(); | |
| var segmentsCount = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).Skip(1).Count(); |
| { | ||
| var segments = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).ToList().Skip(1).ToList(); | ||
|
|
||
| if (segments.Count == 0) |
There was a problem hiding this comment.
Suggested change
| if (segments.Count == 0) | |
| if (segmentsCount == 0) |
| return $"{source}/"; | ||
| } | ||
|
|
||
| public static string FormatRoute(List<string> segments) |
There was a problem hiding this comment.
Suggested change
| public static string FormatRoute(List<string> segments) | |
| public static string FormatRoute(IEnumerable<string> segments) |
| { | ||
| var segments = _path.Split(_pathSeparator, StringSplitOptions.RemoveEmptyEntries).ToList().Skip(1).ToList(); | ||
|
|
||
| if (segments.Count == 0) |
There was a problem hiding this comment.
Suggested change
| if (segments.Count == 0) | |
| if (segments.Count() == 0) |
|
If it's alright my plan is to sweep through and get rid of everything using Linq for the next Pre, store a few more things locally, etc.. I'd apply a few now but I don't want the UI tests to quit out so we can get this merged and tested |
samhouts
changed the title
AxelUser
pushed a commit
to AxelUser/Xamarin.Forms
that referenced
this pull request
Jun 15, 2019
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
Issues Resolved
API Changes
Added:
These classes need to still be fleshed out a bit but they are the beginnings of extracting a uri into a request.
Changed:
None
Platforms Affected
Behavioral/Visual Changes
Review #5790 to see how uri's are interpreted
Testing Procedure
PR Checklist