From 451bf91782c2ec8cf2c80ca74629431cb10241b5 Mon Sep 17 00:00:00 2001
From: "nicolas.barbosa" <celeste.barbosa@etu.uca.fr>
Date: Fri, 31 May 2024 14:40:31 +0200
Subject: [PATCH] Correction fusion

---
 Sources/MauiSpark/Pages/Accueil.xaml         | 19 ++++++++-----------
 Sources/MauiSpark/Pages/Plateau.xaml         | 11 +++++------
 Sources/MauiSpark/Pages/Plateau.xaml.cs      |  5 +++++
 Sources/MauiSpark/Pages/Regle.xaml           |  5 +----
 Sources/MauiSpark/Pages/Regle.xaml.cs        |  7 ++-----
 Sources/MauiSpark/Pages/TableauScore.xaml    |  5 +----
 Sources/MauiSpark/Pages/TableauScore.xaml.cs | 20 +++-----------------
 7 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/Sources/MauiSpark/Pages/Accueil.xaml b/Sources/MauiSpark/Pages/Accueil.xaml
index 4ff83fd..e8b196a 100644
--- a/Sources/MauiSpark/Pages/Accueil.xaml
+++ b/Sources/MauiSpark/Pages/Accueil.xaml
@@ -6,29 +6,26 @@
 
     <Grid
         ColumnDefinitions="*"
-        RowDefinitions="*, *, *">
+        RowDefinitions="auto, *, *">
         
         
         <Grid
-            ColumnDefinitions="*,*,*,*,*"
+            ColumnDefinitions="*,*"
             RowDefinitions="auto">
 
-            <ImageButton 
-                Grid.Column="1"
+            <ImageButton
                 Style="{StaticResource AccueilBouton}"
                 Source="pointinterrogation.png"
-                />
-
-            <ImageButton 
-                Grid.Column="2"
-                Style="{StaticResource AccueilBouton}"
-                Source="connexion.png"
+                HorizontalOptions="Start"
+                Clicked="QuandReglesClique"
                 />
 
             <ImageButton
-                Grid.Column="3"
+                Grid.Column="1"
                 Style="{StaticResource AccueilBouton}"
                 Source="statistiques.png"
+                HorizontalOptions="End"
+                Clicked="QuandTableauClique"
                 />
 
         </Grid>
diff --git a/Sources/MauiSpark/Pages/Plateau.xaml b/Sources/MauiSpark/Pages/Plateau.xaml
index 18a0eba..af956e9 100644
--- a/Sources/MauiSpark/Pages/Plateau.xaml
+++ b/Sources/MauiSpark/Pages/Plateau.xaml
@@ -13,12 +13,11 @@
     <Grid RowDefinitions="*" ColumnDefinitions="*, *,auto">
         <ImageButton 
             Grid.Column="2"
-       Style="{StaticResource AccueilBouton}"
-       Source="pointinterrogation.png"
-       HorizontalOptions="End"
-            VerticalOptions="Start"
-       Clicked="QuandReglesClique"
-       />
+           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 ba3d275..29e3ac7 100644
--- a/Sources/MauiSpark/Pages/Plateau.xaml.cs
+++ b/Sources/MauiSpark/Pages/Plateau.xaml.cs
@@ -110,4 +110,9 @@ public partial class Plateau : ContentPage
             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/Regle.xaml b/Sources/MauiSpark/Pages/Regle.xaml
index 7d60239..aa02f3c 100644
--- a/Sources/MauiSpark/Pages/Regle.xaml
+++ b/Sources/MauiSpark/Pages/Regle.xaml
@@ -6,10 +6,7 @@
              Title="Regle">
     <ScrollView>
         <VerticalStackLayout>
-            <Grid>
-                <ImageButton HorizontalOptions="End" WidthRequest="80" Margin="15" Style="{StaticResource ButtonFermeture}"/>
-            </Grid>
-            <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10" >
+            <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10, 50" >
                 <Image Source="livre.png" WidthRequest="100" HorizontalOptions="End" VerticalOptions="Center" Margin="0"/>
                 <Label Text="Règles" Style="{StaticResource TexteTitre}" Margin="0" />
                 <Image Grid.Row="1" Source="livre.png" WidthRequest="100" HorizontalOptions="Start" VerticalOptions="Center" Margin="0"/>
diff --git a/Sources/MauiSpark/Pages/Regle.xaml.cs b/Sources/MauiSpark/Pages/Regle.xaml.cs
index 464c054..7a3890c 100644
--- a/Sources/MauiSpark/Pages/Regle.xaml.cs
+++ b/Sources/MauiSpark/Pages/Regle.xaml.cs
@@ -4,11 +4,8 @@ public partial class Regle : ContentPage
 {
 	public Regle()
 	{
-		InitializeComponent();
-	}
+		NavigationPage.SetHasNavigationBar(this, false);
 
-	private void QuandButtonArriereClique(object sender, EventArgs e)
-	{
-		Navigation.PopAsync();
+		InitializeComponent();
 	}
 }
\ No newline at end of file
diff --git a/Sources/MauiSpark/Pages/TableauScore.xaml b/Sources/MauiSpark/Pages/TableauScore.xaml
index fc156a8..0222cfe 100644
--- a/Sources/MauiSpark/Pages/TableauScore.xaml
+++ b/Sources/MauiSpark/Pages/TableauScore.xaml
@@ -7,10 +7,7 @@
              Title="TableauScore">
     <ScrollView>
         <VerticalStackLayout>
-            <Grid>
-                <ImageButton HorizontalOptions="End" WidthRequest="80" Margin="15" Style="{StaticResource ButtonFermeture}"/>
-            </Grid>
-            <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10" >
+            <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10, 50" >
                 <Image Source="star.png" WidthRequest="100" HorizontalOptions="End" VerticalOptions="Center" Margin="0"/>
                 <Label Text="Scoreboard" Style="{StaticResource TexteTitre}" Margin="0" />
                 <Image Grid.Row="1" Source="star.png" WidthRequest="100" HorizontalOptions="Start" VerticalOptions="Center" Margin="0"/>
diff --git a/Sources/MauiSpark/Pages/TableauScore.xaml.cs b/Sources/MauiSpark/Pages/TableauScore.xaml.cs
index 230f275..1b5891d 100644
--- a/Sources/MauiSpark/Pages/TableauScore.xaml.cs
+++ b/Sources/MauiSpark/Pages/TableauScore.xaml.cs
@@ -1,33 +1,19 @@
-
-using CoreLibrary.Joueurs;
 using MauiSpark.Views;
-using System.Collections.ObjectModel;
 namespace MauiSpark.Pages;
-using System.Windows;
 
 public partial class TableauScore : ContentPage
 {
     public TableauScore()
     {
-        InitializeComponent();
-        SetDefaultClassement();
-    }
-
-    private void QuandButtonArriereClique(object sender, EventArgs e)
-    {
-            Navigation.PopAsync();
-    }
-  
+        NavigationPage.SetHasNavigationBar(this, false);
 
+        InitializeComponent();
 
-    private void SetDefaultClassement()
-    {
-        CTableauScore.UpdateClassement(CTableauScore.GetClassementNbCoupParPartie);
+        QuandNbCoutMoyenButtonClicked(this, EventArgs.Empty);
     }
 
     private void QuandNbCoutMoyenButtonClicked(object sender, EventArgs e)
     {
-        
         CTableauScore.UpdateClassement(CTableauScore.GetClassementNbCoupParPartie);
     }