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 fb5c664..bb8cdce 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 @@ -3,9 +3,8 @@ package tech.mercantec.easyeat.helpers import android.content.Context import android.util.Log import kotlinx.serialization.Serializable -import tech.mercantec.easyeat.models.CreateIngredient -import tech.mercantec.easyeat.models.CreateRecipe import tech.mercantec.easyeat.models.Ingredient +import tech.mercantec.easyeat.models.Recipe @Serializable data class LoginRequest(val emailUsr: String, val password: String) @@ -113,28 +112,11 @@ fun changePassword(ctx: Context, oldPassword: String, newPassword: String) { return requestJson(ctx, "PUT", "/api/User/change-password", request) } -@Serializable -data class CreateRecipeRequest(val name: String, val description: String, val directions: List, val ingredients: List) -fun createRecipe(ctx: Context, recipe: CreateRecipe) { - val request = CreateRecipeRequest(recipe.name, recipe.description, recipe.directions, recipe.ingredients) - requestJson(ctx, "POST", "/api/recipe/create", request) -} -@Serializable -data class GetAllRecipesResponse(val id: Int, val name: String, val description: String) -fun getAllRecipies(ctx: Context): List { - return requestJson>(ctx, "GET", "/api/Recipe/getall", null) -} -@Serializable -data class RecipeDetailsResponse(val id: Int, val name: String, val description: String, val directions: List, val ingredients: List) - -fun getRecipeDetails(ctx: Context, id: Int): RecipeDetailsResponse { - return requestJson(ctx, "GET", "/api/Recipe/get/$id", null) -} @Serializable data class ShoppingListAddRecipeRequest(val id: Int, val multiplier: Int) diff --git a/app/app/src/main/java/tech/mercantec/easyeat/helpers/dishes.kt b/app/app/src/main/java/tech/mercantec/easyeat/helpers/dishes.kt index 4a7a599..146e876 100644 --- a/app/app/src/main/java/tech/mercantec/easyeat/helpers/dishes.kt +++ b/app/app/src/main/java/tech/mercantec/easyeat/helpers/dishes.kt @@ -19,7 +19,7 @@ fun createRecipe(ctx: Context, recipe: Recipe) { @Serializable data class GetAllRecipesResponse(val id: Int, val name: String, val description: String) -fun getAllRecipes(ctx: Context): List { +fun getAllRecipies(ctx: Context): List { return requestJson>(ctx, "GET", "/api/Recipe/getall", null) } @@ -29,3 +29,4 @@ data class RecipeDetailsResponse(val id: Int, val name: String, val description: fun getRecipeDetails(ctx: Context, id: Int): RecipeDetailsResponse { return requestJson(ctx, "GET", "/api/Recipe/get/$id", null) } + diff --git a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt index a87bc46..5c5f1f6 100644 --- a/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt +++ b/app/app/src/main/java/tech/mercantec/easyeat/ui/dishes/DishDetailsActivity.kt @@ -18,8 +18,6 @@ import android.widget.EditText import android.widget.TextView import androidx.core.widget.doAfterTextChanged import tech.mercantec.easyeat.helpers.AddRecipeToShoppingList -import tech.mercantec.easyeat.helpers.createRecipe -import tech.mercantec.easyeat.models.CreateRecipe import tech.mercantec.easyeat.models.Ingredient class DishDetailsActivity : AppCompatActivity() {