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

Sources/IHM/App.xaml

@@ -5,6 +5,19 @@
              x:Class="IHM.App">
     <Application.Resources>
         <ResourceDictionary>
+            
+            <Style TargetType="Border" x:Key="bordureBlanche">
+                <Setter Property="StrokeShape" Value="RoundRectangle 40"/>
+                <Setter Property="BackgroundColor" Value="White"/>
+            </Style>
+
+            <Style TargetType="Entry" x:Key="zoneDeTexte">
+                <Setter Property="TextColor" Value="Black"/>
+                <Setter Property="BackgroundColor" Value="White"/>
+                <Setter Property="VerticalTextAlignment" Value="Center"/>
+                <Setter Property="FontSize" Value="15"/>
+            </Style>
+
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />

Sources/IHM/AppShellDesktop.xaml.cs

@@ -13,12 +13,7 @@ namespace IHM
         {
             InitializeComponent();
             Routing.RegisterRoute("ForgetPassword", typeof(ForgetPassword));
-
-
         }
 
-
-
-
     }
 }

Sources/IHM/Desktop/ForgetPassword.xaml

@@ -3,18 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="IHM.Desktop.ForgetPassword"
              Title="ForgetPassword">
-    <VerticalStackLayout
+
-        Margin="20"
+    <VerticalStackLayout BackgroundColor="{StaticResource Primary}" Margin="20" Padding="30">
-        Padding="30">
         <Label 
-            Text="Rentrée votre adresse email :"
+            Text="Rentrez votre adresse email :"
             HorizontalOptions="Center" />
 
-        <Border StrokeShape="RoundRectangle 40" BackgroundColor="White" Padding="7" Margin="40">
+        <Border Style="{StaticResource bordureBlanche}">
-            <Entry BackgroundColor="White" 
+            <Entry Style="{StaticResource zoneDeTexte}"
-                   TextColor="Black" 
-                   VerticalTextAlignment="Center" 
-                   FontSize="15" 
                    Placeholder="Email"
                    x:Name="EntryMail"/>
         </Border>
@@ -30,11 +26,8 @@
             <Label Text="Veuillez rentrer le code à 6 chiffres reçus par mail"
                    HorizontalOptions="Center"/>
 
-            <Border StrokeShape="RoundRectangle 40" BackgroundColor="White" Padding="7" Margin="40">
+            <Border Style="{StaticResource bordureBlanche}" Padding="7" Margin="40">
-                <Entry BackgroundColor="White" 
+                <Entry Style="{StaticResource zoneDeTexte}"
-                   TextColor="Black" 
-                   VerticalTextAlignment="Center" 
-                   FontSize="15" 
                    Placeholder="6 Chiffres"
                    Keyboard="Numeric"
                    x:Name="EntryCodeRecept"/>

Sources/IHM/Desktop/MainPage.xaml

@@ -6,16 +6,11 @@
     <StackLayout BackgroundColor="{StaticResource Primary}">
         
 
-
-        
-       
-
         <StackLayout
             
             Spacing="25"
             Padding="30,0"
-            VerticalOptions="Start"
+            VerticalOptions="Start">
-            >
 
                 <Label
                 Margin="0,20,0,30"
@@ -27,20 +22,14 @@
 
             <Image Source="logo_sans_fond.png" HorizontalOptions="Center" HeightRequest="200" />
 
-            <Border StrokeShape="RoundRectangle 20" BackgroundColor="White" Padding="7">
+            <Border Style="{StaticResource bordureBlanche}" Padding="7">
-                    <Entry BackgroundColor="{StaticResource White}" 
+                <Entry Style="{StaticResource zoneDeTexte}"
-                       TextColor="{StaticResource Black}" 
-                       VerticalTextAlignment="Center" 
-                       FontSize="15" 
                        Placeholder="Addresse mail"
                        x:Name="EntryMail"/>
                 </Border>
 
-                <Border StrokeShape="RoundRectangle 20" BackgroundColor="White" Padding="7">
+                <Border Style="{StaticResource bordureBlanche}" Padding="7">
-                    <Entry BackgroundColor="{StaticResource White}" 
+                    <Entry Style="{StaticResource zoneDeTexte}"
-                       TextColor="{StaticResource Black}" 
-                       VerticalTextAlignment="Center" 
-                       FontSize="15" 
                        Placeholder="Mot de passe" 
                        IsPassword="True"
                        x:Name="EntryPassworld"/>