Merge pull request PrismLibrary#1684 from bares43/feature/XamlNavigat…

…ionAnimated xamarin forms xaml navigation animated
CN-TIM · Feb 11, 2019 · 9aaec2f · 9aaec2f
2 parents 388d709 + 55d5d45
commit 9aaec2f
Show file tree

Hide file tree

Showing 10 changed files with 2,232 additions and 178 deletions.
diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Android/HelloWorld.Android.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Android/HelloWorld.Android.csproj
@@ -48,7 +48,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="Xamarin.Forms" Version="3.5.0.129452" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />

diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Android/Resources/Resource.designer.cs b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.Android/Resources/Resource.designer.cs
diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UWP/HelloWorld.UWP.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UWP/HelloWorld.UWP.csproj
@@ -143,7 +143,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="Xamarin.Forms" Version="3.5.0.129452" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.7" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/HelloWorld.iOS.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.iOS/HelloWorld.iOS.csproj
@@ -149,7 +149,7 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="Xamarin.Forms" Version="3.5.0.129452" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/HelloWorld.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/HelloWorld.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="Xamarin.Forms" Version="3.5.0.129452" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/Views/MyMasterDetail.xaml b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/Views/MyMasterDetail.xaml
@@ -14,6 +14,8 @@
                 <Button Text="ViewB" Command="{Binding NavigateCommand}" CommandParameter="MyTabbedPage?selectedTab=ViewB" />
                 <Button Text="ViewC" Command="{Binding NavigateCommand}" CommandParameter="MyTabbedPage?selectedTab=ViewC" />
                 <Button Text="XamlNav" Command="{nav:NavigateTo 'MyNavigationPage/ViewA'}" />
+                <Button Text="XamlNav wihout animation" Command="{nav:NavigateTo 'MyNavigationPage/ViewA', Animated=False}" />
+                <Button Text="XamlNav modal" Command="{nav:NavigateTo 'MyNavigationPage/ViewA', UseModalNavigation=True}" />
             </StackLayout>
         </ContentPage>
     </MasterDetailPage.Master>

diff --git a/Sandbox/Xamarin/HelloWorld/ModuleA/ModuleA.csproj b/Sandbox/Xamarin/HelloWorld/ModuleA/ModuleA.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.967583" />
+    <PackageReference Include="Xamarin.Forms" Version="3.5.0.129452" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Xamarin/Prism.Forms/Navigation/Xaml/GoBackExtension.cs b/Source/Xamarin/Prism.Forms/Navigation/Xaml/GoBackExtension.cs
@@ -12,7 +12,7 @@ protected override async Task HandleNavigation(INavigationParameters parameters,
         {
             var result = GoBackType == GoBackType.ToRoot ?
                 await navigationService.GoBackToRootAsync(parameters) :
-                await navigationService.GoBackAsync(parameters);
+                await navigationService.GoBackAsync(parameters, animated: Animated, useModalNavigation: UseModalNavigation);
 
             if (result.Exception != null)
             {

diff --git a/Source/Xamarin/Prism.Forms/Navigation/Xaml/NavigateToExtension.cs b/Source/Xamarin/Prism.Forms/Navigation/Xaml/NavigateToExtension.cs
@@ -10,7 +10,7 @@ public class NavigateToExtension : NavigationExtensionBase
 
         protected override async Task HandleNavigation(INavigationParameters parameters, INavigationService navigationService)
         {
-            var result = await navigationService.NavigateAsync(Name, parameters);
+            var result = await navigationService.NavigateAsync(Name, parameters, animated: Animated, useModalNavigation: UseModalNavigation);
             if(result.Exception != null)
             {
                 Log(result.Exception);

diff --git a/Source/Xamarin/Prism.Forms/Navigation/Xaml/NavigationExtensionBase.cs b/Source/Xamarin/Prism.Forms/Navigation/Xaml/NavigationExtensionBase.cs
@@ -44,6 +44,10 @@ protected internal get
             set => _sourcePage = value;
         }
 
+        public bool Animated { get; set; } = true;
+
+        public bool? UseModalNavigation { get; set; } 
+
         public bool CanExecute(object parameter) => !IsNavigating;
 
         public event EventHandler CanExecuteChanged;