refactor EditRecipeViewModel initialization to use launched effect

CODYJEWELLWEAVER · Dec 30, 2023 · 4e63f29 · 4e63f29
1 parent a886a9e
commit 4e63f29
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/app/src/androidTest/java/com/android/pocketalchemy/PaInstrumentedTest.kt b/app/src/androidTest/java/com/android/pocketalchemy/PaInstrumentedTest.kt
@@ -36,7 +36,7 @@ class PaInstrumentedTest {
 
     /**
      * Tests functionality of NewRecipeFAB
-     * TODO: TEST CLICK
+     * TODO: TEST CLICK SETS SAVED STATE HANDLE
      */
     @Test
     fun createRecipeFABTest() {

diff --git a/app/src/main/java/com/android/pocketalchemy/PaNavHost.kt b/app/src/main/java/com/android/pocketalchemy/PaNavHost.kt
@@ -1,6 +1,7 @@
 package com.android.pocketalchemy
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavType
@@ -39,8 +40,9 @@ fun PaNavHost() {
             val editRecipeViewModel = hiltViewModel<EditRecipeViewModel>()
             val recipeIdArg = remember { backStackEntry.arguments?.getString("recipeId") }
 
-            // Has no effect on recomposition
-            editRecipeViewModel.setRecipeId(recipeIdArg)
+            LaunchedEffect(recipeIdArg) {
+                editRecipeViewModel.setRecipeId(recipeIdArg)
+            }
 
             EditRecipeScreen(
                 navController,

diff --git a/app/src/main/java/com/android/pocketalchemy/model/RecipeRepository.kt b/app/src/main/java/com/android/pocketalchemy/model/RecipeRepository.kt
@@ -45,8 +45,7 @@ class RecipeRepository @Inject constructor(
             // Creates new document ref
             firestore.collection(RECIPE_COLLECTION).document()
         } else {
-            Log.d(TAG, recipeId)
-            // Return doc
+            // Return existing document ref
             firestore.collection(RECIPE_COLLECTION).document("$recipeId")
         }
     }
@@ -56,7 +55,6 @@ class RecipeRepository @Inject constructor(
      * @param recipe Recipe object to insert into collection
      */
     fun insertRecipe(recipe: Recipe) {
-        Log.d(TAG, "$recipe")
         recipe.recipeId?.let { id ->
             firestore.collection(RECIPE_COLLECTION).document(id)
                 .set(recipe)

diff --git a/app/src/test/java/com/android/pocketalchemy/PaUnitTest.kt b/app/src/test/java/com/android/pocketalchemy/PaUnitTest.kt
@@ -1,6 +1,9 @@
 package com.android.pocketalchemy
 
 import com.android.pocketalchemy.model.Recipe
+import com.android.pocketalchemy.model.getIconDescRes
+import com.android.pocketalchemy.model.getIconRes
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -10,6 +13,13 @@ class PaUnitTest {
 
     @Test
     fun testRecipeDefaultResources() {
-        val recipe = Recipe()
+        var recipe = Recipe()
+
+        assertEquals(recipe.getIconRes(), R.drawable.default_recipe_icon)
+        assertEquals(recipe.getIconDescRes(), R.string.default_recipe_icon_description)
+
+        recipe = Recipe(iconRes = 0, iconDescRes = 0)
+        assertEquals(recipe.getIconRes(), 0)
+        assertEquals(recipe.getIconDescRes(), 0)
     }
 }