Fix streaks of HabitGroups

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt

@@ -74,18 +74,23 @@ class StreakList {
         from: Timestamp,
         to: Timestamp
     ) {
+        list.clear()
         if (habitList.isEmpty) return
         var current = from
         var streakRunning = false
         var streakStart = from
         while (current <= to) {
-            if (habitList.all { it.streaks.isInStreaks(current) } && !streakRunning) {
+            if (habitList.all { it.streaks.isInStreaks(current) }) {
-                streakStart = current
+                if (!streakRunning) {
-                streakRunning = true
+                    streakStart = current
-            } else if (streakRunning) {
+                    streakRunning = true
-                val streakEnd = current.minus(1)
+                }
-                list.add(Streak(streakStart, streakEnd))
+            } else {
-                streakRunning = false
+                if (streakRunning) {
+                    val streakEnd = current.minus(1)
+                    list.add(Streak(streakStart, streakEnd))
+                    streakRunning = false
+                }
             }
             current = current.plus(1)
         }

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.kt

@@ -216,35 +216,28 @@ class HabitCardListCache @Inject constructor(
         if (type == STANDALONE_HABIT) {
             val h = data.uuidToHabit[uuid]
             if (h != null) {
-                val pos = data.habits.indexOf(h)
+                data.habits.removeAt(position)
-                data.habits.removeAt(pos)
                 data.removeWithUUID(uuid)
-                data.positionTypes.removeAt(pos)
+                data.removeWithPos(position)
-                data.positionIndices.removeAt(pos)
+                data.decrementPositions(position + 1, data.positionTypes.size)
-                data.positionToHabit.remove(pos)
+                listener.onItemRemoved(position)
-                data.decrementPositions(pos + 1, data.positionTypes.size)
-                listener.onItemRemoved(pos)
             }
         } else if (type == SUB_HABIT) {
             val h = data.uuidToHabit[uuid]
             if (h != null) {
-                val pos = data.uuidToPosition[uuid]!!
                 val hgrUUID = h.parentUUID
                 val hgr = data.uuidToHabitGroup[hgrUUID]
                 val hgrIdx = data.habitGroups.indexOf(hgr)
                 data.subHabits[hgrIdx].remove(h)
                 data.removeWithUUID(uuid)
-                data.positionTypes.removeAt(pos)
+                data.removeWithPos(position)
-                data.positionIndices.removeAt(pos)
+                data.decrementPositions(position + 1, data.positionTypes.size)
-                data.positionToHabit.remove(pos)
+                listener.onItemRemoved(position)
-                data.decrementPositions(pos + 1, data.positionTypes.size)
-                listener.onItemRemoved(pos)
             }
         } else if (type == HABIT_GROUP) {
             val hgr = data.uuidToHabitGroup[uuid]
             if (hgr != null) {
-                val pos = data.uuidToPosition[uuid]!!
+                val hgrIdx = data.positionIndices[position]
-                val hgrIdx = data.habitGroups.indexOf(hgr)
 
                 for (habit in data.subHabits[hgrIdx].reversed()) {
                     val habitPos = data.uuidToPosition[habit.uuid]!!
@@ -255,7 +248,7 @@ class HabitCardListCache @Inject constructor(
                 data.habitGroups.removeAt(hgrIdx)
                 data.removeWithUUID(hgr.uuid)
                 data.rebuildPositions()
-                listener.onItemRemoved(pos)
+                listener.onItemRemoved(position)
             }
         }
     }
@@ -500,8 +493,7 @@ class HabitCardListCache @Inject constructor(
 
             if (type == STANDALONE_HABIT) {
                 habits.removeAt(fromPosition)
-                positionTypes.removeAt(fromPosition)
+                removeWithPos(fromPosition)
-                positionIndices.removeAt(fromPosition)
                 if (fromPosition < checkedToPosition) {
                     decrementPositions(fromPosition + 1, checkedToPosition)
                 } else {
@@ -513,10 +505,9 @@ class HabitCardListCache @Inject constructor(
             } else {
                 val hgr = uuidToHabitGroup[habit.parentUUID]
                 val hgrIdx = habitGroups.indexOf(hgr)
-                val fromIdx = subHabits[hgrIdx].indexOf(habit)
+                val fromIdx = positionIndices[fromPosition]
                 subHabits[hgrIdx].removeAt(fromIdx)
-                positionTypes.removeAt(fromPosition)
+                removeWithPos(fromPosition)
-                positionIndices.removeAt(fromPosition)
                 if (fromPosition < checkedToPosition) {
                     decrementPositions(fromPosition + 1, checkedToPosition)
                 } else {
@@ -564,6 +555,12 @@ class HabitCardListCache @Inject constructor(
             checkmarks.remove(uuid)
         }
 
+        fun removeWithPos(pos: Int) {
+            positionTypes.removeAt(pos)
+            positionIndices.removeAt(pos)
+            positionToHabit.remove(pos)
+        }
+
         /**
          * Creates a new CacheData without any content.
          */
@@ -664,9 +661,9 @@ class HabitCardListCache @Inject constructor(
                 data.positionTypes.add(position, STANDALONE_HABIT)
                 data.positionIndices.add(position, position)
             } else {
-                val hgr = data.uuidToHabitGroup[habit.parentUUID]
+                val hgrPos = data.uuidToPosition[habit.parentUUID]!!
-                val hgrIdx = data.habitGroups.indexOf(hgr)
+                val hgrIdx = data.positionIndices[hgrPos]
-                val habitIndex = newData.subHabits[hgrIdx].indexOf(habit)
+                val habitIndex = newData.positionIndices[position]
                 data.subHabits[hgrIdx].add(habitIndex, habit)
                 data.positionTypes.add(position, SUB_HABIT)
                 data.positionIndices.add(position, habitIndex)
@@ -685,10 +682,13 @@ class HabitCardListCache @Inject constructor(
         private fun performInsert(habitGroup: HabitGroup, position: Int) {
             if (!data.isValidInsert(habitGroup, position)) return
             val uuid = habitGroup.uuid
-            val prevIdx = newData.habitGroups.indexOf(habitGroup)
+            val prevIdx = newData.positionIndices[position]
             val habitList = newData.subHabits[prevIdx]
-            var idx = data.habitGroups.indexOf(data.positionToHabitGroup[position])
+            val idx = if (data.positionIndices.size > position) {
-            if (idx < 0) idx = data.habitGroups.size
+                data.positionIndices[position]
+            } else {
+                data.habitGroups.size
+            }
 
             data.habitGroups.add(idx, habitGroup)
             data.subHabits.add(prevIdx, habitList)
@@ -737,9 +737,9 @@ class HabitCardListCache @Inject constructor(
                 val newPosition = if (type == STANDALONE_HABIT) {
                     currentPosition
                 } else {
-                    val hgr = data.uuidToHabitGroup[habit.parentUUID]
+                    val hgrPos = data.uuidToPosition[habit.parentUUID]!!
-                    val hgrIdx = data.habitGroups.indexOf(hgr)
+                    val hgrIdx = data.positionIndices[hgrPos]
-                    newData.subHabits[hgrIdx].indexOf(habit) + data.uuidToPosition[hgr!!.uuid]!! + 1
+                    newData.subHabits[hgrIdx].indexOf(habit) + hgrPos + 1
                 }
                 if (prevPosition < 0) {
                     performInsert(habit, newPosition)

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt

@@ -158,12 +158,6 @@ open class ListHabitsBehavior @Inject constructor(
         if (value == YES_MANUAL) screen.showConfetti(habit.color, x, y)
     }
 
-    fun onChangeScore(habit: Habit) {
-        commandRunner.run(
-            RefreshParentGroupCommand(habit, habitGroupList)
-        )
-    }
-
     enum class Message {
         COULD_NOT_EXPORT,
         IMPORT_SUCCESSFUL,