Fixed the NPE on ForegroundLinearLayout and improved the hotspot on f…

…oreground. Check also: 61ffadb
gabrielemariotti · Nov 12, 2014 · f5b5e4d · f5b5e4d
1 parent fa02d62
commit f5b5e4d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardView.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardView.java
@@ -22,11 +22,13 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -202,6 +204,15 @@ protected void initAttrs(AttributeSet attrs, int defStyle) {
         }
     }
 
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    @Override
+    public void drawableHotspotChanged(float x, float y) {
+        super.drawableHotspotChanged(x, y);
+        if (mInternalMainCardLayout != null && mInternalMainCardLayout instanceof ForegroundLinearLayout) {
+            mInternalMainCardLayout.drawableHotspotChanged(x,y);
+        }
+    }
+
     //--------------------------------------------------------------------------
     // Card
     //--------------------------------------------------------------------------

diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardViewNative.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/CardViewNative.java
@@ -22,6 +22,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
@@ -290,6 +291,15 @@ protected void initView() {
 
     }
 
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    @Override
+    public void drawableHotspotChanged(float x, float y) {
+        super.drawableHotspotChanged(x, y);
+        if (mInternalMainCardLayout != null && mInternalMainCardLayout instanceof ForegroundLinearLayout) {
+            mInternalMainCardLayout.drawableHotspotChanged(x,y);
+        }
+    }
+
     //--------------------------------------------------------------------------
     // Card
     //--------------------------------------------------------------------------

diff --git a/library-core/src/main/java/it/gmariotti/cardslib/library/view/ForegroundLinearLayout.java b/library-core/src/main/java/it/gmariotti/cardslib/library/view/ForegroundLinearLayout.java
@@ -28,7 +28,6 @@
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.Gravity;
-import android.view.MotionEvent;
 import android.widget.LinearLayout;
 
 import it.gmariotti.cardslib.library.R;
@@ -224,15 +223,15 @@ public void draw(Canvas canvas) {
         }
     }
 
+
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     @Override
-    public boolean onTouchEvent(MotionEvent e) {
+    public void drawableHotspotChanged(float x, float y) {
+        super.drawableHotspotChanged(x, y);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            if (e.getActionMasked() == MotionEvent.ACTION_DOWN) {
-                if (mForeground != null)
-                    mForeground.setHotspot(e.getX(), e.getY());
+            if (mForeground != null) {
+                mForeground.setHotspot(x, y);
             }
         }
-        return super.onTouchEvent(e);
     }
 }