From 603149c7a13ebd3e933ef7920fbb186fb1978a50 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Wed, 7 Jun 2023 19:11:11 +0200
Subject: [PATCH] better view, connection done

---
 MCTG/Views/ContentPages/Login.xaml         | 59 +++++++++++++++-------
 MCTG/Views/ContentViews/MiniHeader.xaml    | 14 ++---
 MCTG/Views/ContentViews/MiniHeader.xaml.cs |  5 ++
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/MCTG/Views/ContentPages/Login.xaml b/MCTG/Views/ContentPages/Login.xaml
index b2ef68b..5f4eada 100644
--- a/MCTG/Views/ContentPages/Login.xaml
+++ b/MCTG/Views/ContentPages/Login.xaml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="Views.Login"
              xmlns:local="clr-namespace:Views"
              Title="Login"
@@ -22,46 +23,66 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
             
+            
             <!-- Login -->
-            <Label Grid.Column="1"
-                   Grid.Row="0"
+            <Label Grid.Column="1" Grid.Row="0"
+
                    Text="Login :"
+
                    FontAttributes="Bold"
                    FontSize="Medium"
                    Padding="0,50,0,10"
                    MinimumWidthRequest="200"/>
-            <Entry x:Name="login_entry"
-                   Grid.Column="1"
-                   Grid.Row="1"
+
+            <Entry Grid.Column="1" Grid.Row="1"
+                
+                   x:Name="login_entry"
+                   Placeholder="exemple@mctg.fr" PlaceholderColor="DimGrey"
+                   IsSpellCheckEnabled="False"
+                   toolkit:SetFocusOnEntryCompletedBehavior.NextElement="{x:Reference passwd_entry}"
+                   
                    BackgroundColor="#D1E8E2"
                    Margin="0,0,0,20"/>
             
+            
             <!-- Password -->
-            <Label Grid.Column="1"
-                   Grid.Row="2"
+            <Label Grid.Column="1" Grid.Row="2"
+                   
                    Text="Mot de passe :"
+                   
                    FontAttributes="Bold"
                    FontSize="Medium"
                    Padding="0,50,0,10"
                    MinimumWidthRequest="200"/>
-            <Entry x:Name="passwd_entry"
-                   Grid.Column="1"
-                   Grid.Row="3"
+
+            <Entry Grid.Column="1" Grid.Row="3"
+                   
+                   x:Name="passwd_entry"
+                   IsPassword="True"
+                   Completed="LoginButton_Clicked"
+                   
                    BackgroundColor="#D1E8E2"
                    Margin="0,0,0,50"/>
             
+            
             <!-- Checkbox first login -->
-            <CheckBox x:Name="firstLogin_checkbox"
-                      Grid.Column="1"
-                      Grid.Row="4"/>
-            <Label Grid.Column="1"
-                   Grid.Row="4"
-                   Text="première connection"
-                   Margin="50,0,0,0"
-                   FontAttributes="Italic"/>
+            <HorizontalStackLayout
+                Grid.Column="1" Grid.Row="4"
+                HorizontalOptions="Center">
+
+                <CheckBox
+                    x:Name="firstLogin_checkbox"/>
+                <Label
+                    Text="première connection"
+                    FontAttributes="Italic"
+                    Margin="10, 20"/>
+
+            </HorizontalStackLayout>
+            
             
             <!-- Return button -->
-            <Button BackgroundColor="#D1E8E2"
+            <Button Text="Connection"
+                    BackgroundColor="{StaticResource Primary}"
                     Grid.Column="1"
                     Grid.Row="5"
                     Clicked="LoginButton_Clicked"/>
diff --git a/MCTG/Views/ContentViews/MiniHeader.xaml b/MCTG/Views/ContentViews/MiniHeader.xaml
index 436112e..382284f 100644
--- a/MCTG/Views/ContentViews/MiniHeader.xaml
+++ b/MCTG/Views/ContentViews/MiniHeader.xaml
@@ -2,13 +2,14 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Views"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="Views.MiniHeader"
              x:Name="miniheader">
-    <Grid BackgroundColor="#116466" ColumnDefinitions="*,*,*">
+
+    <Grid BackgroundColor="{StaticResource Primary}" ColumnDefinitions="*,*,*">
         <local:ReturnButton NeedReturn="{Binding NeedReturn, Source={x:Reference miniheader}}"
                             HorizontalOptions="Start" Padding="10, 10, 0, 0"
-                            WidthRequest="60"
-                            />
+                            WidthRequest="60"/>
         <Label Grid.Column="1"
             Text="{Binding TitleMini, Source={x:Reference miniheader}}"
             FontSize="Medium"
@@ -19,8 +20,9 @@
             HorizontalOptions="Center" />
         <ImageButton Grid.Column="2"
                      Source="person_default.svg"
-                    WidthRequest="80" HeightRequest="80"
-                    CornerRadius="50" 
-                    BorderWidth="4" BorderColor="Black"/>
+                     WidthRequest="80" HeightRequest="80"
+                     CornerRadius="50" 
+                     BorderWidth="4" BorderColor="Black"
+                     IsVisible="{Binding ., Converter={toolkit:IsNotNullConverter}}"/>
     </Grid>
 </ContentView>
diff --git a/MCTG/Views/ContentViews/MiniHeader.xaml.cs b/MCTG/Views/ContentViews/MiniHeader.xaml.cs
index e847844..b78f281 100644
--- a/MCTG/Views/ContentViews/MiniHeader.xaml.cs
+++ b/MCTG/Views/ContentViews/MiniHeader.xaml.cs
@@ -1,10 +1,15 @@
+using Model;
+
 namespace Views;
 
 public partial class MiniHeader : ContentView
 {
+	MasterManager Master = (Application.Current as App).Master;
+
 	public MiniHeader()
 	{
 		InitializeComponent();
+		BindingContext = Master.User.CurrentConnected;
 	}
 
 	public static readonly BindableProperty TitleMiniProperty =