Rewrite card update to fix #7

robinmanuelthiel · Feb 15, 2018 · 40aa190 · 40aa190
1 parent 8ea0369
commit 40aa190
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.mfractor/.swipecards.db b/.mfractor/.swipecards.db
diff --git a/SwipeCards.Controls/Views/CardStackView.xaml.cs b/SwipeCards.Controls/Views/CardStackView.xaml.cs
@@ -197,8 +197,6 @@ async void OnPanUpdated(object sender, PanUpdatedEventArgs e)
                     //case GestureStatus.Canceled:
                     await HandleTouchCompleted();
                     break;
-                default:
-                    break;
             }
         }
 
@@ -305,17 +303,20 @@ private void ShowNextCard()
                 topCard.Scale = defaultSubcardScale;
                 CardStack.Children.Insert(0, topCard);
             }
-
-            // Update cards
-            for (int i = 0; i < Math.Min(numberOfCards, ItemsSource.Count); i++)
+
+            // Update cards from top to back
+            // Start with the first card on top with is the last one on the CardStack
+            for (var i = numberOfCards - 1; i >= 0; i--)
             {
                 var cardView = (CardView)CardStack.Children[i];
                 cardView.Rotation = 0;
                 cardView.TranslationX = 0;
 
-                if ((itemIndex + 1) - i < ItemsSource.Count)
-                {
-                    cardView.Update(ItemsSource[(itemIndex + 1) - i]);
+                // Check if an item for the card is available
+                var index = Math.Min((numberOfCards - 1), ItemsSource.Count) - i + itemIndex;
+                if (ItemsSource.Count > index)
+                {
+                    cardView.Update(ItemsSource[index]);
                     cardView.IsVisible = true;
                 }
             }