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

merge

Browse Source
This commit is contained in:
LilleBRG 2025-05-13 10:56:42 +02:00
commit cb2df85e5b
11 changed files with 125 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/app/src/main/java/tech/mercantec/easyeat/helpers/dishes.kt Normal file
View File

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

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

@ -8,17 +8,10 @@ data class Recipe(
val id: Int,
val name: String,
val description: String,
val directions: List<CreateDirection>,
val ingredients: List<CreateIngredient>
val directions: List<String>,
val ingredients: List<Ingredient>
)
@Serializable
data class Direction(
val id: Int,
val instruktions: String
)
@Serializable
data class Ingredient(
val id: Int,

35
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishAIActivity.kt
View File

@ -1,16 +1,49 @@
package tech.mercantec.easyeat.ui.dishes
import android.app.ProgressDialog
import android.os.Bundle
import android.widget.Button
import android.widget.EditText
import android.widget.LinearLayout
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.GenerateRecipeResponse
import tech.mercantec.easyeat.helpers.generateRecipeWithAI
import java.util.Locale
import kotlin.concurrent.thread
class CreateDishAIActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.create_dish_ai_form)
findViewById<Button>(R.id.generate).setOnClickListener {
val name = findViewById<EditText>(R.id.dish_title).text.toString()
val progressDialog = ProgressDialog(this)
progressDialog.setMessage("Generating...")
progressDialog.show()
thread {
val response: GenerateRecipeResponse
try {
response = generateRecipeWithAI(this, name, Locale.getDefault().displayLanguage)
} catch (e: ApiRequestException) {
runOnUiThread {
Toast.makeText(this, e.message, Toast.LENGTH_LONG).show()
}
return@thread
} finally {
progressDialog.hide()
}
runOnUiThread {
Toast.makeText(this, response.toString(), Toast.LENGTH_LONG).show()
}
}
}
}
}

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

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

4
app/app/src/main/java/tech/mercantec/easyeat/ui/shopping_list/ShoppingItemAdapter.kt
View File

@ -39,9 +39,9 @@ class ShoppingItemAdapter(context: Context, items: ArrayList<ShoppingListItem>)
val color = TypedValue()
context.theme.resolveAttribute(R.attr.colorDisabled, color, true)
it.setTextColor(ContextCompat.getColor(context, color.resourceId))
}
checkmarkView.visibility = View.VISIBLE
}
} else {
textViews.forEach {
it.paintFlags = it.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
@ -49,11 +49,11 @@ class ShoppingItemAdapter(context: Context, items: ArrayList<ShoppingListItem>)
val color = TypedValue()
context.theme.resolveAttribute(android.R.attr.textColorSecondary, color, true)
it.setTextColor(ContextCompat.getColor(context, color.resourceId))
}
checkmarkView.visibility = View.INVISIBLE
}
}
}
return view
}

44
app/app/src/main/res/layout/create_dish_ai_form.xml
View File

@ -1,14 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:padding="30dp"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/formforai"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="FormForAI"
tools:layout_editor_absoluteX="126dp"
tools:layout_editor_absoluteY="287dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:textAlignment="center"
android:textSize="24sp"
android:text="@string/ai_generate_recipe_title"
/>
<TextView
android:layout_marginTop="20dp"
android:layout_marginStart="2sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:labelFor="@id/dish_title"
android:text="@string/dish_title_label"
/>
<EditText
android:id="@+id/dish_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:importantForAutofill="no"
android:inputType="text"
/>
<Button
android:id="@+id/generate"
android:layout_marginTop="20sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/generate_recipe_label"
/>
</LinearLayout>

3
app/app/src/main/res/values/strings.xml
View File

@ -44,6 +44,9 @@
<string name="search_for_dishes">Search For Dishes</string>
<string name="manually">Manually</string>
<string name="create_dish">Create Dish</string>
<string name="ai_generate_recipe_title">Generate recipe with AI</string>
<string name="dish_title_label">Name of dish</string>
<string name="generate_recipe_label">Generate</string>
<string-array name="units">
<item></item>
<item>g</item>

18
backend/API/BusinessLogic/RecipeLogic.cs
View File

@ -40,7 +40,19 @@ namespace API.BusinessLogic
if (recipe == null || recipe.Id == 0) { return new ConflictObjectResult(new { message = "Could not find any recipe" }); }
return new OkObjectResult(recipe);
var singleRecipeDTO = new GetSingleRecipeDTO();
singleRecipeDTO.Id = recipe.Id;
singleRecipeDTO.Name = recipe.Name;
singleRecipeDTO.Description = recipe.Description;
singleRecipeDTO.Ingredients = recipe.Ingredients;
singleRecipeDTO.Directions = new List<string>();
foreach (var item in recipe.Directions)
{
string directions = item.Instruktions;
singleRecipeDTO.Directions.Add(directions);
}
return new OkObjectResult(singleRecipeDTO);
}
/// <summary>
@ -78,7 +90,7 @@ namespace API.BusinessLogic
foreach (var item in recipe.Directions)
{
Directions directions = new Directions();
directions.Instruktions = item.Instructions;
directions.Instruktions = item;
dish.Directions.Add(directions);
}
@ -119,7 +131,7 @@ namespace API.BusinessLogic
foreach (var item in recipe.Directions)
{
Directions directions = new Directions();
directions.Instruktions = item.Instructions;
directions.Instruktions = item;
dish.Directions.Add(directions);
}

7
backend/API/Models/RecipeModels/DirectionsDTO.cs
View File

@ -1,7 +0,0 @@
namespace API.Models.RecipeModels
{
public class DirectionsDTO
{
public string Instructions { get; set; }
}
}

16
backend/API/Models/RecipeModels/GetSingleRecipeDTO.cs Normal file
View File

@ -0,0 +1,16 @@
namespace API.Models.RecipeModels
{
public class GetSingleRecipeDTO
{
public int Id { get; set; }
public string Name { get; set; }
public string Description { get; set; }
public List<string> Directions { get; set; }
public List<Ingredient> Ingredients { get; set; }
}
}

2
backend/API/Models/RecipeModels/RecipeDTO.cs
View File

@ -6,7 +6,7 @@
public string Description { get; set; }
public List<DirectionsDTO> Directions { get; set; }
public List<string> Directions { get; set; }
public List<IngredientDTO> Ingredients { get; set; }
}