- rebase fixes

Xamarin.Forms.Core.UnitTests/ShellUriHandlerTests.cs

@@ -63,7 +63,6 @@ public async Task LocationRemovesImplicit()
 		[Test]
 		public async Task GlobalNavigateTwice()
 		{
-
 			var shell = new Shell();
 			var item1 = CreateShellItem(asImplicit: true, shellContentRoute: "rootlevelcontent1");
 

Xamarin.Forms.Core/Shell/Shell.cs

@@ -452,8 +452,8 @@ internal async Task GoToAsync(ShellNavigationState state, bool animate, bool ena
 
 			ShellRouteState navigationRequest = await ShellUriParser.ParseAsync(new ShellUriParserArgs(this, state.FullLocation));
 			navigationRequest = await ShellNavigationRequest.NavigatingToAsync(new ShellNavigationArgs(this, navigationRequest));
-
-			if (navigationRequest == null || navigationRequest == this.RouteState)
+			
+			if (navigationRequest == null || navigationRequest == RouteState)
 			{
 				return;
 			}
@@ -469,7 +469,19 @@ internal async Task GoToAsync(ShellNavigationState state, bool animate, bool ena
 
 			var currentRoute = navigationRequest.CurrentRoute;
 			var pathParts = currentRoute.PathParts;
-			IReadOnlyList<PathPart> globalRoutes = pathParts.Skip(3).ToList();
+
+			IReadOnlyList<PathPart> globalRoutes = null;
+			if (replaceEntireStack)
+			{
+				globalRoutes = pathParts.Skip(3).ToList();
+			}
+			else
+			{
+				// skip all global routes already pushed
+				globalRoutes = pathParts.Skip(RouteState.CurrentRoute.PathParts.Count).ToList();
+			}
+
+			globalRoutes = globalRoutes ?? new List<PathPart>();
 
 			ApplyQueryAttributes(this, currentRoute.NavigationParameters, false);
 
@@ -484,7 +496,7 @@ internal async Task GoToAsync(ShellNavigationState state, bool animate, bool ena
 			if (globalRoutes.Count > 0 && nextActiveSection != null && replaceEntireStack)
 			{
 				modalStackPreBuilt = true;
-				await nextActiveSection.GoToAsync(navigationRequest, false, state.FullLocation);
+				await nextActiveSection.GoToAsync(navigationRequest, false, state.FullLocation, RouteState);
 			}
 
 			if (shellItem != null)
@@ -533,13 +545,13 @@ internal async Task GoToAsync(ShellNavigationState state, bool animate, bool ena
 					// TODO get rid of this hack and fix so if there's a stack the current page doesn't display
 					Device.BeginInvokeOnMainThread(async () =>
 					{
-						await CurrentItem.CurrentItem.GoToAsync(navigationRequest, animate, state.FullLocation);
+						await CurrentItem.CurrentItem.GoToAsync(navigationRequest, animate, state.FullLocation, RouteState);
 					});
 				}
 			}
 			else
 			{
-				await CurrentItem.CurrentItem.GoToAsync(navigationRequest, animate, state.FullLocation);
+				await CurrentItem.CurrentItem.GoToAsync(navigationRequest, animate, state.FullLocation, RouteState);
 			}
 
 			_accumulateNavigatedEvents = false;

Xamarin.Forms.Core/Shell/ShellSection.cs

@@ -284,27 +284,38 @@ public static implicit operator ShellSection(TemplatedPage page)
 			return (ShellSection)(ShellContent)page;
 		}
 
-		internal async Task GoToAsync(ShellRouteState navigationRequest, bool animate, Uri uri)
+		internal async Task GoToAsync(ShellRouteState navigationRequest, bool animate, Uri uri, ShellRouteState shellRouteState)
 		{
 			List<Page> navStack = null;
 			string route = String.Empty;
 			var currentRoute = navigationRequest.CurrentRoute;
 			var pathParts = currentRoute.PathParts;
-			IReadOnlyList<PathPart> globalRoutes = pathParts.Skip(3).ToList();
-
-			if (pathParts == null || pathParts.Count <= 3)
-			{
-				await Navigation.PopToRootAsync(animate);
-				return;
-			}
-
+
 			uri = ShellUriHandler.FormatUri(uri);
 			bool replaceEntireStack = false;
 			if (uri.IsAbsoluteUri)
 				replaceEntireStack = true;
 			else if (uri.OriginalString.StartsWith("//", StringComparison.Ordinal) || uri.OriginalString.StartsWith("\\\\", StringComparison.Ordinal))
 				replaceEntireStack = true;
 
+			IReadOnlyList<PathPart> globalRoutes = null;
+			if (replaceEntireStack)
+			{
+				globalRoutes = pathParts.Skip(3).ToList();
+			}
+			else
+			{
+				// skip all global routes already pushed
+				globalRoutes = pathParts.Skip(shellRouteState.CurrentRoute.PathParts.Count).ToList();
+			}
+
+			if (globalRoutes == null || globalRoutes.Count == 0)
+			{
+				await Navigation.PopToRootAsync(animate);
+				return;
+			}
+
+
 			int whereToStartNavigation = 0;
 
 			// Pop the stack down to where it no longer matches 
@@ -335,7 +346,11 @@ internal async Task GoToAsync(ShellRouteState navigationRequest, bool animate, U
 							// pop everything after this route
 							popCount = i + 2;
 							whereToStartNavigation++;
-							ShellApplyParameters.ApplyParameters(new ShellLifecycleArgs((BaseShellItem)LogicalChildren[i], globalRoutes[i], currentRoute));
+
+							if (i < LogicalChildren.Count)
+								ShellApplyParameters.ApplyParameters(new ShellLifecycleArgs((BaseShellItem)LogicalChildren[i], globalRoutes[i], currentRoute));
+							else
+								Shell.ApplyQueryAttributes(navPage, currentRoute.NavigationParameters, isLast);
 
 							// If we're not on the last loop of the stack then continue
 							// otherwise pop the rest of the stack

Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs

@@ -249,7 +249,7 @@ void UpdateBackgroundColor()
 			if (_defaultBackgroundColor == null)
 				_defaultBackgroundColor = CardBackgroundColor.DefaultColor;
 
-			SetCardBackgroundColor(bgColor.IsDefault ? _defaultBackgroundColor.Value : bgColor.ToAndroid());
+			SetCardBackgroundColor(bgColor.IsDefault ? _defaultBackgroundColor.Value : (int)bgColor.ToAndroid());
 		}
 
 		// IVisualElementRenderer

Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs

@@ -482,7 +482,7 @@ void UpdateSplitViewLayout()
 				SetLockMode(isShowingSplit ? LockModeLockedOpen : LockModeUnlocked);
 				unchecked
 				{
-					SetScrimColor(isShowingSplit ? Color.Transparent.ToAndroid() : (int)DefaultScrimColor);
+					SetScrimColor(isShowingSplit ? (int)Color.Transparent.ToAndroid() : (int)DefaultScrimColor);
 				}
 			}
 		}

Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs

@@ -422,7 +422,7 @@ void UpdateSplitViewLayout()
 				SetLockMode(isShowingSplit ? LockModeLockedOpen : LockModeUnlocked);
 				unchecked
 				{
-					SetScrimColor(isShowingSplit ? Color.Transparent.ToAndroid() : (int)DefaultScrimColor);
+					SetScrimColor(isShowingSplit ? (int)Color.Transparent.ToAndroid() : (int)DefaultScrimColor);
 				}
 				Platform?.UpdateMasterDetailToggle();
 			}

Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs

@@ -185,7 +185,7 @@ protected virtual void UpdateDrawerLockMode(FlyoutBehavior behavior)
 
 			unchecked
 			{
-				SetScrimColor(behavior == FlyoutBehavior.Locked ? Color.Transparent.ToAndroid() : (int)DefaultScrimColor);
+				SetScrimColor(behavior == FlyoutBehavior.Locked ? (int)Color.Transparent.ToAndroid() : (int)DefaultScrimColor);
 			}
 		}