fix card order reset after selecting default types

Razeeman · Aug 25, 2024 · f5360f7 · f5360f7
1 parent 682ed77
commit f5360f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/repo/PrefsRepoImpl.kt
@@ -46,6 +46,9 @@ class PrefsRepoImpl @Inject constructor(
         KEY_CARD_ORDER, 0, // Default to name sort.
     )
 
+    override val hasCardOrder: Boolean
+        get() = prefs.contains(KEY_CARD_ORDER)
+
     override var categoryOrder: Int by prefs.delegate(
         KEY_CATEGORY_ORDER, 0, // Default to name sort.
     )

diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/PrefsInteractor.kt
@@ -85,6 +85,10 @@ class PrefsInteractor @Inject constructor(
         prefsRepo.cardOrder = mapFromCardOrder(cardOrder)
     }
 
+    suspend fun hasCardOrder(): Boolean = withContext(Dispatchers.IO) {
+        prefsRepo.hasCardOrder
+    }
+
     suspend fun getCategoryOrder(): CardOrder = withContext(Dispatchers.IO) {
         mapToCardOrder(prefsRepo.categoryOrder)
     }

diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/repo/PrefsRepo.kt
@@ -16,6 +16,7 @@ interface PrefsRepo {
     var chartFilterType: Int
 
     var cardOrder: Int
+    val hasCardOrder: Boolean
     var categoryOrder: Int
     var tagOrder: Int
 

diff --git a/...tracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt b/...tracker/feature_dialogs/defaultTypesSelection/viewModel/DefaultTypesSelectionViewModel.kt
@@ -76,7 +76,9 @@ class DefaultTypesSelectionViewModel @Inject constructor(
                 // Remove ids for correct adding in database.
                 recordTypeInteractor.add(it.copy(id = 0))
             }
-            prefsInteractor.setCardOrder(CardOrder.COLOR)
+            if (!prefsInteractor.hasCardOrder()) {
+                prefsInteractor.setCardOrder(CardOrder.COLOR)
+            }
             wearInteractor.update()
             close.set(Unit)
         }