From 99c309498727d5008d25ab50dd8d62683ba9a937 Mon Sep 17 00:00:00 2001
From: Maxime BATISTA <mabatista1>
Date: Wed, 3 May 2023 11:57:14 +0200
Subject: [PATCH] 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