From 5de6aaf98a52a39867720f9eba3662b3fc9c3240 Mon Sep 17 00:00:00 2001
From: Guillaume REY <gurey2>
Date: Sat, 29 Apr 2023 08:42:33 +0200
Subject: [PATCH] Navigation avec la page Bestiaire pour toutes les pages

---
 Sources/Ohara/MainPage.xaml          |   2 +-
 Sources/Ohara/MainPage.xaml.cs       |   5 +
 Sources/Ohara/PageBateau.xaml        |   2 +-
 Sources/Ohara/PageBateau.xaml.cs     |   5 +
 Sources/Ohara/PageBestiaire.xaml     | 170 +++++++++++++--------------
 Sources/Ohara/PageBestiaire.xaml.cs  |  24 +++-
 Sources/Ohara/PageCarte.xaml         |   2 +-
 Sources/Ohara/PageCarte.xaml.cs      |   5 +
 Sources/Ohara/PageEquipage.xaml      |   6 +-
 Sources/Ohara/PageEquipage.xaml.cs   |   9 ++
 Sources/Ohara/PageFDD.xaml           |   2 +-
 Sources/Ohara/PageFDD.xaml.cs        |   4 +
 Sources/Ohara/PagePersonnage.xaml    |   2 +-
 Sources/Ohara/PagePersonnage.xaml.cs |   5 +
 14 files changed, 145 insertions(+), 98 deletions(-)

diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml
index bdc4636..d4e9043 100644
--- a/Sources/Ohara/MainPage.xaml
+++ b/Sources/Ohara/MainPage.xaml
@@ -30,7 +30,7 @@
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40" Margin="0,20,0,0">
diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs
index afe3eeb..0ddfb5a 100644
--- a/Sources/Ohara/MainPage.xaml.cs
+++ b/Sources/Ohara/MainPage.xaml.cs
@@ -30,5 +30,10 @@ public partial class MainPage : ContentPage
     {
         await Navigation.PushAsync(new PageBateau());
     }
+
+    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBestiaire());
+    }
 }
 
diff --git a/Sources/Ohara/PageBateau.xaml b/Sources/Ohara/PageBateau.xaml
index 57a764b..48a1cf7 100644
--- a/Sources/Ohara/PageBateau.xaml
+++ b/Sources/Ohara/PageBateau.xaml
@@ -29,7 +29,7 @@
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
             <Button Style="{StaticResource buttonMenu2}" Text="Bateaux"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
diff --git a/Sources/Ohara/PageBateau.xaml.cs b/Sources/Ohara/PageBateau.xaml.cs
index 6892255..19ee8fd 100644
--- a/Sources/Ohara/PageBateau.xaml.cs
+++ b/Sources/Ohara/PageBateau.xaml.cs
@@ -34,4 +34,9 @@ public partial class PageBateau : ContentPage
     {
         await Navigation.PushAsync(new MainPage());
     }
+
+    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBestiaire());
+    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageBestiaire.xaml b/Sources/Ohara/PageBestiaire.xaml
index 7ae7de4..5d6c645 100644
--- a/Sources/Ohara/PageBestiaire.xaml
+++ b/Sources/Ohara/PageBestiaire.xaml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Ohara.PageBestiaire"
-             Title="PageBestiaire"
-             BackgroundColor="#e2edf1">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="2*" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="300" />
-            <ColumnDefinition Width="90*" />
-        </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center">
-                <Image.Clip>
-                    <EllipseGeometry Center="150,90"  RadiusX="80"  RadiusY="80"/>
-                </Image.Clip>
-            </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="Fruits du démon" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
-        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="20">
-            <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="10*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions >
-                    <ColumnDefinition Width="20*"/>
-                    <ColumnDefinition Width="25*"/>
-                    <ColumnDefinition Width="10*"/>
-                    <ColumnDefinition Width="10*"/>
-                </Grid.ColumnDefinitions>
-                <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
-                    <Label Text="Filtrer" HorizontalTextAlignment="Center" />
-                </Frame>
-
-                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
-                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
-                </Frame>
-            </Grid>
-
-            <CollectionView x:Name="listeBest" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4">
-                <CollectionView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="25*"/>
-                            </Grid.ColumnDefinitions>
-                            <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" />
-                                </StackLayout>
-                            </Frame>
-
-                        </Grid>
-                    </DataTemplate>
-                </CollectionView.ItemTemplate>
-            </CollectionView>
-
-        </VerticalStackLayout>
-    </Grid>
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Ohara.PageBestiaire"
+             Title="PageBestiaire"
+             BackgroundColor="#e2edf1">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="90*" />
+        </Grid.ColumnDefinitions>
+        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
+
+            <Image Source="ohara2.png" HeightRequest="200" HorizontalOptions="Center">
+                <Image.Clip>
+                    <EllipseGeometry Center="150,90"  RadiusX="80"  RadiusY="80"/>
+                </Image.Clip>
+            </Image>
+
+            <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_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" Clicked="Hyperlink_Bateau"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
+            <Button Style="{StaticResource buttonMenu2}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
+        </VerticalStackLayout>
+        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="20">
+            <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="10*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions >
+                    <ColumnDefinition Width="20*"/>
+                    <ColumnDefinition Width="25*"/>
+                    <ColumnDefinition Width="10*"/>
+                    <ColumnDefinition Width="10*"/>
+                </Grid.ColumnDefinitions>
+                <SearchBar Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="2">
+                    <Label Text="Filtrer" HorizontalTextAlignment="Center" />
+                </Frame>
+
+                <Frame CornerRadius="20" BackgroundColor="#bfe5ef" BorderColor="#bfe5ef" Grid.Column="3">
+                    <Label Text="Trier" HorizontalTextAlignment="Center"  />
+                </Frame>
+            </Grid>
+
+            <CollectionView x:Name="listeBest" ItemsUpdatingScrollMode="KeepScrollOffset" VerticalScrollBarVisibility="Always" ItemsLayout="VerticalGrid, 4">
+                <CollectionView.ItemTemplate>
+                    <DataTemplate>
+                        <Grid Padding="20" ColumnSpacing="20" RowSpacing="20">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="25*"/>
+                            </Grid.ColumnDefinitions>
+                            <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" />
+                                </StackLayout>
+                            </Frame>
+
+                        </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+
+        </VerticalStackLayout>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Ohara/PageBestiaire.xaml.cs b/Sources/Ohara/PageBestiaire.xaml.cs
index 6406ce7..20ff1c6 100644
--- a/Sources/Ohara/PageBestiaire.xaml.cs
+++ b/Sources/Ohara/PageBestiaire.xaml.cs
@@ -14,19 +14,33 @@ public partial class PageBestiaire : ContentPage
 
         listeBest.ItemsSource = Lbest;
     }
-    private async void Hyperlink_FDD(object sender, EventArgs e)
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
     {
-        await Navigation.PushAsync(new PageFDD());
+        await Navigation.PushAsync(new MainPage());
     }
 
-    private async void Hyperlink_Acceuil(object sender, EventArgs e)
+    private async void Hyperlink_FDD(object sender, EventArgs e)
     {
-        await Navigation.PushAsync(new MainPage());
+        await Navigation.PushAsync(new PageFDD());
     }
 
     private async void Hyperlink_Equip(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new PageEquipage());
     }
-    
+    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());
+    }
+
+    private async void Hyperlink_Perso(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PagePersonnage());
+    }
+
+
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageCarte.xaml b/Sources/Ohara/PageCarte.xaml
index f00ac03..d4d5fdf 100644
--- a/Sources/Ohara/PageCarte.xaml
+++ b/Sources/Ohara/PageCarte.xaml
@@ -28,7 +28,7 @@
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
diff --git a/Sources/Ohara/PageCarte.xaml.cs b/Sources/Ohara/PageCarte.xaml.cs
index 586c45e..19926d3 100644
--- a/Sources/Ohara/PageCarte.xaml.cs
+++ b/Sources/Ohara/PageCarte.xaml.cs
@@ -29,4 +29,9 @@ public partial class PageCarte : ContentPage
     {
         await Navigation.PushAsync(new PageBateau());
     }
+
+    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBestiaire());
+    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageEquipage.xaml b/Sources/Ohara/PageEquipage.xaml
index 8866883..272bced 100644
--- a/Sources/Ohara/PageEquipage.xaml
+++ b/Sources/Ohara/PageEquipage.xaml
@@ -22,13 +22,13 @@
 
 
             <Button Style="{StaticResource buttonMenu}" Text="Accueil" Clicked="Hyperlink_Accueil"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Carte"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Carte" Clicked="Hyperlink_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" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Équipages" Clicked="Hyperlink_Equip"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu2}" Text="Équipages"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">
             <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs
index 43e3aad..38b2219 100644
--- a/Sources/Ohara/PageEquipage.xaml.cs
+++ b/Sources/Ohara/PageEquipage.xaml.cs
@@ -37,6 +37,15 @@ public partial class PageEquipage : ContentPage
         await Navigation.PushAsync(new PageBateau());
     }
 
+    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBestiaire());
+    }
+    private async void Hyperlink_Carte(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageCarte());
+    }
+
     private void listeEquip_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
     {
 
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index cb54195..08101a8 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -30,7 +30,7 @@
             <Button Style="{StaticResource buttonMenu2}" Text="Fruits du démon"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
         </VerticalStackLayout>
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">
diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs
index b78228f..a9d5b8e 100644
--- a/Sources/Ohara/PageFDD.xaml.cs
+++ b/Sources/Ohara/PageFDD.xaml.cs
@@ -42,4 +42,8 @@ public partial class PageFDD : ContentPage
     {
         await Navigation.PushAsync(new PageBateau());
     }
+    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new PageBestiaire());
+    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PagePersonnage.xaml b/Sources/Ohara/PagePersonnage.xaml
index 281e0a8..f6de8e2 100644
--- a/Sources/Ohara/PagePersonnage.xaml
+++ b/Sources/Ohara/PagePersonnage.xaml
@@ -28,7 +28,7 @@
             <Button Style="{StaticResource buttonMenu}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
             <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
             <Button Style="{StaticResource buttonMenu}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire"/>
+            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
             <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
         </VerticalStackLayout>
 
diff --git a/Sources/Ohara/PagePersonnage.xaml.cs b/Sources/Ohara/PagePersonnage.xaml.cs
index 35e9bbc..f0e01de 100644
--- a/Sources/Ohara/PagePersonnage.xaml.cs
+++ b/Sources/Ohara/PagePersonnage.xaml.cs
@@ -37,4 +37,9 @@ public partial class PagePersonnage : ContentPage
     {
         await Navigation.PushAsync(new PageBateau());
     }
+
+    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync (new PageBestiaire());
+    }
 }
\ No newline at end of file