Update Demo and fix #5

robinmanuelthiel · Dec 26, 2017 · 31ba731 · 31ba731
1 parent ef56865
commit 31ba731
Show file tree

Hide file tree

Showing 15 changed files with 7,701 additions and 7,152 deletions.
diff --git a/SwipeCards.Controls/Arguments/DraggingEventArgs.cs b/SwipeCards.Controls/Arguments/DraggingEventArgs.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace SwipeCards.Controls.Arguments
+{
+    public class DraggingEventArgs : EventArgs
+    {
+        public readonly object Item;
+
+        public DraggingEventArgs(object item)
+        {
+            this.Item = item;
+        }
+    }
+}
diff --git a/SwipeCards.Controls/Arguments/SwipedEventArgs.cs b/SwipeCards.Controls/Arguments/SwipedEventArgs.cs
@@ -0,0 +1,21 @@
+using System;
+
+namespace SwipeCards.Controls.Arguments
+{
+    public class SwipedEventArgs : EventArgs
+    {
+        public readonly object Item;
+        public readonly SwipeDirection Direction;
+
+        public SwipedEventArgs(object item, SwipeDirection direction)
+        {
+            this.Item = item;
+            this.Direction = direction;
+        }
+    }
+
+    public enum SwipeDirection
+    {
+        Left, Right
+    }
+}
diff --git a/SwipeCards.Controls/SwipeCards.Controls.csproj b/SwipeCards.Controls/SwipeCards.Controls.csproj
@@ -15,7 +15,7 @@
         <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Xamarin.Forms" Version="2.5.0.91635" />
+        <PackageReference Include="Xamarin.Forms" Version="2.5.0.121934" />
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Include="Views\CardStackView.xaml">
@@ -35,5 +35,6 @@
     </ItemGroup>
     <ItemGroup>
         <Folder Include="Views\" />
+        <Folder Include="Arguments\" />
     </ItemGroup>
 </Project>
diff --git a/SwipeCards.Controls/Views/CardStackView.xaml.cs b/SwipeCards.Controls/Views/CardStackView.xaml.cs
@@ -7,6 +7,7 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using Xamarin.Forms.Internals;
+using SwipeCards.Controls.Arguments;
 
 namespace SwipeCards.Controls
 {
@@ -117,11 +118,10 @@ public ICommand SwipedLeftCommand
         //}
 
         #endregion
-
-        public Action<object> SwipedRight = null;
-        public Action<object> SwipedLeft = null;
-        public Action<object> StartedDragging = null;
-        public Action<object> FinishedDragging = null;
+
+        public event EventHandler<SwipedEventArgs> Swiped;
+        public event EventHandler<DraggingEventArgs> StartedDragging;
+        public event EventHandler<DraggingEventArgs> FinishedDragging;
 
         private const int numberOfCards = 2;
         private const int animationLength = 250;
@@ -152,12 +152,14 @@ public void Setup()
             for (var i = numberOfCards - 1; i >= 0; i--)
             {
                 // Create CardView
-                var cardView = new CardView(ItemTemplate);
-                cardView.IsVisible = false;
-                cardView.Scale = (i == 0) ? 1.0f : defaultSubcardScale;
-                cardView.IsEnabled = false;
-
-                // Add CardView to UI
+                var cardView = new CardView(ItemTemplate)
+                {
+                    IsVisible = false,
+                    Scale = (i == 0) ? 1.0f : defaultSubcardScale,
+                    IsEnabled = false
+                };
+
+                // Add CardView to UI
                 CardStack.Children.Add(
                     cardView,
                     Constraint.Constant(0), // X
@@ -172,13 +174,12 @@ public void Setup()
             ShowNextCard();
         }
 
-
         protected override void OnSizeAllocated(double width, double height)
         {
             base.OnSizeAllocated(width, height);
 
             // Recalculate move distance
-            if (CardMoveDistance == -1)
+            if (CardMoveDistance == -1 && !width.Equals(-1))
                 CardMoveDistance = (int)(width / 3);
         }
 
@@ -204,7 +205,7 @@ async void OnPanUpdated(object sender, PanUpdatedEventArgs e)
         private void HandleTouchStart()
         {
             if (itemIndex < ItemsSource.Count)
-                StartedDragging?.Invoke(ItemsSource[itemIndex]);
+                StartedDragging?.Invoke(this, new DraggingEventArgs(ItemsSource[itemIndex]));
         }
 
         private void HandleTouchRunning(float xDiff)
@@ -254,13 +255,13 @@ private async Task HandleTouchCompleted()
                 // Fire events
                 if (cardDistance > 0)
                 {
-                    SwipedRight?.Invoke(ItemsSource[itemIndex]);
+                    Swiped?.Invoke(this, new SwipedEventArgs(ItemsSource[itemIndex], SwipeDirection.Right));
                     if (SwipedRightCommand != null && SwipedRightCommand.CanExecute(ItemsSource[itemIndex]))
                         SwipedRightCommand.Execute(ItemsSource[itemIndex]);
                 }
                 else
                 {
-                    SwipedLeft?.Invoke(ItemsSource[itemIndex]);
+                    Swiped?.Invoke(this, new SwipedEventArgs(ItemsSource[itemIndex], SwipeDirection.Left));
                     if (SwipedLeftCommand != null && SwipedLeftCommand.CanExecute(ItemsSource[itemIndex]))
                         SwipedLeftCommand.Execute(ItemsSource[itemIndex]);
                 }
@@ -283,7 +284,7 @@ private async Task HandleTouchCompleted()
             }
 
             if (itemIndex < ItemsSource.Count)
-                FinishedDragging?.Invoke(ItemsSource[itemIndex]);
+                FinishedDragging?.Invoke(this, new DraggingEventArgs(ItemsSource[itemIndex]));
         }
 
         private void ShowNextCard()

diff --git a/SwipeCards.Demo.Forms.Android/MainActivity.cs b/SwipeCards.Demo.Forms.Android/MainActivity.cs
@@ -9,7 +9,7 @@
 
 namespace SwipeCards.Demo.Forms.Droid
 {
-    [Activity(Label = "SwipeCards.Demo.Forms", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+    [Activity(Label = "SwipeCards Demo", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle bundle)