From da7fac375f2281db58b53c692d40d8d45d93d535 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Wed, 7 Dec 2022 14:52:26 +0100
Subject: [PATCH] Modification pour les vues windows et ajout de styles

---
 Sources/IHM/Desktop/Compte.xaml          | 18 ++++---------
 Sources/IHM/Desktop/Echeancier.xaml      | 26 +++++++++++++++----
 Sources/IHM/Desktop/Operations.xaml      | 32 +++++++++++++++++++++---
 Sources/IHM/Desktop/Planification.xaml   |  3 ++-
 Sources/IHM/Resources/Styles/Styles.xaml | 17 +++++++++++++
 5 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 1d13733..b9b1ffc 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -4,16 +4,14 @@
              x:Class="IHM.Desktop.Compte"
              Title="Compte"
              BackgroundColor="{StaticResource Yellow300Accent}">
+    
     <StackLayout Margin="20" Orientation="Vertical">
         
 
         <Label 
-            FontAttributes="Bold"
             Text="VOTRE COMPTE"
             VerticalOptions="StartAndExpand"
-            HorizontalOptions="Center"
-            FontFamily="Comic Sans MS"
-            FontSize="30"/>
+            Style="{StaticResource TitreWindows}"/>
 
 
         <Label
@@ -28,15 +26,9 @@
         <Button
             x:Name="ConnexionButton"
             Text="Modifier votre solde"
-            TextColor="Black"
-            VerticalOptions="Fill"
-            Margin="20"
-            CornerRadius="20"
-            BorderWidth="2"
-            BorderColor="Black"
-            FontFamily="Comic Sans MS"
-            Background="{StaticResource TestColor}"/>
-        
+            Style="{StaticResource WindowsButton}"
+            VerticalOptions="Fill"/>
+
 
     </StackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index da0f743..4d8ad81 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -2,11 +2,27 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
-             Title="Echeancier">
-    <VerticalStackLayout>
+             Title="Echeancier"
+             BackgroundColor="{StaticResource Yellow300Accent}">
+    
+    <VerticalStackLayout Margin="20">
+        
         <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+            Style="{StaticResource TitreWindows}"
+            Text="ECHEANCIER"
+            VerticalOptions="StartAndExpand"/>
+        
+        <HorizontalStackLayout>
+            <Button
+                x:Name="SaveEcheance"
+                Text="Enregistrer une échéance"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="DelEcheance"
+                Text="Supprimer une échéance"
+                Style="{StaticResource WindowsButton}"/>
+        </HorizontalStackLayout>
+        
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 3d64d07..224b45c 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -2,11 +2,35 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Operations"
-             Title="Operations">
+             Title="Operations"
+             BackgroundColor="{StaticResource Yellow300Accent}">
     <VerticalStackLayout>
         <Label 
-            Text="Welcome to .NET MAUI!"
-            VerticalOptions="Center" 
-            HorizontalOptions="Center" />
+            Style="{StaticResource TitreWindows}"
+            Text="OPERATION"
+            VerticalOptions="StartAndExpand"/>
+
+        <HorizontalStackLayout>
+            <Button
+                x:Name="AddCredit"
+                Text="Effectuer un crédit"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="RetireOperation"
+                Text="Retirer une opération"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="AddDebit"
+                Text="effectuer un débit"
+                Style="{StaticResource WindowsButton}"/>
+
+            <Button
+                x:Name="DelOperation"
+                Text="Supprimer une opération"
+                Style="{StaticResource WindowsButton}"/>
+
+        </HorizontalStackLayout>
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Planification.xaml b/Sources/IHM/Desktop/Planification.xaml
index e90603a..411eae6 100644
--- a/Sources/IHM/Desktop/Planification.xaml
+++ b/Sources/IHM/Desktop/Planification.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Planification"
              Title="Planification">
+    
     <StackLayout BackgroundColor="{StaticResource Yellow300Accent}" >
         <Grid>
             <Grid.RowDefinitions>
@@ -31,7 +32,7 @@
                 <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Tertiary}"  TextColor="{StaticResource White}" Padding="20" Margin="21" ></Button>
                 <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" ></Button>
             </VerticalStackLayout>
--->s
+-->
 
            
         </Grid>
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index a00e7e9..985d195 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -397,4 +397,21 @@
         <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
     </Style>
 
+    <Style TargetType="Label" x:Key="TitreWindows">
+        <Setter Property="FontAttributes" Value="Bold"/>
+        <Setter Property="FontFamily" Value="Comic sans MS"/>
+        <Setter Property="FontSize" Value="30"/>
+        <Setter Property="HorizontalOptions" Value="Center"/>
+    </Style>
+
+    <Style TargetType="Button" x:Key="WindowsButton">
+        <Setter Property="TextColor" Value="Black"/>
+        <Setter Property="Margin" Value="20"/>
+        <Setter Property="CornerRadius" Value="20"/>
+        <Setter Property="BorderWidth" Value="2"/>
+        <Setter Property="BorderColor" Value="Black"/>
+        <Setter Property="FontFamily" Value="Comic sans MS"/>
+        <Setter Property="Background" Value="{StaticResource TestColor}"/>
+    </Style>
+
 </ResourceDictionary>