From 0157d26db1bc59a82c6602d0044df04df8f39687 Mon Sep 17 00:00:00 2001
From: "pauline.prady" <pauline.prady@etu.uca.fr>
Date: Sat, 1 Jun 2024 11:36:06 +0200
Subject: [PATCH 1/2] vue victoire

---
 Sources/MauiSpark/App.xaml.cs                 |  2 +-
 Sources/MauiSpark/MauiSpark.csproj            |  3 ++
 Sources/MauiSpark/Pages/PlateauPage.xaml      |  1 -
 Sources/MauiSpark/Pages/Victoire.xaml         | 38 +++++++++++++------
 Sources/MauiSpark/Vues/ImageResultatVue.xaml  | 13 +++++++
 .../MauiSpark/Vues/ImageResultatVue.xaml.cs   | 18 +++++++++
 Sources/MauiSpark/Vues/TitreVue.xaml.cs       |  6 +--
 7 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 Sources/MauiSpark/Vues/ImageResultatVue.xaml
 create mode 100644 Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs

diff --git a/Sources/MauiSpark/App.xaml.cs b/Sources/MauiSpark/App.xaml.cs
index d4ef4dc..ebf75b3 100644
--- a/Sources/MauiSpark/App.xaml.cs
+++ b/Sources/MauiSpark/App.xaml.cs
@@ -8,7 +8,7 @@ namespace MauiSpark
         {
             InitializeComponent();
 
-            MainPage = new NavigationPage(new AccueilPage());
+            MainPage = new NavigationPage(new Victoire());
             MainPage.Title = "Mastermind";
         }
     }
diff --git a/Sources/MauiSpark/MauiSpark.csproj b/Sources/MauiSpark/MauiSpark.csproj
index 2047be7..90c267c 100644
--- a/Sources/MauiSpark/MauiSpark.csproj
+++ b/Sources/MauiSpark/MauiSpark.csproj
@@ -112,6 +112,9 @@
 	  <MauiXaml Update="Vues\BoutonReglesVue.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Vues\ImageResultatVue.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Vues\JetonVue.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Sources/MauiSpark/Pages/PlateauPage.xaml b/Sources/MauiSpark/Pages/PlateauPage.xaml
index 4b5e23d..78be963 100644
--- a/Sources/MauiSpark/Pages/PlateauPage.xaml
+++ b/Sources/MauiSpark/Pages/PlateauPage.xaml
@@ -103,7 +103,6 @@
                         BindableLayout.ItemsSource="{Binding Code.Jetons}">
                         <BindableLayout.ItemTemplate>
                             <DataTemplate>
-                                <vues:JetonVue Couleur="{Binding Couleur, Converter={StaticResource conv:CouleurVersCouleurMAUI}}"/>
                             </DataTemplate>
                         </BindableLayout.ItemTemplate>
                     </FlexLayout>
diff --git a/Sources/MauiSpark/Pages/Victoire.xaml b/Sources/MauiSpark/Pages/Victoire.xaml
index e327992..ed7614d 100644
--- a/Sources/MauiSpark/Pages/Victoire.xaml
+++ b/Sources/MauiSpark/Pages/Victoire.xaml
@@ -3,17 +3,33 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="MauiSpark.Pages.Victoire"
              xmlns:pages="clr-namespace:MauiSpark.Pages"
+             xmlns:vues="clr-namespace:MauiSpark.Vues"
              Title="Victoire">
-    <VerticalStackLayout>
-        <Grid WidthRequest="80" Margin="20"></Grid>
-        <FlexLayout  Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10" >
-            <Image Source="trophy.jpg" WidthRequest="100" HorizontalOptions="End" VerticalOptions="Center" Margin="0" />
-            <Label Text="{Binding [0]}" Style="{StaticResource TexteTitre}" Margin="0" />
-            <Image Source="trophy.jpg" Grid.Row="1" WidthRequest="100" HorizontalOptions="Start" VerticalOptions="Center" Margin="0" />
-        </FlexLayout>
-        <Frame Margin="40" >
-            <Label HorizontalOptions="Center" Text="{Binding [1]}" Style="{StaticResource TexteFrame}"/>
+
+    <Grid
+        ColumnDefinitions="*"
+        RowDefinitions="*, auto, *">
+
+        <Grid
+            ColumnDefinitions="*, *, *"
+            RowDefinitions="*">
+
+            <vues:ImageResultatVue HorizontalOptions="Start"/>
+
+            <vues:TitreVue Texte="{Binding [0]}" Grid.Column="1"/>
+
+            <vues:ImageResultatVue Grid.Column="2" HorizontalOptions="End"/>
+        </Grid>
+
+        <Frame Grid.Row="1">
+            <Label HorizontalOptions="Center" Text="{Binding [1]}"/>
         </Frame>
-        <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center" Clicked="QuandMenuPresse"/>
-    </VerticalStackLayout>
+
+        <Button 
+            Grid.Row="2"
+            Text="Menu"
+            VerticalOptions="Center"
+            Margin="0, 50"
+            Clicked="QuandMenuPresse"/>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/MauiSpark/Vues/ImageResultatVue.xaml b/Sources/MauiSpark/Vues/ImageResultatVue.xaml
new file mode 100644
index 0000000..00db855
--- /dev/null
+++ b/Sources/MauiSpark/Vues/ImageResultatVue.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.ImageResultatVue"
+             x:Name="ImageResultat">
+    
+    <VerticalStackLayout>
+        <Label 
+            Text="Welcome to .NET MAUI!"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+    </VerticalStackLayout>
+</ContentView>
diff --git a/Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs b/Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs
new file mode 100644
index 0000000..0b2bf91
--- /dev/null
+++ b/Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs
@@ -0,0 +1,18 @@
+namespace MauiSpark.Vues;
+
+public partial class ImageResultatVue : ContentView
+{
+    public static readonly BindableProperty TexteProperty = BindableProperty.Create(nameof(Texte), typeof(string), typeof(TitreVue), default(string));
+
+    public string Image
+    {
+        get => (string)GetValue(TexteProperty);
+        set => SetValue(TexteProperty, value.ToUpper());
+    }
+
+    public ImageResultatVue()
+    {
+        InitializeComponent();
+        BindingContext = this;
+    }
+}
\ No newline at end of file
diff --git a/Sources/MauiSpark/Vues/TitreVue.xaml.cs b/Sources/MauiSpark/Vues/TitreVue.xaml.cs
index f973e6b..d9e3aea 100644
--- a/Sources/MauiSpark/Vues/TitreVue.xaml.cs
+++ b/Sources/MauiSpark/Vues/TitreVue.xaml.cs
@@ -2,12 +2,12 @@ namespace MauiSpark.Vues;
 
 public partial class TitreVue : ContentView
 {
-    public static readonly BindableProperty TextePropriete = BindableProperty.Create(nameof(Texte), typeof(string), typeof(TitreVue), default(string));
+    public static readonly BindableProperty TexteProperty = BindableProperty.Create(nameof(Texte), typeof(string), typeof(TitreVue), default(string));
 
     public string Texte
     {
-        get => (string)GetValue(TextePropriete);
-        set => SetValue(TextePropriete, value.ToUpper());
+        get => (string)GetValue(TexteProperty);
+        set => SetValue(TexteProperty, value.ToUpper());
     }
 
     public TitreVue()

From 36c23b654760f1219c71cad6f545872f2c797b9d Mon Sep 17 00:00:00 2001
From: "pauline.prady" <pauline.prady@etu.uca.fr>
Date: Sat, 1 Jun 2024 11:59:26 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Vue=20r=C3=A9sultat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sources/MauiSpark/App.xaml.cs                   |  2 +-
 Sources/MauiSpark/Pages/Victoire.xaml           |  4 ++--
 Sources/MauiSpark/Pages/Victoire.xaml.cs        |  6 +++---
 Sources/MauiSpark/Vues/ImageResultatVue.xaml    | 14 ++++++--------
 Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs |  6 +++---
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Sources/MauiSpark/App.xaml.cs b/Sources/MauiSpark/App.xaml.cs
index ebf75b3..d4ef4dc 100644
--- a/Sources/MauiSpark/App.xaml.cs
+++ b/Sources/MauiSpark/App.xaml.cs
@@ -8,7 +8,7 @@ namespace MauiSpark
         {
             InitializeComponent();
 
-            MainPage = new NavigationPage(new Victoire());
+            MainPage = new NavigationPage(new AccueilPage());
             MainPage.Title = "Mastermind";
         }
     }
diff --git a/Sources/MauiSpark/Pages/Victoire.xaml b/Sources/MauiSpark/Pages/Victoire.xaml
index ed7614d..ec526a4 100644
--- a/Sources/MauiSpark/Pages/Victoire.xaml
+++ b/Sources/MauiSpark/Pages/Victoire.xaml
@@ -14,11 +14,11 @@
             ColumnDefinitions="*, *, *"
             RowDefinitions="*">
 
-            <vues:ImageResultatVue HorizontalOptions="Start"/>
+            <vues:ImageResultatVue Image="{Binding [2]}" HorizontalOptions="Start"/>
 
             <vues:TitreVue Texte="{Binding [0]}" Grid.Column="1"/>
 
-            <vues:ImageResultatVue Grid.Column="2" HorizontalOptions="End"/>
+            <vues:ImageResultatVue Image="{Binding [2]}" Grid.Column="2" HorizontalOptions="End"/>
         </Grid>
 
         <Frame Grid.Row="1">
diff --git a/Sources/MauiSpark/Pages/Victoire.xaml.cs b/Sources/MauiSpark/Pages/Victoire.xaml.cs
index 44bc475..26f7a26 100644
--- a/Sources/MauiSpark/Pages/Victoire.xaml.cs
+++ b/Sources/MauiSpark/Pages/Victoire.xaml.cs
@@ -34,11 +34,11 @@ public partial class Victoire : ContentPage
         Joueur[] perdants = e.Perdants;
 
         if (gagnants.Length == 1)
-            BindingContext = ("Victoire", $"Le joueur {gagnants.First().Nom} a gagné");
+            BindingContext = ("Victoire", $"Le joueur {gagnants.First().Nom} a gagné", "trophy.jpg");
         else if (gagnants.Length > 1)
-            BindingContext = ("Egalité", $"Les joueurs {string.Join(' ', gagnants.Select(joueur => joueur.Nom))} ont gagné");
+            BindingContext = ("Egalité", $"Les joueurs {string.Join(' ', gagnants.Select(joueur => joueur.Nom))} ont gagné", "egaliter.jpg");
         else
-            BindingContext = ("Défaite", "Personne n'a trouvé le code...");
+            BindingContext = ("Défaite", "Personne n'a trouvé le code...", "defaite.png");
 
 
         if (gagnants.Length == 1)
diff --git a/Sources/MauiSpark/Vues/ImageResultatVue.xaml b/Sources/MauiSpark/Vues/ImageResultatVue.xaml
index 00db855..62ef492 100644
--- a/Sources/MauiSpark/Vues/ImageResultatVue.xaml
+++ b/Sources/MauiSpark/Vues/ImageResultatVue.xaml
@@ -2,12 +2,10 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="MauiSpark.Vues.ImageResultatVue"
-             x:Name="ImageResultat">
-    
-    <VerticalStackLayout>
-        <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
-    </VerticalStackLayout>
+             x:Name="imageResultatVue">
+
+    <Image
+        Source="{Binding Image, Source={x:Reference imageResultatVue}}"
+        WidthRequest="100"
+        />
 </ContentView>
diff --git a/Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs b/Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs
index 0b2bf91..02a1853 100644
--- a/Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs
+++ b/Sources/MauiSpark/Vues/ImageResultatVue.xaml.cs
@@ -2,12 +2,12 @@ namespace MauiSpark.Vues;
 
 public partial class ImageResultatVue : ContentView
 {
-    public static readonly BindableProperty TexteProperty = BindableProperty.Create(nameof(Texte), typeof(string), typeof(TitreVue), default(string));
+    public static readonly BindableProperty ImageProperty = BindableProperty.Create(nameof(Image), typeof(string), typeof(ImageResultatVue), default(string));
 
     public string Image
     {
-        get => (string)GetValue(TexteProperty);
-        set => SetValue(TexteProperty, value.ToUpper());
+        get => (string)GetValue(ImageProperty);
+        set => SetValue(ImageProperty, value);
     }
 
     public ImageResultatVue()