prism 8 api changes

dansiegel · Nov 24, 2020 · 676dfa3 · 676dfa3
1 parent 186bf75
commit 676dfa3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 72 deletions.
diff --git a/src/Prism.Forms.Extended/ViewModels/DefaultViewModel.cs b/src/Prism.Forms.Extended/ViewModels/DefaultViewModel.cs
@@ -1,15 +1,24 @@
-using Prism.AppModel;
-using Prism.Mvvm;
+using Prism.Mvvm;
+using Prism.Navigation;
 
 namespace Prism.Forms.Extended.ViewModels
 {
-    internal class DefaultViewModel : BindableBase, IAutoInitialize
+    internal class DefaultViewModel : BindableBase, IInitialize
     {
         private string _title;
         public string Title
         {
             get => _title;
             set => SetProperty(ref _title, value);
         }
+
+        public void Initialize(INavigationParameters parameters)
+        {
+            if(parameters.TryGetValue("Title", out string title) ||
+                parameters.TryGetValue("title", out title))
+            {
+                Title = title;
+            }
+        }
     }
 }
diff --git a/src/Shiny.Prism/Modularity/IContainerRegistryAutoLoadExtensions.cs b/src/Shiny.Prism/Modularity/IContainerRegistryAutoLoadExtensions.cs
diff --git a/src/Shiny.Prism/Modularity/ShinyPrismModuleInitializer.cs b/src/Shiny.Prism/Modularity/ShinyPrismModuleInitializer.cs
@@ -25,7 +25,6 @@ public void Initialize(IModuleInfo moduleInfo)
             if (module != null)
             {
                 module.RegisterTypes(_container);
-                module.GetType().AutoRegisterViews(_container);
                 module.OnInitialized(_container);
             }
         }

diff --git a/tests/Prism.Forms.Extended.Mocks/Mocks/AppMock.xaml.cs b/tests/Prism.Forms.Extended.Mocks/Mocks/AppMock.xaml.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Prism.Forms.Extended.Mocks.Views;
 using Prism.Ioc;
 using Prism.Navigation;
 using Xamarin.Forms;
@@ -11,7 +7,6 @@
 namespace Prism.Forms.Extended.Mocks
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    [AutoRegisterForNavigation]
     public partial class AppMock : PrismApplication
     {
         public AppMock()
@@ -30,6 +25,10 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
         {
             containerRegistry.RegisterForNavigation<TabbedPage>();
             containerRegistry.RegisterForNavigation<NavigationPage>();
+            containerRegistry.RegisterForNavigation<ViewA>();
+            containerRegistry.RegisterForNavigation<ViewB>();
+            containerRegistry.RegisterForNavigation<ViewC>();
+            containerRegistry.RegisterForNavigation<ViewD>();
         }
     }
 }
diff --git a/tests/Shiny.Prism.Tests/Tests/ModularityTests.cs b/tests/Shiny.Prism.Tests/Tests/ModularityTests.cs
@@ -3,7 +3,6 @@
 using Shiny.Prism.Mocks;
 using Shiny.Prism.Mocks.Modularity;
 using Shiny.Prism.Mocks.Modularity.Services;
-using Shiny.Prism.Modularity;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -34,14 +33,5 @@ public void StartupModuleServicesAreNotRegisteredFromContainerRegistry()
 
             Assert.False(((IContainerProvider)PrismContainerExtension.Current).IsRegistered<IMockModuleServiceB>());
         }
-
-        [Fact]
-        public void GetNavigationSegmentNameInvokesInternalMethod()
-        {
-            var currentType = GetType();
-            var segmentName = IContainerRegistryAutoLoadExtensions.GetNavigationSegmentName(currentType);
-
-            Assert.Equal(currentType.Name, segmentName);
-        }
     }
 }