fix(android): fixed occasional incorrect view measure for FastImage

IjzerenHein · Aug 28, 2019 · ec32eb2 · ec32eb2
1 parent e9e6848
commit ec32eb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/android/src/main/java/com/ijzerenhein/sharedelement/RNSharedElementContent.java b/android/src/main/java/com/ijzerenhein/sharedelement/RNSharedElementContent.java
@@ -1,15 +1,13 @@
 package com.ijzerenhein.sharedelement;
 
 import android.view.View;
-import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 
 import com.facebook.drawee.view.GenericDraweeView;
 import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.interfaces.DraweeController;
-import com.facebook.drawee.drawable.ScalingUtils.ScaleType;
 
 class RNSharedElementContent {
     View view;
@@ -35,6 +33,9 @@ else if (view instanceof ImageView) {
             if (drawable == null) return null;
             int width = drawable.getIntrinsicWidth();
             int height = drawable.getIntrinsicHeight();
+            if ((width <= 0) || (height <= 0)) {
+              return null;
+            }
             return new RectF(0, 0, width, height);
         }
         return new RectF(0, 0, view.getWidth(), view.getHeight());

diff --git a/android/src/main/java/com/ijzerenhein/sharedelement/RNSharedElementDrawable.java b/android/src/main/java/com/ijzerenhein/sharedelement/RNSharedElementDrawable.java
@@ -77,6 +77,7 @@ ViewType update(
     if ((mStyle != null) && (style != null) && !invalidated) {
       switch (viewType) {
         case REACTIMAGEVIEW:
+        case IMAGEVIEW:
           if ((mStyle.compare(style) &
             (RNSharedElementStyle.PROP_BORDER
               | RNSharedElementStyle.PROP_BACKGROUND_COLOR
@@ -87,15 +88,6 @@ ViewType update(
             invalidated = false;
           }
           break;
-        case IMAGEVIEW:
-          if ((mStyle.compare(style) &
-            (RNSharedElementStyle.PROP_BORDER | RNSharedElementStyle.PROP_BACKGROUND_COLOR)) != 0) {
-            //Log.d(LOG_TAG, "drawableChanged, viewType: " + viewType + ", changes: " + mStyle.compare(style));
-            invalidated = true;
-          } else {
-            invalidated = false;
-          }
-          break;
         case PLAIN:
           if ((mStyle.compare(style) &
             (RNSharedElementStyle.PROP_BORDER