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

Compare commits

base: ReiMerc:cb2df85e5b6170d44d1cabb728bb7304138410ac
Branches Tags
ReiMerc:master
..
compare: ReiMerc:f38333dc8c420ef7053da0b2797dd94f61e848c4
Branches Tags
ReiMerc:master

No commits in common. "cb2df85e5b6170d44d1cabb728bb7304138410ac" and "f38333dc8c420ef7053da0b2797dd94f61e848c4" have entirely different histories.
cb2df85e5b ... f38333dc8c

15 changed files with 35 additions and 309 deletions
Show Stats Expand all files Collapse all files

4
app/app/src/main/AndroidManifest.xml
View File

@ -48,10 +48,6 @@
android:name=".ui.dishes.CreateDishAIActivity" android:name=".ui.dishes.CreateDishAIActivity"
android:exported="false" /> android:exported="false" />
<activity
android:name=".ui.dishes.DishDetailsActivity"
android:exported="false" />
<activity <activity
android:name=".ui.profile.ChangePasswordActivity" android:name=".ui.profile.ChangePasswordActivity"
android:exported="false" /> android:exported="false" />

23
app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
View File

@ -1,14 +1,12 @@
package tech.mercantec.easyeat.helpers package tech.mercantec.easyeat.helpers
import android.content.ClipDescription
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import tech.mercantec.easyeat.models.CreateDirection
import tech.mercantec.easyeat.models.CreateIngredient
import tech.mercantec.easyeat.models.CreateRecipe
import tech.mercantec.easyeat.models.Direction import tech.mercantec.easyeat.models.Direction
import tech.mercantec.easyeat.models.Ingredient import tech.mercantec.easyeat.models.Ingredient
import tech.mercantec.easyeat.models.Recipe
@Serializable @Serializable
data class LoginRequest(val emailUsr: String, val password: String) data class LoginRequest(val emailUsr: String, val password: String)
@ -116,24 +114,17 @@ fun changePassword(ctx: Context, oldPassword: String, newPassword: String) {
} }
@Serializable @Serializable
data class CreateRecipeRequest(val name: String, val description: String, val directions: List<CreateDirection>, val ingredients: List<CreateIngredient>) data class CreateRecipeRequest(val name: String, val description: String, val directions: List<Direction>, val ingredients: List<Ingredient>)
fun createRecipe(ctx: Context, recipe: CreateRecipe) { fun createRecipe(ctx: Context, recipe: Recipe) {
val request = CreateRecipeRequest(recipe.name, recipe.description, recipe.directions, recipe.ingredients) val request = CreateRecipeRequest(recipe.name, recipe.description, recipe.directions, recipe.ingredients)
requestJson<CreateRecipeRequest, Boolean>(ctx, "POST", "/api/recipe/create", request) requestJson<CreateRecipeRequest, Boolean>(ctx, "POST", "/api/recipe/create", request)
} }
@Serializable @Serializable
data class GetAllRecipesResponse(val id: Int, val name: String, val description: String) data class RecipeResponse(val id: Int, val name: String, val description: String)
fun getAllRecipies(ctx: Context): List<GetAllRecipesResponse> { fun getRecipies(ctx: Context): List<RecipeResponse> {
return requestJson<Unit, List<GetAllRecipesResponse>>(ctx, "GET", "/api/Recipe/getall", null) return requestJson<Unit, List<RecipeResponse>>(ctx, "GET", "/api/Recipe/getall", null)
}
@Serializable
data class RecipeDetailsResponse(val id: Int, val name: String, val description: String, val directions: List<Direction>, val ingredients: List<Ingredient>)
fun getRecipeDetails(ctx: Context, id: Int): RecipeDetailsResponse {
return requestJson<Unit, RecipeDetailsResponse>(ctx, "GET", "/api/Recipe/get/$id", null)
} }

24
app/app/src/main/java/tech/mercantec/easyeat/models/CreateRecipe.kt
View File

@ -1,24 +0,0 @@
package tech.mercantec.easyeat.models
import kotlinx.serialization.Serializable
@Serializable
data class CreateRecipe(
val name: String,
val description: String,
val directions: List<CreateDirection>,
val ingredients: List<CreateIngredient>
)
@Serializable
data class CreateDirection(
val instructions: String
)
@Serializable
data class CreateIngredient(
val amount: Double?,
val unit: String?,
val name: String
)

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

@ -2,10 +2,8 @@ package tech.mercantec.easyeat.models
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@Serializable @Serializable
data class Recipe( data class Recipe(
val id: Int,
val name: String, val name: String,
val description: String, val description: String,
val directions: List<String>, val directions: List<String>,
@ -14,7 +12,6 @@ data class Recipe(
@Serializable @Serializable
data class Ingredient( data class Ingredient(
val id: Int,
val amount: Double?, val amount: Double?,
val unit: String?, val unit: String?,
val name: String val name: String

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

@ -20,9 +20,9 @@ import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.changePassword import tech.mercantec.easyeat.helpers.changePassword
import tech.mercantec.easyeat.helpers.createRecipe import tech.mercantec.easyeat.helpers.createRecipe
import tech.mercantec.easyeat.helpers.request import tech.mercantec.easyeat.helpers.request
import tech.mercantec.easyeat.models.CreateDirection import tech.mercantec.easyeat.models.Direction
import tech.mercantec.easyeat.models.CreateIngredient import tech.mercantec.easyeat.models.Ingredient
import tech.mercantec.easyeat.models.CreateRecipe import tech.mercantec.easyeat.models.Recipe
import kotlin.concurrent.thread import kotlin.concurrent.thread
class CreateDishActivity : AppCompatActivity() { class CreateDishActivity : AppCompatActivity() {
@ -53,7 +53,7 @@ class CreateDishActivity : AppCompatActivity() {
.map { line -> line.trim() } .map { line -> line.trim() }
.filter { it.isNotEmpty() } .filter { it.isNotEmpty() }
val recipe = CreateRecipe( val recipe = Recipe(
name = findViewById<EditText>(R.id.dishName).text.toString().trim(), name = findViewById<EditText>(R.id.dishName).text.toString().trim(),
description = findViewById<EditText>(R.id.dishDescription).text.toString().trim(), description = findViewById<EditText>(R.id.dishDescription).text.toString().trim(),
directions = directions, directions = directions,
@ -107,8 +107,8 @@ class CreateDishActivity : AppCompatActivity() {
ingredientContainer.addView(ingredientRow) ingredientContainer.addView(ingredientRow)
} }
private fun collectIngredients(): List<CreateIngredient> { private fun collectIngredients(): List<Ingredient> {
val ingredients = mutableListOf<CreateIngredient>() val ingredients = mutableListOf<Ingredient>()
for (i in 0 until ingredientContainer.childCount) { for (i in 0 until ingredientContainer.childCount) {
val ingredientView = ingredientContainer.getChildAt(i) val ingredientView = ingredientContainer.getChildAt(i)
@ -125,7 +125,7 @@ class CreateDishActivity : AppCompatActivity() {
// Optional: Only add non-empty rows // Optional: Only add non-empty rows
if (element.isNotEmpty() && amount.isNotEmpty()) { if (element.isNotEmpty() && amount.isNotEmpty()) {
ingredients.add(CreateIngredient(name = element, amount = amount.toDouble(), unit = unit)) ingredients.add(Ingredient(name = element, amount = amount.toDouble(), unit = unit))
} }
} }

16
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishAdapter.kt
View File

@ -9,11 +9,8 @@ import android.widget.TextView
import tech.mercantec.easyeat.R import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.models.DishListItem import tech.mercantec.easyeat.models.DishListItem
class DishAdapter( class DishAdapter(context: Context, dishes: List<DishListItem>) :
context: Context, ArrayAdapter<DishListItem>(context, 0, dishes) {
private val dishes: List<DishListItem>,
private val onDishClick: (DishListItem) -> Unit
) : ArrayAdapter<DishListItem>(context, 0, dishes) {
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
val dish = getItem(position) val dish = getItem(position)
@ -22,14 +19,9 @@ class DishAdapter(
val nameTextView = view.findViewById<TextView>(R.id.dishName) val nameTextView = view.findViewById<TextView>(R.id.dishName)
val descriptionTextView = view.findViewById<TextView>(R.id.descriptionTextView) val descriptionTextView = view.findViewById<TextView>(R.id.descriptionTextView)
nameTextView.text = dish?.name nameTextView.text = "Name: ${dish?.name}"
descriptionTextView.text = dish?.description descriptionTextView.text = "Description: ${dish?.description}"
view.setOnClickListener {
dish?.let { onDishClick(it) }
}
return view return view
} }
} }

54
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt
View File

@ -1,54 +0,0 @@
package tech.mercantec.easyeat.ui.dishes
import android.os.Bundle
import android.util.Log
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.RecipeDetailsResponse
import tech.mercantec.easyeat.helpers.getRecipeDetails
import kotlin.concurrent.thread
import android.widget.ListView
import android.widget.TextView
class DishDetailsActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_dish_details)
val dishId = intent.getIntExtra("dish_id", -1)
if (dishId == -1) {
Toast.makeText(this, "No dish ID provided", Toast.LENGTH_SHORT).show()
finish()
return
}
thread {
val recipe: RecipeDetailsResponse
try {
recipe = getRecipeDetails(this, dishId)
} catch (e: ApiRequestException) {
runOnUiThread {
Toast.makeText(this, e.message, Toast.LENGTH_LONG).show()
}
return@thread
}
Log.i("DISH", recipe.ingredients.toString())
runOnUiThread {
// Set title and description
findViewById<TextView>(R.id.dishDetailName).text = recipe.name
findViewById<TextView>(R.id.dishDetailDescription).text = recipe.description
// Set up the ingredient list
val ingredientListView = findViewById<ListView>(R.id.dishDetailIngredients)
val ingredientAdapter = IngredientAdapter(this, recipe.ingredients)
ingredientListView.adapter = ingredientAdapter
val instructionsListView = findViewById<ListView>(R.id.dishDetailInstructions)
val instructionsAdapter = InstructionsAdapter(this, recipe.directions)
instructionsListView.adapter = instructionsAdapter
}
}
}
}

22
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
View File

@ -3,6 +3,7 @@ package tech.mercantec.easyeat.ui.dishes
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -11,12 +12,16 @@ import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.launch
import tech.mercantec.easyeat.R import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.databinding.FragmentDishesBinding import tech.mercantec.easyeat.databinding.FragmentDishesBinding
import tech.mercantec.easyeat.helpers.ApiRequestException import tech.mercantec.easyeat.helpers.ApiRequestException
import tech.mercantec.easyeat.helpers.GetAllRecipesResponse import tech.mercantec.easyeat.helpers.RecipeResponse
import tech.mercantec.easyeat.helpers.getAllRecipies import tech.mercantec.easyeat.helpers.getRecipies
import tech.mercantec.easyeat.helpers.login
import tech.mercantec.easyeat.models.DishListItem import tech.mercantec.easyeat.models.DishListItem
import tech.mercantec.easyeat.ui.MainActivity
import kotlin.concurrent.thread import kotlin.concurrent.thread
class DishesFragment : Fragment() { class DishesFragment : Fragment() {
@ -64,11 +69,11 @@ class DishesFragment : Fragment() {
return root return root
} }
fun DishesFragment.loadRecipes() { fun DishesFragment.loadRecipes() {
thread { thread {
val recipes: List<GetAllRecipesResponse> val recipes: List<RecipeResponse>
try { try {
recipes = getAllRecipies(requireContext()) recipes = getRecipies(requireContext())
} catch (e: ApiRequestException) { } catch (e: ApiRequestException) {
activity?.runOnUiThread { activity?.runOnUiThread {
Toast.makeText(requireContext(), e.message, Toast.LENGTH_LONG).show() Toast.makeText(requireContext(), e.message, Toast.LENGTH_LONG).show()
@ -81,12 +86,7 @@ class DishesFragment : Fragment() {
} }
activity?.runOnUiThread { activity?.runOnUiThread {
val adapter = DishAdapter(requireContext(), dishes) { selectedDish -> val adapter = DishAdapter(requireContext(), dishes)
// Open details activity
val intent = Intent(requireContext(), DishDetailsActivity::class.java)
intent.putExtra("dish_id", selectedDish.id)
startActivity(intent)
}
binding.dishesList.adapter = adapter binding.dishesList.adapter = adapter
} }
} }

30
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/IngredientAdapter.kt
View File

@ -1,30 +0,0 @@
package tech.mercantec.easyeat.ui.dishes
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.TextView
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.models.Ingredient
class IngredientAdapter(context: Context, ingredients: List<Ingredient>)
: ArrayAdapter<Ingredient>(context, 0, ingredients) {
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
val ingredient = getItem(position)
val view = convertView ?: LayoutInflater.from(context)
.inflate(R.layout.activity_dish_details_ingredient_list_item, parent, false)
val nameView = view.findViewById<TextView>(R.id.ingredientName)
val amountView = view.findViewById<TextView>(R.id.ingredientAmount)
val unitView = view.findViewById<TextView>(R.id.ingredientUnit)
nameView.text = ingredient?.name ?: ""
amountView.text = ingredient?.amount?.toString() ?: "-"
unitView.text = ingredient?.unit ?: "-"
return view
}
}

26
app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/InstructionsAdapter.kt
View File

@ -1,26 +0,0 @@
package tech.mercantec.easyeat.ui.dishes
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.TextView
import tech.mercantec.easyeat.R
import tech.mercantec.easyeat.models.Direction
class InstructionsAdapter (context: Context, instructions: List<Direction>)
: ArrayAdapter<Direction>(context, 0, instructions) {
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
val ingredient = getItem(position)
val view = convertView ?: LayoutInflater.from(context)
.inflate(R.layout.activity_dish_details_instructions_list_item, parent, false)
val nameView = view.findViewById<TextView>(R.id.instructionText)
nameView.text = ingredient?.instruktions ?: ""
return view
}
}

12
app/app/src/main/res/layout/activity_create_dish_form.xml
View File

@ -15,9 +15,7 @@
android:text="@string/general" android:text="@string/general"
android:textAlignment="center" android:textAlignment="center"
android:textSize="24sp" android:textSize="24sp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"/>
android:textStyle="bold"
/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -46,9 +44,7 @@
android:text="@string/ingredients" android:text="@string/ingredients"
android:textAlignment="center" android:textAlignment="center"
android:textSize="24sp" android:textSize="24sp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"/>
android:textStyle="bold"
/>
<LinearLayout <LinearLayout
android:id="@+id/ingredientContainer" android:id="@+id/ingredientContainer"
@ -69,9 +65,7 @@
android:text="@string/Instructions" android:text="@string/Instructions"
android:textAlignment="center" android:textAlignment="center"
android:textSize="24sp" android:textSize="24sp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"/>
android:textStyle="bold"
/>
<EditText <EditText
android:id="@+id/instructions" android:id="@+id/instructions"

3
app/app/src/main/res/layout/activity_create_dish_ingredient_row.xml
View File

@ -43,7 +43,8 @@
<EditText <EditText
android:id="@+id/ingredientAmountEditText" android:id="@+id/ingredientAmountEditText"
android:layout_width="173dp" android:layout_width="173dp"
android:layout_height="48dp" /> android:layout_height="48dp"
android:hint="0" />
</LinearLayout> </LinearLayout>
<!-- Measurement field --> <!-- Measurement field -->

58
app/app/src/main/res/layout/activity_dish_details.xml
View File

@ -1,58 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="409dp"
android:layout_height="729dp"
tools:layout_editor_absoluteX="1dp"
tools:layout_editor_absoluteY="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<TextView
android:id="@+id/dishDetailName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="30sp"
android:textAlignment="center"
android:layout_marginBottom="10dp"
android:textStyle="bold" />
<TextView
android:id="@+id/dishDetailDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="20sp"
android:textAlignment="center" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginVertical="20dp"
android:textSize="25sp"
android:textAlignment="center"
android:textStyle="bold"
android:text="Ingredients"/>
<ListView
android:id="@+id/dishDetailIngredients"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginVertical="20dp"
android:textSize="25sp"
android:textAlignment="center"
android:textStyle="bold"
android:text="Instructions"/>
<ListView
android:id="@+id/dishDetailInstructions"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>
</ScrollView>

34
app/app/src/main/res/layout/activity_dish_details_ingredient_list_item.xml
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<TextView
android:id="@+id/ingredientName"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Name"
android:textSize="20sp"
/>
<TextView
android:id="@+id/ingredientAmount"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Amount"
android:textSize="20sp"
/>
<TextView
android:id="@+id/ingredientUnit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Unit"
android:textSize="20sp"
/>
</LinearLayout>

19
app/app/src/main/res/layout/activity_dish_details_instructions_list_item.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="10dp">
<TextView
android:id="@+id/instructionText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="20sp"
/>
</LinearLayout>