some small fixes

aaronbond · Mar 2, 2016 · 367ef2c · 367ef2c
1 parent 73367de
commit 367ef2c
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/src/main/java/com/daprlabs/swipedeck/SwipeDeckActivity.java b/app/src/main/java/com/daprlabs/swipedeck/SwipeDeckActivity.java
@@ -26,21 +26,24 @@ public class SwipeDeckActivity extends AppCompatActivity {
     private SwipeDeck cardStack;
     private Context context = this;
 
+    private SwipeDeckAdapter adapter;
+    private ArrayList<String> testData;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_swipe_deck);
         cardStack = (SwipeDeck) findViewById(R.id.swipe_deck);
         cardStack.setHardwareAccelerationEnabled(true);
 
-        final ArrayList<String> testData = new ArrayList<>();
+        testData = new ArrayList<>();
         testData.add("0");
         testData.add("1");
         testData.add("2");
         testData.add("3");
         testData.add("4");
 
-        final SwipeDeckAdapter adapter = new SwipeDeckAdapter(testData, this);
+        adapter = new SwipeDeckAdapter(testData, this);
         cardStack.setAdapter(adapter);
 
         cardStack.setEventCallback(new SwipeDeck.SwipeEventCallback() {
@@ -70,7 +73,6 @@ public void cardActionUp() {
             }
 
         });
-
         cardStack.setLeftImage(R.id.left_image);
         cardStack.setRightImage(R.id.right_image);
 

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven {url "https://clojars.org/repo/"}
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'

diff --git a/cardstack/build.gradle b/cardstack/build.gradle
@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/aaronbond/Swipe-Deck'
     gitUrl = 'https://github.com/aaronbond/Swipe-Deck.git'
 
-    libraryVersion = '0.2.9'
+    libraryVersion = '0.2.12'
 
     developerId = 'aaronbond'
     developerName = 'Aaron Bond'
@@ -28,11 +28,15 @@ android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
 
+    repositories {
+        maven {url "https://clojars.org/repo/"}
+    }
+
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 19
-        versionName "0.2.9"
+        versionCode 22
+        versionName "0.2.12"
     }
     buildTypes {
         release {

diff --git a/cardstack/src/main/java/com/daprlabs/cardstack/SwipeDeck.java b/cardstack/src/main/java/com/daprlabs/cardstack/SwipeDeck.java
@@ -9,6 +9,7 @@
 import android.os.Parcelable;
 import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Adapter;
@@ -54,6 +55,7 @@ public class SwipeDeck extends FrameLayout {
     private SwipeListener swipeListener;
     private int leftImageResource;
     private int rightImageResource;
+    private boolean cardInteraction;
 
     public SwipeDeck(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -101,7 +103,7 @@ public Parcelable onSaveInstanceState()
     {
         //when persisting this piece of state need to roll it back by the child count
         //so those children get restored later instead of skipped over
-        nextAdapterCard = nextAdapterCard - getChildCount();
+        //nextAdapterCard = nextAdapterCard - getChildCount();
         return Icepick.saveInstanceState(this, super.onSaveInstanceState());
     }
 
@@ -201,18 +203,15 @@ private void removeTopCard() {
         if (child != null) {
             child.setOnTouchListener(null);
             swipeListener = null;
+            //this will also check to see if cards are depleted
             removeViewWaitForAnimation(child);
         }
-
-        //if there are no more children left after top card removal let the callback know
-        if (getChildCount() <= 0 && eventCallback != null) {
-            eventCallback.cardsDepleted();
-        }
     }
 
     private void removeViewWaitForAnimation(View child) {
         new RemoveViewOnAnimCompleted().execute(child);
 
+
     }
 
     @Override
@@ -395,11 +394,14 @@ public void cardOffScreen() {
                 @Override
                 public void cardActionDown() {
                     if(eventCallback!=null) eventCallback.cardActionDown();
+                    cardInteraction = true;
                 }
 
                 @Override
                 public void cardActionUp() {
+
                     if(eventCallback!=null) eventCallback.cardActionUp();
+                    cardInteraction = false;
                 }
 
             }, initialX, initialY, ROTATION_DEGREES, OPACITY_END);
@@ -492,6 +494,11 @@ protected View doInBackground(View... params) {
         protected void onPostExecute(View view) {
             super.onPostExecute(view);
             removeView(view);
+
+            //if there are no more children left after top card removal let the callback know
+            if (getChildCount() <= 0 && eventCallback != null) {
+                eventCallback.cardsDepleted();
+            }
         }
     }
 }

diff --git a/cardstack/src/main/java/com/daprlabs/cardstack/SwipeListener.java b/cardstack/src/main/java/com/daprlabs/cardstack/SwipeListener.java
@@ -69,6 +69,8 @@ public boolean onTouch(View v, MotionEvent event) {
                 //gesture has begun
                 float x;
                 float y;
+                //cancel any current animations
+                v.clearAnimation();
 
                 mActivePointerId = event.getPointerId(0);