From 3033b6036864dca7205345f900d8e4f04102fd1e Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Fri, 18 May 2018 23:24:35 +0200
Subject: [PATCH] =?UTF-8?q?Changement=20de=20l'endroit=20o=C3=B9=20la=20Na?=
 =?UTF-8?q?vigationPage=20est=20incluse=20dans=20l'arbo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AideDeJeu/AideDeJeu/App.xaml.cs            |  2 +-
 AideDeJeu/AideDeJeu/Views/AboutPage.xaml   |  4 +-
 AideDeJeu/AideDeJeu/Views/MainPage.xaml    | 56 ++++++++++++----------
 AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs |  8 +---
 4 files changed, 34 insertions(+), 36 deletions(-)

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 @@
     <ContentPage.BindingContext>
         <vm:AboutViewModel />
     </ContentPage.BindingContext>
-    <ContentPage.ToolbarItems>
+    <!--<ContentPage.ToolbarItems>
         <ToolbarItem Text="truc" />
-    </ContentPage.ToolbarItems>
+    </ContentPage.ToolbarItems>-->
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
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 @@
         </ContentPage>
     </MasterDetailPage.Master>
     <MasterDetailPage.Detail>
-        <ContentPage Title="">
-            <ContentPage.ToolbarItems>
-                <ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="spell_book.png" Command="{Binding SwitchToSpells}" />
-                <ToolbarItem Name="Monsters" Text="Monstres" Order="Primary" Icon="dragon_head.png" Command="{Binding SwitchToMonsters}" />
-                <ToolbarItem Name="About" Text="À propos de..." Order="Primary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
-            </ContentPage.ToolbarItems>
-            <StackLayout Orientation="Vertical">
-                <SearchBar x:Name="SearchBar" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
-                    <SearchBar.Behaviors>
-                        <tools:TextChangedBehavior />
-                    </SearchBar.Behaviors>
-                </SearchBar>
+        <NavigationPage>
+            <x:Arguments>
+                <ContentPage Title="">
+                    <ContentPage.ToolbarItems>
+                        <ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="spell_book.png" Command="{Binding SwitchToSpells}" />
+                        <ToolbarItem Name="Monsters" Text="Monstres" Order="Primary" Icon="dragon_head.png" Command="{Binding SwitchToMonsters}" />
+                        <ToolbarItem Name="About" Text="À propos de..." Order="Primary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
+                    </ContentPage.ToolbarItems>
+                    <StackLayout Orientation="Vertical">
+                        <SearchBar x:Name="SearchBar" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
+                            <SearchBar.Behaviors>
+                                <tools:TextChangedBehavior />
+                            </SearchBar.Behaviors>
+                        </SearchBar>
 
-                <ListView x:Name="ItemsListView" 
+                        <ListView x:Name="ItemsListView" 
                     ItemsSource="{Binding Items}"
                     VerticalOptions="FillAndExpand"
                     HasUnevenRows="true"
                     IsRefreshing="{Binding IsBusy, Mode=OneWay}"
                     CachingStrategy="RecycleElement"
                     SelectedItem="{Binding SelectedItem}">
-                    <!--RefreshCommand="{Binding LoadItemsCommand}"
+                            <!--RefreshCommand="{Binding LoadItemsCommand}"
                     IsPullToRefreshEnabled="true"-->
 
-                    <ListView.ItemTemplate>
-                        <DataTemplate>
-                            <ViewCell>
-                                <StackLayout Padding="10">
-                                    <Label Text="{Binding NamePHB}" 
+                            <ListView.ItemTemplate>
+                                <DataTemplate>
+                                    <ViewCell>
+                                        <StackLayout Padding="10">
+                                            <Label Text="{Binding NamePHB}" 
                                         LineBreakMode="NoWrap" 
                                         Style="{DynamicResource subsubsection}" 
                                         FontSize="16" />
-                                </StackLayout>
-                            </ViewCell>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </StackLayout>
-        </ContentPage>
+                                        </StackLayout>
+                                    </ViewCell>
+                                </DataTemplate>
+                            </ListView.ItemTemplate>
+                        </ListView>
+                    </StackLayout>
+                </ContentPage>
+            </x:Arguments>
+        </NavigationPage>
     </MasterDetailPage.Detail>
 </MasterDetailPage>
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();