Fixing resetting image tintColor on Android

Author: mganandraj

ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java

@@ -214,6 +214,29 @@ protected Object getValueOrDefault(Object value, Context context) {
     }
   }
 
+  private static class NullableColorPropSetter extends PropSetter {
+
+    private final int mDefaultValue;
+
+    public NullableColorPropSetter(ReactProp prop, Method setter) {
+      this(prop, setter, 0);
+    }
+
+    public NullableColorPropSetter(ReactProp prop, Method setter, int defaultValue) {
+      super(prop, "mixed", setter);
+      mDefaultValue = defaultValue;
+    }
+
+    @Override
+    protected Object getValueOrDefault(Object value, Context context) {
+      if (value == null) {
+        return null;
+      }
+
+      return ColorPropConverter.getColor(value, context);
+    }
+  }
+
   private static class BooleanPropSetter extends PropSetter {
 
     private final boolean mDefaultValue;
@@ -407,6 +430,9 @@ private static PropSetter createPropSetter(
       if ("Color".equals(annotation.customType())) {
         return new ColorPropSetter(annotation, method, annotation.defaultInt());
       }
+      if ("NullableColor".equals(annotation.customType())) {
+        return new NullableColorPropSetter(annotation, method, annotation.defaultInt());
+      }
       return new IntPropSetter(annotation, method, annotation.defaultInt());
     } else if (propTypeClass == float.class) {
       return new FloatPropSetter(annotation, method, annotation.defaultFloat());
@@ -420,6 +446,9 @@ private static PropSetter createPropSetter(
       if ("Color".equals(annotation.customType())) {
         return new ColorPropSetter(annotation, method);
       }
+      if ("NullableColor".equals(annotation.customType())) {
+        return new NullableColorPropSetter(annotation, method, annotation.defaultInt());
+      }
       return new BoxedIntPropSetter(annotation, method);
     } else if (propTypeClass == ReadableArray.class) {
       return new ArrayPropSetter(annotation, method);

ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java

@@ -145,7 +145,7 @@ public void setLoadingIndicatorSource(ReactImageView view, @Nullable String sour
     view.setLoadingIndicatorSource(source);
   }
 
-  @ReactProp(name = "borderColor", customType = "Color")
+  @ReactProp(name = "borderColor", customType = "NullableColor")
   public void setBorderColor(ReactImageView view, @Nullable Integer borderColor) {
     if (borderColor == null) {
       view.setBorderColor(Color.TRANSPARENT);
@@ -154,7 +154,7 @@ public void setBorderColor(ReactImageView view, @Nullable Integer borderColor) {
     }
   }
 
-  @ReactProp(name = "overlayColor", customType = "Color")
+  @ReactProp(name = "overlayColor", customType = "NullableColor")
   public void setOverlayColor(ReactImageView view, @Nullable Integer overlayColor) {
     if (overlayColor == null) {
       view.setOverlayColor(Color.TRANSPARENT);
@@ -209,7 +209,7 @@ public void setResizeMethod(ReactImageView view, @Nullable String resizeMethod)
     }
   }
 
-  @ReactProp(name = "tintColor", customType = "Color")
+  @ReactProp(name = "tintColor", customType = "NullableColor")
   public void setTintColor(ReactImageView view, @Nullable Integer tintColor) {
     if (tintColor == null) {
       view.clearColorFilter();