From a8010c01c78efa48f057df846416dce051f0dfe5 Mon Sep 17 00:00:00 2001
From: lobroda <lou.broda@etu.uca.fr>
Date: Sat, 9 Sep 2023 14:15:50 +0100
Subject: [PATCH] =?UTF-8?q?ADD=20:=20avancement=20view=20+=20mise=20en=20p?=
 =?UTF-8?q?lace=20popup=20(=C3=A0=20revoir)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LivreLand/Resources/Styles/Colors.xaml        |  2 +
 .../ContentViews/PopupHomePlusButtonView.xaml | 46 ++++++++++++++-----
 .../PopupHomePlusButtonView.xaml.cs           |  1 +
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/LivreLand/Resources/Styles/Colors.xaml b/LivreLand/Resources/Styles/Colors.xaml
index 3a4ab54..65a06bf 100644
--- a/LivreLand/Resources/Styles/Colors.xaml
+++ b/LivreLand/Resources/Styles/Colors.xaml
@@ -10,6 +10,8 @@
     <Color x:Key="HeaderGray">#f2f0f6</Color>
     <Color x:Key="HeaderSeparatorGray">#c9c9cb</Color>
 
+    <Color x:Key="PopupBackground">#f5f5f5</Color>
+    
     <Color x:Key="PinkOrange">#fd0342</Color>
     
     <Color x:Key="Primary">#512BD4</Color>
diff --git a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml
index d347fd1..c855895 100644
--- a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml
+++ b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <toolkit:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+               xmlns:contentView="clr-namespace:LivreLand.View.ContentViews"
                xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-               x:Class="LivreLand.View.ContentViews.PopupHomePlusButtonView">
-    <Grid>
+               x:Class="LivreLand.View.ContentViews.PopupHomePlusButtonView"
+               HorizontalOptions="End"
+               VerticalOptions="Start">
+
+    <Grid BackgroundColor="{DynamicResource PopupBackground}">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
-            <RowDefinition Height="10 "/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="10"/>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
             <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
 
-        <Grid Grid.Row="0">
-            <Label Text="Ajouter un livre"/>
+        <Grid Grid.Row="0"
+              Margin="10,5,10,5">
+            <Label Text="Ajouter un livre"
+                   Style="{StaticResource MasterStateBookText}"/>
         </Grid>
 
-        <Grid Grid.Row="1">
+        <contentView:SeparatorEntireView Grid.Row="1"/>
+
+        <Grid Grid.Row="2"
+              Margin="10,5,10,5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto"/>
                 <ColumnDefinition Width="*"/>
@@ -25,10 +37,14 @@
             </Grid.ColumnDefinitions>
 
             <Label Text="Scanner un code-barres"
+                   Style="{StaticResource HomeButtonText}"
                    Grid.Column="0"/>
         </Grid>
 
-        <Grid Grid.Row="2">
+        <contentView:SeparatorEntireView Grid.Row="3"/>
+
+        <Grid Grid.Row="4"
+              Margin="10,5,10,5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto"/>
                 <ColumnDefinition Width="*"/>
@@ -36,13 +52,15 @@
             </Grid.ColumnDefinitions>
 
             <Label Text="Scanner des codes-barres"
+                   Style="{StaticResource HomeButtonText}"
                    Grid.Column="0"/>
         </Grid>
 
-        <Grid  BackgroundColor="{DynamicResource HeaderGray}"
-              Grid.Row="3"/>
+        <Grid BackgroundColor="{DynamicResource Gray}"
+              Grid.Row="5"/>
 
-        <Grid Grid.Row="4">
+        <Grid Grid.Row="6"
+              Margin="10,5,10,5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto"/>
                 <ColumnDefinition Width="*"/>
@@ -50,6 +68,7 @@
             </Grid.ColumnDefinitions>
 
             <Label Text="Rechercher en ligne"
+                   Style="{StaticResource HomeButtonText}"
                    Grid.Column="0"/>
             <Image Source="magnifying_glass.png"
                    Grid.Column="2">
@@ -59,7 +78,10 @@
             </Image>
         </Grid>
 
-        <Grid Grid.Row="5">
+        <contentView:SeparatorEntireView Grid.Row="7"/>
+
+        <Grid Grid.Row="8"
+              Margin="10,5,10,5">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto"/>
                 <ColumnDefinition Width="*"/>
@@ -67,7 +89,9 @@
             </Grid.ColumnDefinitions>
 
             <Label Text="Saisir l'ISBN"
+                   Style="{StaticResource HomeButtonText}"
                    Grid.Column="0"/>
         </Grid>
     </Grid>
+
 </toolkit:Popup>
diff --git a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs
index 5d8a934..0f4ad94 100644
--- a/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs
+++ b/LivreLand/View/ContentViews/PopupHomePlusButtonView.xaml.cs
@@ -7,5 +7,6 @@ public partial class PopupHomePlusButtonView : Popup
 	public PopupHomePlusButtonView()
 	{
 		InitializeComponent();
+		Size = new Size(0.7 * (DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density), 0.5 * (DeviceDisplay.Current.MainDisplayInfo.Width / DeviceDisplay.Current.MainDisplayInfo.Density));
 	}
 }
\ No newline at end of file