#342 Use NavigationPageAdapter events

src/Caliburn.Micro.Platform/xforms/NavigationPageAdapter.cs

@@ -12,15 +12,43 @@ namespace Caliburn.Micro.Xamarin.Forms {
     /// </summary>
     public class NavigationPageAdapter : INavigationService {
         private readonly NavigationPage navigationPage;
+        private Page currentPage;
 
         /// <summary>
         /// Instantiates new instance of NavigationPageAdapter
         /// </summary>
         /// <param name="navigationPage">The navigation page to adapat</param>
         public NavigationPageAdapter(NavigationPage navigationPage) {
             this.navigationPage = navigationPage;
+
+            navigationPage.Pushed += OnPushed;
+            navigationPage.Popped += OnPopped;
+            navigationPage.PoppedToRoot += OnPoppedToRoot;
         }
 
+        private void OnPoppedToRoot(object sender, NavigationEventArgs e)
+        {
+            DeactivateView(currentPage);
+            ActivateView(navigationPage.CurrentPage);
+
+            currentPage = navigationPage.CurrentPage;
+        }
+
+        private void OnPopped(object sender, NavigationEventArgs e)
+        {
+            DeactivateView(currentPage);
+            ActivateView(navigationPage.CurrentPage);
+
+            currentPage = navigationPage.CurrentPage;
+        }
+
+        private void OnPushed(object sender, NavigationEventArgs e)
+        {
+            DeactivateView(currentPage);
+            ActivateView(navigationPage.CurrentPage);
+
+            currentPage = navigationPage.CurrentPage;
+        }
 
         /// <summary>
         /// Allow Xamarin to navigate to a ViewModel backed by a view which is of type <see cref="T:Xamarin.Forms.ContentView"/> by adapting the result
@@ -168,9 +196,6 @@ private Task PushAsync(Element view, object parameter, bool animated)
                 page = CreateContentPage(contentView, viewModel);
             }
 
-            page.Appearing += (s, e) => ActivateView(page);
-            page.Disappearing += (s, e) => DeactivateView(page);
-
             return navigationPage.PushAsync(page, animated);
         }