From 3f884f0c1c235684a31f5078202fe92cb935d170 Mon Sep 17 00:00:00 2001
From: Alexandre Agostinho <alexandre.agostinho@etu.uca.fr>
Date: Mon, 5 Jun 2023 19:26:29 +0200
Subject: [PATCH] display fix on flayout buttons

---
 MCTG/Views/ContentPages/Home.xaml            |  4 +--
 MCTG/Views/ContentPages/Home.xaml.cs         |  6 +++--
 MCTG/Views/ContentViews/ContainerFlyout.xaml | 27 +++++++++++++-------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/MCTG/Views/ContentPages/Home.xaml b/MCTG/Views/ContentPages/Home.xaml
index 3120fc2..2973af4 100644
--- a/MCTG/Views/ContentPages/Home.xaml
+++ b/MCTG/Views/ContentPages/Home.xaml
@@ -16,7 +16,7 @@
                 <!-- Research -->
                 <Label
                     Text="Recherche de recettes :" FontSize="14"
-                    Margin="20, 10, 15, 0"/>
+                    Margin="20, 0, 15, 0"/>
                 <SearchBar
                     Placeholder="Mots-clés (ex.: rapide, fromage)"
                     TextColor="Black"
@@ -26,7 +26,7 @@
 
                 <!-- Direct research -->
                 <Button
-                    Text="Suggestions"
+                    Text="Suggestions" x:Name="suggestions_button"
                     ImageSource="home_icon.png"
                     Style="{StaticResource button1}"
                     Clicked="Suggestions_Clicked"
diff --git a/MCTG/Views/ContentPages/Home.xaml.cs b/MCTG/Views/ContentPages/Home.xaml.cs
index c1b650b..a74d6cf 100644
--- a/MCTG/Views/ContentPages/Home.xaml.cs
+++ b/MCTG/Views/ContentPages/Home.xaml.cs
@@ -14,7 +14,7 @@ namespace Views
 
         public Home()
         {
-            Master.User.LogIn("admin", "");
+            // Master.User.LogIn("pedrosamigos@hotmail.com", "pamigos");
 
             _recipesDisplayed = Master.Recipe.GetAllRecipes();
             if (Master.User.CurrentConnected is null)
@@ -26,8 +26,10 @@ namespace Views
 
             InitializeComponent();
 
-            BindingContext = this;
             container_base.IsConnected = Master.User.CurrentConnected is not null;
+            suggestions_button.IsVisible = container_base.IsConnected;
+
+            BindingContext = this;
         }
 
 
diff --git a/MCTG/Views/ContentViews/ContainerFlyout.xaml b/MCTG/Views/ContentViews/ContainerFlyout.xaml
index 2961682..b7d12d8 100644
--- a/MCTG/Views/ContentViews/ContainerFlyout.xaml
+++ b/MCTG/Views/ContentViews/ContainerFlyout.xaml
@@ -7,10 +7,10 @@
              x:Name="fl"
              BackgroundColor="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Gray600}}">
 
-    <Grid RowDefinitions="250, *, 100">
+    <Grid RowDefinitions="Auto, *, Auto">
         <VerticalStackLayout Grid.Row="0">
 
-            <Grid RowDefinitions="auto, *">
+            <Grid RowDefinitions="Auto, *">
                 <!-- Return -->
                 <local:ReturnButton NeedReturn="{Binding NeedReturn, Source={x:Reference fl}}" Grid.Row="0"
                                 HorizontalOptions="Start" Padding="10, 10, 0, 0"/>
@@ -28,22 +28,29 @@
             <!-- Connection button -->
             <Button Text="Connection" ImageSource="login_icon.png"
                     Style="{StaticResource button2}"
-                    Margin="15, 120"
+                    Margin="15, 50"
                     IsVisible="{Binding IsConnected, Converter={toolkit:InvertedBoolConverter}, Source={x:Reference fl}}"
                     Clicked="ConnectionButton_Clicked"/>
             
             <!-- Display name -->
-            <StackLayout BindingContext="{Binding ConnectedUser}"
-                         IsVisible="{Binding IsConnected, Source={x:Reference fl}}">
+            <FlexLayout
+                Margin="0, 10"
+                Wrap="Wrap"
+                AlignItems="Center"
+                HorizontalOptions="Center"
+                BindingContext="{Binding ConnectedUser}"
+                IsVisible="{Binding IsConnected, Source={x:Reference fl}}">
+
                 <Label Text="{Binding Name}"
-                   HorizontalOptions="Center" Margin="0,15"
+                   HorizontalOptions="Center" Margin="2,0"
                    FontSize="20" FontAttributes="Bold" HorizontalTextAlignment="Center"
                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
+
                 <Label Text="{Binding Surname}"
-                   HorizontalOptions="Center" 
+                   HorizontalOptions="Center" Margin="2,0"
                    FontSize="20" FontAttributes="Bold" HorizontalTextAlignment="Center"
                    TextColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}"/>
-            </StackLayout>
+            </FlexLayout>
 
         </VerticalStackLayout>
 
@@ -51,10 +58,12 @@
         <ContentView
             VerticalOptions="Fill"
             Grid.Row="1"
+            Margin="0, 30"
             Content="{Binding MyFlyoutContent, Source={x:Reference fl}}"/>
 
         
-        <VerticalStackLayout Grid.Row="2">
+        <VerticalStackLayout Grid.Row="2"
+                             Margin="0, 20">
             <!-- Footer -->
             <Button Text="Déconnection" ImageSource="logout_icon.png"
                     Style="{StaticResource button2}"