Merge pull request #9 from vniehues/develop

update to RC3, fix for AmbiguousRouteException, new interfaces & methods for navigation, testing
vniehues · May 11, 2022 · c7b910f · c7b910f
2 parents a59b532 + 78bee5b
commit c7b910f
Show file tree

Hide file tree

Showing 22 changed files with 225 additions and 43 deletions.
diff --git a/samples/mavvmApp/App.xaml.cs b/samples/mavvmApp/App.xaml.cs
@@ -1,7 +1,9 @@
-using mavvmApp.ViewModels;
+using System.Drawing;
+using mavvmApp.ViewModels;
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
+using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
+using Microsoft.Maui.Graphics;
 using Application = Microsoft.Maui.Controls.Application;
 
 namespace mavvmApp

diff --git a/samples/mavvmApp/AppShell.xaml b/samples/mavvmApp/AppShell.xaml
@@ -2,18 +2,18 @@
 <Shell
 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"
-    Shell.FlyoutBehavior="Disabled"
+
     x:Class="mavvmApp.AppShell">
     <ShellItem>
             <mavvm:MavvmShellContent ViewModel="{x:Type viewmodels:MainPageViewModel}">
             </mavvm:MavvmShellContent>
     </ShellItem>
     <TabBar>
-        <Tab Title="Second">
+        <Tab Title="Second" Route="firstTab">
             <mavvm:MavvmShellContent ViewModel="{x:Type viewmodels:SecondPageViewModel}">
             </mavvm:MavvmShellContent>
         </Tab>
-        <Tab Title="Second 2">
+        <Tab Title="Second 2" Route="secondTab">
             <mavvm:MavvmShellContent ViewModel="{x:Type viewmodels:SecondTabPageViewModel}">
             </mavvm:MavvmShellContent>
             </Tab>

diff --git a/samples/mavvmApp/MauiProgram.cs b/samples/mavvmApp/MauiProgram.cs
@@ -24,6 +24,7 @@ public static MauiApp CreateMauiApp()
 				})
 				.AddRoute<MainPage, MainPageViewModel>()
 				.AddRoute<SecondPage, SecondPageViewModel>()
+				.AddRoute<ThirdPage, ThirdPageViewModel>()
 				.AddRoute<SecondTabPage, SecondTabPageViewModel>();
 
 			builder.Services.AddSingleton<IConsoleService, ConsoleService>();

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>(true, new Dictionary<string, object>{ { "countParam", Count } });
+            await BaseMethods.GoToViewModel<SecondPageViewModel>(false, new NavigationParameters{ { "countParam", Count } });
         }
     }
 }

diff --git a/samples/mavvmApp/ViewModels/SecondPageViewModel.cs b/samples/mavvmApp/ViewModels/SecondPageViewModel.cs
@@ -3,13 +3,25 @@
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Hosting;
 using mavvm;
-using mavvm.Interfaces;
+using CommunityToolkit.Mvvm.Input;
 
 namespace mavvmApp.ViewModels
 {
     [QueryProperty(nameof(Count), "countParam")]
-    public class SecondPageViewModel : BindableBase, IPageAware
+    public partial class SecondPageViewModel : BindableBase, IPageAware, INavigationAware
     {
+        [ICommand]
+        async void GoBack()
+        {
+            await BaseMethods.GoBack();
+        }
+
+        [ICommand]
+        async void GoToThirdPage()
+        {
+            await BaseMethods.GoToViewModel<ThirdPageViewModel>(parameters: new NavigationParameters { { "testKey2", "testValue2" } });
+        }
+
         string _title;
         public string Title
         {
@@ -65,6 +77,16 @@ public void Disappearing()
         {
             _consoleService.Log("Disappearing");
         }
+
+        public void NavigatedBackTo(NavigationParameters parameters)
+        {
+            Console.WriteLine(parameters);
+        }
+
+        public void NavigatedTo(NavigationParameters parameters)
+        {
+            Console.WriteLine(parameters);
+        }
     }
 }
 
diff --git a/samples/mavvmApp/ViewModels/ThirdPageViewModel.cs b/samples/mavvmApp/ViewModels/ThirdPageViewModel.cs
@@ -0,0 +1,26 @@
+using System;
+using CommunityToolkit.Mvvm.Input;
+using mavvm;
+
+namespace mavvmApp.ViewModels
+{
+	public partial class ThirdPageViewModel : BindableBase, INavigateToAware
+	{
+
+		[ICommand]
+		async void GoBack()
+		{
+			await BaseMethods.GoBack(parameters: new NavigationParameters {{"testKey1","testValue1" }});
+		}
+
+        public void NavigatedTo(NavigationParameters parameters)
+		{
+			Console.WriteLine(parameters);
+		}
+
+        public ThirdPageViewModel()
+		{
+		}
+	}
+}
+
diff --git a/samples/mavvmApp/Views/MainPage.xaml b/samples/mavvmApp/Views/MainPage.xaml
@@ -1,9 +1,10 @@
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewmodels="clr-namespace:mavvmApp.ViewModels"
              x:Class="mavvmApp.Views.MainPage"
              Title="{Binding Title}"
-             BackgroundColor="{DynamicResource SecondaryColor}">
+             BackgroundColor="{DynamicResource SecondaryColor}"
+             Shell.PresentationMode="Animated">
 
     <ScrollView>
         <Grid HorizontalOptions="FillAndExpand" RowSpacing="25" RowDefinitions="Auto,Auto,Auto,Auto,*"

diff --git a/samples/mavvmApp/Views/MainPage.xaml.cs b/samples/mavvmApp/Views/MainPage.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Essentials;
 
 namespace mavvmApp.Views
 {

diff --git a/samples/mavvmApp/Views/SecondPage.xaml b/samples/mavvmApp/Views/SecondPage.xaml
@@ -1,13 +1,14 @@
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewmodels="clr-namespace:mavvmApp.ViewModels"
              x:Class="mavvmApp.Views.SecondPage"
              Title="{Binding Title}"
-             BackgroundColor="{DynamicResource SecondaryColor}">
+             BackgroundColor="{DynamicResource SecondaryColor}"
+             Shell.PresentationMode="Animated">
 
 
     <ScrollView>
-        <Grid RowSpacing="25" RowDefinitions="Auto,Auto,Auto,Auto,*"
+        <Grid RowSpacing="25" RowDefinitions="Auto,Auto,Auto,Auto,Auto"
               Padding="{OnPlatform iOS='30,60,30,30', Default='30'}">
 
             <Label 
@@ -25,22 +26,10 @@
                 FontSize="18"
                 HorizontalOptions="Center" />
 
-            <Label 
-                Text="{Binding Count, StringFormat='Current count: {0}'}"
-                Grid.Row="2"
-                FontSize="18"
-                FontAttributes="Bold"
-                HorizontalOptions="Center" />
-
-            <Button Text="Log + Alert"
-                Grid.Row="2" Command="{Binding LogCountCommand}"/>
-
-            <Image Grid.Row="4"
-                Source="dotnet_bot.png"
-                SemanticProperties.Description="Cute dot net bot waving hi to you!"
-                WidthRequest="250"
-                HeightRequest="310"
-                HorizontalOptions="Center" />
+            <Button Text="GoBack"
+                Grid.Row="3" Command="{Binding GoBackCommand}"/>
+            <Button Text="Go to ThirdPage"
+                Grid.Row="4" Command="{Binding GoToThirdPageCommand}"/>
 
         </Grid>
     </ScrollView>

diff --git a/samples/mavvmApp/Views/SecondPage.xaml.cs b/samples/mavvmApp/Views/SecondPage.xaml.cs
@@ -1,7 +1,6 @@
 using System;
 using mavvmApp.ViewModels;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Essentials;
 
 namespace mavvmApp.Views
 { 

diff --git a/samples/mavvmApp/Views/ThirdPage.xaml b/samples/mavvmApp/Views/ThirdPage.xaml
@@ -0,0 +1,48 @@
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:viewmodels="clr-namespace:mavvmApp.ViewModels"
+             x:Class="mavvmApp.Views.ThirdPage"
+             Title="{Binding Title}"
+             BackgroundColor="{DynamicResource SecondaryColor}"
+             Shell.PresentationMode="Animated">
+
+
+    <ScrollView>
+        <Grid RowSpacing="25" RowDefinitions="Auto,Auto,Auto,Auto,*"
+              Padding="{OnPlatform iOS='30,60,30,30', Default='30'}">
+
+            <Label 
+                Text="Hello, World!"
+                Grid.Row="0"
+                SemanticProperties.HeadingLevel="Level1"
+                FontSize="32"
+                HorizontalOptions="Center" />
+
+            <Label 
+                Text="Welcome to .NET Multi-platform App UI"
+                Grid.Row="1"
+                SemanticProperties.HeadingLevel="Level1"
+                SemanticProperties.Description="Welcome to dot net Multi platform App U I"
+                FontSize="18"
+                HorizontalOptions="Center" />
+
+            <Label 
+                Text="{Binding Count, StringFormat='Current count: {0}'}"
+                Grid.Row="2"
+                FontSize="18"
+                FontAttributes="Bold"
+                HorizontalOptions="Center" />
+
+            <Button Text="GoBack"
+                Grid.Row="2" Command="{Binding GoBackCommand}"/>
+
+            <Image Grid.Row="4"
+                Source="dotnet_bot.png"
+                SemanticProperties.Description="Cute dot net bot waving hi to you!"
+                WidthRequest="250"
+                HeightRequest="310"
+                HorizontalOptions="Center" />
+
+        </Grid>
+    </ScrollView>
+</ContentPage>
diff --git a/samples/mavvmApp/Views/ThirdPage.xaml.cs b/samples/mavvmApp/Views/ThirdPage.xaml.cs
@@ -0,0 +1,14 @@
+using System;
+using mavvmApp.ViewModels;
+using Microsoft.Maui.Controls;
+
+namespace mavvmApp.Views
+{ 
+	public partial class ThirdPage : ContentPage
+	{
+		public ThirdPage()
+		{
+			InitializeComponent();
+		}
+	}
+}
diff --git a/samples/mavvmApp/mavvmApp.csproj b/samples/mavvmApp/mavvmApp.csproj
@@ -55,9 +55,21 @@
 	</ItemGroup>
 	<ItemGroup>
 	  <None Remove="CommunityToolkit.Mvvm" />
+	  <None Remove="Microsoft.Maui.Dependencies" />
+	  <None Remove="Microsoft.Maui.Extensions" />
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview1" />
+	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview3" />
+	  <PackageReference Include="Microsoft.Maui.Dependencies" Version="6.0.300-rc.3.5667" />
+	  <PackageReference Include="Microsoft.Maui.Extensions" Version="6.0.300-rc.3.5667" />
+	</ItemGroup>
+	<ItemGroup>
+	  <MauiXaml Condition=" '$(EnableDefaultXamlItems)' == 'true' " Update="Views\SecondPage %28Kopie%29.xaml">
+	    <SubType>Designer</SubType>
+	  </MauiXaml>
+	  <MauiXaml Condition=" '$(EnableDefaultXamlItems)' == 'true' " Update="Views\ThirdPage.xaml">
+	    <SubType>Designer</SubType>
+	  </MauiXaml>
 	</ItemGroup>
 	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
 		<OutputType>WinExe</OutputType>

diff --git a/src/mavvm/Customs/MavvmShellContent.cs b/src/mavvm/Customs/MavvmShellContent.cs
@@ -18,10 +18,15 @@ static void ViewModelChanged(BindableObject bindable, object oldValue, object ne
         {
             var shellcontent = bindable as MavvmShellContent;
 
-            shellcontent.Route = (newValue as Type).Name;
+            shellcontent.SetContentTemplate();
         }
 
         public MavvmShellContent()
+        {
+            SetContentTemplate();
+        }
+
+        void SetContentTemplate()
         {
             ContentTemplate = new DataTemplate(() => Routing.GetOrCreateContent(ViewModel.Name));
         }

diff --git a/src/mavvm/Customs/NavigationParameters.cs b/src/mavvm/Customs/NavigationParameters.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace mavvm
+{
+	public class NavigationParameters : Dictionary<string,object>
+	{
+		public NavigationParameters()
+		{
+		}
+	}
+}
+
diff --git a/src/mavvm/Factories/MavvmResolveRouteFactory.cs b/src/mavvm/Factories/MavvmResolveRouteFactory.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using mavvm.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls;
 

diff --git a/src/mavvm/Interfaces/INavigateBackToAware.cs b/src/mavvm/Interfaces/INavigateBackToAware.cs
@@ -0,0 +1,9 @@
+using System;
+namespace mavvm
+{
+	public interface INavigateBackToAware
+	{
+		void NavigatedBackTo(NavigationParameters parameters);
+	}
+}
+
diff --git a/src/mavvm/Interfaces/INavigateToAware.cs b/src/mavvm/Interfaces/INavigateToAware.cs
@@ -0,0 +1,9 @@
+using System;
+namespace mavvm
+{
+	public interface INavigateToAware
+	{
+		void NavigatedTo(NavigationParameters parameters);
+	}
+}
+
diff --git a/src/mavvm/Interfaces/INavigationAware.cs b/src/mavvm/Interfaces/INavigationAware.cs
@@ -0,0 +1,8 @@
+using System;
+namespace mavvm
+{
+	public interface INavigationAware : INavigateToAware, INavigateBackToAware
+	{
+	}
+}
+
diff --git a/src/mavvm/Interfaces/IPageAware.cs b/src/mavvm/Interfaces/IPageAware.cs
@@ -1,5 +1,5 @@
 using System;
-namespace mavvm.Interfaces
+namespace mavvm
 {
 	public interface IPageAware
 	{