From b506f1ee3dbdfe540ac1d69c2660722d7fc0324f Mon Sep 17 00:00:00 2001
From: "maxime.BATISTA@etu.uca.fr" <maximebatista18@gmail.com>
Date: Mon, 1 May 2023 21:59:40 +0200
Subject: [PATCH 1/7] add bases of create-recipe page

---
 AppShell.xaml                  |  5 +++
 Pages/CreateRecipePage.xaml    | 66 ++++++++++++++++++++++++++++++++++
 Pages/CreateRecipePage.xaml.cs |  9 +++++
 Pages/RecipePage.xaml          |  5 ++-
 Resources/Images/edit.svg      |  3 ++
 Resources/Styles/Colors.xaml   |  1 +
 Resources/Styles/Styles.xaml   |  8 +++++
 ShoopNCook.csproj              |  4 +++
 Views/OwnedRecipeView.xaml     |  2 +-
 Views/RecipeView.xaml          |  2 +-
 Views/StoredRecipeView.xaml    |  2 +-
 11 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 Pages/CreateRecipePage.xaml
 create mode 100644 Pages/CreateRecipePage.xaml.cs
 create mode 100644 Resources/Images/edit.svg

diff --git a/AppShell.xaml b/AppShell.xaml
index df3a2c6..024f992 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -73,5 +73,10 @@
             Title="My Recipes Page"
             ContentTemplate="{DataTemplate pages:MyRecipesPage}"
             Route="MyRecipes" />
+
+        <ShellContent
+            Title="Create Recipe Page"
+            ContentTemplate="{DataTemplate pages:CreateRecipePage}"
+            Route="CreateRecipe" />
     </TabBar>
 </Shell>
\ No newline at end of file
diff --git a/Pages/CreateRecipePage.xaml b/Pages/CreateRecipePage.xaml
new file mode 100644
index 0000000..2418c52
--- /dev/null
+++ b/Pages/CreateRecipePage.xaml
@@ -0,0 +1,66 @@
+<?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.Pages.CreateRecipePage"
+             Title="CreateRecipePage"
+             BackgroundColor="{StaticResource BackgroundPrimary}">
+    <Grid
+        RowDefinitions="Auto, Auto, *"
+        Padding="20, 30, 20, 0">
+        <!-- Header label and return button -->
+        <HorizontalStackLayout
+            Grid.Row="0"
+            MaximumHeightRequest="60">
+
+            <ImageButton 
+                HeightRequest="50"
+                WidthRequest="50"
+                Source="arrow_back.svg"
+                HorizontalOptions="Start"/>
+
+            <Label 
+                Text="Create new recipe"
+                Style="{StaticResource h3}"
+                FontSize="20"
+                VerticalTextAlignment="Center"/>
+        </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>
+
+        <Entry
+            Style="{StaticResource UserInput}"
+            Placeholder="Specify your recipe name"/>
+    </Grid>
+    
+</ContentPage>
\ No newline at end of file
diff --git a/Pages/CreateRecipePage.xaml.cs b/Pages/CreateRecipePage.xaml.cs
new file mode 100644
index 0000000..2d0239b
--- /dev/null
+++ b/Pages/CreateRecipePage.xaml.cs
@@ -0,0 +1,9 @@
+namespace ShoopNCook.Pages;
+
+public partial class CreateRecipePage : ContentPage
+{
+	public CreateRecipePage()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Pages/RecipePage.xaml b/Pages/RecipePage.xaml
index 6158f67..9f26d86 100644
--- a/Pages/RecipePage.xaml
+++ b/Pages/RecipePage.xaml
@@ -15,14 +15,17 @@
         <ScrollView>
             <Grid
                 RowDefinitions="*, Auto, Auto, 0.5*">
+                <!--Header-->
                 <FlexLayout
                     Grid.Row="0"
                     Direction="Row"
                     JustifyContent="SpaceBetween"
                     AlignContent="Center"
                     AlignItems="Center">
+                    
                     <ImageButton 
                         Source="arrow_back.svg"/>
+                    
                     <Label 
                         Style="{StaticResource h1}"
                         x:Name="RecipeName"
@@ -42,7 +45,7 @@
                     Margin="10"
                     Stroke="Transparent"
                     StrokeShape="RoundRectangle 20"
-                    BackgroundColor="AliceBlue">
+                    BackgroundColor="{StaticResource ImageBackground}">
                     <Image 
                         HeightRequest="250"/>
                 </Border>
diff --git a/Resources/Images/edit.svg b/Resources/Images/edit.svg
new file mode 100644
index 0000000..c75bd9e
--- /dev/null
+++ b/Resources/Images/edit.svg
@@ -0,0 +1,3 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.1839 4.11825L5.4851 11.3456C5.13123 11.6774 4.55507 11.6774 4.20121 11.3456C3.84735 11.0138 3.84735 10.4736 4.20121 10.1418L11.9 2.9144C12.2539 2.5826 12.83 2.5826 13.1839 2.9144C13.3608 3.0803 13.4515 3.29725 13.4515 3.5142C13.4515 3.7354 13.3608 3.95235 13.1839 4.11825ZM16.0728 3.21679L14.1447 1.41315C13.26 0.583639 11.8219 0.583639 10.9373 1.41315L2.67138 9.17649C2.41279 9.41471 2.22225 9.71248 2.10883 10.04L0.448394 15.0001C0.226096 15.6552 0.883918 16.272 1.58257 16.0678L6.88144 14.5066C7.22623 14.4045 7.5438 14.2259 7.80239 13.9834L16.0728 6.22004C16.9575 5.39053 16.9575 4.0463 16.0728 3.21679Z" fill="white"/>
+</svg>
diff --git a/Resources/Styles/Colors.xaml b/Resources/Styles/Colors.xaml
index daac8a8..6d20ded 100644
--- a/Resources/Styles/Colors.xaml
+++ b/Resources/Styles/Colors.xaml
@@ -51,5 +51,6 @@
     <Color x:Key="TextColorSecondary">#6d6d6d</Color>
     <Color x:Key="ActionButton">#ff8988</Color>
     <Color x:Key="Selected">#ff8988</Color>
+    <Color x:Key="ImageBackground">AliceBlue</Color>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Resources/Styles/Styles.xaml b/Resources/Styles/Styles.xaml
index fa3882f..5a649dc 100644
--- a/Resources/Styles/Styles.xaml
+++ b/Resources/Styles/Styles.xaml
@@ -65,6 +65,14 @@
         <Setter Property="FontAttributes" Value="Bold"/>
     </Style>
 
+    <Style
+        TargetType="Label"
+        x:Key="h3">
+        <Setter Property="FontFamily" Value="PoppinsRegular"/>
+        <Setter Property="FontSize" Value="16"/>
+        <Setter Property="TextColor" Value="{StaticResource TextColorSecondary}"/>
+    </Style>
+
     <Style
         TargetType="Label"
         x:Key="Small">
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index 36a935f..fa6f1e9 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -52,6 +52,7 @@
 	  <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" />
@@ -92,6 +93,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="Pages\CreateRecipePage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\CounterView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Views/OwnedRecipeView.xaml b/Views/OwnedRecipeView.xaml
index 5b01eec..627cc7c 100644
--- a/Views/OwnedRecipeView.xaml
+++ b/Views/OwnedRecipeView.xaml
@@ -16,7 +16,7 @@
                 Grid.Row="0"
                 Stroke="Transparent"
                 StrokeShape="RoundRectangle 20"
-                BackgroundColor="AliceBlue">
+                BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
                     <Image />
                     <HorizontalStackLayout
diff --git a/Views/RecipeView.xaml b/Views/RecipeView.xaml
index 5b051ee..2908ae7 100644
--- a/Views/RecipeView.xaml
+++ b/Views/RecipeView.xaml
@@ -18,7 +18,7 @@
                 Grid.Row="0"
                 Stroke="Transparent"
                 StrokeShape="RoundRectangle 20"
-                BackgroundColor="AliceBlue">
+                BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
                     <Image />
                     <HorizontalStackLayout
diff --git a/Views/StoredRecipeView.xaml b/Views/StoredRecipeView.xaml
index f1334a7..84ecb88 100644
--- a/Views/StoredRecipeView.xaml
+++ b/Views/StoredRecipeView.xaml
@@ -18,7 +18,7 @@
                 Grid.Row="0"
                 Stroke="Transparent"
                 StrokeShape="RoundRectangle 20"
-                BackgroundColor="AliceBlue">
+                BackgroundColor="{StaticResource ImageBackground}">
                 <Grid>
                     <Image />
                     <HorizontalStackLayout

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

From 47144a99191e2abcabc6f5ba0a18a1da0055930c Mon Sep 17 00:00:00 2001
From: Maxime BATISTA <maxime.batista@etu.uca.fr>
Date: Tue, 2 May 2023 17:57:05 +0200
Subject: [PATCH 3/7] Add '.drone.yml'

---
 .drone.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..211902d
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,10 @@
+kind: pipeline
+name: "Front CI"
+type: docker
+
+steps: 
+  - name: "Build APK"     
+    image: mcr.microsoft.com/dotnet/framework/sdk:4.8.1
+    commands:
+      - dotnet workload install maui
+      - dotnet build -f net7.0-android -c Release
\ No newline at end of file

From ca213a1da2cf2b8bd5a270425a836f32a9edcf78 Mon Sep 17 00:00:00 2001
From: Maxime BATISTA <maxime.batista@etu.uca.fr>
Date: Tue, 2 May 2023 18:00:22 +0200
Subject: [PATCH 4/7] Update '.drone.yml'

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 211902d..e21fbfe 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ type: docker
 
 steps: 
   - name: "Build APK"     
-    image: mcr.microsoft.com/dotnet/framework/sdk:4.8.1
+    image: mono:latest
     commands:
       - dotnet workload install maui
       - dotnet build -f net7.0-android -c Release
\ No newline at end of file

From 32f1fb914b8aae32c63efee90b29777bcbd8e5bf Mon Sep 17 00:00:00 2001
From: Maxime BATISTA <mabatista1>
Date: Wed, 3 May 2023 10:12:57 +0200
Subject: [PATCH 5/7] add comments

---
 Pages/CreateRecipePage.xaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Pages/CreateRecipePage.xaml b/Pages/CreateRecipePage.xaml
index fcac55f..a4c252d 100644
--- a/Pages/CreateRecipePage.xaml
+++ b/Pages/CreateRecipePage.xaml
@@ -26,10 +26,11 @@
                 VerticalTextAlignment="Center"/>
         </HorizontalStackLayout>
 
-        <!--Image display and upload button-->
+        <!--Editor-->
         <ScrollView
             Grid.Row="1">
             <VerticalStackLayout>
+                <!--Image display and Image upload button-->
                 <Grid
                     RowDefinitions="Auto">
                     <Border
@@ -59,8 +60,9 @@
                         WidthRequest="30"/>
                     </Border>
                 </Grid>
-
+                
                 <VerticalStackLayout>
+                    <!--Ingredients-->
                     <Entry
                         Style="{StaticResource UserInput}"
                         Placeholder="Specify your recipe name"/>
@@ -73,6 +75,7 @@
                         <views:IngredientInput/>
                     </VerticalStackLayout>
 
+                    <!--Add new ingredient button-->
                     <HorizontalStackLayout>
                         <HorizontalStackLayout.GestureRecognizers>
                             <TapGestureRecognizer 
@@ -89,6 +92,10 @@
                             Text="Add Ingredient"
                             VerticalTextAlignment="Center"/>
                     </HorizontalStackLayout>
+
+                    <Label
+                        Style="{StaticResource h2}"
+                        Text="Informations"/>
                 </VerticalStackLayout>
             </VerticalStackLayout>
         </ScrollView>

From 99c309498727d5008d25ab50dd8d62683ba9a937 Mon Sep 17 00:00:00 2001
From: Maxime BATISTA <mabatista1>
Date: Wed, 3 May 2023 11:57:14 +0200
Subject: [PATCH 6/7] add StepEntry view

---
 Pages/CreateRecipePage.xaml                   | 54 ++++++++++++++++++-
 Pages/CreateRecipePage.xaml.cs                |  9 +++-
 ShoopNCook.csproj                             |  8 ++-
 ...redientInput.xaml => IngredientEntry.xaml} |  2 +-
 Views/IngredientEntry.xaml.cs                 |  9 ++++
 Views/IngredientInput.xaml.cs                 |  9 ----
 Views/StepEntry.xaml                          | 17 ++++++
 Views/StepEntry.xaml.cs                       | 15 ++++++
 8 files changed, 109 insertions(+), 14 deletions(-)
 rename Views/{IngredientInput.xaml => IngredientEntry.xaml} (97%)
 create mode 100644 Views/IngredientEntry.xaml.cs
 delete mode 100644 Views/IngredientInput.xaml.cs
 create mode 100644 Views/StepEntry.xaml
 create mode 100644 Views/StepEntry.xaml.cs

diff --git a/Pages/CreateRecipePage.xaml b/Pages/CreateRecipePage.xaml
index a4c252d..0bd7bd9 100644
--- a/Pages/CreateRecipePage.xaml
+++ b/Pages/CreateRecipePage.xaml
@@ -69,10 +69,12 @@
                     <Label
                         Style="{StaticResource h2}"
                         Text="Ingredient list (for 1 person)"/>
+                    
+                    <!--Ingredient entry list-->
                     <VerticalStackLayout 
                         x:Name="IngredientList"
                         Spacing="5">
-                        <views:IngredientInput/>
+                        <views:IngredientEntry/>
                     </VerticalStackLayout>
 
                     <!--Add new ingredient button-->
@@ -93,9 +95,59 @@
                             VerticalTextAlignment="Center"/>
                     </HorizontalStackLayout>
 
+                    <!--General Informations-->
                     <Label
                         Style="{StaticResource h2}"
                         Text="Informations"/>
+                    <HorizontalStackLayout>
+                        <Label
+                            Style="{StaticResource h3}"
+                            VerticalTextAlignment="Center"
+                            Text="Cook time: "/>
+                        <Entry
+                            Style="{StaticResource UserInput}"
+                            Keyboard="Numeric"
+                            x:Name="CookTimeInput"/>
+                        <Label
+                            Style="{StaticResource h3}"
+                            VerticalTextAlignment="Center"
+                            Text="minutes"/>
+                    </HorizontalStackLayout>
+
+                    <!--Preparation entry steps list-->
+                    <Label
+                        Style="{StaticResource h2}"
+                        Text="Preparation steps"/>
+
+                    <!--Step list-->
+                    <VerticalStackLayout 
+                        x:Name="StepList"
+                        Spacing="5">
+                        <Entry
+                            Style="{StaticResource UserInput}"
+                            BackgroundColor="{StaticResource BackgroundSecondary}"/>
+                    </VerticalStackLayout>
+
+                    <!--Add new Step button-->
+                    <HorizontalStackLayout>
+                        <HorizontalStackLayout.GestureRecognizers>
+                            <TapGestureRecognizer 
+                                Tapped="OnAddStepTapped"
+                                NumberOfTapsRequired="1"/>
+                        </HorizontalStackLayout.GestureRecognizers>
+                        
+                        <Label 
+                            Text="+"
+                            TextColor="LightGreen"
+                            FontSize="50"/>
+                        <Label
+                            Margin="0, 10, 0, 0"
+                            Style="{StaticResource h2}"
+                            Text="Add Step"
+                            VerticalTextAlignment="Center"/>
+                    </HorizontalStackLayout>
+
+
                 </VerticalStackLayout>
             </VerticalStackLayout>
         </ScrollView>
diff --git a/Pages/CreateRecipePage.xaml.cs b/Pages/CreateRecipePage.xaml.cs
index c061a7a..873de86 100644
--- a/Pages/CreateRecipePage.xaml.cs
+++ b/Pages/CreateRecipePage.xaml.cs
@@ -10,7 +10,12 @@ public partial class CreateRecipePage : ContentPage
 	}
 
     private void OnAddIngredientTapped(object sender, TappedEventArgs e)
-    {
-		IngredientList.Children.Add(new IngredientInput());
+    {
+        IngredientList.Children.Add(new IngredientEntry());
+    }
+
+    private void OnAddStepTapped(object sender, TappedEventArgs e)
+    {
+        StepList.Children.Add(new Entry());
     }
 }
\ No newline at end of file
diff --git a/ShoopNCook.csproj b/ShoopNCook.csproj
index a84c2af..e1025c6 100644
--- a/ShoopNCook.csproj
+++ b/ShoopNCook.csproj
@@ -90,6 +90,9 @@
 	  <Compile Update="Pages\MyListPage.xaml.cs">
 	    <DependentUpon>MyListPage.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Views\IngredientEntry.xaml.cs">
+	    <DependentUpon>IngredientEntry.xaml</DependentUpon>
+	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -105,7 +108,7 @@
 	  <MauiXaml Update="Views\HeadedButton.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\IngredientInput.xaml">
+	  <MauiXaml Update="Views\IngredientEntry.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Views\IngredientView.xaml">
@@ -138,6 +141,9 @@
 	  <MauiXaml Update="Views\SearchPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\StepEntry.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\StoredRecipeView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Views/IngredientInput.xaml b/Views/IngredientEntry.xaml
similarity index 97%
rename from Views/IngredientInput.xaml
rename to Views/IngredientEntry.xaml
index 98c6422..e18d75a 100644
--- a/Views/IngredientInput.xaml
+++ b/Views/IngredientEntry.xaml
@@ -1,7 +1,7 @@
 <?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">
+             x:Class="ShoopNCook.Views.IngredientEntry">
     <Border
         Stroke="{StaticResource BackgroundSecondary}"
         StrokeThickness="1"
diff --git a/Views/IngredientEntry.xaml.cs b/Views/IngredientEntry.xaml.cs
new file mode 100644
index 0000000..2d777b1
--- /dev/null
+++ b/Views/IngredientEntry.xaml.cs
@@ -0,0 +1,9 @@
+namespace ShoopNCook.Views;
+
+public partial class IngredientEntry : ContentView
+{
+	public IngredientEntry()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Views/IngredientInput.xaml.cs b/Views/IngredientInput.xaml.cs
deleted file mode 100644
index 6bcbd3d..0000000
--- a/Views/IngredientInput.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace ShoopNCook.Views;
-
-public partial class IngredientInput : ContentView
-{
-	public IngredientInput()
-	{
-		InitializeComponent();
-	}
-}
\ No newline at end of file
diff --git a/Views/StepEntry.xaml b/Views/StepEntry.xaml
new file mode 100644
index 0000000..2a58c50
--- /dev/null
+++ b/Views/StepEntry.xaml
@@ -0,0 +1,17 @@
+<?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.StepEntry">
+    <VerticalStackLayout>
+        <Label 
+            Style="{StaticResource h3}"
+            Text="Step"/>
+        <Label
+            Style="{StaticResource h3}"
+            x:Name="OrdinalLabel"
+            Text="{Binding Ordinal}"/>
+
+        <Entry
+            Style="{StaticResource UserInput}"/>
+    </VerticalStackLayout>
+</ContentView>
diff --git a/Views/StepEntry.xaml.cs b/Views/StepEntry.xaml.cs
new file mode 100644
index 0000000..5dc1576
--- /dev/null
+++ b/Views/StepEntry.xaml.cs
@@ -0,0 +1,15 @@
+namespace ShoopNCook.Views;
+
+public partial class StepEntry : ContentView
+{
+	private readonly BindableProperty OrdinalProperty = BindableProperty.Create(nameof(OrdinalLabel), typeof(uint), typeof(StepEntry), default(uint));
+	public StepEntry()
+	{
+		InitializeComponent();
+	}
+
+	public uint Ordinal { 
+		get => (uint)GetValue(OrdinalProperty);
+		set => SetValue(OrdinalProperty, value);
+	}
+}
\ No newline at end of file

From 1e53769fcea7c0b6dae3b1a6c642c410f5be50a6 Mon Sep 17 00:00:00 2001
From: Maxime BATISTA <mabatista1>
Date: Wed, 3 May 2023 14:22:00 +0200
Subject: [PATCH 7/7] end create recipe page

---
 Pages/CreateRecipePage.xaml    |  4 +---
 Pages/CreateRecipePage.xaml.cs |  2 +-
 Views/StepEntry.xaml           | 30 +++++++++++++++++++++---------
 Views/StepEntry.xaml.cs        | 12 ++++++++----
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/Pages/CreateRecipePage.xaml b/Pages/CreateRecipePage.xaml
index 0bd7bd9..58fc1b1 100644
--- a/Pages/CreateRecipePage.xaml
+++ b/Pages/CreateRecipePage.xaml
@@ -123,9 +123,7 @@
                     <VerticalStackLayout 
                         x:Name="StepList"
                         Spacing="5">
-                        <Entry
-                            Style="{StaticResource UserInput}"
-                            BackgroundColor="{StaticResource BackgroundSecondary}"/>
+                        <views:StepEntry Ordinal="1"/>
                     </VerticalStackLayout>
 
                     <!--Add new Step button-->
diff --git a/Pages/CreateRecipePage.xaml.cs b/Pages/CreateRecipePage.xaml.cs
index 873de86..7cacaa7 100644
--- a/Pages/CreateRecipePage.xaml.cs
+++ b/Pages/CreateRecipePage.xaml.cs
@@ -16,6 +16,6 @@ public partial class CreateRecipePage : ContentPage
 
     private void OnAddStepTapped(object sender, TappedEventArgs e)
     {
-        StepList.Children.Add(new Entry());
+        StepList.Children.Add(new StepEntry((uint) StepList.Children.Count() + 1));
     }
 }
\ No newline at end of file
diff --git a/Views/StepEntry.xaml b/Views/StepEntry.xaml
index 2a58c50..ffed80e 100644
--- a/Views/StepEntry.xaml
+++ b/Views/StepEntry.xaml
@@ -3,15 +3,27 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="ShoopNCook.Views.StepEntry">
     <VerticalStackLayout>
-        <Label 
-            Style="{StaticResource h3}"
-            Text="Step"/>
-        <Label
-            Style="{StaticResource h3}"
-            x:Name="OrdinalLabel"
-            Text="{Binding Ordinal}"/>
+        <HorizontalStackLayout>
+            <Label 
+                Style="{StaticResource h3}"
+                Text="Step"
+                Margin="0, 0, 2, 0"/>
+
+            <Label
+                Style="{StaticResource h3}"
+                x:Name="OrdinalLabel"/>
+        </HorizontalStackLayout>
+
+        <Border
+            StrokeShape="RoundRectangle 5"
+            Stroke="Gray"
+            BackgroundColor="{StaticResource BackgroundSecondary}">
+            <Editor
+                MaxLength="10000"
+                Style="{StaticResource UserInput}"
+                AutoSize="TextChanges"
+                FontSize="15"/>
+        </Border>
 
-        <Entry
-            Style="{StaticResource UserInput}"/>
     </VerticalStackLayout>
 </ContentView>
diff --git a/Views/StepEntry.xaml.cs b/Views/StepEntry.xaml.cs
index 5dc1576..1807de5 100644
--- a/Views/StepEntry.xaml.cs
+++ b/Views/StepEntry.xaml.cs
@@ -2,14 +2,18 @@ namespace ShoopNCook.Views;
 
 public partial class StepEntry : ContentView
 {
-	private readonly BindableProperty OrdinalProperty = BindableProperty.Create(nameof(OrdinalLabel), typeof(uint), typeof(StepEntry), default(uint));
-	public StepEntry()
+	
+	public StepEntry(): this(1) 
+	{}
+
+	public StepEntry(uint ordinal)
 	{
 		InitializeComponent();
+		Ordinal = ordinal;
 	}
 
 	public uint Ordinal { 
-		get => (uint)GetValue(OrdinalProperty);
-		set => SetValue(OrdinalProperty, value);
+		get => uint.Parse(OrdinalLabel.Text);
+		set => OrdinalLabel.Text = value.ToString();
 	}
 }
\ No newline at end of file