refactored NavigateAsync()

vividos · Dec 8, 2018 · 58941bc · 58941bc
1 parent ed66966
commit 58941bc
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/src/App/Core/Services/NavigationService.cs b/src/App/Core/Services/NavigationService.cs
@@ -33,8 +33,26 @@ public static NavigationService Instance
         /// <param name="parameter">parameter object to pass; may be null</param>
         /// <returns>task to wait on</returns>
         public async Task NavigateAsync(string pageKey, bool animated, object parameter = null)
+        {
+            Type pageType = GetPageTypeFromPageKey(pageKey, parameter);
+
+            if (pageType != null)
+            {
+                Device.BeginInvokeOnMainThread(async () => await this.NavigateAsync(pageType, animated, parameter));
+            }
+        }
+
+        /// <summary>
+        /// Returns Xamarin.Forms page type from given page key; also checks if needed parameters
+        /// were passed.
+        /// </summary>
+        /// <param name="pageKey">page key</param>
+        /// <param name="parameter">parameter; mandatory for some pages</param>
+        /// <returns>page type</returns>
+        private static Type GetPageTypeFromPageKey(string pageKey, object parameter)
         {
             Type pageType = null;
+
             switch (pageKey)
             {
                 case Constants.PageKeyMapPage:
@@ -109,10 +127,7 @@ public async Task NavigateAsync(string pageKey, bool animated, object parameter
                     break;
             }
 
-            if (pageType != null)
-            {
-                Device.BeginInvokeOnMainThread(async () => await this.NavigateAsync(pageType, animated, parameter));
-            }
+            return pageType;
         }
 
         /// <summary>