Merge Changes from dev to release v3.1.10

app/build.gradle.kts

@@ -14,8 +14,8 @@ android {
         applicationId = "com.flux"
         minSdk = 29
         targetSdk = 37
-        versionCode = 15
-        versionName = "3.1.9"
+        versionCode = 16
+        versionName = "3.1.10"
     }
 
     dependenciesInfo {
@@ -86,6 +86,7 @@ kotlin {
 }
 
 dependencies {
+    implementation(libs.androidx.compose.ui.text)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.glance.appwidget)
     implementation(libs.androidx.material3)

app/src/main/java/com/flux/data/dao/TodoInstanceDao.kt

@@ -17,6 +17,9 @@ interface TodoInstanceDao {
     @Query("SELECT * FROM TodoInstance")
     fun loadAllInstances(): List<TodoInstance>
 
+    @Query("SELECT * FROM TodoInstance WHERE todoId = :todoId AND instanceDate = :date LIMIT 1")
+    suspend fun loadInstanceForDate(todoId: String, date: Long): TodoInstance?
+
     @Query("DELETE FROM TodoInstance WHERE workspaceId = :workspaceId")
     suspend fun deleteAllWorkspaceInstance(workspaceId: String)
 

app/src/main/java/com/flux/data/model/TodoModel.kt

@@ -25,6 +25,8 @@ data class TodoModel(
 @Serializable
 data class TodoItem(
     val id: String = UUID.randomUUID().toString(),
+
+
     val value: String = "",
     val isChecked: Boolean = false
 )
@@ -53,6 +55,50 @@ data class TodoInstance(
     val items: List<TodoItem> = emptyList()
 )
 
+data class ItemConsistency(
+    val itemId: String,
+    val label: String,
+    val checkedCount: Int,
+    val totalCount: Int,
+    val isRemoved: Boolean
+) {
+    val percentage: Float
+        get() = if (totalCount == 0) 0f else checkedCount.toFloat() / totalCount
+}
+
+fun TodoModel.calculateItemConsistency(
+    instances: List<TodoInstance>
+): List<ItemConsistency> {
+    val templateIds = items.map { it.id }.toSet()
+    val labelMap = items.associateBy({ it.id }, { it.value })
+    val counts = mutableMapOf<String, Pair<Int, Int>>() // itemId -> (checkedCount, totalCount)
+
+    instances.forEach { instance ->
+        instance.items.forEach { item ->
+            val (checked, total) = counts.getOrDefault(item.id, 0 to 0)
+            counts[item.id] = (checked + if (item.isChecked) 1 else 0) to (total + 1)
+        }
+    }
+
+    return counts.map { (id, pair) ->
+        ItemConsistency(
+            itemId = id,
+            label = labelMap[id] ?: item(id, instances) ?: "Unknown item",
+            checkedCount = pair.first,
+            totalCount = pair.second,
+            isRemoved = id !in templateIds
+        )
+    }.sortedByDescending { it.percentage }
+}
+
+private fun item(itemId: String, instances: List<TodoInstance>): String? {
+    return instances
+        .sortedByDescending { it.instanceDate }
+        .firstNotNullOfOrNull { instance ->
+            instance.items.firstOrNull { it.id == itemId }?.value
+        }
+}
+
 fun TodoInstance.isCompleted(): Boolean {
     return items.all { it.isChecked }
 }

app/src/main/java/com/flux/data/repository/TodoRepositoryImpl.kt

@@ -31,7 +31,23 @@ class TodoRepositoryImpl @Inject constructor(
     }
 
     override suspend fun upsertList(list: TodoModel) {
-        return withContext(Dispatchers.IO) { dao.upsertList(list) }
+        return withContext(Dispatchers.IO) {
+            dao.upsertList(list)
+
+            val todayEpoch = LocalDate.now().toEpochDay()
+            val todayInstance = instanceDao.loadInstanceForDate(list.id, todayEpoch) ?: return@withContext
+
+            val existingById = todayInstance.items.associateBy { it.id }
+            val syncedItems = list.items.map { templateItem ->
+                existingById[templateItem.id]
+                    ?.copy(value = templateItem.value)   // keep isChecked, pick up rename
+                    ?: templateItem.copy(isChecked = false) // newly added item
+            }
+
+            if (syncedItems != todayInstance.items) {
+                instanceDao.upsertTodoInstance(todayInstance.copy(items = syncedItems))
+            }
+        }
     }
 
     override suspend fun deleteList(list: TodoModel) {