From c8c58f29b7b24993ff2a9d7d257bf62b36e57980 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Thu, 20 Apr 2023 16:49:56 +0200
Subject: [PATCH] some fixes and add add recipe button

---
 Pages/MyRecipesPage.xaml     | 15 ++++++++++---
 Resources/Styles/Styles.xaml |  7 ++++--
 ShoopNCook.csproj            | 42 +++++++++++++++++++++++++++++++-----
 Views/OwnedRecipeView.xaml   | 12 +++++------
 4 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/Pages/MyRecipesPage.xaml b/Pages/MyRecipesPage.xaml
index 209977a..33ae85a 100644
--- a/Pages/MyRecipesPage.xaml
+++ b/Pages/MyRecipesPage.xaml
@@ -6,12 +6,11 @@
              xmlns:views="clr-namespace:ShoopNCook.Views"
              BackgroundColor="{StaticResource BackgroundPrimary}">
     <Grid
-        RowDefinitions="Auto, *">
+        RowDefinitions="Auto, *, Auto">
         <!-- Header label and return button -->
         <Grid
             Grid.Row="0"
-            Padding="10, 20, 0, 30"
-            ColumnDefinitions="*">
+            Padding="10, 20, 0, 30">
 
             <ImageButton 
                 Grid.Column="0" 
@@ -52,5 +51,15 @@
                 <views:OwnedRecipeView Margin="5" Note="2" Title="Margherita Pizza"/>
             </FlexLayout>
         </ScrollView>
+
+        <Border 
+            Margin="20, 0, 20, 5"
+            Grid.Row="2"
+            Style="{StaticResource SecondaryBorder}">
+            <Button
+                Style="{StaticResource UserButton}"
+                BackgroundColor="{StaticResource Selected}"
+                Text="Add a new recipe"/>
+        </Border>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Resources/Styles/Styles.xaml b/Resources/Styles/Styles.xaml
index 3a79ae2..fda8d67 100644
--- a/Resources/Styles/Styles.xaml
+++ b/Resources/Styles/Styles.xaml
@@ -7,7 +7,8 @@
     <Style TargetType="Border"
            x:Key="SecondaryBorder">
         <Setter Property="StrokeShape" Value="RoundRectangle 25"/>
-        <Setter Property="Stroke" Value="{StaticResource BackgroundSecondary}"/>
+        <Setter Property="Stroke" Value="Transparent"/>
+        <Setter Property="StrokeThickness" Value="0"/>
         <Setter Property="BackgroundColor" Value="{StaticResource BackgroundSecondary}"/>
     </Style>
 
@@ -15,7 +16,8 @@
            x:Key="SecondaryBorderShadow">
         
         <Setter Property="StrokeShape" Value="RoundRectangle 25"/>
-        <Setter Property="Stroke" Value="{StaticResource BackgroundSecondary}"/>
+        <Setter Property="Stroke" Value="Transparent"/>
+        <Setter Property="StrokeThickness" Value="0"/>
         <Setter Property="BackgroundColor" Value="{StaticResource BackgroundSecondary}"/>
         <Setter Property="Shadow">
             <Setter.Value>
@@ -42,6 +44,7 @@
         x:Key="UserButton">
         <Setter Property="FontFamily" Value="PoppinsMedium"/>
         <Setter Property="FontSize" Value="20"/>
+        <Setter Property="TextColor" Value="{StaticResource ButtonText}"></Setter>
     </Style>
 
     <Style
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index 64d5f50..119a84f 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -49,11 +49,25 @@
 
 	<ItemGroup>
 	  <None Remove="Resources\Fonts\Poppins-Bold.ttf" />
-	  <None Remove="Resources\Images\bin.svg" />
+	  <None Remove="Resources\Fonts\Poppins-Medium.ttf" />
+	  <None Remove="Resources\Fonts\Poppins-Regular.ttf" />
+	  <None Remove="Resources\Images\cookie.svg" />
+	  <None Remove="Resources\Images\email_icon.svg" />
+	  <None Remove="Resources\Images\facebook_logo.svg" />
+	  <None Remove="Resources\Images\hearth_off.svg" />
+	  <None Remove="Resources\Images\hearth_on.svg" />
+	  <None Remove="Resources\Images\logout_arrow.svg" />
+	  <None Remove="Resources\Images\minus.svg" />
+	  <None Remove="Resources\Images\moon_white.svg" />
 	  <None Remove="Resources\Images\email_icon.svg" />
 	  <None Remove="Resources\Images\facebook_logo.svg" />
 	  <None Remove="Resources\Images\password_icon.svg" />
 	  <None Remove="Resources\Images\search_options.svg" />
+	  <None Remove="Resources\Images\share.svg" />
+	  <None Remove="Resources\Images\star_empty.svg" />
+	  <None Remove="Resources\Images\star_full.svg" />
+	  <None Remove="Resources\Images\user.svg" />
+	  <None Remove="Resources\Images\user_fill.svg" />
 	  <None Remove="Resources\Images\visibility_off.svg" />
 	  <None Remove="Resources\Images\visibility_on.svg" />
 	</ItemGroup>
@@ -72,21 +86,39 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="Views\FavoritesPage.xaml">
+	  <MauiXaml Update="Pages\MyList.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\HeadedButton.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\IngredientView.xaml">
+		  <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Pages\FavoritesPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\MyRecipesPage.xaml">
+	  <MauiXaml Update="Pages\MorePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\OwnedRecipeView.xaml">
+	  <MauiXaml Update="Pages\ProfilePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\ProfilePage.xaml">
+	  <MauiXaml Update="Pages\RecipePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Views\RecipeView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Pages\RegisterPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Pages\SearchPage.xaml">
+		  <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\RecipeView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\SearchPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Views/OwnedRecipeView.xaml b/Views/OwnedRecipeView.xaml
index 0a2fb71..5b01eec 100644
--- a/Views/OwnedRecipeView.xaml
+++ b/Views/OwnedRecipeView.xaml
@@ -51,11 +51,13 @@
                     BackgroundColor="{StaticResource Selected}"
                     Stroke="Transparent"
                     StrokeShape="RoundRectangle 250"
-                    Margin="15, 0, 15, 0">
+                    Margin="8, 0, 8, 0">
                     <Grid
                         ColumnDefinitions="Auto, *"
-                        Padding="15, 3, 15, 3"
-                        ColumnSpacing="4">
+                        Padding="10, 3, 10, 3"
+                        ColumnSpacing="4"
+                        HorizontalOptions="Center"
+                        >
                         <Grid.GestureRecognizers>
                             <TapGestureRecognizer 
                                 Tapped="TapGestureRecognizer_Tapped" 
@@ -66,11 +68,9 @@
                             Source="bin.svg"
                             MaximumHeightRequest="15"/>
 
-
                         <Label
                             Grid.Column="1"
-                            Text="Delete"
-                            />
+                            Text="Delete"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>