ReiMerc/easyeat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use string array for directions in recipes

Browse Source
This commit is contained in:
Reimar 2025-05-13 10:33:16 +02:00
parent f0e7e67d77
commit 59af36b3f2
Signed by: Reimar
GPG Key ID: 93549FA07F0AE268
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/app/src/main/java/tech/mercantec/easyeat/helpers/dishes.kt
View File

@ -2,14 +2,11 @@ package tech.mercantec.easyeat.helpers
import android.content.Context import android.content.Context
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tech.mercantec.easyeat.models.Ingredient import tech.mercantec.easyeat.models.Recipe
@Serializable @Serializable
data class GenerateRecipeRequest(val dish: String, val language: String, val numberOfRecipes: Int, val allergi: Array<String>) data class GenerateRecipeRequest(val dish: String, val language: String, val numberOfRecipes: Int, val allergi: Array<String>)
@Serializable fun generateRecipeWithAI(ctx: Context, title: String, language: String): Recipe {
data class GenerateRecipeResponse(val name: String, val description: String, val directions: Array<String>, val ingredients: Array<Ingredient>) return requestJson<GenerateRecipeRequest, Recipe>(ctx, "POST", "/api/Recipe/chatbot", GenerateRecipeRequest(title, language, 1, arrayOf()))
fun generateRecipeWithAI(ctx: Context, title: String, language: String): GenerateRecipeResponse {
return requestJson<GenerateRecipeRequest, GenerateRecipeResponse>(ctx, "POST", "/api/Recipe/chatbot", GenerateRecipeRequest(title, language, 1, arrayOf()))
} }

8
app/app/src/main/java/tech/mercantec/easyeat/models/recipe.kt
View File

@ -6,16 +6,10 @@ import kotlinx.serialization.Serializable
data class Recipe( data class Recipe(
val name: String, val name: String,
val description: String, val description: String,
val directions: List<Direction>, val directions: List<String>,
val ingredients: List<Ingredient> val ingredients: List<Ingredient>
) )
@Serializable
data class Direction(
val instructions: String
)
@Serializable @Serializable
data class Ingredient( data class Ingredient(
val amount: Double?, val amount: Double?,

4
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
View File

@ -48,11 +48,10 @@ class CreateDishActivity : AppCompatActivity() {
saveButton.setOnClickListener { saveButton.setOnClickListener {
val ingredientList = collectIngredients() val ingredientList = collectIngredients()
val instructions = findViewById<EditText>(R.id.instructions).text.toString().trim() val instructions = findViewById<EditText>(R.id.instructions).text.toString().trim()
val directions: List<Direction> = instructions val directions: List<String> = instructions
.split("\n") .split("\n")
.map { line -> line.trim() } .map { line -> line.trim() }
.filter { it.isNotEmpty() } .filter { it.isNotEmpty() }
.map { line -> Direction(instructions = line) }
val recipe = Recipe( val recipe = Recipe(
name = findViewById<EditText>(R.id.dishName).text.toString().trim(), name = findViewById<EditText>(R.id.dishName).text.toString().trim(),
@ -61,7 +60,6 @@ class CreateDishActivity : AppCompatActivity() {
ingredients = ingredientList ingredients = ingredientList
) )
val progressDialog = ProgressDialog(this) val progressDialog = ProgressDialog(this)
progressDialog.setMessage("Loading...") progressDialog.setMessage("Loading...")
progressDialog.show() progressDialog.show()