From 9c106a06deca8badfe5b8904f5e049378a2245b5 Mon Sep 17 00:00:00 2001
From: Raphael LACOTE <Raphael.LACOTE@etu.uca.fr>
Date: Fri, 9 Dec 2022 15:23:14 +0100
Subject: [PATCH] Transformation de content page en content view

---
 Sources/IHM/Desktop/Compte.xaml          | 5 ++---
 Sources/IHM/Desktop/Compte.xaml.cs       | 2 +-
 Sources/IHM/Desktop/DashBoard.xaml       | 6 +++---
 Sources/IHM/Desktop/Dashboard.xaml.cs    | 6 +++---
 Sources/IHM/Desktop/Echeancier.xaml      | 9 ++++-----
 Sources/IHM/Desktop/Echeancier.xaml.cs   | 2 +-
 Sources/IHM/Desktop/Operations.xaml      | 7 +++----
 Sources/IHM/Desktop/Operations.xaml.cs   | 2 +-
 Sources/IHM/Resources/Styles/Colors.xaml | 2 +-
 Sources/IHM/Resources/Styles/Styles.xaml | 8 ++++----
 10 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/Sources/IHM/Desktop/Compte.xaml b/Sources/IHM/Desktop/Compte.xaml
index 41a51c4..ef7f299 100644
--- a/Sources/IHM/Desktop/Compte.xaml
+++ b/Sources/IHM/Desktop/Compte.xaml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Compte"
-             Title="Compte"
              BackgroundColor="{StaticResource Yellow300Accent}">
 
     <StackLayout Margin="20" Orientation="Vertical">
@@ -30,4 +29,4 @@
 
 
     </StackLayout>
-</ContentPage>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Compte.xaml.cs b/Sources/IHM/Desktop/Compte.xaml.cs
index 900a555..d9bf12d 100644
--- a/Sources/IHM/Desktop/Compte.xaml.cs
+++ b/Sources/IHM/Desktop/Compte.xaml.cs
@@ -1,6 +1,6 @@
 namespace IHM.Desktop;
 
-public partial class Compte : ContentPage
+public partial class Compte : ContentView
 {
 	public Compte()
 	{
diff --git a/Sources/IHM/Desktop/DashBoard.xaml b/Sources/IHM/Desktop/DashBoard.xaml
index 3842a4f..bd440f3 100644
--- a/Sources/IHM/Desktop/DashBoard.xaml
+++ b/Sources/IHM/Desktop/DashBoard.xaml
@@ -32,9 +32,9 @@
             <StackLayout BackgroundColor="{StaticResource Secondary}" Grid.Row="1" Grid.Column="0" Grid.RowSpan="6">
 
                 <Button Text="ACCUEIL"  BackgroundColor="{StaticResource Tertiary}" TextColor="{StaticResource White}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="1" ></Button>
-                <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="2"></Button>
-                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3"></Button>
-                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4"></Button>
+                <Button Text="COMPTE"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="2" Clicked="Button_compte"></Button>
+                <Button Text="OPERATION"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="3" Clicked="Button_operation"></Button>
+                <Button Text="ECHEANCIER"  BackgroundColor="{StaticResource Yellow100Accent}" TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="4" Clicked="Button_echeancier"></Button>
                 <Button Text="PLANIFICATION"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="5" Clicked="Button_planification"></Button>
                 <Button Text="STATISTIQUES"  BackgroundColor="{StaticResource Yellow100Accent}"  TextColor="{StaticResource Secondary}" Padding="20" Margin="21" Grid.Column="0" Grid.Row="6"></Button>
             </StackLayout>
diff --git a/Sources/IHM/Desktop/Dashboard.xaml.cs b/Sources/IHM/Desktop/Dashboard.xaml.cs
index a3919f5..582ac2f 100644
--- a/Sources/IHM/Desktop/Dashboard.xaml.cs
+++ b/Sources/IHM/Desktop/Dashboard.xaml.cs
@@ -16,17 +16,17 @@ public partial class Dashboard
 
 	private void Button_echeancier(object sender, EventArgs e)
 	{
-       
+		mainCV.Content = new Echeancier();
     }
 
 	private void Button_operation(object sender, EventArgs e)
 	{
-        
+		mainCV.Content = new Operations();
     }
 
 	private void Button_compte(object sender, EventArgs e)
 	{
-        
+		mainCV.Content = new Compte();
     }
 
 	private void Button_Clicked(object sender, EventArgs e)
diff --git a/Sources/IHM/Desktop/Echeancier.xaml b/Sources/IHM/Desktop/Echeancier.xaml
index e90b274..d942914 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml
+++ b/Sources/IHM/Desktop/Echeancier.xaml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Echeancier"
-             Title="Echeancier"
              BackgroundColor="{StaticResource Yellow300Accent}">
     
     <VerticalStackLayout Margin="20">
@@ -28,12 +27,12 @@
 
         <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
 
-            <Border Background="Green"
+            <Border Background="{StaticResource Primary}"
             Style="{StaticResource TotalButton}">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
-            <Border Background="Brown"
+            <Border Background="{StaticResource Tertiary}"
             Style="{StaticResource TotalButton}">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
@@ -43,4 +42,4 @@
 
 
     </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Echeancier.xaml.cs b/Sources/IHM/Desktop/Echeancier.xaml.cs
index 7c988b7..98d43c4 100644
--- a/Sources/IHM/Desktop/Echeancier.xaml.cs
+++ b/Sources/IHM/Desktop/Echeancier.xaml.cs
@@ -1,6 +1,6 @@
 namespace IHM.Desktop;
 
-public partial class Echeancier : ContentPage
+public partial class Echeancier : ContentView
 {
 	public Echeancier()
 	{
diff --git a/Sources/IHM/Desktop/Operations.xaml b/Sources/IHM/Desktop/Operations.xaml
index 7b9224e..cfce0a0 100644
--- a/Sources/IHM/Desktop/Operations.xaml
+++ b/Sources/IHM/Desktop/Operations.xaml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.Operations"
-             Title="Operations"
              BackgroundColor="{StaticResource Yellow300Accent}">
-    <VerticalStackLayout>
+    <VerticalStackLayout Margin="20">
         <Label 
             Style="{StaticResource TitreWindows}"
             Text="OPERATION"
@@ -35,4 +34,4 @@
 
 
     </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/Sources/IHM/Desktop/Operations.xaml.cs b/Sources/IHM/Desktop/Operations.xaml.cs
index 6da03a9..892a7b7 100644
--- a/Sources/IHM/Desktop/Operations.xaml.cs
+++ b/Sources/IHM/Desktop/Operations.xaml.cs
@@ -1,6 +1,6 @@
 namespace IHM.Desktop;
 
-public partial class Operations : ContentPage
+public partial class Operations : ContentView
 {
 	public Operations()
 	{
diff --git a/Sources/IHM/Resources/Styles/Colors.xaml b/Sources/IHM/Resources/Styles/Colors.xaml
index 213ca53..5334f03 100644
--- a/Sources/IHM/Resources/Styles/Colors.xaml
+++ b/Sources/IHM/Resources/Styles/Colors.xaml
@@ -43,7 +43,7 @@
 
     <LinearGradientBrush x:Key="TestColor" StartPoint="0,0" EndPoint="1,1">
         <GradientStop Color="RosyBrown" Offset="0" />
-        <GradientStop Color="Brown" Offset="0.5" />
+        <GradientStop Color="{StaticResource Tertiary}" Offset="0.5" />
         <GradientStop Color="RosyBrown" Offset="1" />
     </LinearGradientBrush>
 
diff --git a/Sources/IHM/Resources/Styles/Styles.xaml b/Sources/IHM/Resources/Styles/Styles.xaml
index 058bf50..3e703df 100644
--- a/Sources/IHM/Resources/Styles/Styles.xaml
+++ b/Sources/IHM/Resources/Styles/Styles.xaml
@@ -408,16 +408,16 @@
         <Setter Property="TextColor" Value="Black"/>
         <Setter Property="Margin" Value="20"/>
         <Setter Property="CornerRadius" Value="20"/>
-        <Setter Property="BorderWidth" Value="2"/>
+        <Setter Property="BorderWidth" Value="1"/>
         <Setter Property="BorderColor" Value="Black"/>
         <Setter Property="FontFamily" Value="Comic sans MS"/>
         <Setter Property="Background" Value="{StaticResource TestColor}"/>
     </Style>
 
     <Style TargetType="Border" x:Key="TotalButton">
-        <Setter Property="StrokeThickness" Value="2"/>
-        <Setter Property="Padding" Value="220,8"/>
-        <Setter Property="StrokeShape" Value="RoundRectangle 20,20,20,20"/>
+        <Setter Property="StrokeThickness" Value="1"/>
+        <Setter Property="Padding" Value="250,8"/>
+        <Setter Property="StrokeShape" Value="RoundRectangle 10,10,10,10"/>
         <Setter Property="Stroke" Value="Black"/>
     </Style>