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

Fix displaying recipe ingredient note twice (#197)

Browse Source 
* Update README.md

* Bump version to 35

* Cleanup dependencies

* Bump versions of dependencies

* Save isFood/disableAmount flags to db

* Fix displaying ingredient note twice

* Remove whitespace after note is extracted
This commit is contained in:
Kirill Kamakin
2024-01-14 11:44:21 +01:00
committed by GitHub
parent c8f1f477cc
commit 7c02a8341d
17 changed files with 100 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
database_test/src/main/kotlin/gq/kirmanak/mealient/database/TestData.kt
View File

@@ -70,22 +70,26 @@ val CAKE_SUGAR_RECIPE_INGREDIENT_ENTITY = RecipeIngredientEntity(
id = "1",
recipeId = "1",
note = "2 oz of white sugar",
quantity = 1.0,
unit = null,
food = null,
unit = null,
quantity = 1.0,
display = "2 oz of white sugar",
title = "Sugar",
isFood = false,
disableAmount = true,
)
val CAKE_BREAD_RECIPE_INGREDIENT_ENTITY = RecipeIngredientEntity(
id = "3",
recipeId = "1",
note = "2 oz of white bread",
quantity = 1.0,
unit = null,
food = null,
unit = null,
quantity = 1.0,
display = "2 oz of white bread",
title = null,
isFood = false,
disableAmount = true,
)
val FULL_CAKE_INFO_ENTITY = RecipeWithSummaryAndIngredientsAndInstructions(
@@ -115,22 +119,26 @@ val PORRIDGE_MILK_RECIPE_INGREDIENT_ENTITY = RecipeIngredientEntity(
id = "1",
recipeId = "2",
note = "2 oz of white milk",
quantity = 1.0,
unit = null,
food = null,
unit = null,
quantity = 1.0,
display = "2 oz of white milk",
title = null,
isFood = false,
disableAmount = true,
)
val PORRIDGE_SUGAR_RECIPE_INGREDIENT_ENTITY = RecipeIngredientEntity(
id = "2",
recipeId = "2",
note = "2 oz of white sugar",
quantity = 1.0,
unit = null,
food = null,
unit = null,
quantity = 1.0,
display = "2 oz of white sugar",
title = "Sugar",
isFood = false,
disableAmount = true,
)
val PORRIDGE_MIX_RECIPE_INSTRUCTION_ENTITY = RecipeInstructionEntity(