Merge branch 'master' of git.reim.ar:ReiMerc/easyeat
This commit is contained in:
commit
f38333dc8c
@ -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()))
|
||||
}
|
@ -6,16 +6,10 @@ import kotlinx.serialization.Serializable
|
||||
data class Recipe(
|
||||
val name: String,
|
||||
val description: String,
|
||||
val directions: List<Direction>,
|
||||
val directions: List<String>,
|
||||
val ingredients: List<Ingredient>
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class Direction(
|
||||
val instructions: String
|
||||
)
|
||||
|
||||
|
||||
@Serializable
|
||||
data class Ingredient(
|
||||
val amount: Double?,
|
||||
|
@ -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()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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<Direction> = instructions
|
||||
val directions: List<String> = instructions
|
||||
.split("\n")
|
||||
.map { line -> line.trim() }
|
||||
.filter { it.isNotEmpty() }
|
||||
.map { line -> Direction(instructions = line) }
|
||||
|
||||
val recipe = Recipe(
|
||||
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()
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
checkmarkView.visibility = View.VISIBLE
|
||||
} else {
|
||||
textViews.forEach {
|
||||
it.paintFlags = it.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
|
||||
@ -49,9 +49,9 @@ 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
|
||||
}
|
||||
|
||||
checkmarkView.visibility = View.INVISIBLE
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user