diff --git a/AideDeJeu/AideDeJeu/App.xaml.cs b/AideDeJeu/AideDeJeu/App.xaml.cs index 4bd8198a..34568aa8 100644 --- a/AideDeJeu/AideDeJeu/App.xaml.cs +++ b/AideDeJeu/AideDeJeu/App.xaml.cs @@ -14,7 +14,7 @@ namespace AideDeJeu { InitializeComponent(); - MainPage = new NavigationPage(new MainPage()); + MainPage = new MainPage(); } protected override void OnStart () diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml index c11a2bfb..15316d10 100644 --- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml @@ -8,9 +8,9 @@ - + diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml index 0dec5fc2..f3e2d393 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml @@ -82,43 +82,47 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs index d552e269..11f20a3e 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs @@ -17,16 +17,10 @@ namespace AideDeJeu.Views public MainPage () { InitializeComponent (); - Navigator = new Navigator(Navigation); + Navigator = new Navigator((Detail as NavigationPage).Navigation); BindingContext = viewModel = new MainViewModel(Navigator); } - protected override bool OnBackButtonPressed() - { - IsPresented = !IsPresented; - return true; - } - protected override void OnAppearing() { base.OnAppearing();