Merge branch 'UI_Windows' of https://codefirst.iut.uca.fr/git/ConsEcoTeam/ConsEco into UI_Windows

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>
+</ContentView>

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()
 	{

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="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"></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"></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>

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)

Sources/IHM/Desktop/Echeancier.xaml

@@ -1,9 +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"
-             BackgroundImageSource="logo_sans_fond.png"
              BackgroundColor="{StaticResource Yellow300Accent}">
     
     <VerticalStackLayout Margin="20">
@@ -29,19 +27,13 @@
 
         <HorizontalStackLayout HorizontalOptions="Center" VerticalOptions="Fill">
 
-            <Border Background="Green"
+            <Border Background="{StaticResource Primary}"
-            StrokeThickness="2"
+            Style="{StaticResource TotalButton}">
-            Padding="16,8"
-            StrokeShape="RoundRectangle 30,30,30,30"
-            Stroke="Black">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
-            <Border Background="Brown"
+            <Border Background="{StaticResource Tertiary}"
-            StrokeThickness="2"
+            Style="{StaticResource TotalButton}">
-            Padding="16,8"
-            StrokeShape="RoundRectangle 30,30,30,30"
-            Stroke="Black">
             <Label Text=" -- BINDING -- " FontFamily="Comic sans MS"/>
             </Border>
 
@@ -50,4 +42,4 @@
 
 
     </VerticalStackLayout>
-</ContentPage>
+</ContentView>

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()
 	{

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>
+</ContentView>

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()
 	{

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>
 

Sources/IHM/Resources/Styles/Styles.xaml

@@ -408,10 +408,17 @@
         <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="1"/>
+        <Setter Property="Padding" Value="250,8"/>
+        <Setter Property="StrokeShape" Value="RoundRectangle 10,10,10,10"/>
+        <Setter Property="Stroke" Value="Black"/>
+    </Style>
+
 </ResourceDictionary>