more bug fixes and depen. updates

app/build.gradle.kts

@@ -76,37 +76,37 @@ android {
 }
 
 dependencies {
-    val dagger_version = "2.49"
-    val lifecycle_version = "2.6.2"
-    val navigation_version = "2.7.6"
+    val daggerVersion = "2.49"
+    val lifecycleVersion = "2.6.2"
+    val navigationVersion = "2.7.6"
 
     implementation("androidx.test:runner:1.5.2")
     implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version")
-    implementation("androidx.navigation:navigation-compose:$navigation_version")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
+    implementation("androidx.navigation:navigation-compose:$navigationVersion")
     implementation(platform("androidx.compose:compose-bom:2023.10.01"))
     implementation("androidx.activity:activity-compose")
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
-    implementation("com.google.dagger:dagger:$dagger_version")
-    implementation("com.google.dagger:hilt-android:$dagger_version")
+    implementation("com.google.dagger:dagger:$daggerVersion")
+    implementation("com.google.dagger:hilt-android:$daggerVersion")
     implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
     implementation("com.google.accompanist:accompanist-systemuicontroller:0.27.0")
     implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
     implementation("com.google.firebase:firebase-analytics")
     implementation("com.google.firebase:firebase-firestore")
     implementation("com.google.firebase:firebase-auth")
-    implementation("com.google.dagger:hilt-android-testing:$dagger_version")
-    ksp("com.google.dagger:dagger-compiler:$dagger_version")
-    ksp("com.google.dagger:hilt-compiler:$dagger_version")
+    implementation("com.google.dagger:hilt-android-testing:$daggerVersion")
+    ksp("com.google.dagger:dagger-compiler:$daggerVersion")
+    ksp("com.google.dagger:hilt-compiler:$daggerVersion")
     ksp("androidx.hilt:hilt-compiler:1.1.0")
-    kspTest("com.google.dagger:hilt-android-compiler:$dagger_version")
-    kspTest("com.google.dagger:hilt-android-testing:$dagger_version")
+    kspTest("com.google.dagger:hilt-android-compiler:$daggerVersion")
+    kspTest("com.google.dagger:hilt-android-testing:$daggerVersion")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
     testImplementation("org.mockito:mockito-core:5.7.0")
     testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
     testImplementation("com.google.dagger:hilt-android-testing:2.49@aar")

app/src/main/java/com/android/pocketalchemy/model/Ingredient.kt

@@ -1,12 +1,12 @@
 package com.android.pocketalchemy.model
+import androidx.annotation.Keep
 import com.google.firebase.firestore.DocumentId
 import com.google.firebase.firestore.IgnoreExtraProperties
-import androidx.annotation.Keep
 
 /**
  * Ingredient Model class
  */
-@IgnoreExtraPropeties
+@IgnoreExtraProperties
 @Keep
 data class Ingredient(
     @DocumentId val id: String? = null,
@@ -19,7 +19,7 @@ data class Ingredient(
     val sodium: MeasuredInt? = null,
     val fiber: MeasuredInt? = null,
     val sugars: MeasuredInt? = null,
-    val portions: list<MeasuredInt>? = null,
+    val portions: List<MeasuredInt>? = null,
     val fdcId: String? = null
 )