From 799ddb76e50d368ce6ff47446540388f1fa0c2c6 Mon Sep 17 00:00:00 2001
From: LilleBRG <lillebrgmc@gmail.com>
Date: Thu, 8 May 2025 12:12:00 +0200
Subject: [PATCH 1/4] made modal for ai and manual creation of dish

---
 app/app/src/main/AndroidManifest.xml          |  4 +++
 .../tech/mercantec/easyeat/helpers/api.kt     |  8 +++++
 .../tech/mercantec/easyeat/helpers/auth.kt    | 14 +++++++--
 .../tech/mercantec/easyeat/ui/MainActivity.kt |  5 ----
 .../easyeat/ui/dishes/CreateDishAIActivity.kt | 16 ++++++++++
 .../easyeat/ui/dishes/CreateDishActivity.kt   | 11 +------
 .../easyeat/ui/dishes/DishesFragment.kt       | 27 +++++++++++++++--
 .../main/res/drawable/rounded_background.xml  |  4 +++
 .../main/res/layout/create_dish_ai_form.xml   | 14 +++++++++
 .../res/layout/create_dish_modal_dialog.xml   | 29 +++++++++++++++++++
 .../src/main/res/layout/dish_list_item.xml    |  1 +
 .../main/res/xml/network_security_config.xml  |  6 ++++
 12 files changed, 119 insertions(+), 20 deletions(-)
 create mode 100644 app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishAIActivity.kt
 create mode 100644 app/app/src/main/res/drawable/rounded_background.xml
 create mode 100644 app/app/src/main/res/layout/create_dish_ai_form.xml
 create mode 100644 app/app/src/main/res/layout/create_dish_modal_dialog.xml
 create mode 100644 app/app/src/main/res/xml/network_security_config.xml

diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml
index 18a13cb..69e6466 100644
--- a/app/app/src/main/AndroidManifest.xml
+++ b/app/app/src/main/AndroidManifest.xml
@@ -44,6 +44,10 @@
             android:name=".ui.dishes.CreateDishActivity"
             android:exported="false" />
 
+        <activity
+            android:name=".ui.dishes.CreateDishAIActivity"
+            android:exported="false" />
+
         <activity
             android:name=".ui.profile.ChangePasswordActivity"
             android:exported="false" />
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
index c3297eb..914db0a 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
@@ -87,6 +87,14 @@ inline fun <reified Req, reified Res> requestJson(ctx: Context, method: String,
         }
     }
 
+    if (response.body.isBlank()) {
+        // Return Unit or an empty default value depending on Res
+        return when (Res::class) {
+            Unit::class -> Unit as Res
+            else -> throw ApiRequestException("Expected JSON but got empty response", null)
+        }
+    }
+
     try {
         return Json.decodeFromString<Res>(response.body)
     } catch (e: SerializationException) {
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
index 672be6e..e2bc634 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
@@ -114,7 +114,15 @@ data class CreateRecipeRequest(val recipe: Recipe)
 
 fun createRecipe(ctx: Context, recipe: Recipe) {
     val request = CreateRecipeRequest(recipe)
-
-    return requestJson<CreateRecipeRequest, Unit>(ctx, "POST", "/api/recipe/create", request)
-
+    Log.i("recipe name:", recipe.name)
+    Log.i("recipe name:", recipe.description)
+    for (x in recipe.directions) {
+        Log.i("recipe name:", x.instructions)
+    }
+    for(x in recipe.ingredients){
+        Log.i("recipe name:", x.name)
+        Log.i("recipe name:", x.amount.toString())
+        Log.i("recipe name:", x.unit.toString())
+    }
+    requestJson<CreateRecipeRequest, Boolean>(ctx, "POST", "/api/recipe/create", request)
 }
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/MainActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/MainActivity.kt
index fc948f2..f350625 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/MainActivity.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/MainActivity.kt
@@ -34,10 +34,5 @@ class MainActivity : AppCompatActivity() {
         )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
-
-        findViewById<FloatingActionButton>(tech.mercantec.easyeat.R.id.add_dish).setOnClickListener {
-            val intent = Intent(this, CreateDishActivity::class.java)
-            startActivity(intent)
-        }
     }
 }
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishAIActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishAIActivity.kt
new file mode 100644
index 0000000..82133f6
--- /dev/null
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishAIActivity.kt
@@ -0,0 +1,16 @@
+package tech.mercantec.easyeat.ui.dishes
+
+import android.os.Bundle
+import android.widget.LinearLayout
+import androidx.appcompat.app.AppCompatActivity
+import tech.mercantec.easyeat.R
+
+class CreateDishAIActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.create_dish_ai_form)
+
+    }
+
+}
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
index a6d0463..ff22d94 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
@@ -60,16 +60,7 @@ class CreateDishActivity : AppCompatActivity() {
                 ingredients = ingredientList
             )
 
-            Log.i("recipe name:", recipe.name)
-            Log.i("recipe name:", recipe.description)
-            for (x in recipe.directions) {
-                Log.i("recipe name:", x.instructions)
-            }
-            for(x in recipe.ingredients){
-                Log.i("recipe name:", x.name)
-                Log.i("recipe name:", x.amount.toString())
-                Log.i("recipe name:", x.unit.toString())
-            }
+
             val progressDialog = ProgressDialog(this)
             progressDialog.setMessage("Loading...")
             progressDialog.show()
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
index d75d028..bed7736 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
@@ -5,8 +5,10 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import tech.mercantec.easyeat.R
 import tech.mercantec.easyeat.databinding.FragmentDishesBinding
 import tech.mercantec.easyeat.models.Dish
 
@@ -27,10 +29,31 @@ class DishesFragment : Fragment() {
         val root: View = binding.root
 
         binding.addDish.setOnClickListener {
-            val intent = Intent(requireContext(), CreateDishActivity::class.java)
-            startActivity(intent)
+            val dialogView = LayoutInflater.from(requireContext()).inflate(R.layout.create_dish_modal_dialog, null)
+
+            val dialog = android.app.AlertDialog.Builder(requireContext())
+                .setView(dialogView)
+                .setCancelable(true) // tap outside to dismiss
+                .create()
+
+            dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
+
+            dialogView.findViewById<Button>(R.id.createManualBtn).setOnClickListener {
+                val intent = Intent(requireContext(), CreateDishActivity::class.java)
+                startActivity(intent)
+                dialog.dismiss()
+            }
+
+            dialogView.findViewById<Button>(R.id.createAIBtn).setOnClickListener {
+                val intent = Intent(requireContext(), CreateDishAIActivity::class.java)
+                startActivity(intent)
+                dialog.dismiss()
+            }
+
+            dialog.show()
         }
 
+
         context?.let { context ->
             binding.dishesList.setOnItemClickListener { parent, view, position, id ->
                 val selectedItem = parent.getItemAtPosition(position) as Dish
diff --git a/app/app/src/main/res/drawable/rounded_background.xml b/app/app/src/main/res/drawable/rounded_background.xml
new file mode 100644
index 0000000..1b1348d
--- /dev/null
+++ b/app/app/src/main/res/drawable/rounded_background.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="16dp" />
+</shape>
diff --git a/app/app/src/main/res/layout/create_dish_ai_form.xml b/app/app/src/main/res/layout/create_dish_ai_form.xml
new file mode 100644
index 0000000..1de8ce7
--- /dev/null
+++ b/app/app/src/main/res/layout/create_dish_ai_form.xml
@@ -0,0 +1,14 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/formforai"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="FormForAI"
+        tools:layout_editor_absoluteX="126dp"
+        tools:layout_editor_absoluteY="287dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/app/src/main/res/layout/create_dish_modal_dialog.xml b/app/app/src/main/res/layout/create_dish_modal_dialog.xml
new file mode 100644
index 0000000..b165bb5
--- /dev/null
+++ b/app/app/src/main/res/layout/create_dish_modal_dialog.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog_root"
+    android:layout_width="250dp"
+    android:layout_height="400dp"
+    android:orientation="vertical"
+    android:background="@drawable/rounded_background"
+    android:padding="0dp"
+    android:gravity="center">
+
+    <Button
+        android:id="@+id/createManualBtn"
+        android:layout_width="200dp"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Top Button" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#CCCCCC" />
+
+    <Button
+        android:id="@+id/createAIBtn"
+        android:layout_width="200dp"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:text="Bottom Button" />
+</LinearLayout>
diff --git a/app/app/src/main/res/layout/dish_list_item.xml b/app/app/src/main/res/layout/dish_list_item.xml
index 419bc04..41016ac 100644
--- a/app/app/src/main/res/layout/dish_list_item.xml
+++ b/app/app/src/main/res/layout/dish_list_item.xml
@@ -20,4 +20,5 @@
         android:id="@+id/expense"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/app/src/main/res/xml/network_security_config.xml b/app/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..de61259
--- /dev/null
+++ b/app/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">localhost</domain>
+    </domain-config>
+</network-security-config>

From 3b01992eede246b9a0e5bd6f1e5b4d95a910871d Mon Sep 17 00:00:00 2001
From: LilleBRG <lillebrgmc@gmail.com>
Date: Thu, 8 May 2025 18:48:59 +0200
Subject: [PATCH 2/4] code towards create manual and getallrecipies made but
 not working

---
 .../tech/mercantec/easyeat/helpers/api.kt     |  2 +-
 .../tech/mercantec/easyeat/helpers/auth.kt    |  9 ++++
 .../tech/mercantec/easyeat/models/dish.kt     |  2 +-
 .../easyeat/ui/dishes/DishAdapter.kt          | 12 +++---
 .../easyeat/ui/dishes/DishesFragment.kt       | 43 ++++++++-----------
 .../src/main/res/layout/dish_list_item.xml    |  7 +--
 6 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
index 94c200b..b11548c 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/api.kt
@@ -37,7 +37,7 @@ fun request(ctx: Context, method: String, path: String, data: String?, autoRefre
                 outputStream.write(data.toByteArray())
                 outputStream.flush()
             }
-
+            Log.i("http", responseCode.toString())
             if (responseCode == 401) {
                 if (!autoRefresh || refreshToken == null || !refreshAuthToken(ctx, refreshToken)) {
                     val intent = Intent(ctx, LoginActivity::class.java)
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
index e2bc634..3f3ce64 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
@@ -1,5 +1,6 @@
 package tech.mercantec.easyeat.helpers
 
+import android.content.ClipDescription
 import android.content.Context
 import android.util.Log
 import kotlinx.serialization.Serializable
@@ -126,3 +127,11 @@ fun createRecipe(ctx: Context, recipe: Recipe) {
     }
     requestJson<CreateRecipeRequest, Boolean>(ctx, "POST", "/api/recipe/create", request)
 }
+
+@Serializable
+data class RecipeResponse(val id: Int, val name: String, val description: String)
+
+fun getRecipies(ctx: Context): List<RecipeResponse> {
+    Log.i("ello", "yes")
+    return requestJson<Unit, List<RecipeResponse>>(ctx, "GET", "/api/Recipe/getall", null)
+}
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt b/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt
index 1b84e3e..e31ea14 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt
@@ -1,3 +1,3 @@
 package tech.mercantec.easyeat.models
 
-public data class Dish(val name: String, val mainIngredient: String, val expense: Double)
+public data class DishListItem(val name: String, val description: String)
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishAdapter.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishAdapter.kt
index cde2497..5b72d04 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishAdapter.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishAdapter.kt
@@ -7,22 +7,20 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import tech.mercantec.easyeat.R
-import tech.mercantec.easyeat.models.Dish
+import tech.mercantec.easyeat.models.DishListItem
 
-class DishAdapter(context: Context, dishes: Array<Dish>) :
-    ArrayAdapter<Dish>(context, 0, dishes) {
+class DishAdapter(context: Context, dishes: List<DishListItem>) :
+    ArrayAdapter<DishListItem>(context, 0, dishes) {
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
         val dish = getItem(position)
         val view = convertView ?: LayoutInflater.from(context).inflate(R.layout.dish_list_item, parent, false)
 
         val nameTextView = view.findViewById<TextView>(R.id.dishName)
-        val ingredientTextView = view.findViewById<TextView>(R.id.mainIngredient)
-        val expenseTextView = view.findViewById<TextView>(R.id.expense)
+        val descriptionTextView = view.findViewById<TextView>(R.id.descriptionTextView)
 
         nameTextView.text = "Name: ${dish?.name}"
-        ingredientTextView.text = "Main Ingredient: ${dish?.mainIngredient}"
-        expenseTextView.text = "Expense: ${dish?.expense} kr"
+        descriptionTextView.text = "Description: ${dish?.description}"
 
         return view
     }
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
index bed7736..e1f35d9 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
@@ -8,9 +8,12 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 import tech.mercantec.easyeat.R
 import tech.mercantec.easyeat.databinding.FragmentDishesBinding
-import tech.mercantec.easyeat.models.Dish
+import tech.mercantec.easyeat.helpers.getRecipies
+import tech.mercantec.easyeat.models.DishListItem
 
 class DishesFragment : Fragment() {
 
@@ -28,6 +31,21 @@ class DishesFragment : Fragment() {
         _binding = FragmentDishesBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
+        lifecycleScope.launch {
+            try {
+                val recipes = getRecipies(requireContext()) // this is now suspend
+                val dishes = recipes.map {
+                    DishListItem(it.name, it.description) // assuming description is the main ingredient and no price
+                }
+
+                val adapter = DishAdapter(requireContext(), dishes)
+                binding.dishesList.adapter = adapter
+            } catch (e: Exception) {
+                Toast.makeText(requireContext(), "Failed to load recipes: ${e.message}", Toast.LENGTH_LONG).show()
+            }
+        }
+
+
         binding.addDish.setOnClickListener {
             val dialogView = LayoutInflater.from(requireContext()).inflate(R.layout.create_dish_modal_dialog, null)
 
@@ -54,29 +72,6 @@ class DishesFragment : Fragment() {
         }
 
 
-        context?.let { context ->
-            binding.dishesList.setOnItemClickListener { parent, view, position, id ->
-                val selectedItem = parent.getItemAtPosition(position) as Dish
-                Toast.makeText(context, "you selected $selectedItem.name that costs ${selectedItem.expense} kr.", Toast.LENGTH_LONG).show()
-            }
-
-            val listItems = arrayOf(
-                Dish("Spaghetti Bolognese", "Beef", 70.5),
-                Dish("Margherita Pizza", "Cheese", 60.0),
-                Dish("Chicken Curry", "Chicken", 80.2),
-                Dish("Vegetable Stir Fry", "Mixed Vegetables", 50.5),
-                Dish("Sushi", "Fish", 100.0),
-                Dish("Beef Tacos", "Beef", 60.8),
-                Dish("Lentil Soup", "Lentils", 40.5),
-                Dish("Pasta Alfredo", "Cream", 60.9),
-                Dish("Caesar Salad", "Chicken", 50.8),
-                Dish("Falafel Wrap", "Chickpeas", 50.2)
-            )
-
-            binding.dishesList.adapter = DishAdapter(context, listItems)
-        }
-
-
         return root
     }
 
diff --git a/app/app/src/main/res/layout/dish_list_item.xml b/app/app/src/main/res/layout/dish_list_item.xml
index 41016ac..313cbda 100644
--- a/app/app/src/main/res/layout/dish_list_item.xml
+++ b/app/app/src/main/res/layout/dish_list_item.xml
@@ -12,12 +12,7 @@
         android:layout_height="wrap_content" />
 
     <TextView
-        android:id="@+id/mainIngredient"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <TextView
-        android:id="@+id/expense"
+        android:id="@+id/descriptionTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 

From 5c1a5699063b0a3bc984a72bc469c7a763725d67 Mon Sep 17 00:00:00 2001
From: LilleBRG <lillebrgmc@gmail.com>
Date: Fri, 9 May 2025 10:22:02 +0200
Subject: [PATCH 3/4] made new getallrecipedto and return on getallrecipe

---
 .../tech/mercantec/easyeat/helpers/auth.kt    |  1 +
 .../easyeat/ui/dishes/DishesFragment.kt       | 43 +++++++++++++++----
 backend/API/BusinessLogic/RecipeLogic.cs      |  9 +++-
 .../Models/RecipeModels/GetAllRecipesDTO.cs   | 12 ++++++
 4 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 backend/API/Models/RecipeModels/GetAllRecipesDTO.cs

diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
index 3f3ce64..b82a640 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
@@ -110,6 +110,7 @@ fun changePassword(ctx: Context, oldPassword: String, newPassword: String) {
 
     return requestJson<ChangePasswordRequest, Unit>(ctx, "PUT", "/api/User/change-password", request)
 }
+
 @Serializable
 data class CreateRecipeRequest(val recipe: Recipe)
 
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
index e1f35d9..7ee7de3 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
@@ -2,6 +2,7 @@ package tech.mercantec.easyeat.ui.dishes
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -12,8 +13,13 @@ import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import tech.mercantec.easyeat.R
 import tech.mercantec.easyeat.databinding.FragmentDishesBinding
+import tech.mercantec.easyeat.helpers.ApiRequestException
+import tech.mercantec.easyeat.helpers.RecipeResponse
 import tech.mercantec.easyeat.helpers.getRecipies
+import tech.mercantec.easyeat.helpers.login
 import tech.mercantec.easyeat.models.DishListItem
+import tech.mercantec.easyeat.ui.MainActivity
+import kotlin.concurrent.thread
 
 class DishesFragment : Fragment() {
 
@@ -31,20 +37,41 @@ class DishesFragment : Fragment() {
         _binding = FragmentDishesBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
-        lifecycleScope.launch {
+
+        thread {
+            val recipes: List<RecipeResponse>
             try {
-                val recipes = getRecipies(requireContext()) // this is now suspend
-                val dishes = recipes.map {
-                    DishListItem(it.name, it.description) // assuming description is the main ingredient and no price
+                recipes = getRecipies(requireContext())
+            } catch (e: ApiRequestException) {
+                activity?.runOnUiThread {
+                    Toast.makeText(requireContext(), e.message, Toast.LENGTH_LONG).show()
                 }
 
-                val adapter = DishAdapter(requireContext(), dishes)
-                binding.dishesList.adapter = adapter
-            } catch (e: Exception) {
-                Toast.makeText(requireContext(), "Failed to load recipes: ${e.message}", Toast.LENGTH_LONG).show()
+                return@thread
+            }
+            val dishes = recipes.map {
+                DishListItem(
+                    it.name,
+                    it.description
+                ) // assuming description is the main ingredient and no price
             }
         }
 
+//        lifecycleScope.launch {
+//            try {
+//                val recipes = getRecipies(requireContext()) // this is now suspend
+//                val dishes = recipes.map {
+//                    DishListItem(it.name, it.description) // assuming description is the main ingredient and no price
+//                }
+//
+//                val adapter = DishAdapter(requireContext(), dishes)
+//                binding.dishesList.adapter = adapter
+//            } catch (e: Exception) {
+//                Log.i("nice", e.message.toString())
+//                Toast.makeText(requireContext(), "Failed to load recipes: ${e.message}", Toast.LENGTH_LONG).show()
+//            }
+//        }
+
 
         binding.addDish.setOnClickListener {
             val dialogView = LayoutInflater.from(requireContext()).inflate(R.layout.create_dish_modal_dialog, null)
diff --git a/backend/API/BusinessLogic/RecipeLogic.cs b/backend/API/BusinessLogic/RecipeLogic.cs
index 48aaa3f..28e515e 100644
--- a/backend/API/BusinessLogic/RecipeLogic.cs
+++ b/backend/API/BusinessLogic/RecipeLogic.cs
@@ -23,7 +23,14 @@ namespace API.BusinessLogic
             var recipes = await _dbAccess.ReadRecipes(userId);
             if (recipes == null || recipes.Count == 0) { return new ConflictObjectResult(new { message = "Could not find any recipes" }); }
 
-            return new OkObjectResult(recipes);
+            var recipeDtos = recipes.Select(r => new GetAllRecipesDTO
+            {
+                Id = r.Id,
+                Name = r.Name,
+                Description = r.Description
+            }).ToList();
+
+            return new OkObjectResult(recipeDtos);
         }
 
         // Gets a specifik with recipe with the ingredient and directions
diff --git a/backend/API/Models/RecipeModels/GetAllRecipesDTO.cs b/backend/API/Models/RecipeModels/GetAllRecipesDTO.cs
new file mode 100644
index 0000000..47bf29e
--- /dev/null
+++ b/backend/API/Models/RecipeModels/GetAllRecipesDTO.cs
@@ -0,0 +1,12 @@
+namespace API.Models.RecipeModels
+{
+    public class GetAllRecipesDTO
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string Description { get; set; }
+
+    }
+}

From b882bc09a7ff1068e16e4dcbb8ffe668bf028c19 Mon Sep 17 00:00:00 2001
From: LilleBRG <lillebrgmc@gmail.com>
Date: Fri, 9 May 2025 17:03:50 +0200
Subject: [PATCH 4/4] create and diushlist works

---
 .../tech/mercantec/easyeat/helpers/auth.kt    | 18 ++---
 .../tech/mercantec/easyeat/models/dish.kt     |  2 +-
 .../easyeat/ui/dishes/CreateDishActivity.kt   |  8 +-
 .../easyeat/ui/dishes/DishesFragment.kt       | 81 +++++++++----------
 .../res/layout/create_dish_modal_dialog.xml   | 11 ++-
 app/app/src/main/res/values/strings.xml       |  3 +
 6 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
index b82a640..a804e43 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/auth.kt
@@ -4,6 +4,8 @@ import android.content.ClipDescription
 import android.content.Context
 import android.util.Log
 import kotlinx.serialization.Serializable
+import tech.mercantec.easyeat.models.Direction
+import tech.mercantec.easyeat.models.Ingredient
 import tech.mercantec.easyeat.models.Recipe
 @Serializable
 data class LoginRequest(val emailUsr: String, val password: String)
@@ -112,20 +114,11 @@ fun changePassword(ctx: Context, oldPassword: String, newPassword: String) {
 }
 
 @Serializable
-data class CreateRecipeRequest(val recipe: Recipe)
+data class CreateRecipeRequest(val name: String, val description: String, val directions: List<Direction>, val  ingredients: List<Ingredient>)
 
 fun createRecipe(ctx: Context, recipe: Recipe) {
-    val request = CreateRecipeRequest(recipe)
-    Log.i("recipe name:", recipe.name)
-    Log.i("recipe name:", recipe.description)
-    for (x in recipe.directions) {
-        Log.i("recipe name:", x.instructions)
-    }
-    for(x in recipe.ingredients){
-        Log.i("recipe name:", x.name)
-        Log.i("recipe name:", x.amount.toString())
-        Log.i("recipe name:", x.unit.toString())
-    }
+    val request = CreateRecipeRequest(recipe.name, recipe.description, recipe.directions, recipe.ingredients)
+
     requestJson<CreateRecipeRequest, Boolean>(ctx, "POST", "/api/recipe/create", request)
 }
 
@@ -133,6 +126,5 @@ fun createRecipe(ctx: Context, recipe: Recipe) {
 data class RecipeResponse(val id: Int, val name: String, val description: String)
 
 fun getRecipies(ctx: Context): List<RecipeResponse> {
-    Log.i("ello", "yes")
     return requestJson<Unit, List<RecipeResponse>>(ctx, "GET", "/api/Recipe/getall", null)
 }
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt b/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt
index e31ea14..dc2f2a3 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/models/dish.kt
@@ -1,3 +1,3 @@
 package tech.mercantec.easyeat.models
 
-public data class DishListItem(val name: String, val description: String)
+public data class DishListItem(val id: Int,val name: String, val description: String)
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
index ff22d94..e6fdd74 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/CreateDishActivity.kt
@@ -1,5 +1,6 @@
 package tech.mercantec.easyeat.ui.dishes
 
+import android.app.Activity
 import android.app.ProgressDialog
 import android.content.Context
 import android.os.Bundle
@@ -83,15 +84,10 @@ class CreateDishActivity : AppCompatActivity() {
                     Toast.makeText(this, "Password changed successfully", Toast.LENGTH_LONG).show()
                 }
 
+                setResult(Activity.RESULT_OK)
                 finish()
             }
         }
-
-
-
-
-
-
     }
 
     private fun addIngredientRow() {
diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
index 7ee7de3..2910543 100644
--- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
+++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishesFragment.kt
@@ -1,5 +1,6 @@
 package tech.mercantec.easyeat.ui.dishes
 
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
@@ -8,6 +9,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
@@ -24,9 +27,7 @@ import kotlin.concurrent.thread
 class DishesFragment : Fragment() {
 
     private var _binding: FragmentDishesBinding? = null
-
-    // This property is only valid between onCreateView and
-    // onDestroyView.
+    private lateinit var createDishLauncher: ActivityResultLauncher<Intent>
     private val binding get() = _binding!!
 
     override fun onCreateView(
@@ -37,41 +38,7 @@ class DishesFragment : Fragment() {
         _binding = FragmentDishesBinding.inflate(inflater, container, false)
         val root: View = binding.root
 
-
-        thread {
-            val recipes: List<RecipeResponse>
-            try {
-                recipes = getRecipies(requireContext())
-            } catch (e: ApiRequestException) {
-                activity?.runOnUiThread {
-                    Toast.makeText(requireContext(), e.message, Toast.LENGTH_LONG).show()
-                }
-
-                return@thread
-            }
-            val dishes = recipes.map {
-                DishListItem(
-                    it.name,
-                    it.description
-                ) // assuming description is the main ingredient and no price
-            }
-        }
-
-//        lifecycleScope.launch {
-//            try {
-//                val recipes = getRecipies(requireContext()) // this is now suspend
-//                val dishes = recipes.map {
-//                    DishListItem(it.name, it.description) // assuming description is the main ingredient and no price
-//                }
-//
-//                val adapter = DishAdapter(requireContext(), dishes)
-//                binding.dishesList.adapter = adapter
-//            } catch (e: Exception) {
-//                Log.i("nice", e.message.toString())
-//                Toast.makeText(requireContext(), "Failed to load recipes: ${e.message}", Toast.LENGTH_LONG).show()
-//            }
-//        }
-
+        loadRecipes()
 
         binding.addDish.setOnClickListener {
             val dialogView = LayoutInflater.from(requireContext()).inflate(R.layout.create_dish_modal_dialog, null)
@@ -85,13 +52,13 @@ class DishesFragment : Fragment() {
 
             dialogView.findViewById<Button>(R.id.createManualBtn).setOnClickListener {
                 val intent = Intent(requireContext(), CreateDishActivity::class.java)
-                startActivity(intent)
+                createDishLauncher.launch(intent)
                 dialog.dismiss()
             }
 
             dialogView.findViewById<Button>(R.id.createAIBtn).setOnClickListener {
                 val intent = Intent(requireContext(), CreateDishAIActivity::class.java)
-                startActivity(intent)
+                createDishLauncher.launch(intent)
                 dialog.dismiss()
             }
 
@@ -100,13 +67,43 @@ class DishesFragment : Fragment() {
 
 
         return root
+
+    }
+     fun DishesFragment.loadRecipes() {
+        thread {
+            val recipes: List<RecipeResponse>
+            try {
+                recipes = getRecipies(requireContext())
+            } catch (e: ApiRequestException) {
+                activity?.runOnUiThread {
+                    Toast.makeText(requireContext(), e.message, Toast.LENGTH_LONG).show()
+                }
+                return@thread
+            }
+
+            val dishes = recipes.map {
+                DishListItem(it.id, it.name, it.description)
+            }
+
+            activity?.runOnUiThread {
+                val adapter = DishAdapter(requireContext(), dishes)
+                binding.dishesList.adapter = adapter
+            }
+        }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
 
-
+        createDishLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                loadRecipes()
+            }
+        }
+    }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
-}
\ No newline at end of file
+}
diff --git a/app/app/src/main/res/layout/create_dish_modal_dialog.xml b/app/app/src/main/res/layout/create_dish_modal_dialog.xml
index b165bb5..0433bb6 100644
--- a/app/app/src/main/res/layout/create_dish_modal_dialog.xml
+++ b/app/app/src/main/res/layout/create_dish_modal_dialog.xml
@@ -8,12 +8,19 @@
     android:padding="0dp"
     android:gravity="center">
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:text="@string/create_dish"
+        android:textAlignment="center"
+        android:textSize="30sp"/>
+
     <Button
         android:id="@+id/createManualBtn"
         android:layout_width="200dp"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:text="Top Button" />
+        android:text="@string/manually" />
 
     <View
         android:layout_width="match_parent"
@@ -25,5 +32,5 @@
         android:layout_width="200dp"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:text="Bottom Button" />
+        android:text="@string/search_for_dishes" />
 </LinearLayout>
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
index 3ea29e3..acaf39e 100644
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@@ -41,6 +41,9 @@
     <string name="checked_desc">Checked</string>
     <string name="delete_label">Delete</string>
     <string name="empty_shopping_list">Your shopping list is empty</string>
+    <string name="search_for_dishes">Search For Dishes</string>
+    <string name="manually">Manually</string>
+    <string name="create_dish">Create Dish</string>
     <string-array name="units">
         <item></item>
         <item>g</item>