From 9e18199167665cdbe165deb6e27b50eb29493d46 Mon Sep 17 00:00:00 2001
From: Guillaume REY <gurey2>
Date: Wed, 24 May 2023 09:08:07 +0200
Subject: [PATCH] =?UTF-8?q?factorisation=20du=20code=20avec=20ancien=20men?=
 =?UTF-8?q?u=20=20fonctionnel=20->=20reste=20a=20changer=20l'affichage=20d?=
 =?UTF-8?q?u=20bouton=20en=20fonction=20de=20la=20page=20o=C3=B9=20l'on=20?=
 =?UTF-8?q?se=20situe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/Ohara/AppShell.xaml              |   2 +-
 Sources/Ohara/MainPage.xaml              |  31 +--
 Sources/Ohara/MainPage.xaml.cs           |  62 +-----
 Sources/Ohara/Ohara.csproj               |   6 +
 Sources/Ohara/PageBateau.xaml            |  23 +--
 Sources/Ohara/PageBateau.xaml.cs         |  57 +-----
 Sources/Ohara/PageBestiaire.xaml         |  17 +-
 Sources/Ohara/PageBestiaire.xaml.cs      |  53 +-----
 Sources/Ohara/PageCarte.xaml             |  22 +--
 Sources/Ohara/PageCarte.xaml.cs          |  53 +-----
 Sources/Ohara/PageEquipage.xaml          |  18 +-
 Sources/Ohara/PageEquipage.xaml.cs       |  59 +-----
 Sources/Ohara/PageFDD.xaml               |  20 +-
 Sources/Ohara/PageFDD.xaml.cs            |  48 +----
 Sources/Ohara/PageIle.xaml               |  22 +--
 Sources/Ohara/PageIle.xaml.cs            |  49 +----
 Sources/Ohara/PageInfoBateau.xaml        | 228 +++++++++++------------
 Sources/Ohara/PageInfoBateau.xaml.cs     |  36 ----
 Sources/Ohara/PageInfoBestiaire.xaml     |  22 +--
 Sources/Ohara/PageInfoBestiaire.xaml.cs  |  35 ----
 Sources/Ohara/PageInfoEquipage.xaml      |  22 +--
 Sources/Ohara/PageInfoEquipage.xaml.cs   |  37 +---
 Sources/Ohara/PageInfoFdd.xaml           |  22 +--
 Sources/Ohara/PageInfoFdd.xaml.cs        |  37 +---
 Sources/Ohara/PageInfoIle.xaml           |  22 +--
 Sources/Ohara/PageInfoIle.xaml.cs        |  37 +---
 Sources/Ohara/PageInfoPersonnage.xaml    |  22 +--
 Sources/Ohara/PageInfoPersonnage.xaml.cs |  37 +---
 Sources/Ohara/PagePersonnage.xaml        |  21 +--
 Sources/Ohara/PagePersonnage.xaml.cs     |  52 +-----
 Sources/Ohara/menuBoutons.xaml           |  26 +++
 Sources/Ohara/menuBoutons.xaml.cs        |  78 ++++++++
 32 files changed, 290 insertions(+), 986 deletions(-)
 create mode 100644 Sources/Ohara/menuBoutons.xaml
 create mode 100644 Sources/Ohara/menuBoutons.xaml.cs

diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml
index b3588da..ee7e3c1 100644
--- a/Sources/Ohara/AppShell.xaml
+++ b/Sources/Ohara/AppShell.xaml
@@ -4,7 +4,7 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:Ohara"
-    Shell.FlyoutBehavior="Disabled"
+    Shell.FlyoutBehavior="Flyout"
     Shell.NavBarIsVisible="False">
 
     <Shell.TitleView>
diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml
index ddfd08d..4101d0e 100644
--- a/Sources/Ohara/MainPage.xaml
+++ b/Sources/Ohara/MainPage.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.MainPage"
              BackgroundColor="#e2edf1">
 
@@ -15,24 +16,12 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="*" />
         </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 buttonMenu2}" 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" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+        
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
+        
+        
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40" Margin="0,20,0,0">
             <Frame CornerRadius="20"  WidthRequest="600" HeightRequest="75">
                 <Label Text="Bienvenue dans Ohara !" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/>
@@ -56,11 +45,7 @@
 
         
 
-       <!--<Rectangle WidthRequest="200" HeightRequest="300" HorizontalOptions="Start"   BackgroundColor="#72a3b3">
-            <Rectangle.Fill>
-                <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
-                    <GradientStop Color="#cdffd8" Offset="0.0" />-->
-                    <!--<GradientStop Color="#94b9ff" Offset="1.0" /></LinearGradientBrush></Rectangle.Fill></Rectangle>-->
+      
           
        
 
diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs
index ee9e968..fe9e482 100644
--- a/Sources/Ohara/MainPage.xaml.cs
+++ b/Sources/Ohara/MainPage.xaml.cs
@@ -5,69 +5,9 @@ namespace Ohara;
 
 public partial class MainPage : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
-
-    public MainPage(IAudioManager audioManager)
+    public MainPage()
 	{
 		InitializeComponent();
 
-        this.audioManager = audioManager;
-    }
-
-
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-
-    }
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
     }
 }
diff --git a/Sources/Ohara/Ohara.csproj b/Sources/Ohara/Ohara.csproj
index 0c6adbd..e494e65 100644
--- a/Sources/Ohara/Ohara.csproj
+++ b/Sources/Ohara/Ohara.csproj
@@ -58,6 +58,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="menuBoutons.xaml.cs">
+	    <DependentUpon>menuBoutons.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="PageInfoBestiaire.xaml.cs">
 	    <DependentUpon>PageInfoBestiaire.xaml</DependentUpon>
 	  </Compile>
@@ -85,6 +88,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="menuBoutons.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="PageInfoBateau.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Sources/Ohara/PageBateau.xaml b/Sources/Ohara/PageBateau.xaml
index f6ab739..9cad27f 100644
--- a/Sources/Ohara/PageBateau.xaml
+++ b/Sources/Ohara/PageBateau.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageBateau"
              Title="PageBateau"
              BackgroundColor="#e2edf1">
@@ -14,24 +15,10 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="300" 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" x:Name="fdd" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Bateaux"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+
+
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
             <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
                 <Grid.RowDefinitions>
diff --git a/Sources/Ohara/PageBateau.xaml.cs b/Sources/Ohara/PageBateau.xaml.cs
index 4bd5761..3e18b6a 100644
--- a/Sources/Ohara/PageBateau.xaml.cs
+++ b/Sources/Ohara/PageBateau.xaml.cs
@@ -6,67 +6,16 @@ namespace Ohara;
 
 public partial class PageBateau : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
 
-    public PageBateau(IAudioManager audioManager)
+    public PageBateau()
 	{
 		InitializeComponent();
         var manager = new Manager();
         
 
         listeBateau.ItemsSource = manager.GetBateaux();
-        this.audioManager = audioManager;
-    }
-
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
+        
     }
 
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageBestiaire.xaml b/Sources/Ohara/PageBestiaire.xaml
index 0507e86..11f5bcd 100644
--- a/Sources/Ohara/PageBestiaire.xaml
+++ b/Sources/Ohara/PageBestiaire.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageBestiaire"
              Title="PageBestiaire"
              BackgroundColor="#e2edf1">
@@ -12,23 +13,9 @@
             <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>
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
 
-            <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" Clicked="Hyperlink_Ile"/>
-            <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>
diff --git a/Sources/Ohara/PageBestiaire.xaml.cs b/Sources/Ohara/PageBestiaire.xaml.cs
index 8eaa2dc..d2686e9 100644
--- a/Sources/Ohara/PageBestiaire.xaml.cs
+++ b/Sources/Ohara/PageBestiaire.xaml.cs
@@ -6,9 +6,8 @@ namespace Ohara;
 
 public partial class PageBestiaire : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
-    public PageBestiaire(IAudioManager audioManager)
+   
+    public PageBestiaire()
     {
         InitializeComponent();
 
@@ -16,52 +15,6 @@ public partial class PageBestiaire : ContentPage
 
 
         listeBest.ItemsSource = manager.GetBestiaires();
-        this.audioManager = audioManager;
-    }
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
     }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageCarte.xaml b/Sources/Ohara/PageCarte.xaml
index 838c35f..3dd5652 100644
--- a/Sources/Ohara/PageCarte.xaml
+++ b/Sources/Ohara/PageCarte.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageCarte"
              BackgroundColor="#e2edf1">
 
@@ -13,24 +14,9 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="*" />
         </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 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" Clicked="Hyperlink_Bateau"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
 
             <Image Source="carte.png" HorizontalOptions="Center" />
diff --git a/Sources/Ohara/PageCarte.xaml.cs b/Sources/Ohara/PageCarte.xaml.cs
index 1388c12..831c754 100644
--- a/Sources/Ohara/PageCarte.xaml.cs
+++ b/Sources/Ohara/PageCarte.xaml.cs
@@ -4,57 +4,10 @@ namespace Ohara;
 
 public partial class PageCarte : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
-    public PageCarte(IAudioManager audioManager)
+
+    public PageCarte()
 	{
 		InitializeComponent();
-        this.audioManager = audioManager;
-    }
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
     }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageEquipage.xaml b/Sources/Ohara/PageEquipage.xaml
index 123eb44..2e2e707 100644
--- a/Sources/Ohara/PageEquipage.xaml
+++ b/Sources/Ohara/PageEquipage.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageEquipage"
              Title="PageEquipage"
              BackgroundColor="#e2edf1">
@@ -12,24 +13,9 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="90*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
 
-            <Image Source="ohara2.png" HeightRequest="300" HorizontalOptions="Center" >
-                <Image.Clip>
-                    <EllipseGeometry Center="150,90"  RadiusX="80"  RadiusY="80"/>
-                </Image.Clip>
-            </Image>
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
 
-
-            <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" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Équipages"/>
-        </VerticalStackLayout>
         <ScrollView Grid.Row="0" Grid.Column="1" >
             <VerticalStackLayout Spacing="10">
                 <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
diff --git a/Sources/Ohara/PageEquipage.xaml.cs b/Sources/Ohara/PageEquipage.xaml.cs
index 256a7a2..f7bec51 100644
--- a/Sources/Ohara/PageEquipage.xaml.cs
+++ b/Sources/Ohara/PageEquipage.xaml.cs
@@ -5,70 +5,17 @@ using Plugin.Maui.Audio;
 
 public partial class PageEquipage : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
-    public PageEquipage(IAudioManager audioManager)
+
+    public PageEquipage()
 	{
 		InitializeComponent();
         var manager = new Manager();
         listeEquip.ItemsSource = manager.GetEquipages();
-        this.audioManager = audioManager;
-    }
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
     }
 
     private void listeEquip_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
     {
 
     }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index 9835db0..db888ea 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageFDD"
              Title="PageFDD"
              BackgroundColor="#e2edf1">
@@ -15,25 +16,10 @@
             <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>
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
 
-
-                <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 buttonMenu2}" Text="Fruits du démon"/>
-                <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
-                <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
-                <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">
+        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">
             
             <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
                 <Grid.RowDefinitions>
diff --git a/Sources/Ohara/PageFDD.xaml.cs b/Sources/Ohara/PageFDD.xaml.cs
index 8872080..504c662 100644
--- a/Sources/Ohara/PageFDD.xaml.cs
+++ b/Sources/Ohara/PageFDD.xaml.cs
@@ -8,14 +8,11 @@ using System.Windows.Input;
 
 public partial class PageFDD : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
     public ICommand FiltrerType { get; private set; }
-	public PageFDD(IAudioManager audioManager)
+	public PageFDD()
 	{
        
         InitializeComponent();
-        this.audioManager = audioManager;
         var manager = new Manager();
        
 
@@ -41,50 +38,7 @@ public partial class PageFDD : ContentPage
 
     }
 
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
 
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
 
     private void MenuFlyoutItem_Clicked(object sender, EventArgs e)
     {
diff --git a/Sources/Ohara/PageIle.xaml b/Sources/Ohara/PageIle.xaml
index c72a516..b522357 100644
--- a/Sources/Ohara/PageIle.xaml
+++ b/Sources/Ohara/PageIle.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageIle"
              Title="PageIle"
              BackgroundColor="#e2edf1">
@@ -14,24 +15,9 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="300" 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 buttonMenu2}" Text="Îles"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
         <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
             <Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >
                 <Grid.RowDefinitions>
diff --git a/Sources/Ohara/PageIle.xaml.cs b/Sources/Ohara/PageIle.xaml.cs
index 6b07284..95d7cf0 100644
--- a/Sources/Ohara/PageIle.xaml.cs
+++ b/Sources/Ohara/PageIle.xaml.cs
@@ -6,65 +6,18 @@ namespace Ohara;
 
 public partial class PageIle : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
-    public PageIle(IAudioManager audioManager)
+    public PageIle()
 	{
 		InitializeComponent();
         var manager = new Manager();
 
 
         listeIle.ItemsSource = manager.GetIles();
-        this.audioManager = audioManager;
     }
 
     private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
     {
 
     }
-
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
     
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoBateau.xaml b/Sources/Ohara/PageInfoBateau.xaml
index a7e0bfe..4101297 100644
--- a/Sources/Ohara/PageInfoBateau.xaml
+++ b/Sources/Ohara/PageInfoBateau.xaml
@@ -1,122 +1,108 @@
-<?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.PageInfoBateau"
-             Title="PageInfoBateau"
-             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="300" 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 buttonMenu2}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
-        <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
-            <VerticalStackLayout  Spacing="40">
-                <CollectionView x:Name="listeBateau">
-                    <CollectionView.ItemTemplate>
-                        <DataTemplate>
-
-                            <VerticalStackLayout Spacing="10" Padding="40">
-
-                                <Grid ColumnSpacing="20">
-
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="40*"/>
-                                        <ColumnDefinition Width="40*"/>
-                                    </Grid.ColumnDefinitions>
-                                    <VerticalStackLayout Grid.Column="0" Spacing="4">
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <Label Text="Sommaire" Style="{StaticResource titreInfo}"/>
-                                        </Frame>
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <Label Text="1 - Description" TextColor="#72a3b3"/>
-                                        </Frame>
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <Label Text="2 - Caracteristiques" TextColor="#72a3b3"/>
-                                        </Frame>
-
-                                    </VerticalStackLayout>
-                                    <VerticalStackLayout Grid.Column="1" Spacing="4">
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <Label Style="{StaticResource titreInfo}" Text="{Binding Nom}"/>
-                                        </Frame>
-                                        <Frame Style="{StaticResource frameInfo}" >
-                                            <Image
-                                        Source="{Binding Image}"
-                                        HeightRequest="200"
-                                        WidthRequest="300" 
-                                         
-                                    
-                                        />
-                                        </Frame>
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
-                                                <Label Text="Nom Romanisé :" TextColor="#72a3b3" FontAttributes="Bold"/>
-                                                <Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/>
-                                            </StackLayout>
-                                        </Frame>
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
-                                                <Label Text="Affiliation(s) :" TextColor="#72a3b3" FontAttributes="Bold"/>
-                                                <Label Text="{Binding Affiliation}" TextColor="#72a3b3"/>
-                                            </StackLayout>
-                                        </Frame>
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
-                                                <Label Text="Première apparition manga :" TextColor="#72a3b3" FontAttributes="Bold"/>
-                                                <Label Text="{Binding PremierChap}" TextColor="#72a3b3"/>
-                                            </StackLayout>
-                                        </Frame>
-                                        <Frame Style="{StaticResource frameInfo}">
-                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
-                                                <Label Text="Première apparition anime :" TextColor="#72a3b3" FontAttributes="Bold"/>
-                                                <Label Text="{Binding PremierEp}" TextColor="#72a3b3"/>
-                                            </StackLayout>
-                                        </Frame>
-                                    </VerticalStackLayout>
-
-
-
-                                </Grid>
-                                <Label Text="Description :"  TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
-                                <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" />
-                                <Label Text="{Binding Description}" TextColor="#72a3b3" />
-                                <Label Text="Caracteristiques :"  TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
-                                <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" />
-                                <Label Text="{Binding Caracteristique}" TextColor="#72a3b3" />
-
-                            </VerticalStackLayout>
-
-
-
-
-                        </DataTemplate>
-                    </CollectionView.ItemTemplate>
-                </CollectionView>
-
-
-            </VerticalStackLayout>
-        </ScrollView>
-    </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"
+             xmlns:local="clr-namespace:Ohara"
+             x:Class="Ohara.PageInfoBateau"
+             Title="PageInfoBateau"
+             BackgroundColor="#e2edf1">
+    <Grid>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="300" />
+            <ColumnDefinition Width="90*" />
+        </Grid.ColumnDefinitions>
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
+        <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
+            <VerticalStackLayout  Spacing="40">
+                <CollectionView x:Name="listeBateau">
+                    <CollectionView.ItemTemplate>
+                        <DataTemplate>
+
+                            <VerticalStackLayout Spacing="10" Padding="40">
+
+                                <Grid ColumnSpacing="20">
+
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="40*"/>
+                                        <ColumnDefinition Width="40*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <VerticalStackLayout Grid.Column="0" Spacing="4">
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <Label Text="Sommaire" Style="{StaticResource titreInfo}"/>
+                                        </Frame>
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <Label Text="1 - Description" TextColor="#72a3b3"/>
+                                        </Frame>
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <Label Text="2 - Caracteristiques" TextColor="#72a3b3"/>
+                                        </Frame>
+
+                                    </VerticalStackLayout>
+                                    <VerticalStackLayout Grid.Column="1" Spacing="4">
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <Label Style="{StaticResource titreInfo}" Text="{Binding Nom}"/>
+                                        </Frame>
+                                        <Frame Style="{StaticResource frameInfo}" >
+                                            <Image
+                                        Source="{Binding Image}"
+                                        HeightRequest="200"
+                                        WidthRequest="300" 
+                                         
+                                    
+                                        />
+                                        </Frame>
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
+                                                <Label Text="Nom Romanisé :" TextColor="#72a3b3" FontAttributes="Bold"/>
+                                                <Label Text="{Binding NomRomanise}" TextColor="#72a3b3"/>
+                                            </StackLayout>
+                                        </Frame>
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
+                                                <Label Text="Affiliation(s) :" TextColor="#72a3b3" FontAttributes="Bold"/>
+                                                <Label Text="{Binding Affiliation}" TextColor="#72a3b3"/>
+                                            </StackLayout>
+                                        </Frame>
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
+                                                <Label Text="Première apparition manga :" TextColor="#72a3b3" FontAttributes="Bold"/>
+                                                <Label Text="{Binding PremierChap}" TextColor="#72a3b3"/>
+                                            </StackLayout>
+                                        </Frame>
+                                        <Frame Style="{StaticResource frameInfo}">
+                                            <StackLayout HorizontalOptions="Center" Orientation="Horizontal" Spacing="5">
+                                                <Label Text="Première apparition anime :" TextColor="#72a3b3" FontAttributes="Bold"/>
+                                                <Label Text="{Binding PremierEp}" TextColor="#72a3b3"/>
+                                            </StackLayout>
+                                        </Frame>
+                                    </VerticalStackLayout>
+
+
+
+                                </Grid>
+                                <Label Text="Description :"  TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
+                                <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" />
+                                <Label Text="{Binding Description}" TextColor="#72a3b3" />
+                                <Label Text="Caracteristiques :"  TextColor="#72a3b3" FontSize="20" FontAttributes="Bold"/>
+                                <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" />
+                                <Label Text="{Binding Caracteristique}" TextColor="#72a3b3" />
+
+                            </VerticalStackLayout>
+
+
+
+
+                        </DataTemplate>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
+
+
+            </VerticalStackLayout>
+        </ScrollView>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoBateau.xaml.cs b/Sources/Ohara/PageInfoBateau.xaml.cs
index 70e5122..d9683bb 100644
--- a/Sources/Ohara/PageInfoBateau.xaml.cs
+++ b/Sources/Ohara/PageInfoBateau.xaml.cs
@@ -14,40 +14,4 @@ public partial class PageInfoBateau : ContentPage
     }
 
 
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoBestiaire.xaml b/Sources/Ohara/PageInfoBestiaire.xaml
index 01d4f15..dd5f865 100644
--- a/Sources/Ohara/PageInfoBestiaire.xaml
+++ b/Sources/Ohara/PageInfoBestiaire.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageInfoBestiaire"
              Title="PageInfoBestiaire"
              BackgroundColor="#e2edf1">
@@ -13,24 +14,9 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="90*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="300" 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" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
         <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
             <VerticalStackLayout  Spacing="40">
                 <CollectionView x:Name="listeBest">
diff --git a/Sources/Ohara/PageInfoBestiaire.xaml.cs b/Sources/Ohara/PageInfoBestiaire.xaml.cs
index 0d686d0..c5b315e 100644
--- a/Sources/Ohara/PageInfoBestiaire.xaml.cs
+++ b/Sources/Ohara/PageInfoBestiaire.xaml.cs
@@ -14,40 +14,5 @@ public partial class PageInfoBestiaire : ContentPage
          listeBest.ItemsSource = manager.GetBestiaires();
     }
 
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-    }
 
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-    }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoEquipage.xaml b/Sources/Ohara/PageInfoEquipage.xaml
index 4efbd7a..32fddbb 100644
--- a/Sources/Ohara/PageInfoEquipage.xaml
+++ b/Sources/Ohara/PageInfoEquipage.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageInfoEquipage"
              Title="PageInfoEquipage"
              BackgroundColor="#e2edf1">
@@ -13,24 +14,9 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="90*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="300" 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" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu2}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
         <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
             <VerticalStackLayout  Spacing="40">
                 <CollectionView x:Name="listeEquip">
diff --git a/Sources/Ohara/PageInfoEquipage.xaml.cs b/Sources/Ohara/PageInfoEquipage.xaml.cs
index 520c9c3..0eb388f 100644
--- a/Sources/Ohara/PageInfoEquipage.xaml.cs
+++ b/Sources/Ohara/PageInfoEquipage.xaml.cs
@@ -15,40 +15,5 @@ public partial class PageInfoEquipage : ContentPage
 
        listeEquip.ItemsSource = manager.GetEquipages();
     }
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-    }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoFdd.xaml b/Sources/Ohara/PageInfoFdd.xaml
index c1cd691..b8e9091 100644
--- a/Sources/Ohara/PageInfoFdd.xaml
+++ b/Sources/Ohara/PageInfoFdd.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageInfoFdd"
              Title="PageInfoFdd"
              BackgroundColor="#e2edf1">
@@ -13,24 +14,9 @@
             <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 buttonMenu2}" Text="Fruits du démon" Clicked="Hyperlink_FDD"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
         <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
             <VerticalStackLayout Spacing="40">
 
diff --git a/Sources/Ohara/PageInfoFdd.xaml.cs b/Sources/Ohara/PageInfoFdd.xaml.cs
index f16cbbd..bf5a50b 100644
--- a/Sources/Ohara/PageInfoFdd.xaml.cs
+++ b/Sources/Ohara/PageInfoFdd.xaml.cs
@@ -12,40 +12,5 @@ public partial class PageInfoFdd : ContentPage
         listObj.ItemsSource = manager.GetFruits();
     }
 
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-    }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoIle.xaml b/Sources/Ohara/PageInfoIle.xaml
index 37d38d2..11a120b 100644
--- a/Sources/Ohara/PageInfoIle.xaml
+++ b/Sources/Ohara/PageInfoIle.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageInfoIle"
              Title="PageInfoIle"
              BackgroundColor="#e2edf1">
@@ -13,24 +14,9 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="90*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="300" 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 buttonMenu2}" Text="Îles" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
         <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
             <VerticalStackLayout  Spacing="40">
                 <CollectionView x:Name="listeIle">
diff --git a/Sources/Ohara/PageInfoIle.xaml.cs b/Sources/Ohara/PageInfoIle.xaml.cs
index 1f2be14..ed63224 100644
--- a/Sources/Ohara/PageInfoIle.xaml.cs
+++ b/Sources/Ohara/PageInfoIle.xaml.cs
@@ -14,40 +14,5 @@ public partial class PageInfoIle : ContentPage
         listeIle.ItemsSource = manager.GetIles();
     }
 
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-    }
+   
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PageInfoPersonnage.xaml b/Sources/Ohara/PageInfoPersonnage.xaml
index 3452953..aa8e516 100644
--- a/Sources/Ohara/PageInfoPersonnage.xaml
+++ b/Sources/Ohara/PageInfoPersonnage.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PageInfoPersonnage"
              Title="PageInfoPersonnage"
              BackgroundColor="#e2edf1">
@@ -13,24 +14,9 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="90*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="300" 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 buttonMenu2}" Text="Bateaux" Clicked="Hyperlink_Bateau"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
+        
         <ScrollView  Grid.Row="0" Grid.Column="1" Orientation="Vertical" VerticalScrollBarVisibility="Always">
             <VerticalStackLayout  Spacing="40">
                 <CollectionView x:Name="listePerso">
diff --git a/Sources/Ohara/PageInfoPersonnage.xaml.cs b/Sources/Ohara/PageInfoPersonnage.xaml.cs
index 0dd9e25..2ad0ca5 100644
--- a/Sources/Ohara/PageInfoPersonnage.xaml.cs
+++ b/Sources/Ohara/PageInfoPersonnage.xaml.cs
@@ -14,40 +14,5 @@ public partial class PageInfoPersonnage : ContentPage
 
         listePerso.ItemsSource = manager.GetPersonnages();
     }
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-    }
-
-    private async void Hyperlink_Perso(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new PagePersonnage(new Plugin.Maui.Audio.AudioManager()));
-    }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/PagePersonnage.xaml b/Sources/Ohara/PagePersonnage.xaml
index 4c26a7a..3944423 100644
--- a/Sources/Ohara/PagePersonnage.xaml
+++ b/Sources/Ohara/PagePersonnage.xaml
@@ -1,6 +1,7 @@
 <?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"
+             xmlns:local="clr-namespace:Ohara"
              x:Class="Ohara.PagePersonnage"
              BackgroundColor="#e2edf1">
 
@@ -13,24 +14,8 @@
             <ColumnDefinition Width="300" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <VerticalStackLayout BackgroundColor="#72a3b3" Grid.Row="0" Grid.Column="0" Spacing="10">
-
-            <Image Source="ohara2.png" HeightRequest="300" 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 buttonMenu2}" Text="Personnages"/>
-            <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" Clicked="Hyperlink_Ile"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
-            <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
-        </VerticalStackLayout>
+        
+        <local:menuBoutons WidthRequest="300" Grid.Column="0"/>
 
 
 
diff --git a/Sources/Ohara/PagePersonnage.xaml.cs b/Sources/Ohara/PagePersonnage.xaml.cs
index ed6ca93..5a7d4b3 100644
--- a/Sources/Ohara/PagePersonnage.xaml.cs
+++ b/Sources/Ohara/PagePersonnage.xaml.cs
@@ -6,9 +6,7 @@ using Model.Stub;
 using Plugin.Maui.Audio;
 public partial class PagePersonnage : ContentPage
 {
-    private readonly IAudioManager audioManager;
-    private static string chemin = "Sons/test.wav";
-    public PagePersonnage(IAudioManager audioManager)
+    public PagePersonnage()
     {
 
         InitializeComponent();
@@ -16,52 +14,6 @@ public partial class PagePersonnage : ContentPage
 
 
         listePerso.ItemsSource = manager.GetPersonnages();
-        this.audioManager = audioManager;
-    }
-
-    private async void Hyperlink_Accueil(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new MainPage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_FDD(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageFDD(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Equip(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageEquipage(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Carte(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageCarte(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Bateau(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageBateau(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-
-    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync (new PageBestiaire(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
-    }
-    private async void Hyperlink_Ile(object sender, EventArgs e)
-    {
-        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
-        await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
-        player.Play();
     }
+    
 }
\ No newline at end of file
diff --git a/Sources/Ohara/menuBoutons.xaml b/Sources/Ohara/menuBoutons.xaml
new file mode 100644
index 0000000..37e5caa
--- /dev/null
+++ b/Sources/Ohara/menuBoutons.xaml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Ohara.menuBoutons">
+
+
+    <VerticalStackLayout BackgroundColor="#72a3b3" 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 buttonMenu2}" 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" Clicked="Hyperlink_Ile"/>
+        <Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
+        <Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
+    </VerticalStackLayout>
+    
+</ContentView>
diff --git a/Sources/Ohara/menuBoutons.xaml.cs b/Sources/Ohara/menuBoutons.xaml.cs
new file mode 100644
index 0000000..02300f6
--- /dev/null
+++ b/Sources/Ohara/menuBoutons.xaml.cs
@@ -0,0 +1,78 @@
+using Microsoft.Maui.Platform;
+using Plugin.Maui.Audio;
+
+namespace Ohara;
+
+
+
+public partial class menuBoutons : ContentView
+{
+    private readonly IAudioManager audioManager;
+    private static string chemin = "Sons/test.wav";
+
+    public menuBoutons() : this(new AudioManager()) { 
+    
+    }
+
+    public menuBoutons(IAudioManager audioManager)
+	{
+		InitializeComponent();
+
+        this.audioManager = audioManager;
+    }
+
+    private async void Hyperlink_Accueil(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new MainPage());
+        player.Play();
+    }
+
+    private async void Hyperlink_FDD(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new PageFDD());
+        player.Play();
+
+    }
+
+    private async void Hyperlink_Equip(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new PageEquipage());
+        player.Play();
+
+    }
+    private async void Hyperlink_Perso(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new PagePersonnage());
+        player.Play();
+    }
+    private async void Hyperlink_Carte(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new PageCarte());
+        player.Play();
+
+    }
+    private async void Hyperlink_Bateau(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new PageBateau());
+        player.Play();
+    }
+
+    private async void Hyperlink_Bestiaire(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new PageBestiaire());
+        player.Play();
+    }
+    private async void Hyperlink_Ile(object sender, EventArgs e)
+    {
+        var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
+        await Navigation.PushAsync(new PageIle());
+        player.Play();
+    }
+}
\ No newline at end of file