Merge pull request #14 from vniehues/develop

SectionRouteAttribute
vniehues · May 15, 2022 · 174a9a4 · 174a9a4
2 parents efda468 + 8fe6c6f
commit 174a9a4
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 78 deletions.
diff --git a/samples/mavvmApp/AppShell.xaml b/samples/mavvmApp/AppShell.xaml
@@ -9,14 +9,10 @@ xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
         </mavvm:MavvmShellContent>
     </ShellItem>
     <TabBar x:Name="MainTabbar" Route="main">
-        <Tab>
             <mavvm:MavvmShellContent ViewModel="{x:Type viewmodels:SecondPageViewModel}">
             </mavvm:MavvmShellContent>
-        </Tab>
-        <Tab>
             <mavvm:MavvmShellContent ViewModel="{x:Type viewmodels:SecondTabPageViewModel}">
             </mavvm:MavvmShellContent>
-        </Tab>
     </TabBar>
 
     <!--<Tab Title="Library" Icon="library.png">

diff --git a/samples/mavvmApp/ViewModels/MainPageViewModel.cs b/samples/mavvmApp/ViewModels/MainPageViewModel.cs
@@ -3,10 +3,12 @@
 using System.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using mavvm;
+using mavvm.Attibutes;
 using Microsoft.Maui.Controls;
 
 namespace mavvmApp.ViewModels
 {
+    [SectionRoute("start")]
     public class MainPageViewModel : ObservableObject
     {
         string _title;
@@ -46,7 +48,7 @@ void CountUp()
 
         async void Navigate()
         {
-            await BaseMethods.GoToSection<SecondTabPageViewModel>("main",parameters: new NavigationParameters{ { "countParam", Count } });
+            await BaseMethods.GoToViewModel<SecondTabPageViewModel>(parameters: new NavigationParameters{ { "countParam", Count } });
         }
     }
 }

diff --git a/samples/mavvmApp/ViewModels/SecondPageViewModel.cs b/samples/mavvmApp/ViewModels/SecondPageViewModel.cs
@@ -13,7 +13,7 @@ public partial class SecondPageViewModel : BindableBase, IPageAware, INavigation
         [ICommand]
         async void GoBack()
         {
-            await BaseMethods.GoBack();
+            await BaseMethods.GoToViewModel<MainPageViewModel>();
         }
 
         [ICommand]
@@ -70,12 +70,12 @@ async void LogCount()
 
         public void Appearing()
         {
-            _consoleService.Log("Appearing");
+            _consoleService.Log("SecondPage Appearing");
         }
 
         public void Disappearing()
         {
-            _consoleService.Log("Disappearing");
+            _consoleService.Log("SecondPage Disappearing");
         }
 
         public void NavigatedBackTo(NavigationParameters parameters)

diff --git a/samples/mavvmApp/ViewModels/SecondTabPageViewModel.cs b/samples/mavvmApp/ViewModels/SecondTabPageViewModel.cs
@@ -4,8 +4,8 @@
 
 namespace mavvmApp.ViewModels
 {
-    [TabRoute("secondTabPage")]
-    public class SecondTabPageViewModel : BindableBase
+    [SectionRoute("main")]
+    public class SecondTabPageViewModel : BindableBase, INavigationAware
     {
         string _title;
         public string Title
@@ -24,6 +24,14 @@ public SecondTabPageViewModel()
         {
             Title = "Second Tab";
         }
+
+        public void NavigatedTo(NavigationParameters parameters)
+        {
+        }
+
+        public void NavigatedBackTo(NavigationParameters parameters)
+        {
+        }
     }
 }
 
diff --git a/src/mavvm/Attibutes/SectionRouteAttribute.cs b/src/mavvm/Attibutes/SectionRouteAttribute.cs
@@ -0,0 +1,15 @@
+using System;
+namespace mavvm.Attibutes
+{
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+	public class SectionRouteAttribute : Attribute
+	{
+		public string SectionRoute { get; }
+
+		public SectionRouteAttribute(string sectionRoute)
+		{
+			SectionRoute = sectionRoute;
+		}
+	}
+}
+
diff --git a/src/mavvm/Customs/MavvmShellContent.cs b/src/mavvm/Customs/MavvmShellContent.cs
@@ -28,13 +28,11 @@ protected override void OnParentSet()
         {
             base.OnParentSet();
 
-            var tab = this.Parent as Tab;
-            if (tab is null) return;
-
-            var attrib = ViewModel.GetCustomAttribute<TabRouteAttribute>();
-            if (attrib is null) return;
-
-            tab.Route = attrib.TabRoute;
+            if (this.Parent is ShellSection tab)
+            {
+                if (tab is null) return;
+                tab.Route = ViewModel.Name + "Tab";
+            }
         }
 
         public MavvmShellContent()

diff --git a/src/mavvm/Navigation/BaseMethods.cs b/src/mavvm/Navigation/BaseMethods.cs
@@ -30,67 +30,17 @@ public static async Task GoBack(bool replaceStack = false, NavigationParameters
             }
         }
 
-        public static async Task GoToSection(string sectionRoute, NavigationParameters parameters = null, bool animate = true)
-        {
-            var path = $"//{sectionRoute}";
-
-            if (parameters is null)
-            {
-                await Shell.Current.GoToAsync(path, animate);
-            }
-            else
-            {
-                await Shell.Current.GoToAsync(path, false, parameters);
-
-                //HACK: Shell doesn't immediately know about PresentedPage. 
-                await Task.Delay(50);
-
-                if ((Shell.Current?.CurrentItem?.CurrentItem as IShellSectionController)?.PresentedPage?.BindingContext is INavigateToAware vmTo)
-                {
-                    vmTo.NavigatedTo(parameters);
-                }
-            }
-        }
-
-        public static async Task GoToSection<TViewModel>(string sectionRoute, NavigationParameters parameters = null, bool animate = true)
-        {
-            var vmType = typeof(TViewModel);
-
-            var path = $"//{sectionRoute}";
-
-            if (parameters is null)
-            {
-                await Shell.Current.GoToAsync(path, animate);
-
-                //HACK: Shell doesn't immediately know about PresentedPage. 
-                await Task.Delay(50);
-
-                SelectCorrectTab(vmType);
-            }
-            else
-            {
-                await Shell.Current.GoToAsync(path, false, parameters);
-
-                //HACK: Shell doesn't immediately know about PresentedPage. 
-                await Task.Delay(50);
-
-                SelectCorrectTab(vmType);
-
-                if ((Shell.Current?.CurrentItem?.CurrentItem as IShellSectionController)?.PresentedPage?.BindingContext is INavigateToAware vmTo)
-                {
-                    vmTo.NavigatedTo(parameters);
-                }
-            }
-        }
-
         public static async Task GoToViewModel<TViewModel>(bool replaceStack = false, NavigationParameters parameters = null)
         {
             var vmType = typeof(TViewModel);
             var path = (replaceStack ? "//" : "") + vmType.Name;
 
             SelectCorrectTab(vmType);
 
-            if (Shell.Current.CurrentPage.BindingContext.GetType() != vmType)
+            //HACK: Shell doesn't immediately know about CurrentPage. 
+            await Task.Delay(50);
+
+            if (Shell.Current?.CurrentPage?.BindingContext?.GetType() != vmType)
             {
                 if (parameters is null)
                 {
@@ -102,7 +52,7 @@ public static async Task GoToViewModel<TViewModel>(bool replaceStack = false, Na
                 }
             }
 
-            if ((Shell.Current?.CurrentItem?.CurrentItem as IShellSectionController)?.PresentedPage.BindingContext is INavigateToAware vm)
+            if (Shell.Current?.CurrentPage?.BindingContext is INavigateToAware vm)
             {
                 vm.NavigatedTo(parameters);
             }
@@ -111,20 +61,28 @@ public static async Task GoToViewModel<TViewModel>(bool replaceStack = false, Na
         static void SelectCorrectTab(Type viewModelType)
         {
             if (Application.Current?.MainPage is IShellWithTabBar shell)
-            {
-                var attrib = viewModelType.GetCustomAttribute<TabRouteAttribute>();
-                if (attrib is null) return;
-
+            {              
                 var tabItem = shell
                     .TabBar?
                     .Items
-                    .FirstOrDefault(x => x.Route == attrib.TabRoute);
+                    .FirstOrDefault(x => x.Route == viewModelType.Name + "Tab");
 
                 if (tabItem is object)
                 {
                     shell.TabBar.CurrentItem = tabItem;
                 }
             }
+
+            var sectionAttribute = viewModelType.GetCustomAttribute<SectionRouteAttribute>();
+            if (sectionAttribute is object)
+            {
+                var sectionItem = Shell.Current.Items.FirstOrDefault(x => x.Route == sectionAttribute.SectionRoute);
+
+                if (sectionItem is object)
+                {
+                    Shell.Current.CurrentItem = sectionItem;
+                }
+            }
         }
 
         public static Task ShowAlert(string title, string message, string cancel)

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.3</PackageVersion>
+		<PackageVersion>1.0.4</PackageVersion>
 		<Authors>Vincent Niehues</Authors>
 		<Copyright>Vincent Niehues 2021</Copyright>
 		<Owners>Vincent Niehues</Owners>