fixing naming

PrismLibrary · Feb 10, 2019 · f35fd65 · f35fd65
1 parent 2b503a2
commit f35fd65
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/App.xaml.cs b/Sandbox/Windows10/HelloWorld/HelloWorld.Unity/App.xaml.cs
@@ -31,11 +31,11 @@ public App()
             InitializeComponent();
         }
 
-        protected override void RegisterTypes(IContainerRegistry container)
+        protected override void RegisterTypes(IContainerRegistry containerRegistry)
         {
-            container.RegisterSingleton<IDatabase, Database>();
-            container.RegisterForNavigation<MainPage, MainPageViewModel>();
-            container.RegisterForNavigation<ItemPage, ItemPageViewModel>();
+            containerRegistry.RegisterSingleton<IDatabase, Database>();
+            containerRegistry.RegisterForNavigation<MainPage, MainPageViewModel>();
+            containerRegistry.RegisterForNavigation<ItemPage, ItemPageViewModel>();
         }
 
         protected override void OnStart(StartArgs args)

diff --git a/Source/Windows10/Prism.Windows/Navigation/NavigationServiceRegistry.cs b/Source/Windows10/Prism.Windows/Navigation/NavigationServiceRegistry.cs
@@ -20,7 +20,7 @@ public static class NavigationServiceRegistry
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static INavigationService CreateNavigationService(this IContainerProvider container, params Gesture[] gestures)
         {
-            return CreateNavigationService(container, new Frame(), Window.Current.CoreWindow, gestures);
+            return CreateNavigationService(container, null, Window.Current.CoreWindow, gestures);
         }
 
         /// <summary>
@@ -41,9 +41,9 @@ public static INavigationService CreateNavigationService(this IContainerProvider
         /// <param name="gestures">Optional default getures tied to this Frame</param>
         /// <returns>INavigationService</returns>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public static INavigationService Create(this IContainerProvider container, CoreWindow window, params Gesture[] gestures)
+        public static INavigationService CreateNavigationService(this IContainerProvider container, CoreWindow window, params Gesture[] gestures)
         {
-            return CreateNavigationService(container, new Frame(), window, gestures);
+            return CreateNavigationService(container, null, window, gestures);
         }
 
         /// <summary>
@@ -55,7 +55,8 @@ public static INavigationService Create(this IContainerProvider container, CoreW
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static INavigationService CreateNavigationService(this IContainerProvider container, Frame frame, CoreWindow window, params Gesture[] gestures)
         {
-            frame = frame ?? new Frame();
+            if (frame is null)
+                frame = new Frame();
 
             if (_instances.ContainsKey(frame))
                 return _instances[frame];

diff --git a/Source/Windows10/Prism.Windows/PrismApplicationBase.core.cs b/Source/Windows10/Prism.Windows/PrismApplicationBase.core.cs
@@ -104,7 +104,7 @@ private void CallOnInitializedOnce()
             // once and only once, ever
             if (Interlocked.Increment(ref _initialized) == 1)
             {
-                _navigationService = Container.CreateNavigationService(StartupNavigationGestures());
+                _navigationService = Container.CreateNavigationService(SupportedNavigationGestures());
 
                 _logger.Log("[App.OnInitialize()]", Category.Info, Priority.None);
                 OnInitialized();
@@ -178,7 +178,7 @@ private static void TestResuming(StartArgs startArgs)
 
         protected virtual Task OnSuspendingAsync() => Task.CompletedTask;
 
-        protected abstract void RegisterTypes(IContainerRegistry container);
+        protected abstract void RegisterTypes(IContainerRegistry containerRegistry);
 
         protected virtual void OnInitialized()
         {
@@ -189,7 +189,7 @@ protected virtual void OnInitialized()
 
         protected virtual Task OnStartAsync(StartArgs args) => Task.CompletedTask;
 
-        protected virtual Gesture[] StartupNavigationGestures() => new Gesture[] { Gesture.Back, Gesture.Forward, Gesture.Refresh };
+        protected virtual Gesture[] SupportedNavigationGestures() => new Gesture[] { Gesture.Back, Gesture.Forward, Gesture.Refresh };
 
         protected virtual void ConfigureViewModelLocator()
         {
@@ -199,7 +199,7 @@ protected virtual void ConfigureViewModelLocator()
 
                 if (view is Page page && page.Frame != null)
                 {
-                    navigationService = Container.CreateNavigationService(page.Frame);
+                    navigationService = Container.CreateNavigationService(page.Frame, SupportedNavigationGestures());
                 }
 
                 return Container.Resolve(viewModelType, (typeof(INavigationService), navigationService));