Merge pull request #11 from vniehues/develop

Added GoToSection to BaseMethods
vniehues · May 11, 2022 · 19ba951 · 19ba951
2 parents 52c7fda + 7fe1058
commit 19ba951
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/samples/mavvmApp/AppShell.xaml b/samples/mavvmApp/AppShell.xaml
@@ -4,13 +4,13 @@ xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
 			xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:viewmodels="clr-namespace:mavvmApp.ViewModels" xmlns:mavvm="clr-namespace:mavvm;assembly=mavvm"
 
     x:Class="mavvmApp.AppShell">
-    <ShellItem>
+    <ShellItem Route="start">
             <mavvm:MavvmShellContent ViewModel="{x:Type viewmodels:MainPageViewModel}">
             </mavvm:MavvmShellContent>
     </ShellItem>
-    <TabBar>
+    <TabBar Route="main">
         <Tab Title="Second" Route="firstTab">
-            <mavvm:MavvmShellContent ViewModel="{x:Type viewmodels:SecondPageViewModel}">
+            <mavvm:MavvmShellContent Title="MainPageTitle" ViewModel="{x:Type viewmodels:SecondPageViewModel}">
             </mavvm:MavvmShellContent>
         </Tab>
         <Tab Title="Second 2" Route="secondTab">

diff --git a/samples/mavvmApp/ViewModels/MainPageViewModel.cs b/samples/mavvmApp/ViewModels/MainPageViewModel.cs
@@ -46,7 +46,7 @@ void CountUp()
 
         async void Navigate()
         {
-            await BaseMethods.GoToViewModel<SecondPageViewModel>(false, new NavigationParameters{ { "countParam", Count } });
+            await BaseMethods.GoToSection("main", new NavigationParameters{ { "countParam", Count } });
         }
     }
 }

diff --git a/src/mavvm/Navigation/BaseMethods.cs b/src/mavvm/Navigation/BaseMethods.cs
@@ -37,13 +37,15 @@ public static async Task GoToSection(string sectionRoute, NavigationParameters p
             }
             else
             {
-                await Shell.Current.GoToAsync(path, animate, parameters);
+                await Shell.Current.GoToAsync(path, false, parameters);
 
-                if ((Shell.Current?.CurrentItem?.CurrentItem as IShellSectionController)?.PresentedPage.BindingContext is INavigateBackToAware vm)
+                //HACK: Shell doesn'T immediately know about PresentedPage. 
+                await Task.Delay(50);
+
+                if ((Shell.Current?.CurrentItem?.CurrentItem as IShellSectionController)?.PresentedPage?.BindingContext is INavigateToAware vmTo)
                 {
-                    vm.NavigatedBackTo(parameters);
+                    vmTo.NavigatedTo(parameters);
                 }
-
             }
         }
 

diff --git a/src/mavvm/mavvm.csproj b/src/mavvm/mavvm.csproj
@@ -12,7 +12,7 @@
 		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.18362.0</SupportedOSPlatformVersion>
 		<PackageId>mavvm</PackageId>
-		<PackageVersion>1.0.1</PackageVersion>
+		<PackageVersion>1.0.2</PackageVersion>
 		<Authors>Vincent Niehues</Authors>
 		<Copyright>Vincent Niehues 2021</Copyright>
 		<Owners>Vincent Niehues</Owners>
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,7 @@ void CountUp() @@
             async void Navigate()
             {
-                await BaseMethods.GoToViewModel<SecondPageViewModel>(false, new NavigationParameters{ { "countParam", Count } });
+                await BaseMethods.GoToSection("main", new NavigationParameters{ { "countParam", Count } });
             }
         }
     }
@@ Expand Down @@