Fix animation when card moves and updates simultaneously

8 years ago · f55dc0d811
parent 7872983064
commit f55dc0d811
1 changed files with 10 additions and 3 deletions
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/HabitCardListCache.java
@ -388,10 +388,17 @@ public class HabitCardListCache implements CommandRunner.Listener

            int prevPosition = data.habits.indexOf(habit);

-            if (prevPosition < 0) performInsert(habit, currentPosition);
-            else if (prevPosition == currentPosition)
+            if (prevPosition < 0)
+            {
+                performInsert(habit, currentPosition);
+            }
+            else
+            {
+                if (prevPosition != currentPosition)
+                    performMove(habit, prevPosition, currentPosition);
+
                performUpdate(id, currentPosition);
-            else performMove(habit, prevPosition, currentPosition);
+            }
        }

        private void processRemovedHabits()