From 3a5d898a87c80ec4855d2c9fd82901c9b5cd76bd Mon Sep 17 00:00:00 2001
From: Yoan <yoan2004.yb@gmail.com>
Date: Wed, 26 Apr 2023 23:08:00 +0200
Subject: [PATCH] Correction merge

---
 Sources/Ohara/Ohara.csproj         |  3 ++
 Sources/Ohara/PageBateau.xaml      |  3 +-
 Sources/Ohara/PageEquipage.xaml    | 10 +++---
 Sources/Ohara/PageEquipage.xaml.cs | 15 ++++----
 Sources/Ohara/PageFDD.xaml         | 58 +++++++++++++++++-------------
 5 files changed, 52 insertions(+), 37 deletions(-)

diff --git a/Sources/Ohara/Ohara.csproj b/Sources/Ohara/Ohara.csproj
index e62042b..7e8e9c6 100644
--- a/Sources/Ohara/Ohara.csproj
+++ b/Sources/Ohara/Ohara.csproj
@@ -57,6 +57,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="PageBestiaire.xaml.cs">
+		<DependentUpon>PageBestiaire.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="PageCarte.xaml.cs">
 	    <DependentUpon>PageCarte.xaml</DependentUpon>
 	  </Compile>
diff --git a/Sources/Ohara/PageBateau.xaml b/Sources/Ohara/PageBateau.xaml
index e9d9505..57a764b 100644
--- a/Sources/Ohara/PageBateau.xaml
+++ b/Sources/Ohara/PageBateau.xaml
@@ -2,7 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Ohara.PageBateau"
-             Title="PageBateau">
+             Title="PageBateau"
+             BackgroundColor="#e2edf1">
 
     <Grid>
 
diff --git a/Sources/Ohara/PageEquipage.xaml b/Sources/Ohara/PageEquipage.xaml
index 2bf16b9..2272d9f 100644
--- a/Sources/Ohara/PageEquipage.xaml
+++ b/Sources/Ohara/PageEquipage.xaml
@@ -21,14 +21,14 @@
             </Image>
 
 
-            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Acceuil"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Carte"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Personnages"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
+            <Button Style="{StaticResource buttonMenu2}" Text="Carte"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Personnages" Clicked="Hyperlink_Perso"/>
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Équipages"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
             <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs
index d894059..8aa86cd 100644
--- a/Sources/Ohara/PageEquipage.xaml.cs
+++ b/Sources/Ohara/PageEquipage.xaml.cs
@@ -13,24 +13,25 @@ public partial class PageEquipage : ContentPage
 
         listeEquip.ItemsSource = Lequipage;
     }
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new MainPage());
+    }
+
     private async void Hyperlink_FDD(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new PageFDD());
     }
 
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
+    private async void Hyperlink_Equip(object sender, EventArgs e)
     {
-        await Navigation.PushAsync(new MainPage());
+        await Navigation.PushAsync(new PageEquipage());
     }
+
     private async void Hyperlink_Perso(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new PagePersonnage());
     }
-
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageCarte());
-    }
     private async void Hyperlink_Bateau(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new PageBateau());
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index e80885e..feb8c59 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -55,36 +55,46 @@
                 </Frame>
             </Grid>
 
-            <CollectionView x:Name="listeFDD" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4">
+            <CollectionView x:Name="listeFDD" ItemsLayout="VerticalGrid, 4">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-                        <Grid Padding="10" ColumnSpacing="10" RowSpacing="20">
+                        <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="25*"/>
                             </Grid.ColumnDefinitions>
-                            <Image
-                                Source="{Binding Image}"
-                                HeightRequest="300"
-                                WidthRequest="300" />
                             
-                            <Label 
-                                VerticalOptions="End"
-                                Padding="7"
-                                HorizontalTextAlignment="Center"
-                                HorizontalOptions="Center"
-                                Text="{Binding Type}"
-                                FontAttributes="Italic"
-                                BackgroundColor="#72a3b3"/>
-                            <Label 
-                                VerticalOptions="End"
-                                Margin="25"
-                                HorizontalOptions="Center"
-                                HorizontalTextAlignment="Center"
-                                Padding="5"
-                                Text="{Binding Nom}"
-                                BackgroundColor="#72a3b3"
-                                FontAttributes="Bold" />
-                           
+                            <Frame CornerRadius="25"
+                                        BackgroundColor="#e2edf1"
+                                        BorderColor="#72a3b3"
+                                       
+                                    >
+                                <StackLayout Orientation="Vertical" Padding="5">
+                                    <Image
+                                        Source="{Binding Image}"
+                                        HeightRequest="290"
+                                        WidthRequest="290" />
+
+                                    <Label
+                                            HorizontalOptions="Center"
+                                            VerticalOptions="Start"
+                                            HorizontalTextAlignment="Center"
+                                            Text="{Binding Nom}"
+                                         
+                                            FontSize="19"
+                                            TextColor="#72a3b3"
+                                            FontAttributes="Bold" />
+
+                                    <Label
+                                            VerticalOptions="Center"
+                                            HorizontalOptions="Center"
+                                            Text="{Binding Type}"
+                                            FontAttributes="Italic"
+                                            TextColor="#72a3b3"/>
+
+                                </StackLayout>
+                            </Frame>
+
+
                         </Grid>
                     </DataTemplate>
                 </CollectionView.ItemTemplate>