add complex rules to backup

Author: Razeeman

buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Base.kt

@@ -5,7 +5,7 @@ object Base {
     const val namespace = "com.example.util.simpletimetracker"
 
     // Raise by 2 to account for wear version code.
-    const val versionCode = 61
+    const val versionCode = 63
     const val versionName = "1.44"
     const val minSDK = 21
     const val currentSDK = 34

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordTagViewDataInteractor.kt

@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.core.interactor
 
 import com.example.util.simpletimetracker.core.mapper.CategoryViewDataMapper
+import com.example.util.simpletimetracker.core.mapper.CommonViewDataMapper
 import com.example.util.simpletimetracker.domain.interactor.GetSelectableTagsInteractor
 import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.interactor.RecordTagInteractor
@@ -15,6 +16,7 @@ class RecordTagViewDataInteractor @Inject constructor(
     private val recordTagInteractor: RecordTagInteractor,
     private val getSelectableTagsInteractor: GetSelectableTagsInteractor,
     private val categoryViewDataMapper: CategoryViewDataMapper,
+    private val commonViewDataMapper: CommonViewDataMapper,
 ) {
 
     suspend fun getViewData(
@@ -42,7 +44,7 @@ class RecordTagViewDataInteractor @Inject constructor(
                 DividerViewData(1),
             ).takeIf { showAddButton }?.let(viewData::addAll)
 
-            categoryViewDataMapper.mapSelectedCategoriesHint(
+            commonViewDataMapper.mapSelectedHint(
                 isEmpty = selected.isEmpty(),
             ).takeIf { multipleChoiceAvailable }?.let(viewData::add)
 

core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt

@@ -206,16 +206,6 @@ class CategoryViewDataMapper @Inject constructor(
         )
     }
 
-    fun mapSelectedCategoriesHint(isEmpty: Boolean): ViewHolderType {
-        return InfoViewData(
-            text = if (isEmpty) {
-                R.string.nothing_selected
-            } else {
-                R.string.something_selected
-            }.let(resourceRepo::getString),
-        )
-    }
-
     fun getTextColor(
         isDarkTheme: Boolean,
         isFiltered: Boolean,

features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/mapper/ChangeCategoryMapper.kt renamed to core/src/main/java/com/example/util/simpletimetracker/core/mapper/CommonViewDataMapper.kt

@@ -1,16 +1,16 @@
-package com.example.util.simpletimetracker.feature_change_category.mapper
+package com.example.util.simpletimetracker.core.mapper
 
+import com.example.util.simpletimetracker.core.R
+import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.info.InfoViewData
-import com.example.util.simpletimetracker.core.repo.ResourceRepo
-import com.example.util.simpletimetracker.feature_change_category.R
 import javax.inject.Inject
 
-class ChangeCategoryMapper @Inject constructor(
+class CommonViewDataMapper @Inject constructor(
     private val resourceRepo: ResourceRepo,
 ) {
 
-    fun mapSelectedTypesHint(isEmpty: Boolean): ViewHolderType {
+    fun mapSelectedHint(isEmpty: Boolean): ViewHolderType {
         return InfoViewData(
             text = if (isEmpty) {
                 R.string.nothing_selected

data_local/src/main/java/com/example/util/simpletimetracker/data_local/mapper/ComplexRuleDataLocalMapper.kt

@@ -5,7 +5,9 @@ import com.example.util.simpletimetracker.domain.model.ComplexRule
 import com.example.util.simpletimetracker.domain.model.DayOfWeek
 import javax.inject.Inject
 
-class ComplexRuleDataLocalMapper @Inject constructor() {
+class ComplexRuleDataLocalMapper @Inject constructor(
+    private val daysOfWeekDataLocalMapper: DaysOfWeekDataLocalMapper,
+) {
 
     fun map(dbo: ComplexRuleDBO): ComplexRule {
         return ComplexRule(
@@ -15,7 +17,8 @@ class ComplexRuleDataLocalMapper @Inject constructor() {
             actionAssignTagIds = mapIds(dbo.actionSetTagIds),
             conditionStartingTypeIds = mapIds(dbo.conditionStartingTypeIds),
             conditionCurrentTypeIds = mapIds(dbo.conditionCurrentTypeIds),
-            conditionDaysOfWeek = mapDaysOfWeek(dbo.conditionDaysOfWeek),
+            conditionDaysOfWeek = daysOfWeekDataLocalMapper
+                .mapDaysOfWeek(dbo.conditionDaysOfWeek).toSet(),
         )
     }
 
@@ -27,7 +30,8 @@ class ComplexRuleDataLocalMapper @Inject constructor() {
             actionSetTagIds = mapIds(domain.actionAssignTagIds),
             conditionStartingTypeIds = mapIds(domain.conditionStartingTypeIds),
             conditionCurrentTypeIds = mapIds(domain.conditionCurrentTypeIds),
-            conditionDaysOfWeek = mapDaysOfWeek(domain.conditionDaysOfWeek),
+            conditionDaysOfWeek = daysOfWeekDataLocalMapper
+                .mapDaysOfWeek(domain.conditionDaysOfWeek.toList()),
         )
     }
 
@@ -59,26 +63,4 @@ class ComplexRuleDataLocalMapper @Inject constructor() {
             is ComplexRule.Action.AssignTag -> 2L
         }
     }
-
-    private fun mapDaysOfWeek(dbo: String): Set<DayOfWeek> {
-        return dbo.split(',').mapNotNull(daysOfWeekMapReversed::get).toSet()
-    }
-
-    private fun mapDaysOfWeek(domain: Set<DayOfWeek>): String {
-        return domain.mapNotNull(daysOfWeekMap::get).joinToString(separator = ",")
-    }
-
-    companion object {
-        private val daysOfWeekMap = mapOf(
-            DayOfWeek.SUNDAY to "SUNDAY",
-            DayOfWeek.MONDAY to "MONDAY",
-            DayOfWeek.TUESDAY to "TUESDAY",
-            DayOfWeek.WEDNESDAY to "WEDNESDAY",
-            DayOfWeek.THURSDAY to "THURSDAY",
-            DayOfWeek.FRIDAY to "FRIDAY",
-            DayOfWeek.SATURDAY to "SATURDAY",
-        )
-        val daysOfWeekMapReversed = daysOfWeekMap.entries
-            .associate { (key, value) -> value to key }
-    }
 }

data_local/src/main/java/com/example/util/simpletimetracker/data_local/mapper/DaysOfWeekDataLocalMapper.kt

@@ -0,0 +1,39 @@
+package com.example.util.simpletimetracker.data_local.mapper
+
+import com.example.util.simpletimetracker.domain.model.DayOfWeek
+import javax.inject.Inject
+
+class DaysOfWeekDataLocalMapper @Inject constructor() {
+
+    fun mapDaysOfWeek(dbo: String): List<DayOfWeek> {
+        return daysOfWeek.mapIndexedNotNull { index, dayOfWeek ->
+            when (dbo.getOrNull(index)) {
+                // Selected days are marked with 1, days that are not selected - with 0,
+                // if string is empty - assume day is selected to support old app versions.
+                '1' -> dayOfWeek
+                null -> dayOfWeek
+                '0' -> null
+                else -> null
+            }
+        }
+    }
+
+    fun mapDaysOfWeek(domain: List<DayOfWeek>): String {
+        return daysOfWeek.map { dayOfWeek ->
+            if (dayOfWeek in domain) '1' else '0'
+        }.joinToString(separator = "")
+    }
+
+    companion object {
+        // Do not change order, this values saved in database accordingly.
+        private val daysOfWeek = listOf(
+            DayOfWeek.SUNDAY,
+            DayOfWeek.MONDAY,
+            DayOfWeek.TUESDAY,
+            DayOfWeek.WEDNESDAY,
+            DayOfWeek.THURSDAY,
+            DayOfWeek.FRIDAY,
+            DayOfWeek.SATURDAY,
+        )
+    }
+}

data_local/src/main/java/com/example/util/simpletimetracker/data_local/mapper/RecordTypeGoalDataLocalMapper.kt

@@ -6,7 +6,9 @@ import com.example.util.simpletimetracker.domain.model.DayOfWeek
 import com.example.util.simpletimetracker.domain.model.RecordTypeGoal
 import javax.inject.Inject
 
-class RecordTypeGoalDataLocalMapper @Inject constructor() {
+class RecordTypeGoalDataLocalMapper @Inject constructor(
+    private val daysOfWeekDataLocalMapper: DaysOfWeekDataLocalMapper,
+) {
 
     fun map(dbo: RecordTypeGoalDBO): RecordTypeGoal {
         return RecordTypeGoal(
@@ -28,7 +30,7 @@ class RecordTypeGoalDataLocalMapper @Inject constructor() {
                 1L -> RecordTypeGoal.Type.Count(dbo.value)
                 else -> RecordTypeGoal.Type.Duration(dbo.value)
             },
-            daysOfWeek = mapDaysOfWeek(dbo.daysOfWeek),
+            daysOfWeek = daysOfWeekDataLocalMapper.mapDaysOfWeek(dbo.daysOfWeek),
         )
     }
 
@@ -48,39 +50,7 @@ class RecordTypeGoalDataLocalMapper @Inject constructor() {
             },
             value = domain.type.value,
             categoryId = (domain.idData as? RecordTypeGoal.IdData.Category)?.value.orZero(),
-            daysOfWeek = mapDaysOfWeek(domain.daysOfWeek),
-        )
-    }
-
-    fun mapDaysOfWeek(dbo: String): List<DayOfWeek> {
-        return daysOfWeek.mapIndexedNotNull { index, dayOfWeek ->
-            when (dbo.getOrNull(index)) {
-                // Selected days are marked with 1, days that are not selected - with 0,
-                // if string is empty - assume day is selected to support old app versions.
-                '1' -> dayOfWeek
-                null -> dayOfWeek
-                '0' -> null
-                else -> null
-            }
-        }
-    }
-
-    fun mapDaysOfWeek(domain: List<DayOfWeek>): String {
-        return daysOfWeek.map { dayOfWeek ->
-            if (dayOfWeek in domain) '1' else '0'
-        }.joinToString(separator = "")
-    }
-
-    companion object {
-        // Do not change order, this values saved in database accordingly.
-        private val daysOfWeek = listOf(
-            DayOfWeek.SUNDAY,
-            DayOfWeek.MONDAY,
-            DayOfWeek.TUESDAY,
-            DayOfWeek.WEDNESDAY,
-            DayOfWeek.THURSDAY,
-            DayOfWeek.FRIDAY,
-            DayOfWeek.SATURDAY,
+            daysOfWeek = daysOfWeekDataLocalMapper.mapDaysOfWeek(domain.daysOfWeek),
         )
     }
 }

data_local/src/main/java/com/example/util/simpletimetracker/data_local/model/ComplexRuleDBO.kt

@@ -28,7 +28,10 @@ data class ComplexRuleDBO(
     @ColumnInfo(name = "conditionCurrentTypeIds")
     val conditionCurrentTypeIds: String,
 
-    // Days of week stored in string comma separated
+    // Stored as "0000000" string, where each number is a day,
+    // 0 - not selected, 1 - selected,
+    // starting from sunday.
+    // For example, "0111110" - only work days selected.
     @ColumnInfo(name = "conditionDaysOfWeek")
     val conditionDaysOfWeek: String,
 )

data_local/src/main/java/com/example/util/simpletimetracker/data_local/model/RecordTypeGoalDBO.kt

@@ -37,7 +37,7 @@ data class RecordTypeGoalDBO(
     // Stored as "0000000" string, where each number is a day,
     // 0 - not selected, 1 - selected,
     // starting from sunday.
-    // For example, "1111100" - only work days selected.
+    // For example, "0111110" - only work days selected.
     @ColumnInfo(name = "days_of_week")
     val daysOfWeek: String,
 )