#506 Navigation and Forms adapter

All async void temporarily till we move them across properly.
Caliburn-Micro · Mar 5, 2018 · babb62f · babb62f
1 parent 7f36022
commit babb62f
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 37 deletions.
diff --git a/src/Caliburn.Micro.Core/ActivateExtensions.cs b/src/Caliburn.Micro.Core/ActivateExtensions.cs
@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Caliburn.Micro
+{
+    public static class ActivateExtensions
+    {
+        public static Task ActivateAsync(this IActivate activate) => activate.ActivateAsync(CancellationToken.None);
+    }
+}
diff --git a/src/Caliburn.Micro.Platform/Platforms/UWP/INavigationService.cs b/src/Caliburn.Micro.Platform/Platforms/UWP/INavigationService.cs
@@ -1,14 +1,14 @@
-
+using System;
+using System.Collections.Generic;
+using Windows.Foundation;
+using Windows.Storage;
 using Windows.UI.Core;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Navigation;
 
 namespace Caliburn.Micro {
-    using System;
-    using System.Collections.Generic;
-    using Windows.Foundation;
-    using Windows.Storage;
-    using Windows.UI.Xaml;
-    using Windows.UI.Xaml.Controls;
-    using Windows.UI.Xaml.Navigation;
+
 
     /// <summary>
     ///   Implemented by services that provide (<see cref="System.Uri" /> based) navigation.
@@ -221,7 +221,7 @@ protected virtual void OnNavigated(object sender, NavigationEventArgs e) {
         /// </summary>
         /// <param name="view">The view.</param>
         /// <param name="viewModel">The view model.</param>
-        protected virtual void BindViewModel(DependencyObject view, object viewModel = null)
+        protected virtual async void BindViewModel(DependencyObject view, object viewModel = null)
         {
             ViewLocator.InitializeComponent(view);
 
@@ -238,10 +238,9 @@ protected virtual void BindViewModel(DependencyObject view, object viewModel = n
             TryInjectParameters(viewModel, CurrentParameter);
             ViewModelBinder.Bind(viewModel, view, null);
 
-            var activator = viewModel as IActivate;
-            if (activator != null)
+            if (viewModel is IActivate activator)
             {
-                activator.Activate();
+                await activator.ActivateAsync();
             }
         }
 

diff --git a/src/Caliburn.Micro.Platform/Platforms/WPF/INavigationService.cs b/src/Caliburn.Micro.Platform/Platforms/WPF/INavigationService.cs
@@ -1,16 +1,16 @@
-namespace Caliburn.Micro
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Windows;
-    using System.Windows.Controls;
-    using System.Windows.Navigation;
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
 
+namespace Caliburn.Micro
+{
     /// <summary>
     ///   Implemented by services that provide <see cref="Uri" /> based navigation.
     /// </summary>
-    public interface INavigationService {
-        
+    public interface INavigationService
+    {
         /// <summary>
         /// Navigates to the view represented by the given view model.
         /// </summary>
@@ -133,7 +133,11 @@ protected virtual void OnNavigating(object sender, NavigatingCancelEventArgs e)
             {
                 var shouldCancel = false;
                 var runningAsync = true;
-                guard.CanClose(result => { runningAsync = false; shouldCancel = !result; });
+                guard.CanClose(result =>
+                {
+                    runningAsync = false;
+                    shouldCancel = !result;
+                });
                 if (runningAsync)
                     throw new NotSupportedException("Async CanClose is not supported.");
 
@@ -169,7 +173,7 @@ protected virtual bool CanCloseOnNavigating(object sender, NavigatingCancelEvent
         /// </summary>
         /// <param name="sender"> The event sender. </param>
         /// <param name="e"> The event args. </param>
-        protected virtual void OnNavigated(object sender, NavigationEventArgs e)
+        protected virtual async void OnNavigated(object sender, NavigationEventArgs e)
         {
             if (e.Uri.IsAbsoluteUri || e.Content == null)
             {
@@ -198,10 +202,9 @@ protected virtual void OnNavigated(object sender, NavigationEventArgs e)
             TryInjectParameters(viewModel, e.ExtraData);
             ViewModelBinder.Bind(viewModel, page, null);
 
-            var activator = viewModel as IActivate;
-            if (activator != null)
+            if (viewModel is IActivate activator)
             {
-                activator.Activate();
+                await activator.ActivateAsync();
             }
 
             GC.Collect();
@@ -330,7 +333,8 @@ public void NavigateToViewModel<TViewModel>(object extraData = null)
         ///   Removes the most recent entry from the back stack.
         /// </summary>
         /// <returns> The entry that was removed. </returns>
-        public JournalEntry RemoveBackEntry() {
+        public JournalEntry RemoveBackEntry()
+        {
             return frame.RemoveBackEntry();
         }
 
@@ -379,4 +383,4 @@ public event FragmentNavigationEventHandler FragmentNavigation
             remove { frame.FragmentNavigation -= value; }
         }
     }
-}
+}
diff --git a/src/Caliburn.Micro.Platform/Platforms/Xamarin.Forms/FormsApplication.cs b/src/Caliburn.Micro.Platform/Platforms/Xamarin.Forms/FormsApplication.cs
@@ -102,7 +102,7 @@ protected void DisplayRootView<T>()
         /// Locates the view model, locates the associate view, binds them and shows it as the root view.
         /// </summary>
         /// <param name="viewModelType">The view model type.</param>
-        protected void DisplayRootViewFor(Type viewModelType)
+        protected async Task DisplayRootViewForAsync(Type viewModelType)
         {
             var viewModel = IoC.GetInstance(viewModelType, null);
             var view = ViewLocator.LocateForModel(viewModel, null, null);
@@ -114,9 +114,10 @@ protected void DisplayRootViewFor(Type viewModelType)
 
             ViewModelBinder.Bind(viewModel, view, null);
 
-            var activator = viewModel as IActivate;
-            if (activator != null)
-                activator.Activate();
+            if (viewModel is IActivate activator)
+            {
+                await activator.ActivateAsync();
+            }
 
             MainPage = page;
         }
@@ -125,9 +126,9 @@ protected void DisplayRootViewFor(Type viewModelType)
         /// Locates the view model, locates the associate view, binds them and shows it as the root view.
         /// </summary>
         /// <typeparam name="T">The view model type.</typeparam>
-        protected void DisplayRootViewFor<T>()
+        protected Task DisplayRootViewForAsync<T>()
         {
-            DisplayRootViewFor(typeof(T));
+            return DisplayRootViewForAsync(typeof(T));
         }
     }
 }
diff --git a/src/Caliburn.Micro.Platform/Platforms/Xamarin.Forms/NavigationPageAdapter.cs b/src/Caliburn.Micro.Platform/Platforms/Xamarin.Forms/NavigationPageAdapter.cs
@@ -87,10 +87,12 @@ protected virtual void DeactivateView(BindableObject view)
         /// Apply logic to activate a view when it is popped onto the navigation stack
         /// </summary>
         /// <param name="view">the view to activate</param>
-        protected virtual void ActivateView(BindableObject view)
+        protected virtual async void ActivateView(BindableObject view)
         {
-            var activate = view?.BindingContext as IActivate;
-            activate?.Activate();
+            if (view?.BindingContext is IActivate activator)
+            {
+                await activator.ActivateAsync();
+            }
         }
 
         /// <summary>