Fix race condition in updated phrase not immediately showing in settings

willowtreeapps · Jun 12, 2024 · 1012824 · 1012824
1 parent 88119ad
commit 1012824
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/app/src/main/java/com/willowtree/vocable/AppKoinModule.kt b/app/src/main/java/com/willowtree/vocable/AppKoinModule.kt
@@ -19,6 +19,7 @@ import com.willowtree.vocable.settings.AddUpdateCategoryViewModel
 import com.willowtree.vocable.settings.EditCategoriesViewModel
 import com.willowtree.vocable.settings.EditCategoryMenuViewModel
 import com.willowtree.vocable.settings.EditCategoryPhrasesViewModel
+import com.willowtree.vocable.settings.customcategories.CustomCategoryPhraseViewModel
 import com.willowtree.vocable.settings.selectionmode.SelectionModeViewModel
 import com.willowtree.vocable.splash.SplashActivity
 import com.willowtree.vocable.splash.SplashViewModel
@@ -106,4 +107,5 @@ val vocableKoinModule = module {
     viewModel { EditCategoryPhrasesViewModel(get(), get(), get()) }
     viewModel { AddUpdateCategoryViewModel(get(), get(), get()) }
     viewModel { EditCategoryMenuViewModel(get()) }
+    viewModel { CustomCategoryPhraseViewModel(get()) }
 }
diff --git a/app/src/main/java/com/willowtree/vocable/settings/EditCategoryPhrasesViewModel.kt b/app/src/main/java/com/willowtree/vocable/settings/EditCategoryPhrasesViewModel.kt
@@ -4,16 +4,14 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
-import androidx.lifecycle.viewModelScope
 import com.willowtree.vocable.IPhrasesUseCase
 import com.willowtree.vocable.presets.Category
 import com.willowtree.vocable.presets.Phrase
 import com.willowtree.vocable.utils.ILocalizedResourceUtility
-import kotlinx.coroutines.launch
 
 class EditCategoryPhrasesViewModel(
     savedStateHandle: SavedStateHandle,
-    private val phrasesUseCase: IPhrasesUseCase,
+    phrasesUseCase: IPhrasesUseCase,
     private val localizedResourceUtility: ILocalizedResourceUtility
 ) : ViewModel() {
 
@@ -23,10 +21,4 @@ class EditCategoryPhrasesViewModel(
     fun getCategoryName(category: Category): String {
         return localizedResourceUtility.getTextFromCategory(category)
     }
-
-    fun deletePhraseFromCategory(phrase: Phrase) {
-        viewModelScope.launch {
-            phrasesUseCase.deletePhrase(phrase.phraseId)
-        }
-    }
 }
diff --git a/...java/com/willowtree/vocable/settings/customcategories/CustomCategoryPhraseListFragment.kt b/...java/com/willowtree/vocable/settings/customcategories/CustomCategoryPhraseListFragment.kt
@@ -13,7 +13,6 @@ import com.willowtree.vocable.databinding.FragmentCustomCategoryPhraseListBindin
 import com.willowtree.vocable.presets.Category
 import com.willowtree.vocable.presets.Phrase
 import com.willowtree.vocable.settings.EditCategoryPhrasesFragmentDirections
-import com.willowtree.vocable.settings.EditCategoryPhrasesViewModel
 import com.willowtree.vocable.settings.customcategories.adapter.CustomCategoryPhraseAdapter
 import com.willowtree.vocable.utils.ItemOffsetDecoration
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -34,7 +33,7 @@ class CustomCategoryPhraseListFragment : BaseFragment<FragmentCustomCategoryPhra
         }
     }
 
-    private val editCategoriesViewModel: EditCategoryPhrasesViewModel by viewModel()
+    private val viewModel: CustomCategoryPhraseViewModel by viewModel()
     private lateinit var category: Category
 
     private val onPhraseEdit = { phrase: Phrase ->
@@ -88,7 +87,7 @@ class CustomCategoryPhraseListFragment : BaseFragment<FragmentCustomCategoryPhra
             with(dialogPositiveButton) {
                 setText(R.string.delete)
                 action = {
-                    editCategoriesViewModel.deletePhraseFromCategory(phrase)
+                    viewModel.deletePhraseFromCategory(phrase)
                     toggleDialogVisibility(false)
                 }
             }

diff --git a/...in/java/com/willowtree/vocable/settings/customcategories/CustomCategoryPhraseViewModel.kt b/...in/java/com/willowtree/vocable/settings/customcategories/CustomCategoryPhraseViewModel.kt
@@ -0,0 +1,17 @@
+package com.willowtree.vocable.settings.customcategories
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.willowtree.vocable.IPhrasesUseCase
+import com.willowtree.vocable.presets.Phrase
+import kotlinx.coroutines.launch
+
+class CustomCategoryPhraseViewModel(
+    private val phrasesUseCase: IPhrasesUseCase
+) : ViewModel() {
+    fun deletePhraseFromCategory(phrase: Phrase) {
+        viewModelScope.launch {
+            phrasesUseCase.deletePhrase(phrase.phraseId)
+        }
+    }
+}
diff --git a/app/src/main/java/com/willowtree/vocable/utils/VocableFragmentStateAdapter.kt b/app/src/main/java/com/willowtree/vocable/utils/VocableFragmentStateAdapter.kt
@@ -31,6 +31,7 @@ abstract class VocableFragmentStateAdapter<T>(fm: FragmentManager, lifecycle: Li
         with(this.items) {
             clear()
             addAll(items)
+            notifyDataSetChanged()
         }
 
         val oldNumPages = numPages