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

Add linked ingredients to recipe step (#177)

Browse Source 
* Add Compose to app module

* Move Theme to ui module

* Add Coil image loader

* Use Compose for recipe screen

* Save instruction to ingredient relation to DB

* Display ingredients as server formats them

* Display linked ingredients under each step

* Fix ingredients padding

* Show recipe full screen

* Fix recipe screen UI issues

* Hide keyboard on recipe navigation

* Fix loading recipes from DB with no instructions or ingredients

* Add instructions section title

* Add ingredients section title

* Remove unused view holders
This commit is contained in:
Kirill Kamakin
2023-11-07 20:47:01 +01:00
committed by GitHub
parent 5ed1acb678
commit 941d45328e
46 changed files with 797 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
datasource_test/src/main/kotlin/gq/kirmanak/mealient/datasource_test/TestData.kt
View File

@@ -9,6 +9,7 @@ import gq.kirmanak.mealient.datasource.models.AddRecipeSettings
import gq.kirmanak.mealient.datasource.models.AddRecipeSettingsInfo
import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest
import gq.kirmanak.mealient.datasource.models.GetRecipeIngredientResponse
import gq.kirmanak.mealient.datasource.models.GetRecipeInstructionIngredientReference
import gq.kirmanak.mealient.datasource.models.GetRecipeInstructionResponse
import gq.kirmanak.mealient.datasource.models.GetRecipeResponse
import gq.kirmanak.mealient.datasource.models.GetRecipeSettingsResponse
@@ -76,6 +77,8 @@ val MILK_RECIPE_INGREDIENT_RESPONSE = GetRecipeIngredientResponse(
quantity = 1.0,
unit = null,
food = null,
display = "2 oz of white milk",
referenceId = "1",
title = null,
)
@@ -84,7 +87,9 @@ val SUGAR_RECIPE_INGREDIENT_RESPONSE = GetRecipeIngredientResponse(
quantity = 1.0,
unit = null,
food = null,
title = null,
display = "2 oz of white sugar",
referenceId = "1",
title = "Sugar",
)
val BREAD_RECIPE_INGREDIENT_RESPONSE = GetRecipeIngredientResponse(
@@ -92,14 +97,34 @@ val BREAD_RECIPE_INGREDIENT_RESPONSE = GetRecipeIngredientResponse(
quantity = 1.0,
unit = null,
food = null,
display = "2 oz of white bread",
referenceId = "3",
title = null,
)
val MIX_RECIPE_INSTRUCTION_RESPONSE = GetRecipeInstructionResponse("Mix the ingredients")
val MIX_RECIPE_INSTRUCTION_RESPONSE = GetRecipeInstructionResponse(
id = "1",
title = "",
text = "Mix the ingredients",
ingredientReferences = listOf(
GetRecipeInstructionIngredientReference(referenceId = "1"),
GetRecipeInstructionIngredientReference(referenceId = "3"),
),
)
val BAKE_RECIPE_INSTRUCTION_RESPONSE = GetRecipeInstructionResponse("Bake the ingredients")
val BAKE_RECIPE_INSTRUCTION_RESPONSE = GetRecipeInstructionResponse(
id = "2",
title = "",
text = "Bake the ingredients",
ingredientReferences = emptyList()
)
val BOIL_RECIPE_INSTRUCTION_RESPONSE = GetRecipeInstructionResponse("Boil the ingredients")
val BOIL_RECIPE_INSTRUCTION_RESPONSE = GetRecipeInstructionResponse(
id = "3",
title = "",
text = "Boil the ingredients",
ingredientReferences = emptyList()
)
val NO_AMOUNT_RECIPE_SETTINGS_RESPONSE = GetRecipeSettingsResponse(disableAmount = true)
@@ -107,8 +132,8 @@ val CAKE_RECIPE_RESPONSE = GetRecipeResponse(
remoteId = "1",
name = "Cake",
recipeYield = "4 servings",
recipeIngredients = listOf(SUGAR_RECIPE_INGREDIENT_RESPONSE, BREAD_RECIPE_INGREDIENT_RESPONSE),
recipeInstructions = listOf(MIX_RECIPE_INSTRUCTION_RESPONSE, BAKE_RECIPE_INSTRUCTION_RESPONSE),
ingredients = listOf(SUGAR_RECIPE_INGREDIENT_RESPONSE, BREAD_RECIPE_INGREDIENT_RESPONSE),
instructions = listOf(MIX_RECIPE_INSTRUCTION_RESPONSE, BAKE_RECIPE_INSTRUCTION_RESPONSE),
settings = NO_AMOUNT_RECIPE_SETTINGS_RESPONSE,
)
@@ -116,11 +141,11 @@ val PORRIDGE_RECIPE_RESPONSE = GetRecipeResponse(
remoteId = "2",
recipeYield = "3 servings",
name = "Porridge",
recipeIngredients = listOf(
ingredients = listOf(
SUGAR_RECIPE_INGREDIENT_RESPONSE,
MILK_RECIPE_INGREDIENT_RESPONSE,
),
recipeInstructions = listOf(
instructions = listOf(
MIX_RECIPE_INSTRUCTION_RESPONSE,
BOIL_RECIPE_INSTRUCTION_RESPONSE
),