small fixes

Author: maSchoeller

src/Desktop/MaSchoeller.Extensions.Desktop.Sample1/Controllers/Page1Controller.cs

@@ -1,4 +1,4 @@
-using MaSchoeller.Extensions.Desktop.Mvvm;
+using MaSchoeller.Extensions.Desktop.Helpers;
 using MaSchoeller.Extensions.Desktop.Sample1.ViewModels;
 using System;
 using System.Collections.Generic;

src/Desktop/MaSchoeller.Extensions.Desktop.Sample1/Controllers/Page2Controller.cs

@@ -1,4 +1,4 @@
-using MaSchoeller.Extensions.Desktop.Mvvm;
+using MaSchoeller.Extensions.Desktop.Helpers;
 using MaSchoeller.Extensions.Desktop.Sample1.ViewModels;
 using System;
 using System.Collections.Generic;

src/Desktop/MaSchoeller.Extensions.Desktop/Abstracts/IController.cs

@@ -4,7 +4,7 @@
 
 namespace MaSchoeller.Extensions.Desktop.Abstracts
 {
-    public interface IController : IRoutable
+    public interface IController
     {
         public object Initialize();
     }

src/Desktop/MaSchoeller.Extensions.Desktop/Abstracts/INavigationServiceBuilder.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace MaSchoeller.Extensions.Desktop.Abstracts

src/Desktop/MaSchoeller.Extensions.Desktop/Mvvm/ControllerBase.cs renamed to src/Desktop/MaSchoeller.Extensions.Desktop/Helpers/ControllerBase.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace MaSchoeller.Extensions.Desktop.Mvvm
+namespace MaSchoeller.Extensions.Desktop.Helpers
 {
     public abstract class ControllerBase : RoutableBase, IController
     {

src/Desktop/MaSchoeller.Extensions.Desktop/Helpers/RoutableBase.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace MaSchoeller.Extensions.Desktop.Helpers
 {

src/Desktop/MaSchoeller.Extensions.Desktop/Internals/Hosting/DesktopContext.cs

@@ -26,8 +26,8 @@ IHostApplicationLifetime lifetime
 
         public bool IsRunning { get; set; }
 
-        public Application? WpfApplication { get; set; }
+        public Application WpfApplication { get; set; }
 
-        public Dispatcher? Dispatcher => WpfApplication?.Dispatcher;
+        public Dispatcher Dispatcher => WpfApplication?.Dispatcher!;
     }
 }

src/Desktop/MaSchoeller.Extensions.Desktop/Internals/Mvvmc/MvvmcNavigationService.cs

@@ -77,11 +77,15 @@ public async Task<bool> TryNavigateToAsync(string route)
             {
                 throw new InvalidCastException($"The Controller '{_routes[route].Controller.GetType().FullName}' does not implement '{typeof(IController).FullName}', can't able to navigate to this object, change from MVVMC to MVVM if you want only a ViewModel");
             }
+            if (!(controller is IRoutable routable))
+            {
+                throw new InvalidCastException($"The Controller '{_routes[route].Controller.GetType().FullName}' does not implement '{typeof(IRoutable).FullName}', can't able to navigate to this object");
+            }
             if (!(ActivatorUtilities.CreateInstance(_currentServiceScope.ServiceProvider, _routes[route].View) is Page view))
             {
                 throw new InvalidCastException($"The related view '{_routes[route].View.GetType().FullName}' does not inheritance from '{typeof(Page).FullName}', can't able to navigate to this page..");
             }
-            var canEnter = await controller.CanEnterRouteAsync();
+            var canEnter = await routable.CanEnterRouteAsync();
             if (!canEnter)
             {
                 return false;
@@ -91,7 +95,7 @@ public async Task<bool> TryNavigateToAsync(string route)
             if (succeeded)
             {
                 await (CurrentRoute?.LeaveAsync() ?? Task.CompletedTask);
-                CurrentRoute = controller;
+                CurrentRoute = routable;
                 _currentRouteName = route;
                 await CurrentRoute.EnterAsync();
                 Navigated?.Invoke(this, new NavigationEventArgs(route));

src/Desktop/MaSchoeller.Extensions.Desktop/Internals/Mvvmc/MvvmcNavigationServiceBuilder.cs

@@ -5,13 +5,15 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Text;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace MaSchoeller.Extensions.Desktop.Internals.Mvvmc
 {
     internal class MvvmcNavigationServiceBuilder : INavigationServiceBuilder
     {
         private readonly IDictionary<string, (Type ViewModel, Type Page)> _bindings;
+        private readonly IDictionary<string, (Type ViewModel, Type Page)> _controller;
         private Action<IServiceCollection>? _dependencies;
 
         public MvvmcNavigationServiceBuilder()

src/Desktop/MaSchoeller.Extensions.Desktop/MaSchoeller.Extensions.Desktop.csproj

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>8</LangVersion>
     <PackageId>MaSchoeller.Extensions.Desktop</PackageId>
-    <Version>0.1.6</Version>
+    <Version>0.2.0</Version>
     <Authors>Marvin Schoeller</Authors>
     <Company>MaSchoeller</Company>
     <PackageProjectUrl>https://github.com/maSchoeller/DotnetExtensions</PackageProjectUrl>