From f05a0f997d039931f6d2b9ae2ea1ea41802370b8 Mon Sep 17 00:00:00 2001
From: "nicolas.barbosa" <celeste.barbosa@etu.uca.fr>
Date: Fri, 31 May 2024 23:08:04 +0200
Subject: [PATCH] =?UTF-8?q?Ne=20fonctionne=20pas=20j'arrete=20pour=20ce=20?=
 =?UTF-8?q?soir=20-=20Am=C3=A9lioration=20design?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/ConsoleApp1/ConsoleApp1.csproj        |  10 +
 Sources/ConsoleApp1/Program.cs                |  25 ++
 Sources/CoreLibrary/Partie.cs                 |   3 +-
 .../Persistance/PersistanceJSON.cs            |  23 +-
 Sources/CoreLibrary/Regles/IRegles.cs         |   2 +
 .../CoreLibrary/Regles/ReglesClassiques.cs    |   2 +-
 Sources/MauiSpark/App.xaml.cs                 |   6 +-
 Sources/MauiSpark/MauiSpark.csproj            |  30 ++-
 Sources/MauiSpark/Pages/Accueil.xaml          |  45 ----
 Sources/MauiSpark/Pages/Accueil.xaml.cs       |  27 --
 Sources/MauiSpark/Pages/AccueilPage.xaml      |  30 +++
 Sources/MauiSpark/Pages/AccueilPage.xaml.cs   |  17 ++
 Sources/MauiSpark/Pages/ConnexionPage.xaml    |  14 +-
 Sources/MauiSpark/Pages/Mode.xaml             |  10 -
 Sources/MauiSpark/Pages/ModePage.xaml         |  20 ++
 .../Pages/{Mode.xaml.cs => ModePage.xaml.cs}  |  58 +++--
 .../Pages/{Plateau.xaml => PlateauPage.xaml}  |  81 ++----
 .../{Plateau.xaml.cs => PlateauPage.xaml.cs}  | 232 +++++++++---------
 Sources/MauiSpark/Pages/Victoire.xaml.cs      |   2 +-
 .../MauiSpark/Resources/Styles/Colors.xaml    |  29 +--
 .../MauiSpark/Resources/Styles/Styles.xaml    |  68 ++---
 .../MauiSpark/Vues/BoutonClassementVue.xaml   |  10 +
 .../Vues/BoutonClassementVue.xaml.cs          |  16 ++
 Sources/MauiSpark/Vues/BoutonReglesVue.xaml   |  10 +
 .../MauiSpark/Vues/BoutonReglesVue.xaml.cs    |  16 ++
 Sources/MauiSpark/Vues/JetonVue.xaml          |  16 ++
 Sources/MauiSpark/Vues/JetonVue.xaml.cs       |  47 ++++
 Sources/MauiSpark/Vues/TitreVue.xaml          |  13 +
 Sources/MauiSpark/Vues/TitreVue.xaml.cs       |  18 ++
 Sources/mastermind.sln                        |   6 +
 30 files changed, 500 insertions(+), 386 deletions(-)
 create mode 100644 Sources/ConsoleApp1/ConsoleApp1.csproj
 create mode 100644 Sources/ConsoleApp1/Program.cs
 delete mode 100644 Sources/MauiSpark/Pages/Accueil.xaml
 delete mode 100644 Sources/MauiSpark/Pages/Accueil.xaml.cs
 create mode 100644 Sources/MauiSpark/Pages/AccueilPage.xaml
 create mode 100644 Sources/MauiSpark/Pages/AccueilPage.xaml.cs
 delete mode 100644 Sources/MauiSpark/Pages/Mode.xaml
 create mode 100644 Sources/MauiSpark/Pages/ModePage.xaml
 rename Sources/MauiSpark/Pages/{Mode.xaml.cs => ModePage.xaml.cs} (53%)
 rename Sources/MauiSpark/Pages/{Plateau.xaml => PlateauPage.xaml} (54%)
 rename Sources/MauiSpark/Pages/{Plateau.xaml.cs => PlateauPage.xaml.cs} (93%)
 create mode 100644 Sources/MauiSpark/Vues/BoutonClassementVue.xaml
 create mode 100644 Sources/MauiSpark/Vues/BoutonClassementVue.xaml.cs
 create mode 100644 Sources/MauiSpark/Vues/BoutonReglesVue.xaml
 create mode 100644 Sources/MauiSpark/Vues/BoutonReglesVue.xaml.cs
 create mode 100644 Sources/MauiSpark/Vues/JetonVue.xaml
 create mode 100644 Sources/MauiSpark/Vues/JetonVue.xaml.cs
 create mode 100644 Sources/MauiSpark/Vues/TitreVue.xaml
 create mode 100644 Sources/MauiSpark/Vues/TitreVue.xaml.cs

diff --git a/Sources/ConsoleApp1/ConsoleApp1.csproj b/Sources/ConsoleApp1/ConsoleApp1.csproj
new file mode 100644
index 0000000..2150e37
--- /dev/null
+++ b/Sources/ConsoleApp1/ConsoleApp1.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/Sources/ConsoleApp1/Program.cs b/Sources/ConsoleApp1/Program.cs
new file mode 100644
index 0000000..460e52d
--- /dev/null
+++ b/Sources/ConsoleApp1/Program.cs
@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+
+class Program
+{
+    static void Main()
+    {
+        // Récupérer le chemin du dossier AppData de l'utilisateur
+        string appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+
+        // Définir le chemin du dossier "mastermind" dans AppData
+        string mastermindPath = Path.Combine(appDataPath, "Mastermind");
+
+        // Vérifier si le dossier existe, et s'il n'existe pas, le créer
+        if (!Directory.Exists(mastermindPath))
+        {
+            Directory.CreateDirectory(mastermindPath);
+            Console.WriteLine("Le dossier 'mastermind' a été créé dans AppData.");
+        }
+        else
+        {
+            Console.WriteLine("Le dossier 'mastermind' existe déjà dans AppData.");
+        }
+    }
+}
diff --git a/Sources/CoreLibrary/Partie.cs b/Sources/CoreLibrary/Partie.cs
index 5e648b1..5cc4a2a 100644
--- a/Sources/CoreLibrary/Partie.cs
+++ b/Sources/CoreLibrary/Partie.cs
@@ -11,9 +11,10 @@ namespace CoreLibrary
     /// Représente une partie de jeu.
     /// </summary>
     [DataContract]
+    [KnownType(typeof(ReglesClassiques))]
     public class Partie : IEstPersistant
     {
-        
+        [DataMember]
         public IRegles Regles { get; private set; }
 
         [DataMember]
diff --git a/Sources/CoreLibrary/Persistance/PersistanceJSON.cs b/Sources/CoreLibrary/Persistance/PersistanceJSON.cs
index 7d8ea93..f41a8c3 100644
--- a/Sources/CoreLibrary/Persistance/PersistanceJSON.cs
+++ b/Sources/CoreLibrary/Persistance/PersistanceJSON.cs
@@ -9,18 +9,14 @@ namespace CoreLibrary.Persistance
 
         public T[] Charger<T>() where T : IEstPersistant
         {
-            string dossierAvant = Directory.GetCurrentDirectory();
+            string fichier = $"{typeof(T).Name.ToLower()}s.json";
 
-            string dossier = Path.Combine(dossierAvant, "../../../..");
-            string fichier = $"{typeof(T).Name}.json";
+            Directory.SetCurrentDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "../../../../../../.."));
 
-
-            bool c = Directory.Exists(dossier);
-
-            if (!c) 
+            if (!Directory.Exists("Fichiers"))
                 return [];
 
-            Directory.SetCurrentDirectory(dossier);
+            Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), "Fichiers"));
 
             if (!File.Exists(fichier))
                 return [];
@@ -38,13 +34,14 @@ namespace CoreLibrary.Persistance
 
         public void Enregistrer<T>(T[] elements) where T : IEstPersistant
         {
-            string dossier = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Mastermind");
-            string fichier = $"{typeof(T).Name}.json";
+            string fichier = $"{typeof(T).Name.ToLower()}s.json";
+
+            Directory.SetCurrentDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "../../../../../../.."));
 
-            if (!Directory.Exists(dossier))
-                Directory.CreateDirectory(dossier);
+            if (!Directory.Exists("Fichiers"))
+                Directory.CreateDirectory("Fichiers");
 
-            Directory.SetCurrentDirectory(dossier);
+            Directory.SetCurrentDirectory(Path.Combine(Directory.GetCurrentDirectory(), "Fichiers"));
 
             DataContractJsonSerializer jsonSerializer = new DataContractJsonSerializer(typeof(T[]));
 
diff --git a/Sources/CoreLibrary/Regles/IRegles.cs b/Sources/CoreLibrary/Regles/IRegles.cs
index 54776bf..aea134c 100644
--- a/Sources/CoreLibrary/Regles/IRegles.cs
+++ b/Sources/CoreLibrary/Regles/IRegles.cs
@@ -1,4 +1,6 @@
 
+using System.Runtime.Serialization;
+
 namespace CoreLibrary.Regles
 {
     /// <summary>
diff --git a/Sources/CoreLibrary/Regles/ReglesClassiques.cs b/Sources/CoreLibrary/Regles/ReglesClassiques.cs
index 8da48f6..ca65851 100644
--- a/Sources/CoreLibrary/Regles/ReglesClassiques.cs
+++ b/Sources/CoreLibrary/Regles/ReglesClassiques.cs
@@ -18,7 +18,7 @@ namespace CoreLibrary.Regles
         /// Le nombre maximum de tour.
         /// </summary>
         [DataMember]
-        public int TourMaximum { get => 2; }
+        public int TourMaximum { get => 12; }
 
         /// <summary>
         /// La taille maximale d'un code.
diff --git a/Sources/MauiSpark/App.xaml.cs b/Sources/MauiSpark/App.xaml.cs
index f0e41c0..d4ef4dc 100644
--- a/Sources/MauiSpark/App.xaml.cs
+++ b/Sources/MauiSpark/App.xaml.cs
@@ -1,6 +1,4 @@
-using CoreLibrary.Manager;
-using CoreLibrary.Persistance;
-using MauiSpark.Pages;
+using MauiSpark.Pages;
 
 namespace MauiSpark
 {
@@ -10,7 +8,7 @@ namespace MauiSpark
         {
             InitializeComponent();
 
-            MainPage = new NavigationPage(new Accueil());
+            MainPage = new NavigationPage(new AccueilPage());
             MainPage.Title = "Mastermind";
         }
     }
diff --git a/Sources/MauiSpark/MauiSpark.csproj b/Sources/MauiSpark/MauiSpark.csproj
index 62af975..2047be7 100644
--- a/Sources/MauiSpark/MauiSpark.csproj
+++ b/Sources/MauiSpark/MauiSpark.csproj
@@ -67,7 +67,19 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="Pages\Accueil.xaml">
+	  <Compile Update="Pages\AccueilPage.xaml.cs">
+	    <DependentUpon>AccueilPage.xaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="Pages\ModePage.xaml.cs">
+	    <DependentUpon>ModePage.xaml</DependentUpon>
+	  </Compile>
+	  <Compile Update="Pages\PlateauPage.xaml.cs">
+	    <DependentUpon>PlateauPage.xaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiXaml Update="Pages\AccueilPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Pages\ConnexionPage.xaml">
@@ -76,10 +88,10 @@
 	  <MauiXaml Update="Pages\Egaliter.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\Mode.xaml">
+	  <MauiXaml Update="Pages\ModePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\Plateau.xaml">
+	  <MauiXaml Update="Pages\PlateauPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Pages\Regle.xaml">
@@ -94,6 +106,18 @@
 	  <MauiXaml Update="Views\CTableauScore.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Vues\BoutonClassementVue.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Vues\BoutonReglesVue.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Vues\JetonVue.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Vues\TitreVue.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 </Project>
diff --git a/Sources/MauiSpark/Pages/Accueil.xaml b/Sources/MauiSpark/Pages/Accueil.xaml
deleted file mode 100644
index e8b196a..0000000
--- a/Sources/MauiSpark/Pages/Accueil.xaml
+++ /dev/null
@@ -1,45 +0,0 @@
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiSpark.Pages.Accueil"
-             
-             Title="Accueil">
-
-    <Grid
-        ColumnDefinitions="*"
-        RowDefinitions="auto, *, *">
-        
-        
-        <Grid
-            ColumnDefinitions="*,*"
-            RowDefinitions="auto">
-
-            <ImageButton
-                Style="{StaticResource AccueilBouton}"
-                Source="pointinterrogation.png"
-                HorizontalOptions="Start"
-                Clicked="QuandReglesClique"
-                />
-
-            <ImageButton
-                Grid.Column="1"
-                Style="{StaticResource AccueilBouton}"
-                Source="statistiques.png"
-                HorizontalOptions="End"
-                Clicked="QuandTableauClique"
-                />
-
-        </Grid>
-
-        <Label
-            Grid.Row="1"
-            Text="MASTERMIND"
-            FontSize="Header"
-            HorizontalTextAlignment="Center"/>
-
-        <Button 
-            Grid.Row="2"
-            Text="Jouer"
-            Clicked="QuandJouerClique"/>
-
-    </Grid>
-</ContentPage>
diff --git a/Sources/MauiSpark/Pages/Accueil.xaml.cs b/Sources/MauiSpark/Pages/Accueil.xaml.cs
deleted file mode 100644
index 720717a..0000000
--- a/Sources/MauiSpark/Pages/Accueil.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace MauiSpark.Pages;
-
-public partial class Accueil : ContentPage
-{
-	public Accueil()
-	{
-		NavigationPage.SetHasBackButton(this, false);
-        NavigationPage.SetHasNavigationBar(this, false);
-
-        InitializeComponent();
-	}
-
-	private void QuandJouerClique(Object? sender, EventArgs e)
-	{
-		Navigation.PushAsync(new Mode());
-	}
-
-	private void QuandReglesClique (Object? sender, EventArgs e)
-	{
-		Navigation.PushAsync(new Regle());
-	}
-	
-	private void QuandTableauClique(Object? sender, EventArgs e)
-	{
-		Navigation.PushAsync(new TableauScore());
-	}
-}
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/AccueilPage.xaml b/Sources/MauiSpark/Pages/AccueilPage.xaml
new file mode 100644
index 0000000..186c3cd
--- /dev/null
+++ b/Sources/MauiSpark/Pages/AccueilPage.xaml
@@ -0,0 +1,30 @@
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="MauiSpark.Pages.AccueilPage"
+             xmlns:vues="clr-namespace:MauiSpark.Vues"
+             Title="Accueil">
+
+    <Grid
+        ColumnDefinitions="*"
+        RowDefinitions="*, *">
+
+
+        <Grid
+            ColumnDefinitions="*, *, *"
+            RowDefinitions="*">
+
+            <vues:BoutonReglesVue HorizontalOptions="Start"/>
+
+            <vues:TitreVue Texte="mastermind" Grid.Column="1"/>
+
+            <vues:BoutonClassementVue Grid.Column="2" HorizontalOptions="End"/>
+        </Grid>
+
+        <Button 
+            Grid.Row="2"
+            Text="Jouer"
+            VerticalOptions="Center"
+            Margin="0, 50"
+            Clicked="QuandJouerClique"/>
+    </Grid>
+</ContentPage>
diff --git a/Sources/MauiSpark/Pages/AccueilPage.xaml.cs b/Sources/MauiSpark/Pages/AccueilPage.xaml.cs
new file mode 100644
index 0000000..499f4ef
--- /dev/null
+++ b/Sources/MauiSpark/Pages/AccueilPage.xaml.cs
@@ -0,0 +1,17 @@
+namespace MauiSpark.Pages;
+
+public partial class AccueilPage : ContentPage
+{
+	public AccueilPage()
+	{
+		NavigationPage.SetHasBackButton(this, false);
+        NavigationPage.SetHasNavigationBar(this, false);
+
+        InitializeComponent();
+	}
+
+	private void QuandJouerClique(Object? sender, EventArgs e)
+	{
+		Navigation.PushAsync(new ModePage());
+	}
+}
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/ConnexionPage.xaml b/Sources/MauiSpark/Pages/ConnexionPage.xaml
index c19cbb7..bdcb7b2 100644
--- a/Sources/MauiSpark/Pages/ConnexionPage.xaml
+++ b/Sources/MauiSpark/Pages/ConnexionPage.xaml
@@ -3,17 +3,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:Views="clr-namespace:MauiSpark.Views"
              x:Class="MauiSpark.Pages.ConnexionPage"
+             xmlns:vues="clr-namespace:MauiSpark.Vues"
              Title="Connexion">
+
     <Grid
-        ColumnDefinitions="*" 
-        RowDefinitions="*, auto, *">
+        ColumnDefinitions="*"
+        RowDefinitions="auto, *, *">
 
-        <Label
-            VerticalOptions="Center"
-            Text="JOUEURS"
-            HorizontalOptions="Center"
-            FontSize="Header"
-            Margin="0"/>
+        <vues:TitreVue Texte="joueurs"/>
+        
 
         <VerticalStackLayout
             Grid.Row="1"
diff --git a/Sources/MauiSpark/Pages/Mode.xaml b/Sources/MauiSpark/Pages/Mode.xaml
deleted file mode 100644
index f7ea544..0000000
--- a/Sources/MauiSpark/Pages/Mode.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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="MauiSpark.Pages.Mode"
-             Title="Mode">
-    <Grid ColumnDefinitions="*" RowDefinitions="*, *">
-        <Label Text="Mode de jeu"/>
-        <Button Grid.Row="1" Text="Règles classiques" Clicked="QuandReglesClassiques"/>
-    </Grid>
-</ContentPage>
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/ModePage.xaml b/Sources/MauiSpark/Pages/ModePage.xaml
new file mode 100644
index 0000000..7b0f44f
--- /dev/null
+++ b/Sources/MauiSpark/Pages/ModePage.xaml
@@ -0,0 +1,20 @@
+<?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="MauiSpark.Pages.ModePage"
+             xmlns:vues="clr-namespace:MauiSpark.Vues"
+             Title="ModePage">
+    
+    <Grid
+        ColumnDefinitions="*"
+        RowDefinitions="*, *">
+
+        <vues:TitreVue Texte="mode de jeu"/>
+
+        <Button 
+            x:Name="ReglesClassiques"
+            Grid.Row="1"
+            Text="Règles classiques"
+            Clicked="QuandReglesPresse"/>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Mode.xaml.cs b/Sources/MauiSpark/Pages/ModePage.xaml.cs
similarity index 53%
rename from Sources/MauiSpark/Pages/Mode.xaml.cs
rename to Sources/MauiSpark/Pages/ModePage.xaml.cs
index f54dfea..8d86eb7 100644
--- a/Sources/MauiSpark/Pages/Mode.xaml.cs
+++ b/Sources/MauiSpark/Pages/ModePage.xaml.cs
@@ -1,28 +1,32 @@
-using CoreLibrary;
-using CoreLibrary.Events;
-using CoreLibrary.Regles;
-
-namespace MauiSpark.Pages;
-
-public partial class Mode : ContentPage
-{
-    public Mode()
-	{
-        NavigationPage.SetHasNavigationBar(this, false);
-
-        InitializeComponent();
-	}
-
-	private void QuandReglesClassiques(Object? sender, EventArgs e)
-	{
-		Partie partie = new Partie(new ReglesClassiques());
-
-        partie.DemanderNom += new ConnexionPage().QuandDemanderNom;
-        partie.NouveauTour += new Plateau().QuandNouveauTour;
-        partie.PartieTerminee += new Victoire().QuandPartieTerminee;
-
-        MauiProgram.Manageur.NouvellePartie(partie);
-
-        partie.Jouer();
-    }
+using CoreLibrary;
+using CoreLibrary.Regles;
+
+namespace MauiSpark.Pages;
+
+public partial class ModePage : ContentPage
+{
+    public ModePage()
+	{
+        NavigationPage.SetHasNavigationBar(this, false);
+
+        InitializeComponent();
+	}
+
+	private void QuandReglesPresse(Object sender, EventArgs e)
+	{
+        Partie partie;
+
+        if (sender.Equals(ReglesClassiques))
+            partie = new Partie(new ReglesClassiques());
+        else
+            return;
+
+        partie.DemanderNom += new ConnexionPage().QuandDemanderNom;
+        partie.NouveauTour += new PlateauPage().QuandNouveauTour;
+        partie.PartieTerminee += new Victoire().QuandPartieTerminee;
+
+        MauiProgram.Manageur.NouvellePartie(partie);
+
+        partie.Jouer();
+    }
 }
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Plateau.xaml b/Sources/MauiSpark/Pages/PlateauPage.xaml
similarity index 54%
rename from Sources/MauiSpark/Pages/Plateau.xaml
rename to Sources/MauiSpark/Pages/PlateauPage.xaml
index af956e9..4b5e23d 100644
--- a/Sources/MauiSpark/Pages/Plateau.xaml
+++ b/Sources/MauiSpark/Pages/PlateauPage.xaml
@@ -2,25 +2,19 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:conv="clr-namespace:MauiSpark.Convertisseurs"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiSpark.Pages.Plateau"
-             Title="Plateau">
+             x:Class="MauiSpark.Pages.PlateauPage"
+             xmlns:vues="clr-namespace:MauiSpark.Vues"
+             Title="PlateauPage">
 
     <ContentPage.Resources>
         <conv:CouleurVersCouleurMAUI x:Key="CouleurVersCouleurMAUI"/>
         <conv:IndicateurVersCouleurMAUI x:Key="IndicateurVersCouleurMAUI"/>
         <conv:JetonVersTexte x:Key="JetonVersTexte"/>
     </ContentPage.Resources>
-    <Grid RowDefinitions="*" ColumnDefinitions="*, *,auto">
-        <ImageButton 
-            Grid.Column="2"
-           Style="{StaticResource AccueilBouton}"
-           Source="pointinterrogation.png"
-           HorizontalOptions="End"
-           VerticalOptions="Start"
-           Clicked="QuandReglesClique"/>
+
+    <Grid RowDefinitions="*" ColumnDefinitions="*, *">
         <Grid RowDefinitions="*" ColumnDefinitions="*" Margin="50">
             <Border
-                Stroke="#000000"
                 StrokeThickness="2"
                 StrokeShape="RoundRectangle 10"
                 HorizontalOptions="Center">
@@ -47,7 +41,7 @@
                                     <BindableLayout.ItemTemplate>
                                         <DataTemplate>
                                             <Label 
-                                                    Text="*"
+                                                   Text="*"
                                                    TextColor="{Binding ., Converter={StaticResource IndicateurVersCouleurMAUI}}"
                                                    VerticalOptions="Center" 
                                                    HorizontalOptions="Center" />
@@ -65,15 +59,12 @@
                                         BindableLayout.ItemsSource="{Binding [0]}">
                                     <BindableLayout.ItemTemplate>
                                         <DataTemplate>
-                                            <Label Text="O"
-                                                    TextColor="{Binding Couleur, Converter={StaticResource CouleurVersCouleurMAUI}}"
-                                                    VerticalOptions="Center" 
-                                                    HorizontalOptions="Center" />
+                                            
                                         </DataTemplate>
                                     </BindableLayout.ItemTemplate>
                                 </FlexLayout>
 
-                                <BoxView Grid.Row="1" Grid.ColumnSpan="2" HeightRequest="1" BackgroundColor="#000000" VerticalOptions="End"/>
+                                <BoxView Grid.Row="1" Grid.ColumnSpan="2" HeightRequest="1" VerticalOptions="End"/>
                             </Grid>
                         </DataTemplate>
                     </BindableLayout.ItemTemplate>
@@ -87,8 +78,7 @@
 
             <Border
                 HorizontalOptions="FillAndExpand"
-                Grid.Row="1" 
-                Stroke="#000000"
+                Grid.Row="1"
                 StrokeThickness="2"
                 StrokeShape="RoundRectangle 10">
 
@@ -110,17 +100,10 @@
                         Wrap="Wrap"
                         JustifyContent="SpaceAround"
                         AlignItems="Center"
-                        BindableLayout.ItemsSource="{Binding Code.Jetons}"> 
+                        BindableLayout.ItemsSource="{Binding Code.Jetons}">
                         <BindableLayout.ItemTemplate>
                             <DataTemplate>
-                                <Label 
-                                    FontSize="Medium" 
-                                    HorizontalOptions="Center" 
-                                    VerticalOptions="Center" 
-                                    HorizontalTextAlignment="Center"
-                                    VerticalTextAlignment="Center"
-                                    TextColor="{Binding Couleur, Converter={StaticResource CouleurVersCouleurMAUI}}" 
-                                    Text="{Binding ., Converter={StaticResource JetonVersTexte}}"/>
+                                <vues:JetonVue Couleur="{Binding Couleur, Converter={StaticResource conv:CouleurVersCouleurMAUI}}"/>
                             </DataTemplate>
                         </BindableLayout.ItemTemplate>
                     </FlexLayout>
@@ -131,45 +114,21 @@
                         </Label.GestureRecognizers>
                     </Label>
 
+                    <BoxView Grid.Row="1" Grid.ColumnSpan="6" HeightRequest="1" VerticalOptions="Center"/>
 
-                    <BoxView Grid.Row="1" Grid.ColumnSpan="6" HeightRequest="1" BackgroundColor="#000000" VerticalOptions="Center"/>
-
-                    <Label x:Name="JetonRouge" FontSize="Medium" TextColor="{x:Static conv:CouleurVersCouleurMAUI.Rouge}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Text="O">
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer Tapped="CouleurPresee"/>
-                        </Label.GestureRecognizers>
-                    </Label>
-                    <Label x:Name="JetonVert" FontSize="Medium" TextColor="{x:Static conv:CouleurVersCouleurMAUI.Vert}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Text="O">
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer Tapped="CouleurPresee"/>
-                        </Label.GestureRecognizers>
-                    </Label>
-                    <Label x:Name="JetonBleu" FontSize="Medium" TextColor="{x:Static conv:CouleurVersCouleurMAUI.Bleu}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="4" Grid.Row="2" Grid.ColumnSpan="2" Text="O">
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer Tapped="CouleurPresee"/>
-                        </Label.GestureRecognizers>
-                    </Label>
+                    <vues:JetonVue Couleur="{x:Static conv:CouleurVersCouleurMAUI.Rouge}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2"/>
+                    <vues:JetonVue Couleur="{x:Static conv:CouleurVersCouleurMAUI.Vert}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2"/>
+                    <vues:JetonVue Couleur="{x:Static conv:CouleurVersCouleurMAUI.Bleu}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" Grid.Column="4" Grid.Row="2" Grid.ColumnSpan="2"/>
 
-                    <Label x:Name="JetonJaune" FontSize="Medium" TextColor="{x:Static conv:CouleurVersCouleurMAUI.Jaune}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" Text="O">
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer Tapped="CouleurPresee"/>
-                        </Label.GestureRecognizers>
-                    </Label>
-                    <Label x:Name="JetonNoir" FontSize="Medium" TextColor="{x:Static conv:CouleurVersCouleurMAUI.Noir}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="2" Text="O">
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer Tapped="CouleurPresee"/>
-                        </Label.GestureRecognizers>
-                    </Label>
-                    <Label x:Name="JetonBlanc" FontSize="Medium" TextColor="{x:Static conv:CouleurVersCouleurMAUI.Blanc}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2" Text="O">
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer Tapped="CouleurPresee"/>
-                        </Label.GestureRecognizers>
-                    </Label>
+                    <vues:JetonVue Couleur="{x:Static conv:CouleurVersCouleurMAUI.Jaune}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2"/>
+                    <vues:JetonVue Couleur="{x:Static conv:CouleurVersCouleurMAUI.Noir}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" Grid.Column="2" Grid.Row="3" Grid.ColumnSpan="2"/>
+                    <vues:JetonVue Couleur="{x:Static conv:CouleurVersCouleurMAUI.Blanc}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" Grid.Column="4" Grid.Row="3" Grid.ColumnSpan="2"/>
                 </Grid>
             </Border>
 
             <Label Grid.Row="2" Text="{Binding Numero}" FontSize="Medium" VerticalOptions="Center" HorizontalOptions="Center"/>
         </Grid>
-        </Grid>
 
+        <vues:BoutonReglesVue Grid.Column="1" VerticalOptions="Start" HorizontalOptions="End"/>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Plateau.xaml.cs b/Sources/MauiSpark/Pages/PlateauPage.xaml.cs
similarity index 93%
rename from Sources/MauiSpark/Pages/Plateau.xaml.cs
rename to Sources/MauiSpark/Pages/PlateauPage.xaml.cs
index 4dbbf06..e6fd132 100644
--- a/Sources/MauiSpark/Pages/Plateau.xaml.cs
+++ b/Sources/MauiSpark/Pages/PlateauPage.xaml.cs
@@ -1,117 +1,117 @@
-using CoreLibrary;
-using CoreLibrary.Core;
-using CoreLibrary.Events;
-using CoreLibrary.Exceptions;
-using CoreLibrary.Joueurs;
-using MauiSpark.Convertisseurs;
-using System.Globalization;
-
-namespace MauiSpark.Pages;
-
-internal class Tour
-{
-    public IEnumerable<(IEnumerable<Jeton>, IEnumerable<Indicateur>)> Plateau { get; private init; }
-    public Joueur Joueur { get; private init; }
-    public string Numero { get; private init; }
-    public Code Code { get; private init; }
-
-    public Tour(NouveauTourEventArgs e)
-    {
-        Numero = $"Tour {e.Tour}";
-        Joueur = e.Joueur;
-        Code = e.Code;
-
-        (IEnumerable<Jeton>, IEnumerable<Indicateur>)[] plateau = new (IEnumerable<Jeton>, IEnumerable<Indicateur>)[e.Grille.Count()];
-        for (int i = 0; i < e.Grille.Count(); ++i)
-        {
-            plateau[i] = (e.Grille.ElementAt(i).Where(x => x.HasValue).Select(x => x!.Value), e.Indicateurs.ElementAt(i));
-        }
-        Plateau = plateau;
-    }
-}
-
-
-
-public partial class Plateau : ContentPage
-{
-    private Code? code;
-    private Joueur? joueur;
-
-    public Plateau()
-    {
-        NavigationPage.SetHasNavigationBar(this, false);
-
-        InitializeComponent();
-    }
-
-    public async void QuandNouveauTour(object? sender, NouveauTourEventArgs e)
-    {
-        if (Application.Current == null || Application.Current.MainPage == null)
-            return;
-
-        if (((NavigationPage)Application.Current!.MainPage).CurrentPage != this)
-            await Application.Current.MainPage.Navigation.PushAsync(this);
-
-        IEnumerable<Page> pages = Application.Current.MainPage.Navigation.NavigationStack.Reverse().Skip(1);
-
-        foreach (Page page in pages)
-        {
-            if (page is Accueil)
-                break;
-
-            Application.Current.MainPage.Navigation.RemovePage(page);
-        }
-
-        code = e.Code;
-        joueur = e.Joueur;
-
-        BindingContext = new Tour(e);
-    }
-
-    private void CouleurPresee(Object sender, EventArgs e)
-    {
-        Label label = (Label)sender;
-        Couleur couleur = (Couleur)new CouleurVersCouleurMAUI().ConvertBack(label.TextColor, typeof(Couleur), null, CultureInfo.InvariantCulture);
-
-        try
-        {
-            if(code != null)
-                code.AjouterJeton(new Jeton(couleur));
-        }
-        catch (CodeCompletException)
-        {
-            DisplayAlert("Attention", "La code est plein", "OK");
-        }
-    }
-
-    private void SupprimerDernierJeton(Object sender, EventArgs e)
-    {
-        try
-        {
-            if(code != null)
-                code.SupprimerDernierJeton();
-        }
-        catch(CodeVideException)
-        {
-            DisplayAlert("Attention", "La code est vide", "OK");
-        }
-    }
-
-    private void ValiderCode(Object sender, EventArgs e)
-    {
-        try
-        {
-            if(joueur != null && code != null)
-                joueur.Code(code);
-        }
-        catch (CodeIncompletException)
-        {
-            DisplayAlert("Attention", "La code n'est pas complet", "OK");
-        }
-    }
-
-    private async void QuandReglesClique(object sender, EventArgs e)
-    {
-        await Navigation.PushAsync(new Regle());
-    }
+using CoreLibrary;
+using CoreLibrary.Core;
+using CoreLibrary.Events;
+using CoreLibrary.Exceptions;
+using CoreLibrary.Joueurs;
+using MauiSpark.Convertisseurs;
+using System.Globalization;
+
+namespace MauiSpark.Pages;
+
+internal class Tour
+{
+    public IEnumerable<(IEnumerable<Jeton>, IEnumerable<Indicateur>)> Plateau { get; private init; }
+    public Joueur Joueur { get; private init; }
+    public string Numero { get; private init; }
+    public Code Code { get; private init; }
+
+    public Tour(NouveauTourEventArgs e)
+    {
+        Numero = $"Tour {e.Tour}";
+        Joueur = e.Joueur;
+        Code = e.Code;
+
+        (IEnumerable<Jeton>, IEnumerable<Indicateur>)[] plateau = new (IEnumerable<Jeton>, IEnumerable<Indicateur>)[e.Grille.Count()];
+        for (int i = 0; i < e.Grille.Count(); ++i)
+        {
+            plateau[i] = (e.Grille.ElementAt(i).Where(x => x.HasValue).Select(x => x!.Value), e.Indicateurs.ElementAt(i));
+        }
+        Plateau = plateau;
+    }
+}
+
+
+
+public partial class PlateauPage : ContentPage
+{
+    private Code? code;
+    private Joueur? joueur;
+
+    public PlateauPage()
+    {
+        NavigationPage.SetHasNavigationBar(this, false);
+
+        InitializeComponent();
+    }
+
+    public async void QuandNouveauTour(object? sender, NouveauTourEventArgs e)
+    {
+        if (Application.Current == null || Application.Current.MainPage == null)
+            return;
+
+        if (((NavigationPage)Application.Current!.MainPage).CurrentPage != this)
+            await Application.Current.MainPage.Navigation.PushAsync(this);
+
+        IEnumerable<Page> pages = Application.Current.MainPage.Navigation.NavigationStack.Reverse().Skip(1);
+
+        foreach (Page page in pages)
+        {
+            if (page is AccueilPage)
+                break;
+
+            Application.Current.MainPage.Navigation.RemovePage(page);
+        }
+
+        code = e.Code;
+        joueur = e.Joueur;
+
+        BindingContext = new Tour(e);
+    }
+
+    private void CouleurPresee(Object sender, EventArgs e)
+    {
+        Label label = (Label)sender;
+        Couleur couleur = (Couleur)new CouleurVersCouleurMAUI().ConvertBack(label.TextColor, typeof(Couleur), null, CultureInfo.InvariantCulture);
+
+        try
+        {
+            if(code != null)
+                code.AjouterJeton(new Jeton(couleur));
+        }
+        catch (CodeCompletException)
+        {
+            DisplayAlert("Attention", "La code est plein", "OK");
+        }
+    }
+
+    private void SupprimerDernierJeton(Object sender, EventArgs e)
+    {
+        try
+        {
+            if(code != null)
+                code.SupprimerDernierJeton();
+        }
+        catch(CodeVideException)
+        {
+            DisplayAlert("Attention", "La code est vide", "OK");
+        }
+    }
+
+    private void ValiderCode(Object sender, EventArgs e)
+    {
+        try
+        {
+            if(joueur != null && code != null)
+                joueur.Code(code);
+        }
+        catch (CodeIncompletException)
+        {
+            DisplayAlert("Attention", "La code n'est pas complet", "OK");
+        }
+    }
+
+    private async void QuandReglesClique(object sender, EventArgs e)
+    {
+        await Navigation.PushAsync(new Regle());
+    }
 }
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Victoire.xaml.cs b/Sources/MauiSpark/Pages/Victoire.xaml.cs
index e57a7a9..44bc475 100644
--- a/Sources/MauiSpark/Pages/Victoire.xaml.cs
+++ b/Sources/MauiSpark/Pages/Victoire.xaml.cs
@@ -24,7 +24,7 @@ public partial class Victoire : ContentPage
 
         foreach (Page page in pages)
         {
-            if (page is Accueil)
+            if (page is AccueilPage)
                 break;
 
             Application.Current.MainPage.Navigation.RemovePage(page);
diff --git a/Sources/MauiSpark/Resources/Styles/Colors.xaml b/Sources/MauiSpark/Resources/Styles/Colors.xaml
index 1ce724f..a6d858d 100644
--- a/Sources/MauiSpark/Resources/Styles/Colors.xaml
+++ b/Sources/MauiSpark/Resources/Styles/Colors.xaml
@@ -6,19 +6,17 @@
 
     <!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml -->
 
-    <Color x:Key="Primary">#512BD4</Color>
-    <Color x:Key="PrimaryDark">#ac99ea</Color>
-    <Color x:Key="PrimaryDarkText">#242424</Color>
-    <Color x:Key="Secondary">#DFD8F7</Color>
-    <Color x:Key="SecondaryDarkText">#9880e5</Color>
-    <Color x:Key="Tertiary">#2B0B98</Color>
-
-    <Color x:Key="White">White</Color>
-    <Color x:Key="Black">Black</Color>
-    <Color x:Key="Magenta">#D600AA</Color>
-    <Color x:Key="MidnightBlue">#190649</Color>
-    <Color x:Key="OffBlack">#1f1f1f</Color>
-    
+    <Color x:Key="FondClair">#FFFFFF</Color>
+    <Color x:Key="FondSecondaireClair">#EFF2EF</Color>
+    <Color x:Key="BordureClair">#CCCCCC</Color>
+    <Color x:Key="TexteSombre">#000000</Color>
+
+    <Color x:Key="FondSombre">#212121</Color>
+    <Color x:Key="FondSecondaireSombre">#2F2F2F</Color>
+    <Color x:Key="BordureSombre">#101010</Color>
+    <Color x:Key="TexteClair">#FFFFFF</Color>
+
+
     <Color x:Key="Poussin">#FAEEA1</Color>
     <Color x:Key="Raisin">#2F0E36</Color>
     <Color x:Key="Barbie">#DA0081</Color>
@@ -33,6 +31,8 @@
     <Color x:Key="Violet">#A908DC</Color>
     <Color x:Key="LightPurple">#C875A4</Color>
     <Color x:Key="LightYellow">#F0C67B</Color>
+    <Color x:Key="Black">#000000</Color>
+    <Color x:Key="White">#FFFFFF</Color>
 
     <Color x:Key="Gray100">#E1E1E1</Color>
     <Color x:Key="Gray200">#C8C8C8</Color>
@@ -43,9 +43,6 @@
     <Color x:Key="Gray900">#212121</Color>
     <Color x:Key="Gray950">#141414</Color>
 
-    <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/>
-    <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/>
-    <SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}"/>
     <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}"/>
     <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}"/>
 
diff --git a/Sources/MauiSpark/Resources/Styles/Styles.xaml b/Sources/MauiSpark/Resources/Styles/Styles.xaml
index 785dc1c..e08fe8d 100644
--- a/Sources/MauiSpark/Resources/Styles/Styles.xaml
+++ b/Sources/MauiSpark/Resources/Styles/Styles.xaml
@@ -5,80 +5,42 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <Style TargetType="Page" ApplyToDerivedTypes="True">
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Poussin}, Dark={StaticResource Raisin}}"/>
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource FondClair}, Dark={StaticResource FondSombre}}"/>
     </Style>
 
     <Style TargetType="Label">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Barbie}, Dark={StaticResource Perry}}"/>
-    </Style>
-    
-    <Style TargetType="Label" x:Key="TexteFrame">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Black}}"/>
-        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource TexteSombre}, Dark={StaticResource TexteClair}}"/>
     </Style>
 
-    <Style TargetType="Label" x:Key="TexteTitre">
-        <Setter Property="FontSize" Value="70"/>
-        <Setter Property="HorizontalOptions" Value="Center"/>
-        <Setter Property="Margin" Value="0,10,0,10"/>
-    </Style>
-    
     <Style TargetType="Button">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Violet}}"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightSaumon}, Dark={StaticResource Bordeaux}}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource TexteSombre}, Dark={StaticResource TexteClair}}"/>
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource FondSecondaireClair}, Dark={StaticResource FondSecondaireSombre}}" />
         <Setter Property="FontSize" Value="Large"/>
         <Setter Property="HeightRequest" Value="80"/>
-        <Setter Property="Margin" Value="200, 0"/>
+        <Setter Property="WidthRequest" Value="500"/>
     </Style>
 
     <Style TargetType="Frame">
         <Setter Property="BorderColor" Value="Black"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Peche}, Dark={StaticResource VertFonce}}"/>
-    </Style>
-    <Style TargetType="Entry">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Vin}}"/>
     </Style>
 
-    <Style TargetType="Button" x:Key="AccueilBouton">
-        <Setter Property="HeightRequest" Value="150" />
-        <Setter Property="WidthRequest" Value="150" />
-    </Style>
-    <Style TargetType="Frame" x:Key="FrameTitrePage">
-        <Setter Property="BorderColor" Value="Black"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightYellow}, Dark={StaticResource LightPurple}}"/>
+    <Style TargetType="Entry">
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource TexteSombre}, Dark={StaticResource TexteClair}}"/>
     </Style>
 
     <Style TargetType="ImageButton">
-        <Setter Property="BackgroundColor" Value="Transparent"/>
-        <Setter Property="BorderWidth" Value="0" />
+        <Setter Property="MaximumWidthRequest" Value="150"/>
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource FondClair}, Dark={StaticResource FondSombre}}"/>
+        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource FondClair}, Dark={StaticResource FondSombre}}"/>
     </Style>
 
-
-    <Style TargetType="ImageButton" x:Key="ButtonFermeture">
-        <Setter Property="WidthRequest" Value="50"/>
-        <Setter Property="HeightRequest" Value="50"/>
-        <Setter Property="Source" Value="Fleche_Retour.png"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Margin" Value="5"/>
-        <Setter Property="BorderWidth" Value="0"/>
-        <Setter Property="CornerRadius" Value="8"/>
-        <Setter Property="Padding" Value="14,10"/>
-        <Setter Property="MinimumHeightRequest" Value="20"/>
-        <Setter Property="MinimumWidthRequest" Value="20"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Pomme}, Dark={StaticResource DarkRed}}"/>
+    <Style TargetType="Border">
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource FondSecondaireClair}, Dark={StaticResource FondSecondaireSombre}}"/>
+        <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource BordureClair}, Dark={StaticResource BordureSombre}}"/>
     </Style>
 
-    <Style TargetType="Button" x:Key="ButtonTableau">
-        <Setter Property="BackgroundColor" Value="Transparent"/>
-        <Setter Property="BorderWidth" Value="0"/>
-        <Setter Property="CornerRadius" Value="8"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource Black}}"/>
-        <Setter Property="FontSize" Value="25"/>
-
+    <Style TargetType="BoxView">
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource BordureClair}, Dark={StaticResource BordureSombre}}"/>
     </Style>
-    
 
 </ResourceDictionary>
diff --git a/Sources/MauiSpark/Vues/BoutonClassementVue.xaml b/Sources/MauiSpark/Vues/BoutonClassementVue.xaml
new file mode 100644
index 0000000..da1515f
--- /dev/null
+++ b/Sources/MauiSpark/Vues/BoutonClassementVue.xaml
@@ -0,0 +1,10 @@
+<?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="MauiSpark.Vues.BoutonClassementVue"
+             x:Name="boutonClassementVue">
+
+    <ImageButton
+        Source="statistiques.png"
+        Clicked="QuandClassementClique"/>
+</ContentView>
diff --git a/Sources/MauiSpark/Vues/BoutonClassementVue.xaml.cs b/Sources/MauiSpark/Vues/BoutonClassementVue.xaml.cs
new file mode 100644
index 0000000..506e4d3
--- /dev/null
+++ b/Sources/MauiSpark/Vues/BoutonClassementVue.xaml.cs
@@ -0,0 +1,16 @@
+using MauiSpark.Pages;
+
+namespace MauiSpark.Vues;
+
+public partial class BoutonClassementVue : ContentView
+{
+	public BoutonClassementVue()
+	{
+		InitializeComponent();
+	}
+
+    private void QuandClassementClique(Object? sender, EventArgs e)
+    {
+        Navigation.PushAsync(new TableauScore());
+    }
+}
\ No newline at end of file
diff --git a/Sources/MauiSpark/Vues/BoutonReglesVue.xaml b/Sources/MauiSpark/Vues/BoutonReglesVue.xaml
new file mode 100644
index 0000000..cbd81f3
--- /dev/null
+++ b/Sources/MauiSpark/Vues/BoutonReglesVue.xaml
@@ -0,0 +1,10 @@
+<?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="MauiSpark.Vues.BoutonReglesVue"
+             x:Name="boutonReglesVue">
+
+    <ImageButton
+        Source="pointinterrogation.png"
+        Clicked="QuandReglesClique"/>
+</ContentView>
diff --git a/Sources/MauiSpark/Vues/BoutonReglesVue.xaml.cs b/Sources/MauiSpark/Vues/BoutonReglesVue.xaml.cs
new file mode 100644
index 0000000..b817153
--- /dev/null
+++ b/Sources/MauiSpark/Vues/BoutonReglesVue.xaml.cs
@@ -0,0 +1,16 @@
+using MauiSpark.Pages;
+
+namespace MauiSpark.Vues;
+
+public partial class BoutonReglesVue : ContentView
+{
+    public BoutonReglesVue()
+    {
+		InitializeComponent();
+    }
+
+    private void QuandReglesClique(Object? sender, EventArgs e)
+    {
+        Navigation.PushAsync(new Regle());
+    }
+}
\ No newline at end of file
diff --git a/Sources/MauiSpark/Vues/JetonVue.xaml b/Sources/MauiSpark/Vues/JetonVue.xaml
new file mode 100644
index 0000000..84e8cc1
--- /dev/null
+++ b/Sources/MauiSpark/Vues/JetonVue.xaml
@@ -0,0 +1,16 @@
+<?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="MauiSpark.Vues.JetonVue"
+             x:Name="jetonVue">
+
+    <Grid 
+        x:Name="Grid"
+        SizeChanged="QuandTailleChangee">
+        
+        <Ellipse
+            x:Name="Cercle"
+            Fill="{Binding Couleur, Source={x:Reference jetonVue}}"/>
+    </Grid>
+    
+</ContentView>
diff --git a/Sources/MauiSpark/Vues/JetonVue.xaml.cs b/Sources/MauiSpark/Vues/JetonVue.xaml.cs
new file mode 100644
index 0000000..1634905
--- /dev/null
+++ b/Sources/MauiSpark/Vues/JetonVue.xaml.cs
@@ -0,0 +1,47 @@
+namespace MauiSpark.Vues;
+
+public partial class JetonVue : ContentView
+{
+    public static readonly BindableProperty CouleurPropriete = BindableProperty.Create(nameof(Couleur), typeof(Color), typeof(JetonVue), default(Color), propertyChanged: QuandCouleurChange);
+
+    public Color? Couleur
+    {
+        get => (Color?)GetValue(CouleurPropriete);
+        set => SetValue(CouleurPropriete, value);
+    }
+
+    public JetonVue()
+    {
+        InitializeComponent();
+        BindingContext = this;
+    }
+
+    private void QuandTailleChangee(object sender, EventArgs e)
+    {
+        double taille = Math.Min(Grid.Width, Grid.Height) / 2;
+        Cercle.WidthRequest = Cercle.HeightRequest = taille;
+    }
+
+    private static void QuandCouleurChange(BindableObject bindable, object oldValue, object newValue)
+    {
+        var view = bindable as JetonVue;
+        if (view != null)
+        {
+            view.UpdateCouleur();
+        }
+    }
+
+    private void UpdateCouleur()
+    {
+        // Gérer la couleur null
+        if (Couleur == null)
+        {
+            // Définir une couleur par défaut si null
+            BackgroundColor = Colors.Transparent; // Ou toute autre couleur par défaut
+        }
+        else
+        {
+            BackgroundColor = Couleur;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Sources/MauiSpark/Vues/TitreVue.xaml b/Sources/MauiSpark/Vues/TitreVue.xaml
new file mode 100644
index 0000000..ab15fae
--- /dev/null
+++ b/Sources/MauiSpark/Vues/TitreVue.xaml
@@ -0,0 +1,13 @@
+<?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="MauiSpark.Vues.TitreVue"
+             x:Name="titreVue">
+
+    <Label
+        FontSize="Header"
+        Text="{Binding Texte, Source={x:Reference titreVue}}"
+        HorizontalTextAlignment="Center"
+        VerticalTextAlignment="Start"
+        Margin="10, 50"/>
+</ContentView>
diff --git a/Sources/MauiSpark/Vues/TitreVue.xaml.cs b/Sources/MauiSpark/Vues/TitreVue.xaml.cs
new file mode 100644
index 0000000..f973e6b
--- /dev/null
+++ b/Sources/MauiSpark/Vues/TitreVue.xaml.cs
@@ -0,0 +1,18 @@
+namespace MauiSpark.Vues;
+
+public partial class TitreVue : ContentView
+{
+    public static readonly BindableProperty TextePropriete = BindableProperty.Create(nameof(Texte), typeof(string), typeof(TitreVue), default(string));
+
+    public string Texte
+    {
+        get => (string)GetValue(TextePropriete);
+        set => SetValue(TextePropriete, value.ToUpper());
+    }
+
+    public TitreVue()
+    {
+        InitializeComponent();
+        BindingContext = this;
+    }
+}
\ No newline at end of file
diff --git a/Sources/mastermind.sln b/Sources/mastermind.sln
index af9bf58..4816ed0 100644
--- a/Sources/mastermind.sln
+++ b/Sources/mastermind.sln
@@ -14,6 +14,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTesting", "UnitTesting\
 		{341FB405-085D-4C34-B395-64EF0F9B93E0} = {341FB405-085D-4C34-B395-64EF0F9B93E0}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{69A6F940-1A25-4FC0-83E3-ABEFA4003DD6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,6 +40,10 @@ Global
 		{A2182054-C0D1-46D6-BD39-F3F7926CE2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A2182054-C0D1-46D6-BD39-F3F7926CE2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2182054-C0D1-46D6-BD39-F3F7926CE2DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69A6F940-1A25-4FC0-83E3-ABEFA4003DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A6F940-1A25-4FC0-83E3-ABEFA4003DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69A6F940-1A25-4FC0-83E3-ABEFA4003DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69A6F940-1A25-4FC0-83E3-ABEFA4003DD6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE