From 57f20e57b252fa2ce6b88d4ab8fb207a172a43e8 Mon Sep 17 00:00:00 2001
From: "camille.turpin-etienne" <camille.turpin-etienne@etu.uca.fr>
Date: Wed, 29 May 2024 16:59:24 +0200
Subject: [PATCH] Navigation fonctionnel dans toute l'application

---
 Sources/MauiSpark/Pages/Accueil.xaml          |  2 ++
 Sources/MauiSpark/Pages/Accueil.xaml.cs       | 10 ++++++++++
 Sources/MauiSpark/Pages/ConnexionPage.xaml.cs |  2 +-
 Sources/MauiSpark/Pages/Defaite.xaml          |  2 +-
 Sources/MauiSpark/Pages/Defaite.xaml.cs       |  5 +++++
 Sources/MauiSpark/Pages/Egalite.xaml          |  2 +-
 Sources/MauiSpark/Pages/Egalite.xaml.cs       | 10 +++++++++-
 Sources/MauiSpark/Pages/Plateau.xaml          | 11 +++++++++--
 Sources/MauiSpark/Pages/Plateau.xaml.cs       |  4 ++++
 Sources/MauiSpark/Pages/Regle.xaml            |  2 +-
 Sources/MauiSpark/Pages/Regle.xaml.cs         |  5 +++++
 Sources/MauiSpark/Pages/TableauScore.xaml     |  2 +-
 Sources/MauiSpark/Pages/TableauScore.xaml.cs  |  9 +++++++++
 Sources/MauiSpark/Pages/Victoire.xaml         |  2 +-
 Sources/MauiSpark/Pages/Victoire.xaml.cs      |  4 ++++
 15 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/Sources/MauiSpark/Pages/Accueil.xaml b/Sources/MauiSpark/Pages/Accueil.xaml
index 72cf04a..2d17473 100644
--- a/Sources/MauiSpark/Pages/Accueil.xaml
+++ b/Sources/MauiSpark/Pages/Accueil.xaml
@@ -16,6 +16,7 @@
                 Style="{StaticResource AccueilBouton}"
                 Source="pointinterrogation.png"
                 HorizontalOptions="End"
+                Clicked="QuandReglesClique"
                 />
         </Grid>
 
@@ -47,6 +48,7 @@
                 Grid.Column="1"
                 HorizontalOptions="End"
                 Source="statistiques.png"
+                Clicked="QuandTableauClique"
                 />
         </Grid>
 
diff --git a/Sources/MauiSpark/Pages/Accueil.xaml.cs b/Sources/MauiSpark/Pages/Accueil.xaml.cs
index dec0cd7..720717a 100644
--- a/Sources/MauiSpark/Pages/Accueil.xaml.cs
+++ b/Sources/MauiSpark/Pages/Accueil.xaml.cs
@@ -14,4 +14,14 @@ public partial class Accueil : ContentPage
 	{
 		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/ConnexionPage.xaml.cs b/Sources/MauiSpark/Pages/ConnexionPage.xaml.cs
index 22da3d0..9ff56e2 100644
--- a/Sources/MauiSpark/Pages/ConnexionPage.xaml.cs
+++ b/Sources/MauiSpark/Pages/ConnexionPage.xaml.cs
@@ -48,7 +48,7 @@ public partial class ConnexionPage : ContentPage
         }
         else if (e.Gagnants.Count() == 2)
         {
-            Navigation.PushAsync(new Egalite());
+            Navigation.PushAsync(new Egalite((Partie)sender, e));
         }
         else
         {
diff --git a/Sources/MauiSpark/Pages/Defaite.xaml b/Sources/MauiSpark/Pages/Defaite.xaml
index 831c89a..5c7a172 100644
--- a/Sources/MauiSpark/Pages/Defaite.xaml
+++ b/Sources/MauiSpark/Pages/Defaite.xaml
@@ -15,6 +15,6 @@
         <Frame Margin="20">
             <Label HorizontalOptions="Center" Text="{Binding}" Style="{StaticResource TexteFrame}"/>
         </Frame>
-        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
+        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center" Clicked="QuandButtonMenuCliquer"></Button>
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Defaite.xaml.cs b/Sources/MauiSpark/Pages/Defaite.xaml.cs
index cee0d7b..3ce9780 100644
--- a/Sources/MauiSpark/Pages/Defaite.xaml.cs
+++ b/Sources/MauiSpark/Pages/Defaite.xaml.cs
@@ -11,4 +11,9 @@ public partial class Defaite : ContentPage
 
 		BindingContext = $"Aucun des deux joueurs, {e.Perdants.First().Nom} et {e.Perdants.Last().Nom} n'a trouvé le code secret";
 	}
+	
+	private void QuandButtonMenuCliquer(object sender, EventArgs e)
+	{
+		Navigation.PushAsync(new Mode());
+	}
 }
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Egalite.xaml b/Sources/MauiSpark/Pages/Egalite.xaml
index cedbcdb..a2e31e2 100644
--- a/Sources/MauiSpark/Pages/Egalite.xaml
+++ b/Sources/MauiSpark/Pages/Egalite.xaml
@@ -15,6 +15,6 @@
         <Frame Margin="20">
             <Label HorizontalOptions="Center" Text="Les deux joueur ont trouvé en même temps" Style="{StaticResource TexteFrame}"/>
         </Frame>
-        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
+        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center" Clicked="QuandButtonMenuCliquer"></Button>
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Egalite.xaml.cs b/Sources/MauiSpark/Pages/Egalite.xaml.cs
index 010abb3..cb9d50e 100644
--- a/Sources/MauiSpark/Pages/Egalite.xaml.cs
+++ b/Sources/MauiSpark/Pages/Egalite.xaml.cs
@@ -1,9 +1,17 @@
+using CoreLibrary.Events;
+using CoreLibrary;
+
 namespace MauiSpark.Pages;
 
 public partial class Egalite : ContentPage
 {
-	public Egalite()
+	public Egalite(Partie p, PartieTermineeEventArgs e)
 	{
 		InitializeComponent();
+        BindingContext = $"Les deux joueurs, {e.Gagnants.First().Nom} et {e.Gagnants.Last().Nom} ont trouvé le code secret"; ;
 	}
+    private void QuandButtonMenuCliquer(object sender, EventArgs e)
+    {
+        Navigation.PushAsync(new Mode());
+    }
 }
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Plateau.xaml b/Sources/MauiSpark/Pages/Plateau.xaml
index bf2362b..18a0eba 100644
--- a/Sources/MauiSpark/Pages/Plateau.xaml
+++ b/Sources/MauiSpark/Pages/Plateau.xaml
@@ -10,8 +10,15 @@
         <conv:IndicateurVersCouleurMAUI x:Key="IndicateurVersCouleurMAUI"/>
         <conv:JetonVersTexte x:Key="JetonVersTexte"/>
     </ContentPage.Resources>
-
-    <Grid RowDefinitions="*" ColumnDefinitions="*, *">
+    <Grid RowDefinitions="*" ColumnDefinitions="*, *,auto">
+        <ImageButton 
+            Grid.Column="2"
+       Style="{StaticResource AccueilBouton}"
+       Source="pointinterrogation.png"
+       HorizontalOptions="End"
+            VerticalOptions="Start"
+       Clicked="QuandReglesClique"
+       />
         <Grid RowDefinitions="*" ColumnDefinitions="*" Margin="50">
             <Border
                 Stroke="#000000"
diff --git a/Sources/MauiSpark/Pages/Plateau.xaml.cs b/Sources/MauiSpark/Pages/Plateau.xaml.cs
index c97405a..f782d9a 100644
--- a/Sources/MauiSpark/Pages/Plateau.xaml.cs
+++ b/Sources/MauiSpark/Pages/Plateau.xaml.cs
@@ -44,6 +44,10 @@ public partial class Plateau : ContentPage
         p.NouveauTour += QuandNouveauTour;
     }
 
+    private void QuandReglesClique(object sender, EventArgs e) 
+    {
+        Navigation.PushAsync(new Regle());
+    }
     private void QuandNouveauTour(object? sender, NouveauTourEventArgs e)
     {
         code = e.Code;
diff --git a/Sources/MauiSpark/Pages/Regle.xaml b/Sources/MauiSpark/Pages/Regle.xaml
index 79666bd..d2ef974 100644
--- a/Sources/MauiSpark/Pages/Regle.xaml
+++ b/Sources/MauiSpark/Pages/Regle.xaml
@@ -12,7 +12,7 @@
                     <Label Text="Règle" Style="{StaticResource TexteTitre}" />
                 </Frame>
                 <Grid RowDefinitions="auto,auto">
-                    <ImageButton Grid.Row="0" Style="{StaticResource ButtonFermeture}"/>
+                    <ImageButton Grid.Row="0" Style="{StaticResource ButtonFermeture}" Clicked="QuandButtonArriereClique"/>
                     <Image Grid.Row="1" Source="livre.png" WidthRequest="100" HorizontalOptions="Start" VerticalOptions="Center" Margin="10"/>
                 </Grid>
             </FlexLayout>
diff --git a/Sources/MauiSpark/Pages/Regle.xaml.cs b/Sources/MauiSpark/Pages/Regle.xaml.cs
index 07db133..464c054 100644
--- a/Sources/MauiSpark/Pages/Regle.xaml.cs
+++ b/Sources/MauiSpark/Pages/Regle.xaml.cs
@@ -6,4 +6,9 @@ public partial class Regle : ContentPage
 	{
 		InitializeComponent();
 	}
+
+	private void QuandButtonArriereClique(object sender, EventArgs e)
+	{
+		Navigation.PopAsync();
+	}
 }
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/TableauScore.xaml b/Sources/MauiSpark/Pages/TableauScore.xaml
index 8be3c70..e43dda7 100644
--- a/Sources/MauiSpark/Pages/TableauScore.xaml
+++ b/Sources/MauiSpark/Pages/TableauScore.xaml
@@ -13,7 +13,7 @@
                     <Label Text="Scoreboard" Style="{StaticResource TexteTitre}"/>
                 </Frame>
                 <Grid RowDefinitions="auto,auto">
-                    <ImageButton Grid.Row="0" Style="{StaticResource ButtonFermeture}"/>
+                    <ImageButton Grid.Row="0" Style="{StaticResource ButtonFermeture}" Clicked="QuandButtonArriereClique" />
                     <Image Grid.Row="1" Source="star.png" WidthRequest="100" HorizontalOptions="Start" VerticalOptions="Center" Margin="10"/>
                 </Grid>
             </FlexLayout>
diff --git a/Sources/MauiSpark/Pages/TableauScore.xaml.cs b/Sources/MauiSpark/Pages/TableauScore.xaml.cs
index 10d0c3f..230f275 100644
--- a/Sources/MauiSpark/Pages/TableauScore.xaml.cs
+++ b/Sources/MauiSpark/Pages/TableauScore.xaml.cs
@@ -3,6 +3,7 @@ using CoreLibrary.Joueurs;
 using MauiSpark.Views;
 using System.Collections.ObjectModel;
 namespace MauiSpark.Pages;
+using System.Windows;
 
 public partial class TableauScore : ContentPage
 {
@@ -11,6 +12,14 @@ public partial class TableauScore : ContentPage
         InitializeComponent();
         SetDefaultClassement();
     }
+
+    private void QuandButtonArriereClique(object sender, EventArgs e)
+    {
+            Navigation.PopAsync();
+    }
+  
+
+
     private void SetDefaultClassement()
     {
         CTableauScore.UpdateClassement(CTableauScore.GetClassementNbCoupParPartie);
diff --git a/Sources/MauiSpark/Pages/Victoire.xaml b/Sources/MauiSpark/Pages/Victoire.xaml
index 11d5aa2..eb9f59b 100644
--- a/Sources/MauiSpark/Pages/Victoire.xaml
+++ b/Sources/MauiSpark/Pages/Victoire.xaml
@@ -15,6 +15,6 @@
         <Frame Margin="20" >
             <Label HorizontalOptions="Center" Text="{Binding}" Style="{StaticResource TexteFrame}"/>
         </Frame>
-        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
+        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center" Clicked="QuandButtonMenuCliquer"></Button>
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/Victoire.xaml.cs b/Sources/MauiSpark/Pages/Victoire.xaml.cs
index c964b14..8a77351 100644
--- a/Sources/MauiSpark/Pages/Victoire.xaml.cs
+++ b/Sources/MauiSpark/Pages/Victoire.xaml.cs
@@ -11,4 +11,8 @@ public partial class Victoire : ContentPage
 
 		BindingContext = $"Le joueur {e.Gagnants.First().Nom} a gagné";
     }
+    private void QuandButtonMenuCliquer(object sender, EventArgs e)
+    {
+        Navigation.PushAsync(new Mode());
+    }
 }
\ No newline at end of file