From c51b94acadbf2af4c099e4b01327848d22a52aea Mon Sep 17 00:00:00 2001
From: "camille.turpin-etienne" <camille.turpin-etienne@etu.uca.fr>
Date: Tue, 2 Apr 2024 19:22:34 +0200
Subject: [PATCH] style page score et frame

---
 mastermind/Pages/Defaite.xaml           |  6 +++---
 mastermind/Pages/Egaliter.xaml          |  6 +++---
 mastermind/Pages/Regle.xaml             |  6 +++---
 mastermind/Pages/TableauScore.xaml      |  9 ++++-----
 mastermind/Pages/Victoire.xaml          |  6 +++---
 mastermind/Resources/Styles/Colors.xaml |  7 ++++++-
 mastermind/Resources/Styles/Styles.xaml | 26 ++++++++++++-------------
 mastermind/Views/CTableauScore.xaml     | 10 +++++-----
 8 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/mastermind/Pages/Defaite.xaml b/mastermind/Pages/Defaite.xaml
index fe32138..9a91087 100644
--- a/mastermind/Pages/Defaite.xaml
+++ b/mastermind/Pages/Defaite.xaml
@@ -7,12 +7,12 @@
     <VerticalStackLayout >
         <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">
             <Image Source="defaite.png" MaximumHeightRequest="100" MaximumWidthRequest="100" />
-            <Frame BackgroundColor="Black" HorizontalOptions="Center" VerticalOptions="Center">
-                <Label Text="Defaite" TextColor="White" FontSize="Large" HorizontalOptions="Center"></Label>
+            <Frame HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}" >
+                <Label Text="Defaite" FontSize="Large" HorizontalOptions="Center"></Label>
             </Frame>
             <Image Source="defaite.png" MaximumHeightRequest="100" MaximumWidthRequest="100"/>
         </FlexLayout>
-        <Frame BackgroundColor="Grey" Margin="20">
+        <Frame Margin="20">
             <Label HorizontalOptions="Center" Text="Aucun des deux joueurs, Joueur 1 et Joueur 2 n'a trouvé le code secret"/>
         </Frame>
         <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
diff --git a/mastermind/Pages/Egaliter.xaml b/mastermind/Pages/Egaliter.xaml
index 80bbc42..25baa3a 100644
--- a/mastermind/Pages/Egaliter.xaml
+++ b/mastermind/Pages/Egaliter.xaml
@@ -7,12 +7,12 @@
     <VerticalStackLayout>
         <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">
             <Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100" />
-            <Frame BackgroundColor="Black" HorizontalOptions="Center" VerticalOptions="Center">
-                <Label Text="Egaliter" TextColor="White" FontSize="Large" HorizontalOptions="Center"></Label>
+            <Frame HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}">
+                <Label Text="Egaliter" FontSize="Large" HorizontalOptions="Center"></Label>
             </Frame>
             <Image Source="egaliter.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100"/>
         </FlexLayout>
-        <Frame BackgroundColor="Grey" Margin="20">
+        <Frame Margin="20">
             <Label HorizontalOptions="Center" Text="Les deux joueur ont trouvé en même temps"/>
         </Frame>
         <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
diff --git a/mastermind/Pages/Regle.xaml b/mastermind/Pages/Regle.xaml
index 3d23126..62c9818 100644
--- a/mastermind/Pages/Regle.xaml
+++ b/mastermind/Pages/Regle.xaml
@@ -8,15 +8,15 @@
         <VerticalStackLayout>
             <FlexLayout Direction="Row" JustifyContent="SpaceAround">
                 <Image Source="livre.png" WidthRequest="100" HorizontalOptions="End" VerticalOptions="Center" Margin="0,24,0,0"/>
-                <Frame BorderColor="Black" CornerRadius="5" BackgroundColor="Black" Margin="10" HorizontalOptions="Center" VerticalOptions="Center">
-                    <Label Text="Règle" HorizontalOptions="Center" FontSize="75" VerticalOptions="Start" Margin="0,10,0,10" TextColor="White" />
+                <Frame  CornerRadius="5" Margin="10" HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}">
+                    <Label Text="Règle" HorizontalOptions="Center" FontSize="75" VerticalOptions="Start" Margin="0,10,0,10" />
                 </Frame>
                 <Grid RowDefinitions="auto,auto">
                     <ImageButton Grid.Row="0" Style="{StaticResource ButtonFermeture}"/>
                     <Image Grid.Row="1" Source="livre.png" WidthRequest="100" HorizontalOptions="Start" VerticalOptions="Center" Margin="10"/>
                 </Grid>
             </FlexLayout>
-            <Frame BackgroundColor="LightGray" Margin="20">
+            <Frame  Margin="20">
                 <Grid ColumnDefinitions="*,auto">
                     <Label Text="
                     Le but du jeu est de découvrir la combinaison. On génère aléatoirement deux combinaisons de 4 couleurs (six couleurs au total : jaune, bleu, rouge, vert, blanc et noir), une combinaison pour chaque joueur.
diff --git a/mastermind/Pages/TableauScore.xaml b/mastermind/Pages/TableauScore.xaml
index 379b1d1..a9c25d6 100644
--- a/mastermind/Pages/TableauScore.xaml
+++ b/mastermind/Pages/TableauScore.xaml
@@ -4,21 +4,20 @@
              xmlns:pages="clr-namespace:mastermind.Pages"
              xmlns:views="clr-namespace:mastermind.Views"
              x:Class="mastermind.Pages.TableauScore"
-             Title="TableauScore"
-             BackgroundImageSource="wood.jpg">
+             Title="TableauScore">
     <ScrollView>
         <VerticalStackLayout>
             <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" >
                 <Image Source="star.png" WidthRequest="100" HorizontalOptions="End" VerticalOptions="Center" Margin="0,24,0,0"/>
-                <Frame BorderColor="Black" CornerRadius="5" BackgroundColor="Black" Margin="10" HorizontalOptions="Center" VerticalOptions="Center" >
-                    <Label Text="Scoreboard" HorizontalOptions="Center" FontSize="75" VerticalOptions="Start" Margin="0,10,0,10" TextColor="White" />
+                <Frame CornerRadius="5" Margin="10" HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}" >
+                    <Label Text="Scoreboard" HorizontalOptions="Center" FontSize="75" VerticalOptions="Start" Margin="0,10,0,10"/>
                 </Frame>
                 <Grid RowDefinitions="auto,auto">
                     <ImageButton Grid.Row="0" Style="{StaticResource ButtonFermeture}"/>
                     <Image Grid.Row="1" Source="star.png" WidthRequest="100" HorizontalOptions="Start" VerticalOptions="Center" Margin="10"/>
                 </Grid>
             </FlexLayout>
-            <Frame Margin="5" BorderColor="Black">
+            <Frame Margin="5" >
                 <Grid ColumnDefinitions="auto,*,auto,auto" ColumnSpacing="10">
                     <Button Margin="0,5,5,5" Grid.Column="0" Text="RANK" Style="{StaticResource ButtonTableau}"></Button>
                     <Button Margin="5"  Grid.Column="1" Text="PSEUDO" Style="{StaticResource ButtonTableau}" HorizontalOptions="Start" ></Button>
diff --git a/mastermind/Pages/Victoire.xaml b/mastermind/Pages/Victoire.xaml
index b47a5ef..17e288c 100644
--- a/mastermind/Pages/Victoire.xaml
+++ b/mastermind/Pages/Victoire.xaml
@@ -7,12 +7,12 @@
     <VerticalStackLayout>
         <FlexLayout Direction="Row" JustifyContent="SpaceAround" AlignContent="Center" VerticalOptions="Center" Margin="10">
             <Image Source="trophy.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100" />
-            <Frame BackgroundColor="Black" HorizontalOptions="Center" VerticalOptions="Center">
-                <Label Text="Victoire" TextColor="White" FontSize="Large" HorizontalOptions="Center"></Label>
+            <Frame HorizontalOptions="Center" VerticalOptions="Center" Style="{StaticResource FrameTitrePage}">
+                <Label Text="Victoire" FontSize="Large" HorizontalOptions="Center"></Label>
             </Frame>
             <Image Source="trophy.jpg" MaximumHeightRequest="100" MaximumWidthRequest="100"/>
         </FlexLayout>
-        <Frame BackgroundColor="Grey" Margin="20" >
+        <Frame Margin="20" >
             <Label HorizontalOptions="Center" Text="Le joueur x a gagné"/>
         </Frame>
         <Button Text="Menu" VerticalOptions="End" HorizontalOptions="Center"></Button>
diff --git a/mastermind/Resources/Styles/Colors.xaml b/mastermind/Resources/Styles/Colors.xaml
index 2910bd4..0de4bcd 100644
--- a/mastermind/Resources/Styles/Colors.xaml
+++ b/mastermind/Resources/Styles/Colors.xaml
@@ -27,7 +27,12 @@
     <Color x:Key="Perry">#358F92</Color>
     <Color x:Key="Bordeaux">#662323</Color>
     <Color x:Key="Peche">#F2B861</Color>
-
+    <Color x:Key="LightSaumon">#E3A79F</Color>
+    <Color x:Key="DarkRed">#72170B</Color>
+    <Color x:Key="LightPurple">#C875A4</Color>
+    <Color x:Key="LightYellow">#F0C67B</Color>
+    <Color x:Key="DarkPurple">#622E72</Color>
+    
     <Color x:Key="Gray100">#E1E1E1</Color>
     <Color x:Key="Gray200">#C8C8C8</Color>
     <Color x:Key="Gray300">#ACACAC</Color>
diff --git a/mastermind/Resources/Styles/Styles.xaml b/mastermind/Resources/Styles/Styles.xaml
index 3886b18..2544e8c 100644
--- a/mastermind/Resources/Styles/Styles.xaml
+++ b/mastermind/Resources/Styles/Styles.xaml
@@ -18,12 +18,23 @@
         <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Pomme}, Dark={StaticResource Bordeaux}}" />
     </Style>
 
+    <Style TargetType="Frame">
+        <Setter Property="BorderColor" Value="Black"/>
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightSaumon}, Dark={StaticResource LightPurple}}"/>
+    </Style>
 
+    <Style TargetType="Frame" x:Key="FrameTitrePage">
+        <Setter Property="BorderColor" Value="Black"/>
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource LightYellow}, Dark={StaticResource DarkPurple}}"/>
+    </Style>
+
+    <Style TargetType="Label" x:Key="TexteTableau">
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}"/>
+    </Style>
 
 
 
     <Style TargetType="ImageButton" x:Key="ButtonFermeture">
-        <Setter Property="BackgroundColor" Value="DarkRed" />
         <Setter Property="WidthRequest" Value="50"/>
         <Setter Property="HeightRequest" Value="50"/>
         <Setter Property="Source" Value="Fleche_Retour.png"/>
@@ -34,19 +45,6 @@
         <Setter Property="Padding" Value="14,10"/>
         <Setter Property="MinimumHeightRequest" Value="20"/>
         <Setter Property="MinimumWidthRequest" Value="20"/>
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="PointerOver" />
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
     </Style>
 
 
diff --git a/mastermind/Views/CTableauScore.xaml b/mastermind/Views/CTableauScore.xaml
index d7d1634..d3f4491 100644
--- a/mastermind/Views/CTableauScore.xaml
+++ b/mastermind/Views/CTableauScore.xaml
@@ -3,12 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="mastermind.Views.CTableauScore">
 
-    <Frame  BorderColor="Black" CornerRadius="5" Padding="0" BackgroundColor="Gray" VerticalOptions="Start" Margin="5" >
+    <Frame CornerRadius="5" Padding="0" VerticalOptions="Start" Margin="5" >
         <Grid ColumnDefinitions="auto,*,auto,auto" ColumnSpacing="10">
-            <Label Grid.Column="0" Text="N°1" Margin="20" />
-            <Label Grid.Column="1" Text="Joueur 1" Margin="20" />
-            <Label Grid.Column="2" Text="5" Margin="20" />
-            <Label Grid.Column="3" Text="10000" Margin="20" />
+            <Label Grid.Column="0" Text="N°1" Margin="20" Style="{StaticResource TexteTableau}" />
+            <Label Grid.Column="1" Text="Joueur 1" Margin="20" Style="{StaticResource TexteTableau}" />
+            <Label Grid.Column="2" Text="5" Margin="20" Style="{StaticResource TexteTableau}" />
+            <Label Grid.Column="3" Text="10000" Margin="20" Style="{StaticResource TexteTableau}"/>
         </Grid>
     </Frame>
 </ContentView>