-= 1.1.3. =- (42)

Author: Jim Clermonts

app/build.gradle

@@ -43,7 +43,7 @@ android {
         applicationId "eu.theappfactory.dailyrecipes"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 41
+        versionCode 42
         versionName "1.1.3"
         resConfigs "nl"
 

app/src/main/java/eu/theappfactory/dailyrecipes/data/ingredients/FirestoreIngredientsDataSource.kt

@@ -66,6 +66,7 @@ class FirestoreIngredientsDataSource(private val firestore: FirebaseFirestore) :
                 if (it.isSuccessful.not()) {
                     Timber.d("Did not add ingredient item.")
                 }
+                items.add(item)
             }.addOnFailureListener { it.printStackTrace() }
     }
 

app/src/main/java/eu/theappfactory/dailyrecipes/data/ingredients/IngredientsRepository.kt

@@ -39,7 +39,9 @@ class DefaultIngredientsRepository @Inject constructor(
         // Show quick cached version
         val localIngredients = getLocalIngredients(ingredientsUrls!!)
         Timber.i("emitting cached")
-        emit(localIngredients)
+        if (localIngredients.isNotEmpty()) {
+            emit(localIngredients)
+        }
 
         // First get the actual ones from the remote.
         if (ingredientsUrls != null) {

app/src/main/java/eu/theappfactory/dailyrecipes/ui/ingredients/AddIngredientsActivity.kt

@@ -62,17 +62,17 @@ class AddIngredientsActivity : BaseActivity() {
         }
     }
 
-    override fun onPause() {
-        super.onPause()
+    override fun onDestroy() {
+        super.onDestroy()
         viewModel.resetSelectedStates()
     }
 
     private fun initViewModel() {
         viewModel.apply {
             load(intent.getStringExtra(EXTRA_ID).orEmpty())
 
-            onIngredientsUpdate.observe(this@AddIngredientsActivity) {
-                updateView(it)
+            onIngredientsUpdate.observe(this@AddIngredientsActivity) { ingredients ->
+                updateView(ingredients)
             }
 
             onSaveSuccess.observe(this@AddIngredientsActivity) {

app/src/main/java/eu/theappfactory/dailyrecipes/ui/ingredients/AddIngredientsViewModel.kt

@@ -20,6 +20,7 @@ import eu.theappfactory.dailyrecipes.networking.successOr
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -50,7 +51,7 @@ class AddIngredientsViewModel @Inject constructor(
     private val _onShowSaveButton = MutableLiveData<Boolean>()
     val onShowSaveButton: LiveData<Boolean> = _onShowSaveButton
 
-    private val _onIngredientsUpdate = MutableLiveData<ArrayList<IngredientItemData>>()
+    private val _onIngredientsUpdate = MutableLiveData<List<IngredientItemData>>()
     val onIngredientsUpdate = _onIngredientsUpdate.map {
         val sortedList = it.orEmpty().sortedBy { it.title }
         sortedList
@@ -72,8 +73,14 @@ class AddIngredientsViewModel @Inject constructor(
 
             when (result) {
                 is Result.Success -> {
-                    ingredientsForRecipe = result.data.first() as ArrayList<IngredientItemData>
-                    _onIngredientsUpdate.postValue(ingredientsForRecipe)
+                    if (result.data.toList().isNotEmpty()) {
+                        ingredientsForRecipe = result.data.first() as ArrayList<IngredientItemData>
+                        // In the add ingredient screen, the items are selected by default
+                        addCheckmark()
+                        _onIngredientsUpdate.postValue(ingredientsForRecipe)
+                    } else {
+                        _onIngredientsUpdate.postValue(arrayListOf())
+                    }
                 }
                 is Result.Error -> {
                     Timber.e("Something went wrong.")
@@ -83,6 +90,12 @@ class AddIngredientsViewModel @Inject constructor(
         }
     }
 
+    private fun addCheckmark() {
+        for (ingredient in ingredientsForRecipe) {
+            ingredient.isSelected = true
+        }
+    }
+
     fun searchIngredients(searchQuery: String) = viewModelScope.launch {
         currentSearch = searchQuery
 

app/src/main/java/eu/theappfactory/dailyrecipes/ui/ingredients/IngredientsActivity.kt

@@ -117,10 +117,10 @@ class IngredientsActivity : BaseActivity() {
     }
 
     private fun updateView(ingredients: List<IngredientItemData>, index: Int) {
-        if (ingredients.any { it.isSelected }) {
-            binding.insertIngredientsButton.visibility = View.VISIBLE
-        } else {
+        if (ingredients.all { it.optional == true }) {
             binding.insertIngredientsButton.visibility = View.GONE
+        } else {
+            binding.insertIngredientsButton.visibility = View.VISIBLE
         }
 
         adapter.items = ingredients