atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix resetting list of ingredients and instructions

Browse Source
This commit is contained in:
Kirill Kamakin
2022-11-17 21:51:22 +01:00
parent 183f504e33
commit 04bcb59de2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeFragment.kt
View File

@@ -127,9 +127,8 @@ class AddRecipeFragment : Fragment(R.layout.fragment_add_recipe) {
private fun saveValues() = with(binding) { private fun saveValues() = with(binding) {
logger.v { "saveValues() called" } logger.v { "saveValues() called" }
val instructions = val instructions = parseInputRows(instructionsFlow).map { AddRecipeInstructionInfo(it) }
parseInputRows(instructionsFlow).map { AddRecipeInstructionInfo(text = it) } val ingredients = parseInputRows(ingredientsFlow).map { AddRecipeIngredientInfo(it) }
val ingredients = parseInputRows(ingredientsFlow).map { AddRecipeIngredientInfo(note = it) }
val settings = AddRecipeSettingsInfo( val settings = AddRecipeSettingsInfo(
public = publicRecipe.isChecked, public = publicRecipe.isChecked,
disableComments = disableComments.isChecked, disableComments = disableComments.isChecked,
@@ -156,17 +155,18 @@ class AddRecipeFragment : Fragment(R.layout.fragment_add_recipe) {
private fun onSavedInputLoaded(request: AddRecipeInfo) = with(binding) { private fun onSavedInputLoaded(request: AddRecipeInfo) = with(binding) {
logger.v { "onSavedInputLoaded() called with: request = $request" } 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 } request.recipeIngredient.map { it.note }
.showIn(ingredientsFlow, R.string.fragment_add_recipe_ingredient_hint) .showIn(ingredientsFlow, R.string.fragment_add_recipe_ingredient_hint)
request.recipeInstructions.map { it.text } request.recipeInstructions.map { it.text }
.showIn(instructionsFlow, R.string.fragment_add_recipe_instruction_hint) .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) { private fun Iterable<String>.showIn(flow: Flow, @StringRes hintId: Int) {