From 5a070989e539946d381b96c0c2b578e935b4ca5c Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Wed, 5 Oct 2016 18:45:45 +0200
Subject: [PATCH] Fixes navigation after app resume

---
 BookAStar/BookAStar/App.xaml.cs                    | 8 ++++----
 BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs  | 2 +-
 BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs    | 2 +-
 BookAStar/BookAStar/Pages/DashboardPage.xaml.cs    | 2 +-
 BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 8f13c2ee..e5e319b7 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -196,11 +196,11 @@ namespace BookAStar
             navPage.ToolbarItems.Add(tiSetts);
             */
             this.MainPage = masterDetail;
-            Resolver.Resolve<IDependencyContainer>()
-                .Register<INavigationService>(t => new NavigationService(masterDetail.Detail.Navigation))
-                ;
+            masterDetail.ToolbarItems.Add(tiHome);
+            masterDetail.ToolbarItems.Add(tiSetts);
+            NavigationService = new NavigationService(masterDetail.Detail.Navigation);
         }
-
+        public INavigationService NavigationService { protected set; get; }
         public void PostDeviceInfo()
         {
             var res = PlatformSpecificInstance.InvokeApi(
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index 9e953465..439438c7 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -18,7 +18,7 @@ namespace BookAStar.Pages
         private void OnViewDetail(object sender, ItemTappedEventArgs e)
         {
             BookQueryData data = e.Item as BookQueryData;
-            Resolver.Resolve<INavigationService>().NavigateTo<BookQueryPage>(true,data);
+            App.CurrentApp.NavigationService.NavigateTo<BookQueryPage>(true,data);
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index 77eb613e..8acfe73e 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -77,7 +77,7 @@ namespace BookAStar.Pages
                 Id = 0,
                 Description = "# **Hello Estimate!**"
             };
-            Resolver.Resolve<INavigationService>().NavigateTo<EditEstimatePage>(true,
+            App.CurrentApp.NavigationService.NavigateTo<EditEstimatePage>(true,
                 new EstimateViewModel(e));
         }
         
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
index 85290eb1..86cd2ca4 100644
--- a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
@@ -35,7 +35,7 @@ namespace BookAStar.Pages
 
         private void ShowPage<T>(object [] args, bool animate=false) where T:Page
         {
-            Resolver.Resolve<INavigationService>().NavigateTo<T>(animate, args);
+            App.CurrentApp.NavigationService.NavigateTo<T>(animate, args);
             App.MasterPresented = false;
         }
 
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index 8bba1227..63ffd087 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -44,7 +44,7 @@ namespace BookAStar.Pages
         protected void OnNewCommanLine(object sender, EventArgs e)
         {
             var com = new BillingLine();
-            Resolver.Resolve<INavigationService>().NavigateTo<EditBillingLinePage>(
+            App.CurrentApp.NavigationService.NavigateTo<EditBillingLinePage>(
                 true,
                 new object[] { new BillingLineViewModel(((EstimateViewModel)this.BindingContext).Data,com) } );
         }