notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

Fixes navigation after app resume

Browse source
This commit is contained in:
Paul Schneider 2016-10-05 18:45:45 +02:00
commit 5a070989e5
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BookAStar/BookAStar/App.xaml.cs
View file

@ -196,11 +196,11 @@ namespace BookAStar
navPage.ToolbarItems.Add(tiSetts); navPage.ToolbarItems.Add(tiSetts);
*/ */
this.MainPage = masterDetail; this.MainPage = masterDetail;
Resolver.Resolve<IDependencyContainer>() masterDetail.ToolbarItems.Add(tiHome);
.Register<INavigationService>(t => new NavigationService(masterDetail.Detail.Navigation)) masterDetail.ToolbarItems.Add(tiSetts);
; NavigationService = new NavigationService(masterDetail.Detail.Navigation);
} }
public INavigationService NavigationService { protected set; get; }
public void PostDeviceInfo() public void PostDeviceInfo()
{ {
var res = PlatformSpecificInstance.InvokeApi( var res = PlatformSpecificInstance.InvokeApi(

2
BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
View file

@ -18,7 +18,7 @@ namespace BookAStar.Pages
private void OnViewDetail(object sender, ItemTappedEventArgs e) private void OnViewDetail(object sender, ItemTappedEventArgs e)
{ {
BookQueryData data = e.Item as BookQueryData; BookQueryData data = e.Item as BookQueryData;
Resolver.Resolve<INavigationService>().NavigateTo<BookQueryPage>(true,data); App.CurrentApp.NavigationService.NavigateTo<BookQueryPage>(true,data);
} }
} }
} }

2
BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
View file

@ -77,7 +77,7 @@ namespace BookAStar.Pages
Id = 0, Id = 0,
Description = "# **Hello Estimate!**" Description = "# **Hello Estimate!**"
}; };
Resolver.Resolve<INavigationService>().NavigateTo<EditEstimatePage>(true, App.CurrentApp.NavigationService.NavigateTo<EditEstimatePage>(true,
new EstimateViewModel(e)); new EstimateViewModel(e));
} }

2
BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
View file

@ -35,7 +35,7 @@ namespace BookAStar.Pages
private void ShowPage<T>(object [] args, bool animate=false) where T:Page 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; App.MasterPresented = false;
} }

2
BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
View file

@ -44,7 +44,7 @@ namespace BookAStar.Pages
protected void OnNewCommanLine(object sender, EventArgs e) protected void OnNewCommanLine(object sender, EventArgs e)
{ {
var com = new BillingLine(); var com = new BillingLine();
Resolver.Resolve<INavigationService>().NavigateTo<EditBillingLinePage>( App.CurrentApp.NavigationService.NavigateTo<EditBillingLinePage>(
true, true,
new object[] { new BillingLineViewModel(((EstimateViewModel)this.BindingContext).Data,com) } ); new object[] { new BillingLineViewModel(((EstimateViewModel)this.BindingContext).Data,com) } );
} }