Some fixes

Change-Id: Ie174dc64b2babbacbf97474fd41fb355201c75c8

4 files changed, 42 insertions, 6 deletions

diff --git a/src/com/android/cards/internal/CardArrayAdapter.java b/src/com/android/cards/internal/CardArrayAdapter.java
index 8c2fef7..7ebc8cb 100644
--- a/src/com/android/cards/internal/CardArrayAdapter.java
+++ b/src/com/android/cards/internal/CardArrayAdapter.java
@@ -197,7 +197,7 @@ public class CardArrayAdapter extends BaseCardArrayAdapter implements UndoBarCon
      * @param card {@link Card}
      * @param cardView {@link com.android.cards.view.base.CardViewWrapper}
      */
-    protected void setupSwipeableAnimation(final Card card, CardView cardView) {
+    protected void setupSwipeableAnimation(final Card card, CardViewWrapper cardView) {
         HashMap<Integer, Card.OnLongCardClickListener> multipleOnLongClickListner =
                 card.getMultipleOnLongClickListener();
         if (card.isSwipeable()){
@@ -235,7 +235,7 @@ public class CardArrayAdapter extends BaseCardArrayAdapter implements UndoBarCon
         }
     }
 
-    private void setPartialOnTouchListeners(CardView cardView,
+    private void setPartialOnTouchListeners(CardViewWrapper cardView,
             SwipeDismissListViewTouchListener onTouchListener,
             HashMap<Integer, Card.OnLongCardClickListener> multipleOnLongClickListner) {
         if (multipleOnLongClickListner != null && !multipleOnLongClickListner.isEmpty()) {
diff --git a/src/com/android/cards/view/CardView.java b/src/com/android/cards/view/CardView.java
index 61636d6..6150480 100644
--- a/src/com/android/cards/view/CardView.java
+++ b/src/com/android/cards/view/CardView.java
@@ -33,6 +33,7 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.ViewTreeObserver;
 
 import java.util.HashMap;
@@ -590,10 +591,10 @@ public class CardView extends BaseCardView implements CardViewWrapper {
                 }
 
                 @Override
-                public void onDismiss(CardView cardView, Card card) {
-                    final ViewGroup vg = (ViewGroup)(cardView.getParent());
+                public void onDismiss(CardViewWrapper cardView, Card card) {
+                    final ViewGroup vg = (ViewGroup)(cardView.getCardParent());
                     if (vg!=null){
-                        vg.removeView(cardView);
+                        vg.removeView(cardView.getCardView());
                         card.onSwipeCard();
                     }
                 }
@@ -1147,4 +1148,13 @@ public class CardView extends BaseCardView implements CardViewWrapper {
     public void changeBackgroundColorResourceId(int colorResourceId) {
         //TODO : do nothing for now
     }
+
+    public ViewParent getCardParent() {
+        return getParent();
+    }
+
+    public View getCardView() {
+        View v = this;
+        return v;
+    }
 }
diff --git a/src/com/android/cards/view/CardViewNative.java b/src/com/android/cards/view/CardViewNative.java
index b241886..e8062b8 100644
--- a/src/com/android/cards/view/CardViewNative.java
+++ b/src/com/android/cards/view/CardViewNative.java
@@ -35,6 +35,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 
@@ -685,7 +686,7 @@ public class CardViewNative extends android.support.v7.widget.CardView implement
      * @param area
      * @return
      */
-    protected View decodeAreaOnClickListener(int area){
+    public View decodeAreaOnClickListener(int area) {
 
         if (area<Card.CLICK_LISTENER_ALL_VIEW && area>Card.CLICK_LISTENER_CONTENT_VIEW)
             return null;
@@ -1268,4 +1269,13 @@ public class CardViewNative extends android.support.v7.widget.CardView implement
     public View getInternalMainCardLayout() {
         return mInternalMainCardLayout;
     }
+
+    public ViewParent getCardParent() {
+        return getParent();
+    }
+
+    public View getCardView() {
+        View v = this;
+        return v;
+    }
 }
diff --git a/src/com/android/cards/view/base/CardViewWrapper.java b/src/com/android/cards/view/base/CardViewWrapper.java
index 09e6ecc..6c2687c 100644
--- a/src/com/android/cards/view/base/CardViewWrapper.java
+++ b/src/com/android/cards/view/base/CardViewWrapper.java
@@ -21,6 +21,7 @@ package com.android.cards.view.base;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.view.ViewParent;
 
 import com.android.cards.internal.Card;
 import com.android.cards.view.component.CardThumbnailView;
@@ -159,4 +160,19 @@ public interface CardViewWrapper {
      * @return
      */
     View getInternalMainCardLayout();
+
+    /**
+     *
+     * @param area
+     * @return
+     */
+    public View decodeAreaOnClickListener(int area);
+
+    /**
+     *
+     * @return
+     */
+    public ViewParent getCardParent();
+
+    public View getCardView();
 }