From 382bb13650e9a5e2561878171617ffe793a4acae Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Wed, 19 Apr 2023 14:45:37 +0200
Subject: [PATCH 1/3] fix all headers to be centered

---
 AppShell.xaml               |  6 ++++++
 ShoopNCook.csproj           |  3 +++
 Views/FavoritesPage.xaml    | 17 +++++++++++------
 Views/MyRecipesPage.xaml    | 32 ++++++++++++++++++++++++++++++++
 Views/MyRecipesPage.xaml.cs |  9 +++++++++
 Views/ProfilePage.xaml      | 26 ++++++++++++++------------
 Views/RecipePage.xaml       |  5 +----
 Views/SearchPage.xaml       | 27 ++++++++++++++++-----------
 8 files changed, 92 insertions(+), 33 deletions(-)
 create mode 100644 Views/MyRecipesPage.xaml
 create mode 100644 Views/MyRecipesPage.xaml.cs

diff --git a/AppShell.xaml b/AppShell.xaml
index 2f54421..260e05d 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -38,5 +38,11 @@
             Title="Favorites Page"
             ContentTemplate="{DataTemplate views:FavoritesPage}"
             Route="Favorites" />
+
+
+        <ShellContent
+            Title="My Recipes Page"
+            ContentTemplate="{DataTemplate views:MyRecipesPage}"
+            Route="MyRecipes" />
     </TabBar>
 </Shell>
\ No newline at end of file
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index d32645e..56b5262 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -74,6 +74,9 @@
 	  <MauiXaml Update="Views\FavoritesPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\MyRecipesPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\ProfilePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Views/FavoritesPage.xaml b/Views/FavoritesPage.xaml
index 5aa1b63..ef36e98 100644
--- a/Views/FavoritesPage.xaml
+++ b/Views/FavoritesPage.xaml
@@ -11,21 +11,26 @@
         <!-- Header label and return button -->
         <Grid
             Grid.Row="0"
-            ColumnDefinitions="Auto, *"
-            Padding="10, 20, 0, 30">
+            Padding="20, 40, 0, 30"
+            ColumnDefinitions="*"
+            MaximumHeightRequest="60">
 
             <ImageButton 
                 Grid.Column="0" 
                 HeightRequest="50"
                 WidthRequest="50"
-                Source="arrow_back.svg"/>
+                Source="arrow_back.svg"
+                HorizontalOptions="Start"/>
+
             <Label 
-                Grid.Column="1"
+                Grid.Column="0"
                 FontSize="24"
                 TextColor="{StaticResource TextColorPrimary}"
-                Text="Favorites recipes"
+                Text="Favorites Recipes"
+                MaximumHeightRequest="60"
                 FontFamily="PoppinsBold"
-                HorizontalOptions="Center"/>
+                HorizontalOptions="Center"
+                VerticalOptions="Center"/>
         </Grid>
 
         <!-- Favorite items -->
diff --git a/Views/MyRecipesPage.xaml b/Views/MyRecipesPage.xaml
new file mode 100644
index 0000000..09e1b98
--- /dev/null
+++ b/Views/MyRecipesPage.xaml
@@ -0,0 +1,32 @@
+<?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"
+             x:Class="ShoopNCook.Views.MyRecipesPage"
+             Title="MyRecipesPage"
+             BackgroundColor="{StaticResource BackgroundPrimary}">
+    <Grid
+        RowDefinitions="Auto, *">
+        <!-- Header label and return button -->
+        <Grid
+            Grid.Row="0"
+            Padding="10, 20, 0, 30"
+            ColumnDefinitions="*">
+
+            <ImageButton 
+                Grid.Column="0" 
+                HeightRequest="50"
+                WidthRequest="50"
+                Source="arrow_back.svg"
+                HorizontalOptions="Start"/>
+            
+            <Label 
+                Grid.Column="0"
+                FontSize="24"
+                TextColor="{StaticResource TextColorPrimary}"
+                Text="My Recipes"
+                FontFamily="PoppinsBold"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"/>
+        </Grid>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/Views/MyRecipesPage.xaml.cs b/Views/MyRecipesPage.xaml.cs
new file mode 100644
index 0000000..aaf6794
--- /dev/null
+++ b/Views/MyRecipesPage.xaml.cs
@@ -0,0 +1,9 @@
+namespace ShoopNCook.Views;
+
+public partial class MyRecipesPage : ContentPage
+{
+	public MyRecipesPage()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Views/ProfilePage.xaml b/Views/ProfilePage.xaml
index 7f795ff..8426e3d 100644
--- a/Views/ProfilePage.xaml
+++ b/Views/ProfilePage.xaml
@@ -13,23 +13,25 @@
             <!-- Profile label and return button -->
             <Grid
                 Grid.Row="0"
-                RowDefinitions="Auto, *"
-                ColumnDefinitions="*, 1.5*"
-                Margin="0, 0, 0, 40">
-                <HorizontalStackLayout>
-                    <ImageButton 
-                        Grid.Column="0" 
-           
-                        HeightRequest="50"
-                        WidthRequest="50"
-                        Source="arrow_back.svg"/>
-                </HorizontalStackLayout>
+                Padding="10, 20, 0, 30"
+                ColumnDefinitions="*"
+                MaximumHeightRequest="60">
+
+                <ImageButton 
+                    Grid.Column="0" 
+                    HeightRequest="50"
+                    WidthRequest="50"
+                    Source="arrow_back.svg"
+                    HorizontalOptions="Start"/>
+
                 <Label 
-                    Grid.Column="1"
+                    Grid.Column="0"
                     FontSize="24"
                     TextColor="{StaticResource TextColorPrimary}"
                     Text="Profile"
+                    MaximumHeightRequest="60"
                     FontFamily="PoppinsBold"
+                    HorizontalOptions="Center"
                     VerticalOptions="Center"/>
             </Grid>
 
diff --git a/Views/RecipePage.xaml b/Views/RecipePage.xaml
index 9423b7c..e763845 100644
--- a/Views/RecipePage.xaml
+++ b/Views/RecipePage.xaml
@@ -8,8 +8,7 @@
     
     <Grid
         RowDefinitions="90*, 10*"
-        Padding="10"
-        >
+        Padding="10">
 
         <!--Main content-->
         <ScrollView>
@@ -141,9 +140,7 @@
                             HorizontalOptions="Center"
                             Text="Submit"/>
                     </Border>
-
                 </HorizontalStackLayout>
-               
             </Grid>
         </ScrollView>
 
diff --git a/Views/SearchPage.xaml b/Views/SearchPage.xaml
index 5c4c873..baf00fb 100644
--- a/Views/SearchPage.xaml
+++ b/Views/SearchPage.xaml
@@ -12,26 +12,31 @@
 
         <!-- Search label and return button -->
         <Grid
-            RowDefinitions="Auto, *"
-            ColumnDefinitions="*, 1.5*"
-            Margin="0, 0, 0, 30">
+            Grid.Row="0"
+            Padding="10, 20, 0, 30"
+            ColumnDefinitions="*"
+            MaximumHeightRequest="60">
+
+            <ImageButton 
+                Grid.Column="0" 
+                HeightRequest="50"
+                WidthRequest="50"
+                Source="arrow_back.svg"
+                HorizontalOptions="Start"/>
 
-            <HorizontalStackLayout>
-                <ImageButton 
-                    Grid.Column="0" 
-                    HeightRequest="50"
-                    WidthRequest="50"
-                    Source="arrow_back.svg"/>
-            </HorizontalStackLayout>
             <Label 
-                Grid.Column="1"
+                Grid.Column="0"
                 FontSize="24"
                 TextColor="{StaticResource TextColorPrimary}"
                 Text="Search"
+                MaximumHeightRequest="60"
+                
                 FontFamily="PoppinsBold"
+                HorizontalOptions="Center"
                 VerticalOptions="Center"/>
         </Grid>
 
+
         <!-- Search input and filter button -->
         
         <Grid 

From 7d840a486d25af82ce44121e81d0b027c6ba985c Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Thu, 20 Apr 2023 15:22:51 +0200
Subject: [PATCH 2/3] add MyRecipes page

---
 ShoopNCook.csproj             |  3 +++
 Views/MyRecipesPage.xaml      | 24 ++++++++++++++++++++++++
 Views/OwnedRecipeView.xaml    |  6 ++++++
 Views/OwnedRecipeView.xaml.cs | 14 ++++++++++++++
 Views/RecipeView.xaml.cs      |  1 -
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 Views/OwnedRecipeView.xaml
 create mode 100644 Views/OwnedRecipeView.xaml.cs

diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index 56b5262..0974f50 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -77,6 +77,9 @@
 	  <MauiXaml Update="Views\MyRecipesPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\OwnedRecipeView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\ProfilePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Views/MyRecipesPage.xaml b/Views/MyRecipesPage.xaml
index 09e1b98..e59de70 100644
--- a/Views/MyRecipesPage.xaml
+++ b/Views/MyRecipesPage.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ShoopNCook.Views.MyRecipesPage"
              Title="MyRecipesPage"
+             xmlns:views="clr-namespace:ShoopNCook.Views"
              BackgroundColor="{StaticResource BackgroundPrimary}">
     <Grid
         RowDefinitions="Auto, *">
@@ -28,5 +29,28 @@
                 HorizontalOptions="Center"
                 VerticalOptions="Center"/>
         </Grid>
+
+        <!-- Favorite items -->
+        <ScrollView
+            Grid.Row="1">
+            <FlexLayout
+                JustifyContent="Center"
+                AlignItems="Start"
+                AlignContent="Start"
+                Direction="Row"
+                Wrap="Wrap">
+
+                <views:RecipeView Margin="5" Note="4.5" Title="Spaghetti Bolognese" Subtitle="30 min"/>
+                <views:RecipeView Margin="5" Note="3" Title="Chickend Curry" Subtitle="45 min"/>
+                <views:RecipeView Margin="5" Note="0.2" Title="Beef Stroganoff" Subtitle="10 min"/>
+                <views:RecipeView Margin="5" Note="1.6" Title="Fish And Ships" Subtitle="15 min"/>
+                <views:RecipeView Margin="5" Note="5" Title="Caesar Salad" Subtitle="20 min"/>
+                <views:RecipeView Margin="5" Note="3.5" Title="Vegetables" Subtitle="60 min"/>
+                <views:RecipeView Margin="5" Note="4.6" Title="Guacamole" Subtitle="90 min"/>
+                <views:RecipeView Margin="5" Note="4" Title="Pad Thai" Subtitle="10 min"/>
+                <views:RecipeView Margin="5" Note="3" Title="French Toast" Subtitle="5 min"/>
+                <views:RecipeView Margin="5" Note="2" Title="Margherita Pizza" Subtitle="2 min"/>
+            </FlexLayout>
+        </ScrollView>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Views/OwnedRecipeView.xaml b/Views/OwnedRecipeView.xaml
new file mode 100644
index 0000000..adcf9e6
--- /dev/null
+++ b/Views/OwnedRecipeView.xaml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="ShoopNCook.Views.OwnedRecipeView">
+    
+</ContentView>
diff --git a/Views/OwnedRecipeView.xaml.cs b/Views/OwnedRecipeView.xaml.cs
new file mode 100644
index 0000000..9f8f54f
--- /dev/null
+++ b/Views/OwnedRecipeView.xaml.cs
@@ -0,0 +1,14 @@
+namespace ShoopNCook.Views;
+
+public partial class OwnedRecipeView : ContentView
+{
+
+    private readonly RecipeView recipeView; 
+
+	public OwnedRecipeView(float note, string title, string subtitle)
+    { 
+        recipeView = new RecipeView(note, title, subtitle);
+        InitializeComponent();
+    }
+
+}
\ No newline at end of file
diff --git a/Views/RecipeView.xaml.cs b/Views/RecipeView.xaml.cs
index 8dcd0ea..5051268 100644
--- a/Views/RecipeView.xaml.cs
+++ b/Views/RecipeView.xaml.cs
@@ -3,7 +3,6 @@ namespace ShoopNCook.Views;
 public partial class RecipeView : ContentView
 {
 
-
 	public RecipeView(): this(5, "Title", "Subtitle")
 	{}
 

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 3/3] 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>