36

Sandbox/Xamarin.Forms.Sandbox/App.StartHere.cs

@@ -12,7 +12,7 @@ namespace Xamarin.Forms.Sandbox
         {
             bool useTabPage = false;
             bool useMDP = false;
-            bool useNavigationPage = false;
+            bool useNavigationPage = true;
 
             if (useNavigationPage)
                 MainPage = new NavigationPage(new MainPage());
@@ -22,8 +22,6 @@ namespace Xamarin.Forms.Sandbox
                 MainPage = new TabPage();
             else if (Device.RuntimePlatform == Device.UWP)
                 MainPage = new MainPage();
-            else
-                MainPage = new ShellPage();
         }
     }
 }

Sandbox/Xamarin.Forms.Sandbox/App.cs

@@ -21,9 +21,6 @@ namespace Xamarin.Forms.Sandbox
 
 		void AddStyleSheet()
 		{
-			this.Resources.Add(StyleSheet.FromResource(
-				"Styles.css",
-				IntrospectionExtensions.GetTypeInfo(typeof(App)).Assembly));
 		}
 
 		void InitializeLegacyRenderers()

Sandbox/Xamarin.Forms.Sandbox/MainPage.xaml.cs

@@ -20,7 +20,7 @@ namespace Xamarin.Forms.Sandbox
 
         async void BtnClick_Clicked(object sender, EventArgs e)
         {
-            await Navigation.PushAsync(new MainPage());
+            await Navigation.PushAsync(new MainPage(), false);
         }
     }
 }

Sandbox/Xamarin.Forms.Sandbox/Xamarin.Forms.Sandbox.csproj

@@ -20,9 +20,18 @@
     <None Update="MainPage.xaml">
       <Generator>MSBuild:Compile</Generator>
     </None>
+    <None Update="MDP.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+    <None Update="MDPMaster.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
     <None Update="ShellPage.xaml">
       <Generator>MSBuild:Compile</Generator>
     </None>
+    <None Update="TabPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
   </ItemGroup>