From 04bcb59de25ff4148f1e41a24fdf32c6d660e601 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Thu, 17 Nov 2022 21:51:22 +0100
Subject: [PATCH] Fix resetting list of ingredients and instructions

---
 .../mealient/ui/add/AddRecipeFragment.kt         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeFragment.kt
index 2da5a36..d311d68 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeFragment.kt
@@ -127,9 +127,8 @@ class AddRecipeFragment : Fragment(R.layout.fragment_add_recipe) {
 
     private fun saveValues() = with(binding) {
         logger.v { "saveValues() called" }
-        val instructions =
-            parseInputRows(instructionsFlow).map { AddRecipeInstructionInfo(text = it) }
-        val ingredients = parseInputRows(ingredientsFlow).map { AddRecipeIngredientInfo(note = it) }
+        val instructions = parseInputRows(instructionsFlow).map { AddRecipeInstructionInfo(it) }
+        val ingredients = parseInputRows(ingredientsFlow).map { AddRecipeIngredientInfo(it) }
         val settings = AddRecipeSettingsInfo(
             public = publicRecipe.isChecked,
             disableComments = disableComments.isChecked,
@@ -156,17 +155,18 @@ class AddRecipeFragment : Fragment(R.layout.fragment_add_recipe) {
 
     private fun onSavedInputLoaded(request: AddRecipeInfo) = with(binding) {
         logger.v { "onSavedInputLoaded() called with: request = $request" }
-        recipeNameInput.setText(request.name)
-        recipeDescriptionInput.setText(request.description)
-        recipeYieldInput.setText(request.recipeYield)
-        publicRecipe.isChecked = request.settings.public
-        disableComments.isChecked = request.settings.disableComments
 
         request.recipeIngredient.map { it.note }
             .showIn(ingredientsFlow, R.string.fragment_add_recipe_ingredient_hint)
 
         request.recipeInstructions.map { it.text }
             .showIn(instructionsFlow, R.string.fragment_add_recipe_instruction_hint)
+
+        recipeNameInput.setText(request.name)
+        recipeDescriptionInput.setText(request.description)
+        recipeYieldInput.setText(request.recipeYield)
+        publicRecipe.isChecked = request.settings.public
+        disableComments.isChecked = request.settings.disableComments
     }
 
     private fun Iterable<String>.showIn(flow: Flow, @StringRes hintId: Int) {