keep compatible with Prism 8

dansiegel · Apr 6, 2020 · 58da72f · 58da72f
1 parent c6a168e
commit 58da72f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/Prism.Forms.Extended/Ioc/IContainerRegistryExtensions.cs b/src/Prism.Forms.Extended/Ioc/IContainerRegistryExtensions.cs
@@ -15,6 +15,9 @@ namespace Prism.Ioc
 {
     public static class IContainerRegistryExtensions
     {
+        // Provided to keep compatibility with Prism 8.0
+        private const string NavigationServiceName = "PageNavigationService";
+
         public static void RegisterRequiredTypes(this IContainerRegistry containerRegistry)
         {
             containerRegistry.RegisterManySingletonOnce<AggregateLogger>();
@@ -29,8 +32,9 @@ public static void RegisterRequiredTypes(this IContainerRegistry containerRegist
             containerRegistry.RegisterSingletonOnce<IModuleManager, ModuleManager>();
             containerRegistry.RegisterSingletonOnce<IModuleInitializer, ModuleInitializer>();
             containerRegistry.RegisterSingletonOnce<IDialogService, DialogService>();
-            containerRegistry.Register<INavigationService, ErrorReportingNavigationService>(PrismApplicationBase.NavigationServiceName);
+            containerRegistry.Register<INavigationService, ErrorReportingNavigationService>(NavigationServiceName);
             containerRegistry.Register<INavigationService, ErrorReportingNavigationService>();
+            var isRegistered = containerRegistry.IsRegistered<INavigationService>(NavigationServiceName);
         }
 
         public static void RegisterPrismCoreServices(this IServiceCollection services)

diff --git a/src/Shiny.Prism/Navigation/NavigationServiceDelegate.cs b/src/Shiny.Prism/Navigation/NavigationServiceDelegate.cs
@@ -10,7 +10,10 @@ namespace Prism.Navigation
 {
     internal class NavigationServiceDelegate : INavigationServiceDelegate
     {
-        private IContainerProvider Container { get; }
+        // Provided to keep compatibility with Prism 8.0
+        private const string NavigationServiceName = "PageNavigationService";
+
+        private IContainerExtension Container { get; }
         private IApplicationProvider ApplicationProvider { get; }
 
         public NavigationServiceDelegate(IContainerExtension container, IApplicationProvider applicationProvider)
@@ -128,7 +131,9 @@ private INavigationService GetNavigationService()
         {
             if (PrismApplicationBase.Current is null) return null;
 
-            var navService = Container.Resolve<INavigationService>(PrismApplicationBase.NavigationServiceName);
+            var navService = Container.IsRegistered<INavigationService>(NavigationServiceName) ? 
+                Container.Resolve<INavigationService>(NavigationServiceName) :
+                Container.Resolve<INavigationService>();
 
             if (navService is IPageAware pa)
             {

diff --git a/tests/Prism.Forms.Extended.Mocks/Tests/PrismApplicationTests.cs b/tests/Prism.Forms.Extended.Mocks/Tests/PrismApplicationTests.cs
@@ -123,6 +123,8 @@ public void ErrorReportingNavigationServiceIsRegistered()
         {
             var app = CreateApp();
             INavigationService navService = null;
+
+            // TODO: Remove internal constants
             var ex = Record.Exception(() => navService = app.Container.Resolve<INavigationService>(PrismApplicationBase.NavigationServiceName));
 
             Assert.Null(ex);