Merge pull request #1 from Rohanraj123/Development-day6

Development day6

Author: Rohanraj123

app/build.gradle.kts

@@ -87,6 +87,7 @@ dependencies {
     implementation(libs.sharedpreferences)
     implementation(libs.lifecycle.compose)
     implementation(libs.runtime.livedata)
+    implementation(libs.swipe.refresh)
 
     // Dagger-hilt
     implementation("com.google.dagger:hilt-android:2.48")

app/src/main/java/com/example/cookbook/MainActivity.kt

@@ -4,13 +4,11 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.example.cookbook.presentation.view.navigation.Navigation
 import com.example.cookbook.presentation.viewmodel.HomeScreenViewModel
 import com.example.cookbook.presentation.viewmodel.LogInScreenViewModel
+import com.example.cookbook.presentation.viewmodel.RecipeDetailScreenViewModel
 import com.example.cookbook.presentation.viewmodel.RegisterScreenViewModel
 import com.example.cookbook.ui.theme.CookBookTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -28,16 +26,17 @@ class MainActivity : ComponentActivity() {
                 val registerScreenViewModel = hiltViewModel<RegisterScreenViewModel>()
                 val logInScreenViewModel = hiltViewModel<LogInScreenViewModel>()
                 val homeScreenViewModel = hiltViewModel<HomeScreenViewModel>()
+                val recipeDetailScreenViewModel = hiltViewModel<RecipeDetailScreenViewModel>()
 
                 logInScreenViewModel.setNavController(navController)
 
                 Navigation(
                     navController = navController,
                     registerScreenViewModel = registerScreenViewModel,
                     logInScreenViewModel = logInScreenViewModel,
+                    recipeDetailScreenViewModel,
                     homeScreenViewModel
                 )
-
             }
         }
     }

app/src/main/java/com/example/cookbook/data/datasource/api/RetrofitApi.kt

@@ -18,6 +18,9 @@ interface RetrofitApi {
      */
     @GET("random")
     fun getRandomRecipe(
-        @Query("api_key") apiKey: String
+        @Query("apiKey") apiKey: String,
+        @Query("number") number: Int
     ): Call<RandomRecipeResponse>
+
+    @GET("complexSearch")
 }

app/src/main/java/com/example/cookbook/data/models/randomrecipemodel/AnalyzedInstruction.kt

@@ -1,6 +1,8 @@
 package com.example.cookbook.data.models.randomrecipemodel
 
+import com.google.gson.annotations.SerializedName
+
 data class AnalyzedInstruction(
-    val name: String,
-    val steps: List<Step>
+    @SerializedName("name")  val name  : String,
+    @SerializedName("steps") val steps : List<Step>
 )

app/src/main/java/com/example/cookbook/data/models/randomrecipemodel/Equipment.kt

@@ -1,9 +1,11 @@
 package com.example.cookbook.data.models.randomrecipemodel
 
+import com.google.gson.annotations.SerializedName
+
 data class Equipment(
-    val id: Int,
-    val image: String,
-    val localizedName: String,
-    val name: String,
-    val temperature: Temperature
+    @SerializedName("id"           ) val id            : Int,
+    @SerializedName("image"        ) val image         : String,
+    @SerializedName("localizedName") val localizedName : String,
+    @SerializedName("name"         ) val name          : String,
+    @SerializedName("temperature"  ) val temperature   : Temperature
 )

app/src/main/java/com/example/cookbook/data/models/randomrecipemodel/ExtendedIngredient.kt

@@ -1,16 +1,18 @@
 package com.example.cookbook.data.models.randomrecipemodel
 
+import com.google.gson.annotations.SerializedName
+
 data class ExtendedIngredient(
-    val aisle: String,
-    val amount: Double,
-    val consistency: String,
-    val id: Int,
-    val image: String,
-    val measures: Measures,
-    val meta: List<String>,
-    val name: String,
-    val nameClean: String,
-    val original: String,
-    val originalName: String,
-    val unit: String
+    @SerializedName("aisle"        ) val aisle        : String,
+    @SerializedName("amount"       ) val amount       : Double,
+    @SerializedName("consistency"  ) val consistency  : String,
+    @SerializedName("id"           ) val id           : Int,
+    @SerializedName("image"        ) val image        : String,
+    @SerializedName("measures"     ) val measures     : Measures,
+    @SerializedName("meta"         ) val meta         : List<String>,
+    @SerializedName("name"         ) val name         : String,
+    @SerializedName("nameClean"    ) val nameClean    : String,
+    @SerializedName("original"     ) val original     : String,
+    @SerializedName("originalName" ) val originalName : String,
+    @SerializedName("unit"         ) val unit         : String
 )

app/src/main/java/com/example/cookbook/data/models/randomrecipemodel/Ingredient.kt

@@ -1,8 +1,10 @@
 package com.example.cookbook.data.models.randomrecipemodel
 
+import com.google.gson.annotations.SerializedName
+
 data class Ingredient(
-    val id: Int,
-    val image: String,
-    val localizedName: String,
-    val name: String
+    @SerializedName("id"            ) val id            : Int,
+    @SerializedName("image"         ) val image         : String,
+    @SerializedName("localizedName" ) val localizedName : String,
+    @SerializedName("name"          ) val name          : String
 )

app/src/main/java/com/example/cookbook/data/models/randomrecipemodel/Length.kt

@@ -1,6 +1,8 @@
 package com.example.cookbook.data.models.randomrecipemodel
 
+import com.google.gson.annotations.SerializedName
+
 data class Length(
-    val number: Int,
-    val unit: String
+    @SerializedName("number" ) val number : Int,
+    @SerializedName("unit"   ) val unit   : String
 )

app/src/main/java/com/example/cookbook/data/models/randomrecipemodel/Measures.kt

@@ -1,6 +1,8 @@
 package com.example.cookbook.data.models.randomrecipemodel
 
+import com.google.gson.annotations.SerializedName
+
 data class Measures(
-    val metric: Metric,
-    val us: Us
+    @SerializedName("metric" ) val metric : Metric,
+    @SerializedName("us"     ) val us     : Us
 )

app/src/main/java/com/example/cookbook/data/models/randomrecipemodel/Metric.kt

@@ -1,7 +1,9 @@
 package com.example.cookbook.data.models.randomrecipemodel
 
+import com.google.gson.annotations.SerializedName
+
 data class Metric(
-    val amount: Double,
-    val unitLong: String,
-    val unitShort: String
+    @SerializedName("amount"    ) val amount    : Double,
+    @SerializedName("unitLong"  ) val unitLong  : String,
+    @SerializedName("unitShort" ) val unitShort : String
 )