From 89647c11decb07e72a402f8d9a8b0cfc32f57127 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 9 Jul 2018 19:23:46 +0200
Subject: [PATCH] Modifs barres

---
 AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml |  3 ++
 AideDeJeu/AideDeJeu/Views/MainPage.xaml       | 31 ++++++++++++-------
 AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs    |  4 +--
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
index 8852e90b..9b4dc1c2 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
@@ -12,6 +12,9 @@
             <tools:StringListToStringConverter x:Key="StringListToStringConverter" />
         </ResourceDictionary>
     </ContentPage.Resources>
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.AboutCommand}" />
+    </ContentPage.ToolbarItems>
     <ScrollView Orientation="Vertical" BackgroundColor="#fdf1dc">
         <mdview:MarkdownView x:Name="mdMarkdown" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Item.Markdown}" />
     </ScrollView>
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
index a0f64bcb..7ef5b7cf 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
@@ -8,6 +8,9 @@
     x:Name="This" 
     IsPresented="False" 
     Title="{Binding ItemSourceType,Converter={StaticResource ItemSourceTypeToTitleConverter}}">
+    <MasterDetailPage.ToolbarItems>
+        <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
+    </MasterDetailPage.ToolbarItems>
     <MasterDetailPage.Resources>
         <ResourceDictionary>
             <tools:ItemSourceTypeToStringConverter x:Key="ItemSourceTypeToTitleConverter" SpellVO="Spells" SpellHD="Sorts (H&amp;D)" MonsterVO="Monsters" MonsterHD="Créatures (H&amp;D)" />
@@ -43,16 +46,22 @@
             <!--<ContentPage.ToolbarItems>
                         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
                     </ContentPage.ToolbarItems>-->
-            <StackLayout Orientation="Vertical" VerticalOptions="Fill" HorizontalOptions="Fill">
-                <StackLayout Orientation="Horizontal">
-                    <Button Text="=" Clicked="Button_Clicked"/>
-                    <SearchBar x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
-                        <SearchBar.Behaviors>
-                            <tools:TextChangedBehavior />
-                        </SearchBar.Behaviors>
-                    </SearchBar>
-                </StackLayout>
-                <ListView x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
+            <Grid VerticalOptions="Fill" HorizontalOptions="Fill">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Button Grid.Column="0" Grid.Row="0" Text="=" Clicked="Button_Clicked"/>
+                <SearchBar Grid.Column="1" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
+                    <SearchBar.Behaviors>
+                        <tools:TextChangedBehavior />
+                    </SearchBar.Behaviors>
+                </SearchBar>
+                <ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
                     <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>
@@ -64,7 +73,7 @@
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
-            </StackLayout>
+            </Grid>
         </ContentPage>
     </MasterDetailPage.Detail>
 </MasterDetailPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
index ad332b41..ee687923 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
@@ -35,8 +35,8 @@ namespace AideDeJeu.Views
         {
             base.OnAppearing();
 
-            this.MasterBehavior = MasterBehavior.Default;
-            this.MasterBehavior = MasterBehavior.Popover;
+            //this.MasterBehavior = MasterBehavior.Default;
+            //this.MasterBehavior = MasterBehavior.Popover;
             if (Main.Items.Count() == 0)
                 Main.LoadItemsCommand.Execute(null);
         }