From bfd99461568f2c8528de45df33dfeb7cbc1fdea4 Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Mon, 1 May 2023 23:31:49 +0200
Subject: [PATCH] add IngredientInput and integration in CreateRecipePage

---
 Pages/CreateRecipePage.xaml    | 108 ++++++++++++++++++++++-----------
 Pages/CreateRecipePage.xaml.cs |   7 +++
 ShoopNCook.csproj              |  12 +++-
 Views/IngredientInput.xaml     |  62 +++++++++++++++++++
 Views/IngredientInput.xaml.cs  |   9 +++
 5 files changed, 159 insertions(+), 39 deletions(-)
 create mode 100644 Views/IngredientInput.xaml
 create mode 100644 Views/IngredientInput.xaml.cs

diff --git a/Pages/CreateRecipePage.xaml b/Pages/CreateRecipePage.xaml
index 2418c52..fcac55f 100644
--- a/Pages/CreateRecipePage.xaml
+++ b/Pages/CreateRecipePage.xaml
@@ -3,10 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ShoopNCook.Pages.CreateRecipePage"
              Title="CreateRecipePage"
+             xmlns:views="clr-namespace:ShoopNCook.Views"
              BackgroundColor="{StaticResource BackgroundPrimary}">
     <Grid
-        RowDefinitions="Auto, Auto, *"
-        Padding="20, 30, 20, 0">
+        RowDefinitions="Auto, *, Auto"
+        Padding="20, 30, 20, 20">
         <!-- Header label and return button -->
         <HorizontalStackLayout
             Grid.Row="0"
@@ -26,41 +27,76 @@
         </HorizontalStackLayout>
 
         <!--Image display and upload button-->
-        <Grid
-            Grid.Row="1"
-            RowDefinitions="Auto">
-            <Border
-                Grid.Row="0"
-                BackgroundColor="{StaticResource ImageBackground}"
-                Stroke="White"
-                StrokeThickness="2"
-                StrokeShape="RoundRectangle 25">
-                <Image 
-                    x:Name="RecipeImage"
-                    HeightRequest="250"/>
-            </Border>
-            <Border
-                Grid.Row="0"
-                BackgroundColor="{StaticResource Selected}"
-                Stroke="White"
-                StrokeThickness="2"
-                StrokeShape="RoundRectangle 200"
-                WidthRequest="50"
-                HeightRequest="50"
-                HorizontalOptions="End"
-                VerticalOptions="End"
-                TranslationY="20"
-                TranslationX="-20">
-                <ImageButton
-                    Source="edit.svg"
-                    WidthRequest="30"
-                    />
-            </Border>
-        </Grid>
+        <ScrollView
+            Grid.Row="1">
+            <VerticalStackLayout>
+                <Grid
+                    RowDefinitions="Auto">
+                    <Border
+                        Grid.Row="0"
+                        BackgroundColor="{StaticResource ImageBackground}"
+                        Stroke="White"
+                        StrokeThickness="2"
+                        StrokeShape="RoundRectangle 25">
+                        <Image 
+                            x:Name="RecipeImage"
+                            HeightRequest="250"/>
+                    </Border>
+                    <Border
+                        Grid.Row="0"
+                        BackgroundColor="{StaticResource Selected}"
+                        Stroke="White"
+                        StrokeThickness="2"
+                        StrokeShape="RoundRectangle 200"
+                        WidthRequest="50"
+                        HeightRequest="50"
+                        HorizontalOptions="End"
+                        VerticalOptions="End"
+                        TranslationY="20"
+                        TranslationX="-20">
+                        <ImageButton
+                        Source="edit.svg"
+                        WidthRequest="30"/>
+                    </Border>
+                </Grid>
+
+                <VerticalStackLayout>
+                    <Entry
+                        Style="{StaticResource UserInput}"
+                        Placeholder="Specify your recipe name"/>
+                    <Label
+                        Style="{StaticResource h2}"
+                        Text="Ingredient list (for 1 person)"/>
+                    <VerticalStackLayout 
+                        x:Name="IngredientList"
+                        Spacing="5">
+                        <views:IngredientInput/>
+                    </VerticalStackLayout>
 
-        <Entry
-            Style="{StaticResource UserInput}"
-            Placeholder="Specify your recipe name"/>
+                    <HorizontalStackLayout>
+                        <HorizontalStackLayout.GestureRecognizers>
+                            <TapGestureRecognizer 
+                                Tapped="OnAddIngredientTapped"
+                                NumberOfTapsRequired="1"/>
+                        </HorizontalStackLayout.GestureRecognizers>
+                        <Label 
+                            Text="+"
+                            TextColor="LightGreen"
+                            FontSize="50"/>
+                        <Label
+                            Margin="0, 10, 0, 0"
+                            Style="{StaticResource h2}"
+                            Text="Add Ingredient"
+                            VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+                </VerticalStackLayout>
+            </VerticalStackLayout>
+        </ScrollView>
+        <Button
+            Grid.Row="3"
+            Style="{StaticResource UserButton}"
+            BackgroundColor="{StaticResource ActionButton}"
+            Text="Upload recipe"/>
     </Grid>
     
 </ContentPage>
\ No newline at end of file
diff --git a/Pages/CreateRecipePage.xaml.cs b/Pages/CreateRecipePage.xaml.cs
index 2d0239b..c061a7a 100644
--- a/Pages/CreateRecipePage.xaml.cs
+++ b/Pages/CreateRecipePage.xaml.cs
@@ -1,3 +1,5 @@
+using ShoopNCook.Views;
+
 namespace ShoopNCook.Pages;
 
 public partial class CreateRecipePage : ContentPage
@@ -6,4 +8,9 @@ public partial class CreateRecipePage : ContentPage
 	{
 		InitializeComponent();
 	}
+
+    private void OnAddIngredientTapped(object sender, TappedEventArgs e)
+    {
+		IngredientList.Children.Add(new IngredientInput());
+    }
 }
\ No newline at end of file
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index fa6f1e9..a84c2af 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -32,10 +32,8 @@
 
 	<ItemGroup>
 		<!-- App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
 
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
@@ -52,16 +50,18 @@
 	  <None Remove="Resources\Fonts\Poppins-Medium.ttf" />
 	  <None Remove="Resources\Fonts\Poppins-Regular.ttf" />
 	  <None Remove="Resources\Images\cookie.svg" />
-	  <None Remove="Resources\Images\edit.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\Home.svg" />
+	  <None Remove="Resources\Images\list.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\more.svg" />
 	  <None Remove="Resources\Images\password_icon.svg" />
 	  <None Remove="Resources\Images\search_options.svg" />
 	  <None Remove="Resources\Images\share.svg" />
@@ -96,12 +96,18 @@
 	  <MauiXaml Update="Pages\CreateRecipePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Pages\Splash.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\CounterView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Views\HeadedButton.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\IngredientInput.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\IngredientView.xaml">
 		  <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Views/IngredientInput.xaml b/Views/IngredientInput.xaml
new file mode 100644
index 0000000..98c6422
--- /dev/null
+++ b/Views/IngredientInput.xaml
@@ -0,0 +1,62 @@
+<?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.IngredientInput">
+    <Border
+        Stroke="{StaticResource BackgroundSecondary}"
+        StrokeThickness="1"
+        StrokeShape="RoundRectangle 200">
+        
+        <Grid
+            BackgroundColor="{StaticResource BackgroundSecondary}"
+            Padding="9"
+            ColumnDefinitions="2*, *, *"
+            ColumnSpacing="5">
+            <Border
+                Grid.Column="0"
+                Stroke="Transparent"
+                StrokeThickness="0"
+                StrokeShape="RoundRectangle 200"
+                BackgroundColor="LightGray">
+                <Entry 
+                    Style="{StaticResource UserInput}"
+                    Placeholder="Ingredient Name"
+                    HeightRequest="40"/>
+            </Border>
+            <Border
+                Grid.Column="1"
+                Stroke="Transparent"
+                StrokeThickness="0"
+                StrokeShape="RoundRectangle 200"
+                BackgroundColor="LightGray">
+                <Entry 
+                    Style="{StaticResource UserInput}"
+                    Placeholder="Quantity"
+                    HeightRequest="40"/>
+            </Border>
+            <Border
+                Grid.Column="2"
+                Stroke="Transparent"
+                StrokeThickness="0"
+                StrokeShape="RoundRectangle 200"
+                BackgroundColor="LightGray">
+                <Picker
+                    Title="Unit"
+                    TextColor="{StaticResource TextColorPrimary}"
+                    TitleColor="{StaticResource TextColorSecondary}"
+                    FontFamily="PoppinsMedium">
+                    <Picker.ItemsSource>
+                        <x:Array Type="{x:Type x:String}">
+                            <x:String>G</x:String>
+                            <x:String>mG</x:String>
+                            <x:String>kG</x:String>
+
+                            <x:String>L</x:String>
+                            <x:String>cL</x:String>
+                        </x:Array>
+                    </Picker.ItemsSource>
+                </Picker>
+            </Border>   
+    </Grid>
+    </Border>
+</ContentView>
diff --git a/Views/IngredientInput.xaml.cs b/Views/IngredientInput.xaml.cs
new file mode 100644
index 0000000..6bcbd3d
--- /dev/null
+++ b/Views/IngredientInput.xaml.cs
@@ -0,0 +1,9 @@
+namespace ShoopNCook.Views;
+
+public partial class IngredientInput : ContentView
+{
+	public IngredientInput()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file