From 67eb8c9628cd5070319fac0d81be3ab8ac62006a Mon Sep 17 00:00:00 2001
From: "leo.tuaillon" <leo.TUAILLON@etu.uca.fr>
Date: Wed, 5 Apr 2023 00:30:54 +0200
Subject: [PATCH] =?UTF-8?q?HomePage=20Corrig=C3=A9=20(reste=20=C3=A0=20cha?=
 =?UTF-8?q?nger=20les=20boutons=20en=20blanc,=20la=20searchBar=20et=20fini?=
 =?UTF-8?q?r=20le=20FlexLayout=20pour=20les=20recommended=20for=20you,=20a?=
 =?UTF-8?q?ussi=20remplacer=20les=20rectangle=20par=20les=20component=20re?=
 =?UTF-8?q?cipes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Resources/{AppIcon => Images}/account.svg |   0
 Resources/{AppIcon => Images}/sort.svg    |   0
 Resources/{AppIcon => Images}/syncalt.svg |   0
 Resources/Styles/Styles.xaml              |  10 -
 Views/HomePage.xaml                       | 296 +++++++++-------------
 5 files changed, 126 insertions(+), 180 deletions(-)
 rename Resources/{AppIcon => Images}/account.svg (100%)
 rename Resources/{AppIcon => Images}/sort.svg (100%)
 rename Resources/{AppIcon => Images}/syncalt.svg (100%)

diff --git a/Resources/AppIcon/account.svg b/Resources/Images/account.svg
similarity index 100%
rename from Resources/AppIcon/account.svg
rename to Resources/Images/account.svg
diff --git a/Resources/AppIcon/sort.svg b/Resources/Images/sort.svg
similarity index 100%
rename from Resources/AppIcon/sort.svg
rename to Resources/Images/sort.svg
diff --git a/Resources/AppIcon/syncalt.svg b/Resources/Images/syncalt.svg
similarity index 100%
rename from Resources/AppIcon/syncalt.svg
rename to Resources/Images/syncalt.svg
diff --git a/Resources/Styles/Styles.xaml b/Resources/Styles/Styles.xaml
index 0e66b7c..18bcc12 100644
--- a/Resources/Styles/Styles.xaml
+++ b/Resources/Styles/Styles.xaml
@@ -4,16 +4,6 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-    <Border 
-        x:Key="UserInput"
-        Grid.Row="3"
-        StrokeShape="RoundRectangle 15"
-        Stroke="{StaticResource BackgroundSecondary}">
-        <Entry
-            TextColor="{StaticResource TextColorPrimary}"
-            PlaceholderColor="{StaticResource TextColorSecondary}"
-            BackgroundColor="{StaticResource BackgroundSecondary}"/>
-    </Border>
 
     <Style TargetType="ActivityIndicator">
         <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
diff --git a/Views/HomePage.xaml b/Views/HomePage.xaml
index 7573fad..7797520 100644
--- a/Views/HomePage.xaml
+++ b/Views/HomePage.xaml
@@ -5,179 +5,135 @@
              Title="HomePage">
 
     <ScrollView>
-        <StackLayout>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Frame BackgroundColor="Pink"
-                       CornerRadius="5"
-                       HeightRequest="40"
-                       WidthRequest="40"
-                       Grid.Column="0"
-                       Margin="10">
-                    <Image Source="../Ressources/AppIcon/sort.svg"
-                           HeightRequest="20"
-                           WidthRequest="20"
-                           Aspect="AspectFit"
-                           VerticalOptions="Center"
-                           HorizontalOptions="Center"/>
-                </Frame>
-                <Image Source="../Ressources/AppIcon/account.svg"
-                       HeightRequest="40"
-                       WidthRequest="40"
-                       Grid.Column="2"
-                       Margin="10"/>
-                <SearchBar Placeholder="Search here ..."
-                           PlaceholderColor="Gray"
-                           HeightRequest="40"
-                           BackgroundColor="White"
-                           TextColor="Black"
-                           FontSize="14"
-                           Grid.Column="1"
-                           Margin="10,0,10,0"
-                           VerticalOptions="Center"/>
-                <Frame BackgroundColor="Pink"
-                       CornerRadius="5"
-                       HeightRequest="40"
-                       WidthRequest="40"
-                       Grid.Column="1"
-                       Margin="0,0,10,0"
-                       HorizontalOptions="End">
-                    <Image Source="../Ressources/AppIcon/syncalt.svg"
-                           HeightRequest="20"
-                           WidthRequest="20"
-                           Aspect="AspectFit"
-                           VerticalOptions="Center"
-                           HorizontalOptions="Center"/>         
-                </Frame>
-            </Grid>
-            <StackLayout Orientation="Horizontal"
-                         Margin="10,20,10,10">
-                <Label Text="Popular recipe"
-                       FontSize="18"
-                       FontAttributes="Bold"
-                       HorizontalOptions="StartAndExpand"/>
-                <Button Text="Show All"
-                        BackgroundColor="Transparent"
-                        TextColor="Pink"
-                        FontSize="14"
-                        FontAttributes="Bold"
-                        HorizontalOptions="End"/>
-            </StackLayout>
-            <ScrollView Margin="10,0,10,10">
-                <StackLayout>
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-
-                        <!-- Mettez ici le même composant recette que vous avez déjà créé -->
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"
-                     Margin="0,0,10,10"
-                     Grid.Row="0"
-                     Grid.Column="0"/>
-
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"
-                     Margin="0,0,0,10"
-                     Grid.Row="0"
-                     Grid.Column="1"/>
-
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"
-                     Margin="0,0,10,10"
-                     Grid.Row="1"
-                     Grid.Column="0"/>
-
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"
-                     Margin="0,0,0,10"
-                     Grid.Row="1"
-                     Grid.Column="1"/>
+        <Grid RowDefinitions="Auto,Auto,Auto,*">
+            <FlexLayout
+                Grid.Row="0"
+                JustifyContent="SpaceBetween"
+                AlignItems="Center"
+                AlignContent="Center"
+                Margin="20"
+                >
+                <ImageButton Source="sort.svg" 
+                             Padding="5" 
+                             BackgroundColor="Pink" 
+                             WidthRequest="65" 
+                             HeightRequest="65" 
+                             CornerRadius="15" 
+                             Margin="0,5,10,0">
+                </ImageButton>
+                <ImageButton Source="account.svg" 
+                             Padding="5" 
+                             BackgroundColor="Transparent" 
+                             WidthRequest="75" 
+                             HeightRequest="75" 
+                             CornerRadius="15" 
+                             Margin="0,5,0,0">
+                </ImageButton>                
+            </FlexLayout>
+            <Grid 
+                ColumnDefinitions="*,Auto"  
+                Grid.Row="1"
 
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"
-                     Margin="0,0,10,10"
-                     Grid.Row="2"
-                     Grid.Column="0"/>
-
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"
-                     Margin="0,0,0,10"
-                     Grid.Row="2"
-                     Grid.Column="1"/>
-                    </Grid>
-                </StackLayout>
-            </ScrollView>
-            <StackLayout Orientation="Horizontal"
-                         Margin="10,20,10,10">
-                <Label Text="Recommended for you"
-                       FontSize="18"
-                       FontAttributes="Bold"
-                       HorizontalOptions="StartAndExpand"/>
-                <Button Text="Show All"
-                        BackgroundColor="Transparent"
-                        TextColor="Pink"
-                        FontSize="14"
-                        FontAttributes="Bold"
-                        HorizontalOptions="End"/>
-            </StackLayout>
-            <Label Text="Recommended for you"
-       Margin="10,20,0,0"
-       FontSize="Title"
-       FontAttributes="Bold"/>
-
-            <Button Text="Show all"
-        Margin="0,20,10,0"
-        FontAttributes="Bold"
-        FontSize="Medium"
-        TextColor="Gray"
-        BackgroundColor="White"
-        HorizontalOptions="End"/>
-
-            <ScrollView Margin="10,0,10,10">
-                <StackLayout>
-                    <Grid ColumnSpacing="10"
-                    RowSpacing="10"
-                    HorizontalOptions="FillAndExpand"
-                    VerticalOptions="FillAndExpand"
-                    Margin="0,0,0,10"
-                    RowDefinitions="2"
-                    ColumnDefinitions="2">
-
-                        <!-- Mettez ici le même composant recette que vous avez déjà créé -->
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"/>
+                Margin="20"
+                >
+                <Entry
+                    Margin="5,10,5,5"
+                    Grid.Column="0"
+                    Placeholder="Search here..."
+                    >                 
+                </Entry>
+                <ImageButton 
+                    Grid.Column="1" 
+                    Source="syncalt.svg" 
+                    Padding="5" 
+                    BackgroundColor="Pink" 
+                    WidthRequest="65" 
+                    HeightRequest="65" 
+                    CornerRadius="15"
+                    Margin="0,5,5,0">
+                </ImageButton>
+            </Grid>
 
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"/>
+            <VerticalStackLayout
+                Grid.Row="2">
+                <FlexLayout
+                        
+                    JustifyContent="SpaceBetween"
+                    AlignItems="Center"
+                    AlignContent="Stretch"
+                    Margin="20"
+                    >
+                    <Label Text="Popular recipe" 
+                           HeightRequest="30"
+                           FontSize="Title"
+                           FontAttributes="Bold"
+                           Margin="5,0,0,0"
+                           >
+                            
+                    </Label>
+                    <Label Text="Show All"
+                           Margin="0,5,5,0"
+                           HeightRequest="25"
+                           TextColor="Grey"
+                           >
+                    </Label>
+                </FlexLayout>
+                <HorizontalStackLayout Spacing="10">
+                    <Border StrokeShape="RoundRectangle 25">
+                        <Rectangle HeightRequest="150" WidthRequest="150" BackgroundColor="Yellow">
+                        </Rectangle>
+                    </Border>
+                    <Border  StrokeShape="RoundRectangle 25">
+                        <Rectangle HeightRequest="150" WidthRequest="150" BackgroundColor="Yellow">
+                        </Rectangle>
+                    </Border>
+                    <Border StrokeShape="RoundRectangle 25">
+                        <Rectangle HeightRequest="150" WidthRequest="150" BackgroundColor="Yellow">
+                        </Rectangle>
+                    </Border>
+                </HorizontalStackLayout>
+            </VerticalStackLayout>
+            
+            <VerticalStackLayout
+                Grid.Row="3">
+                <FlexLayout
+                        
+                    JustifyContent="SpaceBetween"
+                    AlignItems="Center"
+                    AlignContent="Stretch"
+                    Margin="20,40,20,20"
+                    >
+                    <Label Text="Recommended for you" 
+                           HeightRequest="35"
+                           FontSize="Title"
+                           FontAttributes="Bold"
+                           Margin="5,0,0,0"
+                           >
 
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"/>
+                    </Label>
+                    <Label Text="Show All"
+                           Margin="0,5,5,0"
+                           HeightRequest="25"
+                           TextColor="Grey"
+                           >
+                    </Label>
+                </FlexLayout>
+                <FlexLayout>
+                    <Border StrokeShape="RoundRectangle 25">
+                        <Rectangle HeightRequest="150" WidthRequest="150" BackgroundColor="Yellow">
+                        </Rectangle>
+                    </Border>
+                    <Border  StrokeShape="RoundRectangle 25">
+                        <Rectangle HeightRequest="150" WidthRequest="150" BackgroundColor="Yellow">
+                        </Rectangle>
+                    </Border>
+                    <Border StrokeShape="RoundRectangle 25">
+                        <Rectangle HeightRequest="150" WidthRequest="150" BackgroundColor="Yellow">
+                        </Rectangle>
+                    </Border>
+                </FlexLayout>
+            </VerticalStackLayout>
 
-                        <BoxView BackgroundColor="LightBlue"
-                     HeightRequest="120"
-                     WidthRequest="150"/>
-                    </Grid>
-                </StackLayout>
-            </ScrollView>
-        </StackLayout>
+        </Grid>
     </ScrollView>
 </ContentPage>
\ No newline at end of file