From 4acf009284bfbcd3408b0f198358112de1bcba28 Mon Sep 17 00:00:00 2001
From: Andrei Coman <andreic@fb.com>
Date: Mon, 6 Jun 2016 04:23:50 -0700
Subject: [PATCH] Pass resource drawable id to constructor directly

Summary:
Instead of passing the helper to each method that uses it, just pass it
to the image constructor.

Reviewed By: dmmiller

Differential Revision: D3364532

fbshipit-source-id: 949bdbf951875c9b8cd05d028a2c329e12d72042
---
 .../react/views/image/ReactImageManager.java  |  7 +++---
 .../react/views/image/ReactImageView.java     | 24 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
index eaee5053a..fbd98355c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
@@ -71,19 +71,20 @@ public class ReactImageManager extends SimpleViewManager<ReactImageView> {
     return new ReactImageView(
         context,
         getDraweeControllerBuilder(),
-        getCallerContext());
+        getCallerContext(),
+        mResourceDrawableIdHelper);
   }
 
   // In JS this is Image.props.source.uri
   @ReactProp(name = "src")
   public void setSource(ReactImageView view, @Nullable String source) {
-    view.setSource(source, mResourceDrawableIdHelper);
+    view.setSource(source);
   }
 
   // In JS this is Image.props.loadingIndicatorSource.uri
   @ReactProp(name = "loadingIndicatorSrc")
   public void setLoadingIndicatorSource(ReactImageView view, @Nullable String source) {
-    view.setLoadingIndicatorSource(source, mResourceDrawableIdHelper);
+    view.setLoadingIndicatorSource(source);
   }
 
   @ReactProp(name = "borderColor", customType = "Color")
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
index 10a474420..d7d093868 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -11,6 +11,8 @@ package com.facebook.react.views.image;
 
 import javax.annotation.Nullable;
 
+import java.util.Arrays;
+
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
@@ -51,8 +53,6 @@ import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 
-import java.util.Arrays;
-
 /**
  * Wrapper class around Fresco's GenericDraweeView, enabling persisting props across multiple view
  * update and consistent processing of both static and network images.
@@ -135,6 +135,8 @@ public class ReactImageView extends GenericDraweeView {
     }
   }
 
+  private final ResourceDrawableIdHelper mResourceDrawableIdHelper;
+
   private @Nullable Uri mUri;
   private @Nullable Drawable mLoadingImageDrawable;
   private int mBorderColor;
@@ -163,12 +165,14 @@ public class ReactImageView extends GenericDraweeView {
   public ReactImageView(
       Context context,
       AbstractDraweeControllerBuilder draweeControllerBuilder,
-      @Nullable Object callerContext) {
+      @Nullable Object callerContext,
+      ResourceDrawableIdHelper resourceDrawableIdHelper) {
     super(context, buildHierarchy(context));
     mScaleType = ImageResizeMode.defaultValue();
     mDraweeControllerBuilder = draweeControllerBuilder;
     mRoundedCornerPostprocessor = new RoundedCornerPostprocessor();
     mCallerContext = callerContext;
+    mResourceDrawableIdHelper = resourceDrawableIdHelper;
   }
 
   public void setShouldNotifyLoadEvents(boolean shouldNotify) {
@@ -255,9 +259,7 @@ public class ReactImageView extends GenericDraweeView {
     mIsDirty = true;
   }
 
-  public void setSource(
-      @Nullable String source,
-      ResourceDrawableIdHelper resourceDrawableIdHelper) {
+  public void setSource(@Nullable String source) {
     mUri = null;
     if (source != null) {
       try {
@@ -270,7 +272,7 @@ public class ReactImageView extends GenericDraweeView {
         // ignore malformed uri, then attempt to extract resource ID.
       }
       if (mUri == null) {
-        mUri = resourceDrawableIdHelper.getResourceDrawableUri(getContext(), source);
+        mUri = mResourceDrawableIdHelper.getResourceDrawableUri(getContext(), source);
         mIsLocalImage = true;
       } else {
         mIsLocalImage = false;
@@ -279,10 +281,8 @@ public class ReactImageView extends GenericDraweeView {
     mIsDirty = true;
   }
 
-  public void setLoadingIndicatorSource(
-      @Nullable String name,
-      ResourceDrawableIdHelper resourceDrawableIdHelper) {
-    Drawable drawable = resourceDrawableIdHelper.getResourceDrawable(getContext(), name);
+  public void setLoadingIndicatorSource(@Nullable String name) {
+    Drawable drawable = mResourceDrawableIdHelper.getResourceDrawable(getContext(), name);
     mLoadingImageDrawable =
         drawable != null ? (Drawable) new AutoRotateDrawable(drawable, 1000) : null;
     mIsDirty = true;
@@ -313,7 +313,7 @@ public class ReactImageView extends GenericDraweeView {
     }
 
     boolean doResize = shouldResize(mUri);
-    if (doResize && (getWidth() <= 0 || getHeight() <=0)) {
+    if (doResize && (getWidth() <= 0 || getHeight() <= 0)) {
       // If need a resize and the size is not yet set, wait until the layout pass provides one
       return;
     }